summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1332 from mattermost/plt-560Christopher Speller2015-11-064-37/+66
|\ | | | | PLT-560 Prevent SSO users from changing their email
| * Prevent SSO users from changing their emailJoramWilander2015-11-064-37/+66
| |
* | Merge pull request #1333 from mattermost/GIT-888Christopher Speller2015-11-061-0/+9
|\ \ | | | | | | GIT-888 improving perf
| * | GIT-888 improving perf=Corey Hulen2015-11-061-0/+9
|/ /
* | Merge pull request #1331 from Tsynapse/patch-2Joram Wilander2015-11-061-1/+1
|\ \ | | | | | | Update to proxy_pass
| * | Update to proxy_passJason2015-11-061-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-2Joram Wilander2015-11-0613-31/+585
|\ \ \ | |_|/ |/| | PLT-857: Support `attachments` for Incoming Webhooks
| * | remove max column size from 'props'Florian Orben2015-11-061-1/+1
| | |
| * | fix alter table command for postgresFlorian Orben2015-11-062-1/+8
| | |
| * | fix logging statement not to post nonsenseFlorian Orben2015-11-061-2/+2
| | |
| * | remove two unused assignmentsFlorian Orben2015-11-052-2/+0
| | |
| * | postgres needs another query to get table information...Florian Orben2015-11-052-17/+8
| | |
| * | PLT-857: Support for Incoming Webhooks - Try #2Florian Orben2015-11-0510-41/+182
| | |
| * | collapse text after 700 chars or 5 line breaksFlorian Orben2015-11-052-2/+60
| | |
| * | attachments frontendFlorian Orben2015-11-057-0/+359
| | |
* | | Merge pull request #1321 from hmhealey/plt911Joram Wilander2015-11-063-50/+125
|\ \ \ | | | | | | | | PLT-911 Search autocomplete improvements
| * | | Moved public and private channels into separate sections in the search ↵hmhealey2015-11-053-36/+74
| | | | | | | | | | | | | | | | autocomplete
| * | | Fixed search autocomplete click handlinghmhealey2015-11-051-1/+1
| | | |
| * | | Changed search autocomplete to scroll when making a selection using the keyboardhmhealey2015-11-051-13/+50
| | | |
* | | | Merge pull request #1325 from hmhealey/plt618Joram Wilander2015-11-062-52/+350
|\ \ \ \ | | | | | | | | | | PLT-618 Ignore formatting markdown lists containing only one element
| * | | | Changed markdown lexer to ignore lists containing only one itemhmhealey2015-11-051-50/+54
| | | | |
| * | | | Cleaned up Markedown Lexer for eslinthmhealey2015-11-051-62/+56
| | | | |
| * | | | Copied part of the marked lexer into markdown.jsxhmhealey2015-11-051-1/+298
| | | | |
| * | | | Moved highlighting code out of markdown.jsxhmhealey2015-11-052-51/+54
| | | | |
* | | | | Merge pull request #1329 from florianorben/no_panic_on_webhook_errJoram Wilander2015-11-061-0/+5
|\ \ \ \ \ | |_|_|_|/ |/| | | | don't panic if incoming webhook contains invalid json
| * | | | don't panic if incoming webhook contains invalid jsonFlorian Orben2015-11-061-0/+5
| | |_|/ | |/| |
* | | | Rename tests-emoticons.md to test-emoticons.mdit332015-11-051-0/+0
| | | |
* | | | Create tests-emoticons.mdit332015-11-051-0/+930
| | | |
* | | | Merge pull request #1330 from mattermost/revert-1324-PLT-480Corey Hulen2015-11-051-1/+1
|\ \ \ \ | |/ / / |/| | | Revert 59581c38506acf267854f33af3c1d25e876dbb69
| * | | Revert 59581c38506acf267854f33af3c1d25e876dbb69Corey Hulen2015-11-051-1/+1
|/ / /
* | | Merge pull request #1320 from mattermost/PLT-1040Harrison Healey2015-11-052-1/+1
|\ \ \ | | | | | | | | PLT-1040 changing ding
| * | | Switching to mp3=Corey Hulen2015-11-053-1/+1
| | | |
| * | | PLT-1040 changing ding=Corey Hulen2015-11-052-1/+1
| | | |
* | | | Update Release-Numbering.mdit332015-11-051-1/+7
| | | |
* | | | Merge pull request #1324 from gabel/PLT-480Joram Wilander2015-11-051-1/+1
|\ \ \ \ | | | | | | | | | | PLT-480 Use `Utils.displayUsername` for username renderings
| * | | | PLT-480: Use `Utils.displayUsername` for username renderings. (fixes #874)Martin Fischer2015-11-051-1/+1
| | |/ / | |/| |
* | | | Merge pull request #1302 from mattermost/it33-patch-1Corey Hulen2015-11-051-0/+2
|\ \ \ \ | |/ / / |/| | | Noting random build failures
| * | | Update CONTRIBUTING.mdit332015-11-051-1/+2
| | | |
| * | | Update CONTRIBUTING.mdit332015-11-041-1/+1
| | | |
| * | | Noting random build failuresit332015-11-041-0/+1
| | | |
* | | | Merge pull request #1319 from asaadmahmoodspin/ui-improvementsCorey Hulen2015-11-053-21/+29
|\ \ \ \ | |_|/ / |/| | | UI Improvements for Slack and post dropdown
| * | | UI Improvements for Slack and post dropdownAsaad Mahmood2015-11-053-21/+29
| | | |
* | | | Merge pull request #1317 from hmhealey/scrollCorey Hulen2015-11-052-4/+7
|\ \ \ \ | | | | | | | | | | Re-added changes made in ac052fb9 to perfect scrollbar
| * | | | Re-added changes made in ac052fb9 to perfect scrollbarhmhealey2015-11-052-4/+7
| | |_|/ | |/| |
* | | | Merge pull request #1315 from mattermost/plt-996Corey Hulen2015-11-054-6/+6
|\ \ \ \ | | | | | | | | | | PLT-996 Prevent tutorial showing up a second before post list loads
| * | | | Update tutorial to not show by defaultJoramWilander2015-11-054-6/+6
| | | | |
* | | | | Merge pull request #1314 from mattermost/plt-829Corey Hulen2015-11-051-1/+5
|\ \ \ \ \ | |_|_|/ / |/| | | | PLT-829 Only allow one ding every 3s
| * | | | Only allow one ding every 3sJoramWilander2015-11-051-1/+5
| |/ / /
* | | | Merge pull request #1316 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-11-057-96/+134
|\ \ \ \ | |_|/ / |/| | | Modal improvements for members
| * | | Modal improvements for membersAsaad Mahmood2015-11-057-96/+134
| | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-05 10:48:33 +0000