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

1626 Коммитов

Автор SHA1 Сообщение Дата
Asaad Mahmood
2935e7c1bf Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-29 00:02:01 +05: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
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
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
Corey Hulen
01c622b9a3 Merge pull request #1195 from mattermost/plt-822
PLT-822 Refactoring post_store into post_store and search_store
2015-10-27 08:22:13 -07:00
Asaad Mahmood
179c4ea684 Merge branch 'master' of https://github.com/mattermost/platform into ui-improvements 2015-10-27 20:15:33 +05:00
Christopher Speller
3ca8a11a43 Merge pull request #1197 from rgarmsen2295/plt-166
PLT-166 Fixed issue with missing help text for @all and @channel in mention list
2015-10-27 08:49:38 -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
Reed Garmsen
ae3e600c7d Fixed issue with missing help text for @all and @channel in mention list 2015-10-26 17:11:35 -07:00
Florian Orben
bced07a7f4 add helper method to initiate a direct channel chat 2015-10-26 23:30:00 +01:00
Florian Orben
2008a20d9d use 'Overlay' instead if 'OverlayTrigger' 2015-10-26 23:30:00 +01:00
Florian Orben
c753eacad0 Add some to channel member popover 2015-10-26 23:30:00 +01:00
Christopher Speller
bf555fae14 Refactoring post_store into post_store and search_store 2015-10-26 15:45:52 -04:00
Corey Hulen
86e3764cbd Merge pull request #1193 from hmhealey/plt798
PLT-798 Prevent image files larger than 4k resolution from being uploaded
2015-10-26 12:10:10 -07:00
Joram Wilander
2680b81568 Merge pull request #1191 from mattermost/PLT-564
PLT-564 removing auto-hide from error bar
2015-10-26 15:01:41 -04: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
hmhealey
ff6e91f51d Fixed file upload and profile picture upload error display to work for serverside errors 2015-10-26 14:45:13 -04:00
Corey Hulen
101497ec09 Merge pull request #1173 from florianorben/PLT-642
PLT-642: Browser tab alerts
2015-10-26 10:47:01 -07:00
=Corey Hulen
6d957a26d8 PLT-564 removing auto-hide from error bar 2015-10-26 10:42:54 -07:00
=Corey Hulen
fc31411564 PLT-25 adding stats to admin console 2015-10-26 09:55:24 -07:00
Florian Orben
a88fe8ea1a rename methods and varibles to a more meaningful name 2015-10-26 17:53:25 +01:00
Florian Orben
a9ec7215ad PLT-642: Browser tab alerts 2015-10-26 17:53:25 +01:00
Florian Orben
9a4d648c9b rename getTypingText to updateTypingText and set component's state in it 2015-10-26 17:46:56 +01:00
Florian Orben
b7aa4220d5 use constant value to check if to send a typing event for comments 2015-10-26 17:46:56 +01: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
Christopher Speller
3b3cc234eb Merge pull request #1181 from girishso/star-search2
PLT-747: Allow search results to match portions of words
2015-10-26 08:56:30 -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
Florian Orben
c6bbebbf6f Mattermost can not send message start with slash
resolves #827
2015-10-25 23:55:50 +01:00
it33
af62f4d571 Update help 2015-10-25 13:37:49 -07:00
it33
6afe95158c Update websocket error
Getting this error when websockets is properly configured and connection is just slow
2015-10-25 13:37:06 -07:00
Pat Lathem
3a588fbc18 Fix highlighting of trailing punctuation for own username 2015-10-25 14:09:09 -05:00
Pat Lathem
80e0a8db1d Fix off by one error 2015-10-24 18:54:01 -05:00
Pat Lathem
0c04535599 Remove trailing punctuation when parsing @username references 2015-10-24 18:32:45 -05:00