Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1333 from mattermost/GIT-888 | Christopher Speller | 2015-11-06 | 1 | -0/+9 |
|\ | | | | | GIT-888 improving perf | ||||
| * | GIT-888 improving perf | =Corey Hulen | 2015-11-06 | 1 | -0/+9 |
|/ | |||||
* | Merge pull request #1331 from Tsynapse/patch-2 | Joram Wilander | 2015-11-06 | 1 | -1/+1 |
|\ | | | | | Update to proxy_pass | ||||
| * | Update to proxy_pass | Jason | 2015-11-06 | 1 | -1/+1 |
| | | | | | | Changed proxy_pass to the mattermost server rather than pointing at the nginx server(localhost) | ||||
* | | Merge pull request #1327 from florianorben/PLT-857-2 | Joram Wilander | 2015-11-06 | 13 | -31/+585 |
|\ \ | | | | | | | PLT-857: Support `attachments` for Incoming Webhooks | ||||
| * | | remove max column size from 'props' | Florian Orben | 2015-11-06 | 1 | -1/+1 |
| | | | |||||
| * | | fix alter table command for postgres | Florian Orben | 2015-11-06 | 2 | -1/+8 |
| | | | |||||
| * | | fix logging statement not to post nonsense | Florian Orben | 2015-11-06 | 1 | -2/+2 |
| | | | |||||
| * | | remove two unused assignments | Florian Orben | 2015-11-05 | 2 | -2/+0 |
| | | | |||||
| * | | postgres needs another query to get table information... | Florian Orben | 2015-11-05 | 2 | -17/+8 |
| | | | |||||
| * | | PLT-857: Support for Incoming Webhooks - Try #2 | Florian Orben | 2015-11-05 | 10 | -41/+182 |
| | | | |||||
| * | | collapse text after 700 chars or 5 line breaks | Florian Orben | 2015-11-05 | 2 | -2/+60 |
| | | | |||||
| * | | attachments frontend | Florian Orben | 2015-11-05 | 7 | -0/+359 |
| | | | |||||
* | | | Merge pull request #1321 from hmhealey/plt911 | Joram Wilander | 2015-11-06 | 3 | -50/+125 |
|\ \ \ | | | | | | | | | PLT-911 Search autocomplete improvements | ||||
| * | | | Moved public and private channels into separate sections in the search ↵ | hmhealey | 2015-11-05 | 3 | -36/+74 |
| | | | | | | | | | | | | | | | | autocomplete | ||||
| * | | | Fixed search autocomplete click handling | hmhealey | 2015-11-05 | 1 | -1/+1 |
| | | | | |||||
| * | | | Changed search autocomplete to scroll when making a selection using the keyboard | hmhealey | 2015-11-05 | 1 | -13/+50 |
| | | | | |||||
* | | | | Merge pull request #1325 from hmhealey/plt618 | Joram Wilander | 2015-11-06 | 2 | -52/+350 |
|\ \ \ \ | | | | | | | | | | | PLT-618 Ignore formatting markdown lists containing only one element | ||||
| * | | | | Changed markdown lexer to ignore lists containing only one item | hmhealey | 2015-11-05 | 1 | -50/+54 |
| | | | | | |||||
| * | | | | Cleaned up Markedown Lexer for eslint | hmhealey | 2015-11-05 | 1 | -62/+56 |
| | | | | | |||||
| * | | | | Copied part of the marked lexer into markdown.jsx | hmhealey | 2015-11-05 | 1 | -1/+298 |
| | | | | | |||||
| * | | | | Moved highlighting code out of markdown.jsx | hmhealey | 2015-11-05 | 2 | -51/+54 |
| | | | | | |||||
* | | | | | Merge pull request #1329 from florianorben/no_panic_on_webhook_err | Joram Wilander | 2015-11-06 | 1 | -0/+5 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | don't panic if incoming webhook contains invalid json | ||||
| * | | | | don't panic if incoming webhook contains invalid json | Florian Orben | 2015-11-06 | 1 | -0/+5 |
| | |_|/ | |/| | | |||||
* | | | | Rename tests-emoticons.md to test-emoticons.md | it33 | 2015-11-05 | 1 | -0/+0 |
| | | | | |||||
* | | | | Create tests-emoticons.md | it33 | 2015-11-05 | 1 | -0/+930 |
| | | | | |||||
* | | | | Merge pull request #1330 from mattermost/revert-1324-PLT-480 | Corey Hulen | 2015-11-05 | 1 | -1/+1 |
|\ \ \ \ | |/ / / |/| | | | Revert 59581c38506acf267854f33af3c1d25e876dbb69 | ||||
| * | | | Revert 59581c38506acf267854f33af3c1d25e876dbb69 | Corey Hulen | 2015-11-05 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #1320 from mattermost/PLT-1040 | Harrison Healey | 2015-11-05 | 2 | -1/+1 |
|\ \ \ | | | | | | | | | PLT-1040 changing ding | ||||
| * | | | Switching to mp3 | =Corey Hulen | 2015-11-05 | 3 | -1/+1 |
| | | | | |||||
| * | | | PLT-1040 changing ding | =Corey Hulen | 2015-11-05 | 2 | -1/+1 |
| | | | | |||||
* | | | | Update Release-Numbering.md | it33 | 2015-11-05 | 1 | -1/+7 |
| | | | | |||||
* | | | | Merge pull request #1324 from gabel/PLT-480 | Joram Wilander | 2015-11-05 | 1 | -1/+1 |
|\ \ \ \ | | | | | | | | | | | PLT-480 Use `Utils.displayUsername` for username renderings | ||||
| * | | | | PLT-480: Use `Utils.displayUsername` for username renderings. (fixes #874) | Martin Fischer | 2015-11-05 | 1 | -1/+1 |
| | |/ / | |/| | | |||||
* | | | | Merge pull request #1302 from mattermost/it33-patch-1 | Corey Hulen | 2015-11-05 | 1 | -0/+2 |
|\ \ \ \ | |/ / / |/| | | | Noting random build failures | ||||
| * | | | Update CONTRIBUTING.md | it33 | 2015-11-05 | 1 | -1/+2 |
| | | | | |||||
| * | | | Update CONTRIBUTING.md | it33 | 2015-11-04 | 1 | -1/+1 |
| | | | | |||||
| * | | | Noting random build failures | it33 | 2015-11-04 | 1 | -0/+1 |
| | | | | |||||
* | | | | Merge pull request #1319 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2015-11-05 | 3 | -21/+29 |
|\ \ \ \ | |_|/ / |/| | | | UI Improvements for Slack and post dropdown | ||||
| * | | | UI Improvements for Slack and post dropdown | Asaad Mahmood | 2015-11-05 | 3 | -21/+29 |
| | | | | |||||
* | | | | Merge pull request #1317 from hmhealey/scroll | Corey Hulen | 2015-11-05 | 2 | -4/+7 |
|\ \ \ \ | | | | | | | | | | | Re-added changes made in ac052fb9 to perfect scrollbar | ||||
| * | | | | Re-added changes made in ac052fb9 to perfect scrollbar | hmhealey | 2015-11-05 | 2 | -4/+7 |
| | |_|/ | |/| | | |||||
* | | | | Merge pull request #1315 from mattermost/plt-996 | Corey Hulen | 2015-11-05 | 4 | -6/+6 |
|\ \ \ \ | | | | | | | | | | | PLT-996 Prevent tutorial showing up a second before post list loads | ||||
| * | | | | Update tutorial to not show by default | JoramWilander | 2015-11-05 | 4 | -6/+6 |
| | | | | | |||||
* | | | | | Merge pull request #1314 from mattermost/plt-829 | Corey Hulen | 2015-11-05 | 1 | -1/+5 |
|\ \ \ \ \ | |_|_|/ / |/| | | | | PLT-829 Only allow one ding every 3s | ||||
| * | | | | Only allow one ding every 3s | JoramWilander | 2015-11-05 | 1 | -1/+5 |
| |/ / / | |||||
* | | | | Merge pull request #1316 from asaadmahmoodspin/ui-improvements | Harrison Healey | 2015-11-05 | 7 | -96/+134 |
|\ \ \ \ | |_|/ / |/| | | | Modal improvements for members | ||||
| * | | | Modal improvements for members | Asaad Mahmood | 2015-11-05 | 7 | -96/+134 |
| | | | | |||||
* | | | | Merge pull request #1313 from mattermost/plt-992 | Joram Wilander | 2015-11-05 | 8 | -11/+14 |
|\ \ \ \ | |_|/ / |/| | | | PLT-992 / PLT-984 Fixed center channel height magic. Fixes tutorial. | ||||
| * | | | Fixed center channel height magic. Fixes tutorial | Christopher Speller | 2015-11-05 | 8 | -11/+14 |
| | | | |