Commit Graph

2529 Commits

Author SHA1 Message Date
=Corey Hulen
08a343c372 Fixing 1 more case 2015-09-25 09:51:27 -07:00
Joram Wilander
f75475d3d0 Merge pull request #805 from mattermost/plt-250
PLT-250 Fix post list not resizing properly for file previews.
2015-09-25 12:09:00 -04:00
Harrison Healey
4ef5981e6c Merge pull request #806 from mattermost/fixing-redirect
redirect to team after login
2015-09-25 12:01:09 -04:00
JoramWilander
58dcbd64af Fix post list not resizing properlu for file previews. 2015-09-25 11:41:08 -04:00
=Corey Hulen
e05c6ed6d1 redirect to team after login 2015-09-25 08:36:02 -07:00
Christopher Speller
e743ad483a Merge pull request #794 from mattermost/PLT-157
PLT-157 Fixing blue bar and renders warning when mis-configured.
2015-09-25 11:31:47 -04:00
Christopher Speller
c81fbc6d95 Merge pull request #797 from asaadmahmoodspin/bug-fixes
Bug fixes and UI improvements for multiple tickets
2015-09-25 11:29:11 -04:00
Corey Hulen
ab7b36089c Merge pull request #803 from mattermost/plt-405
PLT-405 Fixes youtube videos causing random scrolling.
2015-09-25 08:14:20 -07:00
Corey Hulen
74ccf42387 Merge pull request #802 from mattermost/plt-291
PLT-291 Fixing 404 page props
2015-09-25 08:13:45 -07:00
=Corey Hulen
fb1ba90051 Fixing typo 2015-09-25 08:12:16 -07:00
=Corey Hulen
d989be85cb Merge branch 'master' into PLT-157 2015-09-25 08:11:01 -07:00
Joram Wilander
2322a7c74e Merge pull request #793 from hmhealey/plt367
PLT-367 Added a json response to the uploadProfileImage api call
2015-09-25 10:22:27 -04:00
Asaad Mahmood
3cf729dcaa Using react tooltip for timestamp in center channel instead of normal bootstrap 2015-09-25 18:54:02 +05:00
Harrison Healey
4a871e9df8 Merge pull request #799 from mattermost/plt-31-2
PLT-31 Added welcome email back in.
2015-09-25 09:43:22 -04:00
Harrison Healey
1a92a3cc79 Merge pull request #801 from mattermost/plt-376
PLT-376 Fix account settings being scrolled to bottom when opened.
2015-09-25 09:42:34 -04:00
Asaad Mahmood
7964150cb2 Merge branch 'master' of https://github.com/mattermost/platform into bug-fixes 2015-09-25 18:15:44 +05:00
Christopher Speller
ceed229062 Merge pull request #800 from mishimi/patch-7
PLT 381 In Theme Color settings, change the "Button Color" to "Button…
2015-09-25 09:15:38 -04:00
JoramWilander
a45095c0b6 Fixes youtube videos causing random scrolling. 2015-09-25 09:03:07 -04:00
JoramWilander
b03d8610de Fix acconut settings being scrolled to bottom when opened. 2015-09-25 08:43:06 -04:00
Joram Wilander
5b3cc2a4e7 Merge pull request #795 from chengweiv5/fix-typo
Fix a typo and trailing space: adminsiter -> administer
2015-09-25 08:31:28 -04:00
mishimi
b86833f0c5 PLT 381 In Theme Color settings, change the "Button Color" to "Button Text"
Also made the following changes
1. Capitalize all words
2. Remove the word "color" if it comes after "text"
Ex. Sidebar text color --> Sidebar Text
2015-09-25 05:23:04 -07:00
JoramWilander
84763e9bde Added welcome email back in. 2015-09-25 08:19:05 -04:00
Asaad Mahmood
bba6264304 Adding margin bot to videos 2015-09-25 16:52:48 +05:00
Asaad Mahmood
6d87e9cd02 Improving uploader name and video type for videos 2015-09-25 16:44:36 +05:00
Christopher Speller
5573df3013 Merge pull request #792 from esethna/patch-2
Update NOTICE.txt to include emoji license info V2
2015-09-25 07:42:39 -04:00
Asaad Mahmood
b1a7225f30 Bug fixes and UI improvements for multiple tickets 2015-09-25 16:38:11 +05:00
Chengwei Yang
73e5ce1a66 Fix a typo and trailing space: adminsiter -> administer
Signed-off-by: Chengwei Yang <yangchengwei@qiyi.com>
2015-09-25 09:36:19 +08:00
=Corey Hulen
8a9fc46f8b Fixing eslint 2015-09-24 15:13:18 -07:00
=Corey Hulen
04c12ba58e Fixing blue bar and renders warning when mis-configured. 2015-09-24 15:06:54 -07:00
hmhealey
7bb384b92d Added a json response to the uploadProfileImage api call 2015-09-24 16:47:34 -04:00
esethna
737e48dce3 Update NOTICE.txt to include emoji license info V3
Tweaked the license info as per chat with Ian
2015-09-24 14:01:46 -06:00
esethna
ca8efc66c3 Update NOTICE.txt to include emoji license info V2
Added to the bottom of the file
2015-09-24 13:32:27 -06:00
Corey Hulen
6a4a73c2d3 Merge pull request #787 from mattermost/PLT-30
PLT-30 Removing old valet crud
2015-09-24 12:30:18 -07:00
=Corey Hulen
8ad9a88bda Fixing merge 2015-09-24 12:12:27 -07:00
Harrison Healey
caa157a377 Merge pull request #789 from mattermost/PLT-362
PLT-362 removing themes and hiding OAuth provider option.
2015-09-24 15:07:48 -04:00
Joram Wilander
9d136beb02 Merge pull request #785 from mattermost/PLT-203
Partial fix for PLT-203
2015-09-24 14:52:51 -04:00
Christopher Speller
6d3e836668 Merge pull request #788 from hmhealey/plt379
PLT-379 Removed smilies that start with a semicolon
2015-09-24 14:52:08 -04:00
=Corey Hulen
30a5aa44ff fixing issue 2015-09-24 11:14:44 -07:00
=Corey Hulen
57269dcaf4 Removing default theme no longer in use 2015-09-24 11:08:39 -07:00
=Corey Hulen
e58f15a286 Disabling OAuth provider for 0.8 2015-09-24 11:06:00 -07:00
hmhealey
fe55c77a41 Removed smilies that start with a semicolon 2015-09-24 13:56:14 -04:00
=Corey Hulen
a374419ad5 Removing old valet crud 2015-09-24 10:52:32 -07:00
Joram Wilander
d077655ffc Merge pull request #782 from asaadmahmoodspin/plt-298
plt-298 - Improving UI for webhooks
2015-09-24 13:37:35 -04:00
Harrison Healey
75b1b43fd8 Merge pull request #783 from mattermost/plt-287
PLT-287 Hiding export from UI
2015-09-24 12:53:41 -04:00
Harrison Healey
627e4f1c2b Merge pull request #784 from mattermost/img-modal-fix
Fixing arrow keys in preview image modal
2015-09-24 12:53:14 -04:00
Asaad Mahmood
0e08d7d460 Removing config file EnableIncomingWebhooks to false 2015-09-24 21:51:03 +05:00
=Corey Hulen
717fab65e0 Partial fix for PLT-203 2015-09-24 09:44:36 -07:00
Christopher Speller
7efacb09bf Fixing arrow keys in preview image modal 2015-09-24 12:39:36 -04:00
Christopher Speller
e6697a447e Hiding export from UI 2015-09-24 12:12:12 -04:00
Asaad Mahmood
1ca84a8f8a plt-298 - Improving UI for webhooks 2015-09-24 21:05:21 +05:00