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

440 Коммитов

Автор SHA1 Сообщение Дата
hmhealey
6428878e20 Moved InviteMemberModal to be controlled by a store 2015-11-02 17:35:59 -05:00
hmhealey
efa7b8252f Ported ConfirmModal and InviteMemberModal to React-Bootstrap 2015-11-02 15:10:14 -05:00
Harrison Healey
e52669c2da Merge pull request #1249 from mattermost/plt-823
PLT-823 Refactor of center channel
2015-11-02 14:20:54 -05:00
Christopher Speller
17233b1dce Merge pull request #1259 from stasvovk/PLT-639
PLT-639: display full name, nickname or username in direct messages
2015-11-02 14:10:59 -05:00
Stas Vovk
bc57489d8b fixed errors in displayUsername 2015-11-02 17:45:51 +02: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
Christopher Speller
ed68f2e901 Refactoring center channel 2015-11-02 08:16:57 -05:00
Vincent Taverna
e16f51e552 fix isBrowserEdge typo 2015-11-01 18:30:20 -05:00
Stas Vovk
b84af10455 display full name, nickname or username in direct messages 2015-11-01 01:08:18 +02: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
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
JoramWilander
d56757b745 Add team type constants. 2015-10-29 09:03:34 -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
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
Asaad Mahmood
110bc3e7e9 Multiple UI changes 2015-10-29 00:02:17 +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
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
=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
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
Christopher Speller
640a7789db Merge pull request #1174 from florianorben/member-popover
Add styling to channel member popover
2015-10-27 08:42:54 -04:00
Girish S
9de0ceb229 auto-link mentions with user names having symbols
this also handles the case where user_name having '_'
2015-10-27 18:02:07 +05:30
=Corey Hulen
834e1a8b58 adding arrow notation 2015-10-26 22:13:40 -07:00
=Corey Hulen
aec99ceb9d Merge branch 'master' into PLT-25 2015-10-26 22:11:42 -07:00
Corey Hulen
2b198a8cfc Merge pull request #1178 from mattermost/update-web-socket-help
Update web socket help
2015-10-26 22:04:53 -07:00
Florian Orben
bced07a7f4 add helper method to initiate a direct channel chat 2015-10-26 23:30:00 +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
Harrison Healey
b46c01b290 Merge pull request #1171 from trashcan/github-1130-handle-trailing-characters-after-user
Handle trailing characters after user
2015-10-26 09:57:29 -04:00
Harrison Healey
fa2c9878d2 Merge pull request #1170 from florianorben/PLT-395
PLT-395: Add syntax highlighting to Markdown code blocks
2015-10-26 09:50:40 -04:00
Harrison Healey
9b6f695042 Merge pull request #1183 from girishso/strip-extra-s
strip extra hyphens from urls
2015-10-26 09:27:28 -04:00
Girish S
5d25e55254 strips extra hiphens from channel url 2015-10-26 14:48:00 +05:30
Girish S
e9812655f6 made eslint happy 2015-10-26 13:00:26 +05:30
Girish S
4cfde35256 append * to search query if not present and highlight partial matches 2015-10-26 12:25:14 +05:30
=Corey Hulen
70b5918734 Merge branch 'master' into PLT-25 2015-10-25 22:42:38 -07:00