Commit Graph

1792 Commits

Author SHA1 Message Date
Christopher Speller
51da1b1ca1 Merge pull request #1332 from mattermost/plt-560
PLT-560 Prevent SSO users from changing their email
2015-11-06 10:17:04 -05:00
=Corey Hulen
4110181ad8 GIT-888 improving perf 2015-11-06 06:35:38 -08:00
Joram Wilander
1ecad4301e Merge pull request #1327 from florianorben/PLT-857-2
PLT-857: Support `attachments` for Incoming Webhooks
2015-11-06 09:05:32 -05:00
JoramWilander
7eca077877 Prevent SSO users from changing their email 2015-11-06 08:56:13 -05:00
Joram Wilander
6417d4728d Merge pull request #1321 from hmhealey/plt911
PLT-911 Search autocomplete improvements
2015-11-06 08:13:03 -05:00
Joram Wilander
23a8dbca9f Merge pull request #1325 from hmhealey/plt618
PLT-618 Ignore formatting markdown lists containing only one element
2015-11-06 08:12:25 -05:00
Corey Hulen
6af93e2a1b Revert 59581c3850 2015-11-05 22:58:33 -08:00
Florian Orben
4dedb14467 remove two unused assignments 2015-11-05 23:57:01 +01:00
Florian Orben
b085bc2d56 PLT-857: Support for Incoming Webhooks - Try #2 2015-11-05 23:33:21 +01:00
Florian Orben
4b6eb56415 collapse text after 700 chars or 5 line breaks 2015-11-05 23:33:21 +01:00
Florian Orben
d3ed791ab5 attachments frontend 2015-11-05 23:33:21 +01:00
Harrison Healey
d96cb50b68 Merge pull request #1320 from mattermost/PLT-1040
PLT-1040 changing ding
2015-11-05 17:26:42 -05:00
hmhealey
431cb089ed Changed markdown lexer to ignore lists containing only one item 2015-11-05 16:49:43 -05:00
hmhealey
f0578868ed Cleaned up Markedown Lexer for eslint 2015-11-05 16:19:53 -05:00
=Corey Hulen
3c16cffea2 Switching to mp3 2015-11-05 13:18:30 -08:00
Martin Fischer
08e03e615c PLT-480: Use Utils.displayUsername for username renderings. (fixes #874) 2015-11-05 22:15:07 +01:00
hmhealey
fedfeb67aa Copied part of the marked lexer into markdown.jsx 2015-11-05 15:53:10 -05:00
hmhealey
9b218c1af1 Moved highlighting code out of markdown.jsx 2015-11-05 14:47:16 -05:00
hmhealey
e29342d426 Moved public and private channels into separate sections in the search autocomplete 2015-11-05 14:12:31 -05:00
Corey Hulen
6418b78f1c Merge pull request #1319 from asaadmahmoodspin/ui-improvements
UI Improvements for Slack and post dropdown
2015-11-05 10:24:03 -08:00
=Corey Hulen
a28441be7e PLT-1040 changing ding 2015-11-05 10:23:06 -08:00
Asaad Mahmood
dc677bc88b UI Improvements for Slack and post dropdown 2015-11-05 23:08:25 +05:00
Corey Hulen
57f0cde207 Merge pull request #1315 from mattermost/plt-996
PLT-996 Prevent tutorial showing up a second before post list loads
2015-11-05 09:53:58 -08:00
Corey Hulen
1e63d268c2 Merge pull request #1314 from mattermost/plt-829
PLT-829 Only allow one ding every 3s
2015-11-05 09:53:39 -08:00
hmhealey
52e75012c3 Fixed search autocomplete click handling 2015-11-05 12:24:54 -05:00
hmhealey
c1ae28cc10 Changed search autocomplete to scroll when making a selection using the keyboard 2015-11-05 12:15:18 -05:00
Harrison Healey
ff38c402cb Merge pull request #1316 from asaadmahmoodspin/ui-improvements
Modal improvements for members
2015-11-05 12:08:34 -05:00
Asaad Mahmood
bc1820a498 Modal improvements for members 2015-11-05 21:43:41 +05:00
Joram Wilander
0e72831639 Merge pull request #1313 from mattermost/plt-992
PLT-992 / PLT-984 Fixed center channel height magic. Fixes tutorial.
2015-11-05 11:12:24 -05:00
JoramWilander
3927891827 Update tutorial to not show by default 2015-11-05 10:49:43 -05:00
JoramWilander
c41dd77b29 Only allow one ding every 3s 2015-11-05 10:44:38 -05:00
Christopher Speller
fafc3bfae4 Fixed center channel height magic. Fixes tutorial 2015-11-05 10:24:26 -05:00
JoramWilander
d48b305661 Add constant form 'mention' 2015-11-05 09:42:29 -05:00
JoramWilander
f3b0ae64ff Only show * in tab title when a channel is marked unread 2015-11-05 09:39:07 -05:00
Christopher Speller
40eea5b5e3 Merge pull request #1308 from asaadmahmoodspin/plt-960
Plt 960 - Moving code themes into custom themes
2015-11-05 07:31:37 -05:00
Asaad Mahmood
a809ff8862 Updating UI for access history and access log modals 2015-11-05 11:06:47 +05:00
Asaad Mahmood
9bf832f9f3 Updating code themes 2015-11-05 10:43:20 +05:00
Asaad Mahmood
11ccb14fd4 Merge branch 'plt-960' of https://github.com/rgarmsen2295/platform into PLT-960 2015-11-05 10:26:44 +05:00
Corey Hulen
72a18e7d10 Merge pull request #1298 from asaadmahmoodspin/ui-improvements
Multiple UI Improvements
2015-11-04 21:23:02 -08:00
Christopher Speller
8c2dace188 Merge pull request #1303 from mattermost/plt-516-2
PLT-516 Part 2 of fixing performance issues with large teams
2015-11-04 19:18:22 -05:00
Reed Garmsen
4897997025 Removed old code theme selector and fixed some issues 2015-11-04 14:58:21 -08:00
Corey Hulen
a88ce12f58 Merge pull request #1304 from mattermost/leave-channel-fix
Fixed leaving channels issue
2015-11-04 13:56:33 -08:00
Reed Garmsen
0054924cdb Moved code theme picker into custom theme subarea 2015-11-04 13:05:55 -08:00
Christopher Speller
aee6d9b608 Merge pull request #1287 from hmhealey/plt382
PLT-382 Refactored some modals to use React-Bootstrap and added a confirmation when discarding theme changes
2015-11-04 12:59:41 -05:00
Asaad Mahmood
c58c4cde44 Binding handleShown to constructor 2015-11-04 22:37:26 +05:00
Asaad Mahmood
2cf2b9b2a6 Making tutorial buttons and tutorial circles consistent 2015-11-04 22:37:26 +05:00
Asaad Mahmood
184208ef26 Fixing issues with memberList modal 2015-11-04 22:37:26 +05:00
Asaad Mahmood
71035bfdc7 Adding focus for channel modals 2015-11-04 22:37:26 +05:00
Christopher Speller
1afd2f1ac1 Fixed leaving channels issue 2015-11-04 12:23:55 -05:00
JoramWilander
22b4e5c4c0 Convert channel_members and channel_invite modals to react boostrap to fix performance issues 2015-11-04 12:19:01 -05:00