Commit Graph

4819 Commits

Author SHA1 Message Date
JoramWilander
c26edcf678 Final updates 2016-01-14 08:24:09 -05:00
JoramWilander
22c522178c Fix error message 2016-01-14 08:24:09 -05:00
JoramWilander
537a220d07 Minor update to about modal 2016-01-14 08:24:09 -05:00
JoramWilander
33519518d6 Remove bin from gitignore 2016-01-14 08:24:09 -05:00
JoramWilander
874d120535 Add some unit tests 2016-01-14 08:24:09 -05:00
JoramWilander
9110dd54a1 Added license validation and settings 2016-01-14 08:24:09 -05:00
Corey Hulen
53b0cd8f2a Merge pull request #1855 from rgarmsen2295/plt-1006
PLT-1006 Changed team statistics page to show usernames with email shown in a tooltip
2016-01-13 09:03:42 -06:00
Corey Hulen
1e1864d78f Merge pull request #1853 from asaadmahmoodspin/ui-improvements
Adding away icon and changing online and offline icons
2016-01-13 09:03:01 -06:00
Corey Hulen
75ae098dfe Merge pull request #1850 from mattermost/preview-mode
Documenting how Preview Mode is disabled
2016-01-13 09:02:43 -06:00
Corey Hulen
b15b2bc2ae Merge pull request #1878 from mattermost/release-1.4
Fixing docker files for 1.4 RC2
2016-01-12 16:43:05 -06:00
=Corey Hulen
d36af55d57 Fixing config file 2016-01-12 16:42:31 -06:00
=Corey Hulen
837de1e0c8 Fixing docker files for 1.4 RC2 2016-01-12 16:40:18 -06:00
Corey Hulen
b8c70b4d04 Merge pull request #1876 from mattermost/release-1.4
Release 1.4 RC2
2016-01-12 14:46:06 -06:00
=Corey Hulen
6ce6115100 Update docker to 1.4 RC2 2016-01-12 14:11:18 -06:00
Corey Hulen
55da65f689 Merge pull request #1872 from mattermost/plt-1667
PLT-1667 Support old OAuth routes
2016-01-12 14:08:29 -06:00
Corey Hulen
fe98208146 Merge pull request #1862 from mattermost/lfbrock-patch-1
Update changelog.md
2016-01-12 14:08:18 -06:00
Joram Wilander
cc746dda6a Merge pull request #1830 from rgarmsen2295/plt-1599
PLT-1599 Help text in invite member modal now reflects the default channel name
2016-01-12 11:39:14 -05:00
Joram Wilander
944aa682f0 Merge pull request #1857 from esethna/patch-51
Update test-attachments.md
2016-01-12 11:36:25 -05:00
Joram Wilander
8fa136eb3d Merge pull request #1863 from esethna/patch-53
Update test-markdown-basics.md
2016-01-12 11:35:53 -05:00
Joram Wilander
c94695a8b0 Merge pull request #1873 from mattermost/lfbrock-patch-2
Update test-markdown-basics.md
2016-01-12 11:35:10 -05:00
Joram Wilander
691380a60a Merge pull request #1852 from mattermost/PLT-1608
PLT-1608 Upgrading logging package
2016-01-12 11:29:21 -05:00
lfbrock
85e9797c0c Update test-markdown-basics.md 2016-01-12 10:47:57 -05:00
JoramWilander
d1eb3eef30 Add removal comments 2016-01-12 08:04:55 -05:00
JoramWilander
1763ff6d72 Support old oauth routes 2016-01-12 08:02:38 -05:00
Corey Hulen
82818ced78 Merge pull request #1866 from mattermost/fix-docker-14
Fixing dockerfile
2016-01-11 17:04:30 -06:00
=Corey Hulen
16263f4e26 Fixing dockerfile 2016-01-11 16:52:30 -06:00
lfbrock
a457a83c61 Update CHANGELOG.md 2016-01-11 16:50:15 -05:00
Eric Sethna
7610e2ae00 Update test-markdown-basics.md
Add carriage return tests
2016-01-11 13:41:47 -07:00
=Corey Hulen
cf0d275ae4 Merge branch 'release-1.4' 2016-01-11 13:42:06 -06:00
Corey Hulen
49530d2f9f Merge pull request #1860 from mattermost/push-test-v1.4
Adding push-test.mattermost.com
2016-01-11 13:41:35 -06:00
lfbrock
63b5182150 Update CHANGELOG.md 2016-01-11 14:25:28 -05:00
it33
22f714bd02 Adding push-test.mattermost.com 2016-01-11 11:22:13 -08:00
lfbrock
0b9570d059 Update CHANGELOG.md 2016-01-11 14:22:07 -05:00
Corey Hulen
5c49f32088 Merge pull request #1858 from mattermost/release-1.4
Release 1.4 rc1
2016-01-11 13:19:50 -06:00
lfbrock
51bd6808bf Update CHANGELOG.md 2016-01-11 14:19:47 -05:00
=Corey Hulen
5083a3947a Release 1.4 rc1 2016-01-11 13:04:55 -06:00
Eric Sethna
af040d4723 Update test-attachments.md
Update test doc after changes were made to how some audio and video files display and preview.
2016-01-11 11:57:01 -07:00
Corey Hulen
56b19df12a Merge pull request #1856 from mattermost/react-rm-debug
Removing react debugging
2016-01-11 12:32:57 -06:00
=Corey Hulen
b94aad1fd3 Removing react debugging 2016-01-11 12:32:28 -06:00
Joram Wilander
7511c80a6a Merge pull request #1854 from hmhealey/plt1608
PLT-1608 Fixed developer errors storing invalid error objects
2016-01-11 13:22:43 -05:00
Reed Garmsen
fff7143a31 Changed statistics to show usernames with an email tooltip 2016-01-11 09:43:45 -08:00
hmhealey
1e4c52a70e Fixed developer errors storing invalid error objects 2016-01-11 12:35:48 -05:00
Corey Hulen
cffb5215b0 Merge pull request #1849 from hmhealey/plt1578
PLT-571 Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs
2016-01-11 10:08:13 -06:00
=Corey Hulen
a41c807c70 modifying config 2016-01-11 09:46:30 -06:00
hmhealey
5de20f0133 Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs 2016-01-11 10:42:18 -05:00
Asaad Mahmood
e9c2fd7cbb Adding away icon and changing online and offline icons 2016-01-11 20:32:31 +05:00
=Corey Hulen
30bb530903 Upgrading logging package 2016-01-11 09:13:38 -06:00
=Corey Hulen
b1251b9393 Upgrade logging package 2016-01-11 09:12:51 -06:00
Harrison Healey
01d6a48419 Merge pull request #1822 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
2016-01-11 09:57:27 -05:00
Joram Wilander
7aa7f83524 Merge pull request #1824 from hmhealey/plt1525
PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel
2016-01-11 06:54:55 -05:00