Commit Graph

3494 Commits

Author SHA1 Message Date
lfbrock
7bb514769c Update release-process 2015-10-29 17:03:28 -04:00
lfbrock
7c68284e82 Create release-process 2015-10-29 17:01:07 -04:00
Harrison Healey
1f64733040 Merge pull request #1225 from florianorben/1196-for-edit-modal
enable ctrl+enter send for edit msg modal
2015-10-29 16:04:12 -04:00
Florian Orben
7e70788c94 simplify check if ctrl+enter was pressed 2015-10-29 17:44:10 +01:00
Joram Wilander
444c9942fc Merge pull request #1231 from hmhealey/plt798
PLT-798 Fixed nil pointer when failing to upload an oversized image
2015-10-29 12:43:42 -04: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
Corey Hulen
6683a4aaab Merge pull request #1230 from asaadmahmoodspin/ui-improvements
UI Improvements
2015-10-29 08:29:31 -07:00
hmhealey
ce4f5cb3cf Fixed nil pointer when failing to upload an oversized image 2015-10-29 11:07:45 -04:00
Asaad Mahmood
c84da38b61 Updating margin for paragraphs 2015-10-29 20:03:59 +05:00
Asaad Mahmood
33362a56a7 UI Improvements 2015-10-29 19:24:18 +05:00
Joram Wilander
9497ecb954 Merge pull request #1227 from mattermost/plt-849
PLT-849 Update town square intro text.
2015-10-29 10:18:45 -04: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
Corey Hulen
64b617099d Merge pull request #1226 from mattermost/bug-fix
Fixing 200 error bug
2015-10-29 00:13:58 -07:00
=Corey Hulen
6f599604c9 Fixing 200 error bug 2015-10-29 00:00:41 -07: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
5c03f3aad8 Merge pull request #1214 from mattermost/outgoing-hook-fix
Pass in iter vars to closures properly for outgoing webhooks
2015-10-28 14:45:08 -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
Corey Hulen
9312272234 Merge pull request #1219 from asaadmahmoodspin/ui-improvements
Ui improvements
2015-10-28 14:42:58 -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
bf8dd9d3c8 Merge pull request #1216 from mattermost/revert-1170-PLT-395
Revert "PLT-395: Add syntax highlighting to Markdown code blocks"
2015-10-28 13:26:45 -04:00
Christopher Speller
c86df0f0c6 Revert "PLT-395: Add syntax highlighting to Markdown code blocks" 2015-10-28 13:09:39 -04:00
JoramWilander
35d1ac80dd Pass in iter vars to closure properly 2015-10-28 10:37:33 -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
Christopher Speller
5322112045 Merge pull request #1187 from mattermost/code-contribution-guidelines-update
Code contribution guidelines update
2015-10-28 08:28:10 -04:00
Joram Wilander
32978e59f9 Merge pull request #1205 from florianorben/fix-relative-time
Dont display '1 minute ago' timestamps for post posted < than 1 minute ago
2015-10-28 08:07:39 -04:00
=Corey Hulen
36308f949d PLT-25 fixing issues with stats page 2015-10-27 22:55:10 -07:00
it33
570b54bbfc Typo fix 2015-10-27 17:29:54 -07:00
it33
5871452ccb Adding "Solution" sections to guide 2015-10-27 17:29:35 -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
it33
87514f34bb Update Troubleshooting.md 2015-10-27 17:24:34 -07: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
it33
ede80afe4c Update Administration.md 2015-10-27 17:05:20 -07:00
it33
a899b7ef65 Update Troubleshooting.md 2015-10-27 16:59:24 -07:00
it33
078fb4e5c0 Update Outgoing-Webhooks.md 2015-10-27 16:53:30 -07:00