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

4161 Коммитов

Автор SHA1 Сообщение Дата
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
Christopher Speller
3bb2e67203 Fixing 404 page props 2015-09-24 12:04:45 -04: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
Jack
aa6da728ba set transparent png background to white 2015-09-24 08:33:15 -07: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
Harrison Healey
d5343f997d Merge pull request #777 from asaadmahmoodspin/plt-363
plt-363 - Adding organisation theme
2015-09-24 10:00:35 -04:00
Asaad Mahmood
5183103e8f plt-363 - Adding organisation theme 2015-09-24 18:55:53 +05:00
Harrison Healey
4f371254c6 Merge pull request #771 from rgarmsen2295/plt-143
PLT-143 Support for text drag and drop
2015-09-24 09:17:59 -04:00
Harrison Healey
90d1f4c6a1 Merge pull request #776 from mishimi/patch-5
PLT-388 Added warning that @mentions from Slack are not imported
2015-09-24 09:09:53 -04:00
Christopher Speller
54c7dba33d Merge pull request #765 from mattermost/PLT-349
PLT-349 adding team mgt to admin console
2015-09-24 08:14:30 -04:00
Joram Wilander
56f76502e3 Merge pull request #769 from hmhealey/plt334
PLT-334 Restricted markdown output to only appear on one line when in singleline mode
2015-09-24 08:14:25 -04:00
mishimi
59afe8bdf8 PLT-388
Warning users that  @mentions from Slack are currently not supported after import
2015-09-24 04:07:49 -07:00
Jack
8617c6a4a3 godep fix 2015-09-23 20:10:11 -07:00
Jack
dd94a3df5d add imaging 2015-09-23 20:00:36 -07:00
Jack
f43d355078 godep save 2015-09-23 19:54:07 -07:00
Jack
396a535f10 use github.com/disintegration/imaging 2015-09-23 15:57:49 -07:00
=Corey Hulen
00112cae51 Assiging first user system_admin role 2015-09-23 15:52:59 -07:00
Reed Garmsen
ef8705ab6b Text cursor now focuses on the textbox after performing a drag and drop of some text 2015-09-23 15:41:26 -07:00
Corey Hulen
fba72b849c Merge pull request #766 from mattermost/postpone-oauth-and-webhooks
Removing OAuth and webhooks changes
2015-09-23 15:25:44 -07:00
Corey Hulen
23029204dc Merge pull request #770 from hmhealey/plt339
PLT-339 Changed Markdown links to open in a new tab
2015-09-23 15:21:46 -07:00