opensource/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2026-10-25 10:07:25 +08:00
Code Issues Packages Projects Releases Wiki Activity
3,480 Commits 1,189 Branches 1,612 Tags
63ea5e26913bd0cb7500a35ff20832732e48b7e2
Commit Graph
1824 Commits
Author SHA1 Message Date
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
Corey Hulen 8e43a99581 Merge pull request #1206 from florianorben/post_style 
Change post paragraphs' line heights and margins for better readability
 2015-10-28 22:27:15 -07: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
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
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 2c9c2dfad1 Change post paragraphs' line heights and margins for better readability 2015-10-28 01:23:02 +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
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 28847c6b4b Merge pull request #1194 from mattermost/webhook-request 
Parse incoming webhook requests into model instead of string map
 2015-10-26 22:06:49 -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
JoramWilander c94388042b Parse incoming webhook requsets into model instead of string map 2015-10-26 15:10:17 -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