Граф коммитов

2519 Коммитов

Автор SHA1 Сообщение Дата
it33
5548bdfd36 Update rate_settings.jsx 2015-09-25 21:53:37 -07:00
it33
4f81f8826b Update log_settings.jsx 2015-09-25 21:38:38 -07:00
it33
7a777217be Update image_settings.jsx 2015-09-25 21:25:39 -07:00
it33
56b3df2e87 Update email_settings.jsx 2015-09-25 21:23:46 -07:00
it33
de1c87f660 Update sql_settings.jsx 2015-09-25 21:03:57 -07:00
it33
84e3c816d6 Update team_settings.jsx 2015-09-25 21:01:42 -07:00
it33
0c27f8e584 Update service_settings.jsx 2015-09-25 20:56:32 -07:00
it33
4192b9efce Minor wording change 2015-09-25 08:09:50 -07:00
it33
d60c18d8d6 Typo fix 2015-09-25 07:59:36 -07:00
it33
8ec509b9f6 Fix capitalization type 2015-09-25 07:57:51 -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
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
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
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
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
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
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
Joram Wilander
6c0d094d13 Merge pull request #780 from hmhealey/plt258
PLT-258 Added help text to notification settings to say which browsers support them
2015-09-24 12:01:50 -04:00
Joram Wilander
ff03c53c46 Merge pull request #781 from hmhealey/plt332
PLT-332 Improved date tooltips
2015-09-24 12:01:22 -04:00
Corey Hulen
819ef528b8 Merge pull request #779 from mattermost/plt-294
PLT-294 Converting preview image modal to use react-bootstrap.
2015-09-24 08:59:00 -07:00
Corey Hulen
a7d75d3bce Merge pull request #778 from mattermost/plt-43
PLT-43 Fixes backspace navigating back a page.
2015-09-24 08:58:32 -07:00
hmhealey
44e00a4f9c Changed format of date tooltips 2015-09-24 11:36:32 -04:00
hmhealey
32feec5b66 Removed timestamp tooltips from posts in the RHS 2015-09-24 11:25:36 -04:00
Christopher Speller
c5d78f828a Converting preview image modal to use react-bootstrap. Fixes issue where modal would appear behind background on iOS 2015-09-24 10:58:56 -04:00
hmhealey
a59f8def8c Added help text to notification settings to say which browsers support them 2015-09-24 10:58:49 -04:00
JoramWilander
21a1eaa189 Fixes backspace navigating back a page. 2015-09-24 10:13:14 -04:00