summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1236 from girishso/webhook-notificationCorey Hulen2015-10-301-1/+3
|\ | | | | Show usernames overridden by Incoming Webhooks in notification messages.
| * Show usernames overridden by Incoming Webhooks in notification messages.Girish S2015-10-301-1/+3
| | | | | | | | fixes PLT-856
* | Merge pull request #1211 from mattermost/PLT-340Joram Wilander2015-10-3028-145/+781
|\ \ | | | | | | PLT-340 allow team directory and open invites
| * | Adding error when enabling team dir without global prop being set.=Corey Hulen2015-10-291-2/+9
| | |
| * | Moving single team redirect to backend=Corey Hulen2015-10-282-8/+5
| | |
| * | Merge branch 'master' into PLT-340=Corey Hulen2015-10-287-60/+65
| |\ \
| * | | PLT-340 allow team directory and open invites=Corey Hulen2015-10-271-1/+7
| | | |
| * | | Merge branch 'master' into PLT-340=Corey Hulen2015-10-273-8/+18
| |\ \ \
| * | | | Removing console.log=Corey Hulen2015-10-271-2/+0
| | | | |
| * | | | PLT-340=Corey Hulen2015-10-2728-139/+757
| | | | |
| * | | | Adding upgrade calls for db=Corey Hulen2015-10-271-0/+3
| | | | |
| * | | | Merge branch 'master' into PLT-340=Corey Hulen2015-10-2758-345/+1895
| |\ \ \ \
| * | | | | Adding new fields to team model=Corey Hulen2015-10-261-10/+17
| | | | | |
* | | | | | Merge pull request #1220 from florianorben/PLT-395Harrison Healey2015-10-3014-2/+231
|\ \ \ \ \ \ | | | | | | | | | | | | | | PLT-395: Add syntax highlighting to Markdown code blocks
| * | | | | | allow code theme to be shareableFlorian Orben2015-10-292-2/+7
| | | | | | |
| * | | | | | use XML syntax highlighting if provided language is htmlFlorian Orben2015-10-291-4/+10
| | | | | | |
| * | | | | | escape user inputFlorian Orben2015-10-291-2/+2
| | | | | | |
| * | | | | | Add java and ini languageFlorian Orben2015-10-292-1/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to add those altough they are quite common
| * | | | | | fix markup if code is of unknown languageFlorian Orben2015-10-291-1/+1
| | | | | | |
| * | | | | | code style theme chooserFlorian Orben2015-10-299-2/+111
| | | | | | |
| * | | | | | highlight code in markdown blocksFlorian Orben2015-10-296-0/+103
| | | | | | |
* | | | | | | Merge pull request #1233 from hmhealey/plt600Christopher Speller2015-10-302-5/+12
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | PLT-600 Added help text for the channel header and purpose dialogs
| * | | | | | Added help text for the channel header and purpose dialogshmhealey2015-10-292-5/+12
| | | | | | |
* | | | | | | Update API.mdit332015-10-291-1/+1
| | | | | | |
* | | | | | | Merge pull request #1235 from mattermost/it33-patch-1it332015-10-291-5/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Add reference to Web Service API
| * | | | | | | Add reference to Web Service APIit332015-10-291-5/+5
|/ / / / / / /
* | | | | | | Merge pull request #1234 from mattermost/lfbrock-patch-1it332015-10-291-0/+99
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Create release-process.md
| * | | | | | | Rename release-process to release-process.mdlfbrock2015-10-291-0/+0
| | | | | | | |
| * | | | | | | Update release-processlfbrock2015-10-291-8/+0
| | | | | | | |
| * | | | | | | Update release-processlfbrock2015-10-291-2/+0
| | | | | | | |
| * | | | | | | Create release-processlfbrock2015-10-291-0/+109
| | | | | | | |
* | | | | | | | Merge pull request #1228 from mattermost/moving-api-docit332015-10-292-3/+5
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | Update and rename doc/api/Overview.md to doc/developer/API-Web-Servic…
| * | | | | | | Update README.mdit332015-10-291-1/+1
| | | | | | | |
| * | | | | | | Update and rename doc/api/Overview.md to doc/developer/API-Web-Service.mdit332015-10-291-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
* | | | | | | | Merge pull request #1225 from florianorben/1196-for-edit-modalHarrison Healey2015-10-291-1/+20
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | enable ctrl+enter send for edit msg modal
| * | | | | | | simplify check if ctrl+enter was pressedFlorian Orben2015-10-292-75/+4
| | | | | | | |
| * | | | | | | fix component unmountFlorian Orben2015-10-292-1/+70
| | | | | | | |
| * | | | | | | enable ctrl+enter send for edit msg modalFlorian Orben2015-10-291-4/+25
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #1231 from hmhealey/plt798Joram Wilander2015-10-291-1/+1
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | PLT-798 Fixed nil pointer when failing to upload an oversized image
| * | | | | | Fixed nil pointer when failing to upload an oversized imagehmhealey2015-10-291-1/+1
| | | | | | |
* | | | | | | Merge pull request #1230 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-10-298-171/+239
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | UI Improvements
| * | | | | | Updating margin for paragraphsAsaad Mahmood2015-10-291-1/+7
| | | | | | |
| * | | | | | UI ImprovementsAsaad Mahmood2015-10-297-170/+232
|/ / / / / /
* | | | | | Merge pull request #1227 from mattermost/plt-849Joram Wilander2015-10-292-4/+45
|\ \ \ \ \ \ | |/ / / / / |/| | | | | PLT-849 Update town square intro text.
| * | | | | Add team type constants.JoramWilander2015-10-291-0/+2
| | | | | |
| * | | | | Update town square intro text.JoramWilander2015-10-291-4/+43
|/ / / / /
* | | | | Merge pull request #1224 from rgarmsen2295/plt-763Joram Wilander2015-10-294-2/+4
|\ \ \ \ \ | | | | | | | | | | | | PLT-763 Fixed issue with refocusing not working after editing a post in the RHS
| * | | | | Fixed issue with refocusing not working after editing a post in the RHSReed Garmsen2015-10-284-2/+4
| | | | | |
* | | | | | Merge pull request #1221 from florianorben/disallow_edit_bot_msg_arrow_upJoram Wilander2015-10-291-4/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Dont edit reply messages of outgoing webhooks by pressing up-arrow in chat input box
| * | | | | | Dont edit reply messages of outgoing webhooks by pressing up-arrow in chat ↵Florian Orben2015-10-281-4/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | input box
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-05 07:17:23 +0000