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

1666 Коммитов

Автор SHA1 Сообщение Дата
Christopher Speller
e7f29ea214 Fixing eslint not recursing 2015-10-30 16:43:50 -04:00
Corey Hulen
81c8d5dac6 Merge pull request #1238 from girishso/webhook-creator-notifs
display webhook notifications to the creator of webhook
2015-10-30 08:48:51 -07:00
Corey Hulen
3d54abd3a0 Merge pull request #1236 from girishso/webhook-notification
Show usernames overridden by Incoming Webhooks in notification messages.
2015-10-30 08:48:27 -07:00
Joram Wilander
256be4c14d Merge pull request #1211 from mattermost/PLT-340
PLT-340 allow team directory and open invites
2015-10-30 10:57:25 -04:00
Harrison Healey
c2cd58a33f Merge pull request #1220 from florianorben/PLT-395
PLT-395: Add syntax highlighting to Markdown code blocks
2015-10-30 09:21:53 -04:00
Christopher Speller
b686e51cfd Merge pull request #1233 from hmhealey/plt600
PLT-600 Added help text for the channel header and purpose dialogs
2015-10-30 07:44:13 -04:00
Girish S
d6f0f70798 display webhook notifications to the creator of webhook 2015-10-30 12:56:50 +05:30
Girish S
fec10f5f80 Show usernames overridden by Incoming Webhooks in notification messages.
fixes PLT-856
2015-10-30 12:44:00 +05:30
hmhealey
1eefbe2441 Added help text for the channel header and purpose dialogs 2015-10-29 14:48:58 -04:00
Florian Orben
7e70788c94 simplify check if ctrl+enter was pressed 2015-10-29 17:44:10 +01:00
Florian Orben
ca04e3bbc3 fix component unmount 2015-10-29 17:31:50 +01:00
Florian Orben
5119e96366 enable ctrl+enter send for edit msg modal 2015-10-29 17:31:50 +01:00
Florian Orben
d630567c91 allow code theme to be shareable 2015-10-29 17:26:34 +01:00
Florian Orben
3c8fd99425 use XML syntax highlighting if provided language is html 2015-10-29 17:26:34 +01:00
Florian Orben
bad01d40a2 escape user input 2015-10-29 17:26:34 +01: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
aeb0a08d07 fix markup if code is of unknown language 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
=Corey Hulen
bedf85a122 Adding error when enabling team dir without global prop being set. 2015-10-29 08:54:27 -07:00
Asaad Mahmood
33362a56a7 UI Improvements 2015-10-29 19:24:18 +05:00
JoramWilander
d56757b745 Add team type constants. 2015-10-29 09:03:34 -04:00
JoramWilander
f5cbbd9adc Update town square intro text. 2015-10-29 09:01:40 -04:00
Joram Wilander
63ea5e2691 Merge pull request #1224 from rgarmsen2295/plt-763
PLT-763 Fixed issue with refocusing not working after editing a post in the RHS
2015-10-29 08:12:12 -04:00
Joram Wilander
b58251df7b Merge pull request #1221 from florianorben/disallow_edit_bot_msg_arrow_up
Dont edit reply messages of outgoing webhooks by pressing up-arrow in chat input box
2015-10-29 07:54:44 -04:00
Joram Wilander
82abf9063f Merge pull request #1218 from hmhealey/underscores
PLT-631/PLT-764/PLT-204/PLT-521 Updating autolinking and handling of underscores by the markdown parser
2015-10-29 07:53:06 -04:00
Reed Garmsen
b2cbb956a7 Fixed issue with refocusing not working after editing a post in the RHS 2015-10-28 16:12:45 -07:00
Corey Hulen
5f2e01a938 Merge pull request #1213 from mattermost/plt-836
PLT-836 Prevent markdown styled links from embedding gifs
2015-10-28 14:44:53 -07:00
Corey Hulen
89f67cd11d Merge pull request #1199 from hmhealey/plt600
PLT-600 Renamed channel description to channel header and added channel purpose field
2015-10-28 14:44:02 -07:00
Florian Orben
f0c614147f Dont edit reply messages of outgoing webhooks by pressing up-arrow in chat input box 2015-10-28 22:28:10 +01:00
Asaad Mahmood
110bc3e7e9 Multiple UI changes 2015-10-29 00:02:17 +05:00
Asaad Mahmood
2935e7c1bf Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-29 00:02:01 +05:00
hmhealey
0356130ca6 Updated markdown regexes to better handle underscores and links 2015-10-28 14:31:41 -04:00
hmhealey
429e25864b Modified markdown lexer to not break up words written in snake_case 2015-10-28 14:31:41 -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
=Corey Hulen
0b967b2acb Moving single team redirect to backend 2015-10-28 08:58:27 -07:00
=Corey Hulen
953e27cdf7 Merge branch 'master' into PLT-340 2015-10-28 08:48:12 -07:00
JoramWilander
46613a1679 Prevent markdown styled links from embedding gifs 2015-10-28 09:13:41 -04:00
Asaad Mahmood
e104829dcd Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-28 18:04:27 +05:00
Christopher Speller
c6f3361d3c Merge pull request #1210 from mattermost/PLT-25
PLT-25 fixing issues with stats page
2015-10-28 08:34:57 -04:00
=Corey Hulen
36308f949d PLT-25 fixing issues with stats page 2015-10-27 22:55:10 -07:00
=Corey Hulen
be0bf941bf Removing console.log 2015-10-27 22:32:16 -07:00
=Corey Hulen
bb25056d9a PLT-340 2015-10-27 22:18:52 -07: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
Florian Orben
0e5612a7db allow messages to be send on ctrl+enter 2015-10-28 01:26:10 +01:00
Florian Orben
c91f4f8ab1 Dont display '1 minute ago' timestamps for post posted < than 1 minute ago 2015-10-28 01:19:57 +01:00
Corey Hulen
e0f69060fa Merge pull request #1190 from mattermost/PLT-25
PLT-25 adding stats to admin console
2015-10-27 11:40:49 -07:00
hmhealey
019bf6a7fe Added ability to see/edit channel purpose in the client 2015-10-27 12:46:31 -04:00
hmhealey
887d205b1f Renamed Channel.Description to Channel.Header on the client 2015-10-27 12:46:31 -04:00