Commit Graph

2752 Commits

Author SHA1 Message Date
Christopher Speller
515d709c2e Merge pull request #915 from mattermost/plt-300
PLT-300 Update allow/deny oauth page UI, and add ouath as reserved word.
2015-10-05 10:32:27 -04:00
Christopher Speller
f4afabd679 Merge pull request #903 from mattermost/PLT-44
PLT-44 allow team switching without the need to login
2015-10-05 10:20:14 -04:00
Joram Wilander
8595fd85c7 Merge pull request #887 from asaadmahmoodspin/plt-375
plt-375 - Making modals compatible with themes
2015-10-05 10:17:52 -04:00
Harrison Healey
b144ac1036 Merge pull request #900 from mattermost/PLT-462
PLT-462 Adding diagnostic info
2015-10-05 09:27:24 -04:00
Asaad Mahmood
c2d014b00a Increasing spacing for bottom unread notification 2015-10-05 08:13:15 +05:00
Asaad Mahmood
89d6613b93 Updating theme colours for popovers, drop downs etc 2015-10-05 08:04:32 +05:00
Asaad Mahmood
74fecd1952 Updating search colours 2015-10-05 06:43:08 +05:00
Asaad Mahmood
fef9947757 Updating jpg to png for theme names 2015-10-05 06:34:35 +05:00
Asaad Mahmood
7ba82096eb Merge branch 'master' of https://github.com/mattermost/platform into plt-375 2015-10-05 06:21:52 +05:00
it33
44ceedc2ad Merge pull request #905 from chengkun/patch-1
Fixed typo in single-container-install.md
2015-10-04 07:33:29 -07:00
it33
b69ee1325d Update CHANGELOG.md 2015-10-02 19:32:34 -07:00
Asaad Mahmood
fb290743d7 Changing jpeg images back to png 2015-10-02 22:32:50 +05:00
=Corey Hulen
3b34e73132 Fixing redirect issue 2015-10-02 10:29:56 -07:00
Asaad Mahmood
d8c5c4f746 Merge branch 'master' of https://github.com/mattermost/platform into plt-375
Conflicts:
	web/react/components/user_settings/user_settings_appearance.jsx
2015-10-02 22:26:28 +05:00
JoramWilander
6221927351 Update allow/deny oauth page UI, and add ouath as reserved word. 2015-10-02 12:47:54 -04:00
Corey Hulen
41069d83d2 Merge pull request #904 from teviot/teviot-patch-1
Increase test timeouts to accommodate slow dev environments
2015-10-02 09:21:38 -07:00
=Corey Hulen
e0743a6a2b Fixing break 2015-10-02 09:16:03 -07:00
=Corey Hulen
4452bb7988 Fixing issues 2015-10-02 09:13:30 -07:00
=Corey Hulen
cee6dc270b Fixing issues 2015-10-02 09:12:09 -07:00
=Corey Hulen
3863c3c15e Adding offical build function 2015-10-02 09:01:50 -07:00
=Corey Hulen
b2052de746 Merge branch 'master' into PLT-462 2015-10-02 08:36:56 -07:00
Christopher Speller
c427e9c9d6 Merge pull request #912 from hmhealey/plt174
PLT-174 Added emailto: to the beginning of email links
2015-10-02 10:24:31 -04:00
Harrison Healey
2f60ab82a8 Merge pull request #909 from mattermost/plt-446
PLT-446 Added help text to incoming webhooks.
2015-10-02 09:50:15 -04:00
Harrison Healey
5a31c950b0 Merge pull request #913 from mattermost/it33-patch-3
Change text to avoid confusion with Slack Import
2015-10-02 09:33:28 -04:00
it33
95fe16e0d9 Change text to avoid confusion with Slack Import 2015-10-02 06:23:26 -07:00
hmhealey
fe8c04c973 Added emailto: to the beginning of email links 2015-10-02 09:18:45 -04:00
JoramWilander
28e84f1d13 Added help text for incoming webhooks. 2015-10-02 09:18:19 -04:00
Christopher Speller
b07fad563d Merge pull request #911 from hmhealey/plt437
PLT-437 Removed $ from time tooltip
2015-10-02 09:15:19 -04:00
hmhealey
c4203d8cd9 Removed $ from time tooltip 2015-10-02 08:54:31 -04:00
Christopher Speller
92404d6452 Merge pull request #906 from teviot/teviot-patch-2
Pass-through post creation time when importing posts
2015-10-02 08:50:23 -04:00
Joram Wilander
08d390953a Merge pull request #881 from hmhealey/plt194
PLT-194 Changes to ChannelMember notification settings
2015-10-02 08:45:38 -04:00
it33
fbbee5bf61 Update slack-import.md 2015-10-02 05:40:34 -07:00
it33
f0c8019da4 Added link to Slack Import 2015-10-02 05:16:58 -07:00
it33
36f0117afb Create slack-import.md 2015-10-02 05:16:20 -07:00
Joram Wilander
cf66eaa357 Merge pull request #901 from hmhealey/paossword
Fixed typo in mattermost.go help text
2015-10-02 08:05:52 -04:00
Teviot Systems
fc82f57102 Pass-through post creation time when importing posts 2015-10-02 20:16:27 +10:00
Chengkun
01a014d714 Fixed typo in single-container-install.md
Remove the typo of quotation marks after 'docker-machine create -d virtualbox dev'
2015-10-02 15:18:22 +08:00
Teviot Systems
32533b718f Increase test timeouts to accommodate slow dev environments 2015-10-02 14:05:25 +10:00
=Corey Hulen
90635ad216 Fixing issue with being logged into other team 2015-10-01 18:15:40 -07:00
=Corey Hulen
430806301d PLT-44 allow team switching without the need to login 2015-10-01 17:52:47 -07:00
it33
9083f0b15c Merge pull request #898 from tmuwandi/patch-1
Fixed incorrect punctuation
2015-10-01 15:31:13 -07:00
it33
6a5ef81981 Merge pull request #894 from thomas9987/patch-1
Fixed formatting
2015-10-01 15:29:59 -07:00
it33
768d90a118 Merge pull request #897 from chuck5/patch-1
Changed comma to period to correct grammar error.
2015-10-01 15:28:55 -07:00
hmhealey
896c5f0b58 Fixed typo in mattermost.go help text 2015-10-01 16:37:15 -04:00
=Corey Hulen
9d688821aa PLT-462 Adding diagnostic info 2015-10-01 13:02:04 -07:00
tmuwandi
ab8685a74d Update prod-ubuntu.md 2015-10-01 12:40:33 -07:00
it33
013df9f661 Merge pull request #895 from drbaker/patch-1
Grammar fix: "setup" -> "set up" in header lines
2015-10-01 12:38:00 -07:00
chuck5
89bed8ddfc Changed comma to period to correct grammar error. 2015-10-01 12:35:42 -07:00
drbaker
7ecca3bcad Grammar fix: "setup" -> "set up" in header lines 2015-10-01 12:31:10 -07:00
thomas9987
04916a5f9d Fixed formatting
Removed empty bullet point
2015-10-01 12:30:47 -07:00