Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1238 from girishso/webhook-creator-notifs | Corey Hulen | 2015-10-30 | 1 | -1/+1 |
|\ | | | | | display webhook notifications to the creator of webhook | ||||
| * | display webhook notifications to the creator of webhook | Girish S | 2015-10-30 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #1236 from girishso/webhook-notification | Corey Hulen | 2015-10-30 | 1 | -1/+3 |
|\ \ | | | | | | | Show usernames overridden by Incoming Webhooks in notification messages. | ||||
| * | | Show usernames overridden by Incoming Webhooks in notification messages. | Girish S | 2015-10-30 | 1 | -1/+3 |
| |/ | | | | | | | fixes PLT-856 | ||||
* | | Merge pull request #1211 from mattermost/PLT-340 | Joram Wilander | 2015-10-30 | 28 | -145/+781 |
|\ \ | | | | | | | PLT-340 allow team directory and open invites | ||||
| * | | Adding error when enabling team dir without global prop being set. | =Corey Hulen | 2015-10-29 | 1 | -2/+9 |
| | | | |||||
| * | | Moving single team redirect to backend | =Corey Hulen | 2015-10-28 | 2 | -8/+5 |
| | | | |||||
| * | | Merge branch 'master' into PLT-340 | =Corey Hulen | 2015-10-28 | 7 | -60/+65 |
| |\ \ | |||||
| * | | | PLT-340 allow team directory and open invites | =Corey Hulen | 2015-10-27 | 1 | -1/+7 |
| | | | | |||||
| * | | | Merge branch 'master' into PLT-340 | =Corey Hulen | 2015-10-27 | 3 | -8/+18 |
| |\ \ \ | |||||
| * | | | | Removing console.log | =Corey Hulen | 2015-10-27 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | PLT-340 | =Corey Hulen | 2015-10-27 | 28 | -139/+757 |
| | | | | | |||||
| * | | | | Adding upgrade calls for db | =Corey Hulen | 2015-10-27 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | Merge branch 'master' into PLT-340 | =Corey Hulen | 2015-10-27 | 58 | -345/+1895 |
| |\ \ \ \ | |||||
| * | | | | | Adding new fields to team model | =Corey Hulen | 2015-10-26 | 1 | -10/+17 |
| | | | | | | |||||
* | | | | | | Merge pull request #1220 from florianorben/PLT-395 | Harrison Healey | 2015-10-30 | 14 | -2/+231 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-395: Add syntax highlighting to Markdown code blocks | ||||
| * | | | | | | allow code theme to be shareable | Florian Orben | 2015-10-29 | 2 | -2/+7 |
| | | | | | | | |||||
| * | | | | | | use XML syntax highlighting if provided language is html | Florian Orben | 2015-10-29 | 1 | -4/+10 |
| | | | | | | | |||||
| * | | | | | | escape user input | Florian Orben | 2015-10-29 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | Add java and ini language | Florian Orben | 2015-10-29 | 2 | -1/+7 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Forgot to add those altough they are quite common | ||||
| * | | | | | | fix markup if code is of unknown language | Florian Orben | 2015-10-29 | 1 | -1/+1 |
| | | | | | | | |||||
| * | | | | | | code style theme chooser | Florian Orben | 2015-10-29 | 9 | -2/+111 |
| | | | | | | | |||||
| * | | | | | | highlight code in markdown blocks | Florian Orben | 2015-10-29 | 6 | -0/+103 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1233 from hmhealey/plt600 | Christopher Speller | 2015-10-30 | 2 | -5/+12 |
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | | PLT-600 Added help text for the channel header and purpose dialogs | ||||
| * | | | | | | Added help text for the channel header and purpose dialogs | hmhealey | 2015-10-29 | 2 | -5/+12 |
| | | | | | | | |||||
* | | | | | | | Update API.md | it33 | 2015-10-29 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1235 from mattermost/it33-patch-1 | it33 | 2015-10-29 | 1 | -5/+5 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add reference to Web Service API | ||||
| * | | | | | | | Add reference to Web Service API | it33 | 2015-10-29 | 1 | -5/+5 |
|/ / / / / / / | |||||
* | | | | | | | Merge pull request #1234 from mattermost/lfbrock-patch-1 | it33 | 2015-10-29 | 1 | -0/+99 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Create release-process.md | ||||
| * | | | | | | | Rename release-process to release-process.md | lfbrock | 2015-10-29 | 1 | -0/+0 |
| | | | | | | | | |||||
| * | | | | | | | Update release-process | lfbrock | 2015-10-29 | 1 | -8/+0 |
| | | | | | | | | |||||
| * | | | | | | | Update release-process | lfbrock | 2015-10-29 | 1 | -2/+0 |
| | | | | | | | | |||||
| * | | | | | | | Create release-process | lfbrock | 2015-10-29 | 1 | -0/+109 |
| | | | | | | | | |||||
* | | | | | | | | Merge pull request #1228 from mattermost/moving-api-doc | it33 | 2015-10-29 | 2 | -3/+5 |
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | | Update and rename doc/api/Overview.md to doc/developer/API-Web-Servic… | ||||
| * | | | | | | | Update README.md | it33 | 2015-10-29 | 1 | -1/+1 |
| | | | | | | | | |||||
| * | | | | | | | Update and rename doc/api/Overview.md to doc/developer/API-Web-Service.md | it33 | 2015-10-29 | 1 | -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-modal | Harrison Healey | 2015-10-29 | 1 | -1/+20 |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | enable ctrl+enter send for edit msg modal | ||||
| * | | | | | | | simplify check if ctrl+enter was pressed | Florian Orben | 2015-10-29 | 2 | -75/+4 |
| | | | | | | | | |||||
| * | | | | | | | fix component unmount | Florian Orben | 2015-10-29 | 2 | -1/+70 |
| | | | | | | | | |||||
| * | | | | | | | enable ctrl+enter send for edit msg modal | Florian Orben | 2015-10-29 | 1 | -4/+25 |
| | |/ / / / / | |/| | | | | | |||||
* | | | | | | | Merge pull request #1231 from hmhealey/plt798 | Joram Wilander | 2015-10-29 | 1 | -1/+1 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | PLT-798 Fixed nil pointer when failing to upload an oversized image | ||||
| * | | | | | | Fixed nil pointer when failing to upload an oversized image | hmhealey | 2015-10-29 | 1 | -1/+1 |
| | | | | | | | |||||
* | | | | | | | Merge pull request #1230 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-10-29 | 8 | -171/+239 |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | UI Improvements | ||||
| * | | | | | | Updating margin for paragraphs | Asaad Mahmood | 2015-10-29 | 1 | -1/+7 |
| | | | | | | | |||||
| * | | | | | | UI Improvements | Asaad Mahmood | 2015-10-29 | 7 | -170/+232 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #1227 from mattermost/plt-849 | Joram Wilander | 2015-10-29 | 2 | -4/+45 |
|\ \ \ \ \ \ | |/ / / / / |/| | | | | | PLT-849 Update town square intro text. | ||||
| * | | | | | Add team type constants. | JoramWilander | 2015-10-29 | 1 | -0/+2 |
| | | | | | | |||||
| * | | | | | Update town square intro text. | JoramWilander | 2015-10-29 | 1 | -4/+43 |
|/ / / / / | |||||
* | | | | | Merge pull request #1224 from rgarmsen2295/plt-763 | Joram Wilander | 2015-10-29 | 4 | -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 RHS | Reed Garmsen | 2015-10-28 | 4 | -2/+4 |
| | | | | | |