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

3524 Коммитов

Автор SHA1 Сообщение Дата
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
it33
8cf5687e8a Update API.md 2015-10-29 19:03:56 -07:00
it33
8e708b9b86 Merge pull request #1235 from mattermost/it33-patch-1
Add reference to Web Service API
2015-10-29 19:02:42 -07:00
it33
0d827a4aca Add reference to Web Service API 2015-10-29 18:28:49 -07:00
it33
81851ecd50 Merge pull request #1234 from mattermost/lfbrock-patch-1
Create release-process.md
2015-10-29 14:40:35 -07:00
it33
5e1d6bbb52 Merge pull request #1228 from mattermost/moving-api-doc
Update and rename doc/api/Overview.md to doc/developer/API-Web-Servic…
2015-10-29 14:40:23 -07:00
lfbrock
8efaaf83a3 Rename release-process to release-process.md 2015-10-29 17:12:15 -04:00
it33
af278fa988 Update README.md 2015-10-29 14:09:28 -07:00
lfbrock
96e63d31e2 Update release-process 2015-10-29 17:05:59 -04:00
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
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
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
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
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
it33
99402e9d99 Update and rename doc/api/Overview.md to doc/developer/API-Web-Service.md
Per discussion with CH, moving this over to /developer and working to integrate it into: https://github.com/mattermost/platform/blob/master/doc/developer/API.md

This is a multi-step process, we need to get everything under /developer, then explain from https://github.com/mattermost/platform/blob/master/doc/developer/API.md where to find everything. Documentation won't be perfect in first go, but we need to react quickly to community having questions around this.
2015-10-29 07:00:20 -07: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