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

95 Коммитов

Автор SHA1 Сообщение Дата
JoramWilander
d48b305661 Add constant form 'mention' 2015-11-05 09:42:29 -05:00
Reed Garmsen
4897997025 Removed old code theme selector and fixed some issues 2015-11-04 14:58:21 -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
JoramWilander
fb5b57836e Multiple fixes to major performance issues with teams with 50+ users 2015-11-03 14:52:25 -05:00
hmhealey
6428878e20 Moved InviteMemberModal to be controlled by a store 2015-11-02 17:35:59 -05:00
JoramWilander
97449a102e Add tutorial popovers 2015-11-02 14:47:24 -05:00
JoramWilander
0e801a4e70 Add tutorial intro screens for new users. 2015-11-02 14:47:04 -05:00
Christopher Speller
1e7ac66e3b Some renaming 2015-11-02 10:29:53 -05:00
Christopher Speller
b9a3ff74dd Hooking up external components 2015-11-02 08:16:57 -05:00
Florian Orben
7424242284 Add java and ini language
Forgot to add those altough they are quite common
2015-10-29 17:26:34 +01:00
Florian Orben
3e7ffafa97 code style theme chooser 2015-10-29 17:26:34 +01:00
Florian Orben
1e4510be3b highlight code in markdown blocks 2015-10-29 17:26:34 +01:00
JoramWilander
d56757b745 Add team type constants. 2015-10-29 09:03:34 -04:00
Joram Wilander
ccf9e0cabd Merge pull request #1196 from florianorben/send-on-ctrl
allow messages to be send on ctrl+enter
2015-10-28 14:09:01 -04:00
Christopher Speller
c86df0f0c6 Revert "PLT-395: Add syntax highlighting to Markdown code blocks" 2015-10-28 13:09:39 -04:00
Florian Orben
f7808d1172 add new user-setting section 'advanced' and remove ctrl-send setting from general tab 2015-10-28 01:26:10 +01:00
Joram Wilander
b826d09480 Merge pull request #1189 from mattermost/plt-762
PLT-762 Fix error message on leaving channel
2015-10-26 15:01:18 -04:00
Florian Orben
46042d995b PLT-703: Support multiple users being shown as typing underneath input boxes. 2015-10-26 17:46:56 +01:00
JoramWilander
fda62fbbf5 Fix error message on leaving channel 2015-10-26 12:05:09 -04:00
Florian Orben
51032ae11d Add java and ini language
Forgot to add those altough they are quite common
2015-10-24 21:55:44 +02:00
Florian Orben
0f62befef0 code style theme chooser 2015-10-24 21:55:44 +02:00
Florian Orben
113741243b highlight code in markdown blocks 2015-10-24 21:55:44 +02:00
hmhealey
a5a2826700 Added keyboard selection to search autocomplete 2015-10-23 13:05:38 -04:00
Asaad Mahmood
cc904a7ec7 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-23 10:53:57 +05:00
Asaad Mahmood
5c09060f53 Multiple UI Improvements
- Changing the UI for the active item in the nav
- Updating the UI for drag and drop
- Fixing z-index for date selector
2015-10-22 20:18:31 +05:00
=Corey Hulen
36658c13a4 Fixing merge conflicts 2015-10-19 11:42:40 -07:00
Harrison Healey
d139c9e825 Merge pull request #1108 from mattermost/plt-235
PLT-235 Implement outgoing webhooks.
2015-10-19 14:24:02 -04:00
=Corey Hulen
468f01dc89 Merging from master 2015-10-19 10:25:51 -07:00
JoramWilander
af6e2c29eb Implement outgoing webhooks. 2015-10-19 09:00:30 -04:00
=Corey Hulen
8b2d7f391a Fixing merge 2015-10-16 09:12:30 -07:00
=Corey Hulen
6a1755d2e3 Inital support for multi-tab loging 2015-10-16 09:10:54 -07:00
JoramWilander
20723437aa Fix typing socket constant 2015-10-16 11:48:55 -04:00
JoramWilander
2b5ec4a3c0 Small refactor of websocket code on client and server 2015-10-16 11:48:55 -04:00
Stas Vovk
79fcb98084 Merge remote-tracking branch 'upstream/master' into PLT-637
Conflicts:
	web/react/utils/constants.jsx
2015-10-16 14:21:51 +03:00
Florian Orben
551b07960e PLT-74: Enable Up Arrow keyboard shortcut to edit your last message 2015-10-15 21:25:31 +02:00
Stas Vovk
76e278a13d added display tab under account settings. added 24h time option 2015-10-14 20:36:12 +03:00
hmhealey
2a39e8dbfa Removed Preference.AltId 2015-10-13 12:29:31 -04:00
hmhealey
599644fb2f Renamed show_hide preference to show 2015-10-13 09:42:25 -04:00
hmhealey
7d03c24b44 Changed direct channels in the sidebar to be displayed based on user preferences 2015-10-13 09:42:24 -04:00
Asaad Mahmood
fd4bfee6ea Multiple UI Improvements 2015-10-12 19:22:05 +05:00
Christopher Speller
b85b529373 Changing SpinPunch to Mattermost in copyright 2015-10-08 12:27:09 -04:00
Christopher Speller
4263c08c55 Merge pull request #953 from asaadmahmoodspin/plt-522
PLT-522 - Adding option for mentionHighlightLink for themes
2015-10-07 08:43:24 -04:00
Asaad Mahmood
698ca63d99 PLT-522 - Adding option for mentionHighlightLink for themes 2015-10-07 14:41:24 +05:00
Asaad Mahmood
d99aea1502 Removing sidebar text hover color 2015-10-06 22:33:30 +05:00
Asaad Mahmood
a0a32bb608 Updating link color opacity in LHS 2015-10-06 22:25:22 +05:00
Asaad Mahmood
06fbb8b7df Adding mention highlight setting and improving search highlight too 2015-10-06 10:04:39 +05:00
Asaad Mahmood
8c7f4672eb Multiple UI Improvements 2015-10-06 09:37:11 +05:00
Asaad Mahmood
813792dd60 pot-375 - Making modals compatible with themes 2015-10-01 09:33:21 +05:00
JoramWilander
a9f5918a9d Update incoming webhooks to hide DMs and accept direct JSON payloads. 2015-09-29 08:38:26 -04:00