summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into plugins-2JoramWilander2018-06-2747-26268/+12238
|\
| * Gfycat integration (#8971)Kenny Au2018-06-273-0/+21
| * MM-10910 fix join and open channel commands to work with tilde (#8984)Sudheer2018-06-272-2/+97
| * translations PR 20180625 (#8998)Elias Nahum2018-06-2714-26173/+11561
| * Lock bulk importing to master database node (#9012)Joram Wilander2018-06-279-1/+57
| * Simplify oauth (#8972)Emil Velikov2018-06-264-28/+11
| * MM-11034: Reply properly to incomming webhooks on errors (#9010)Jesús Espino2018-06-262-2/+8
| * MM-10833: send down computed channel props (#8953)Jesse Hallam2018-06-266-54/+411
| * MM-11008: Fix translation and change the code to be auto-extracted (#9009)Jesús Espino2018-06-262-4/+12
| * Add Purpose as a searchable field (#8067)Chris Duarte2018-06-263-3/+47
| * Update diagnostics.go (#8989)Jason Blais2018-06-261-0/+7
| * MM-10700 - Updating default image preview size (#9002) (#9003)Joram Wilander2018-06-261-1/+1
| * MM-10269: Make jobserver work without restart. (#9005)George Goldberg2018-06-262-0/+5
* | MM-9674 Add plugin API for publishing custom WebSocket events (#8999)Joram Wilander2018-06-275-2/+49
* | MM-10702 Moving plugins to use hashicorp go-plugin. (#8978)Christopher Speller2018-06-25303-9370/+52116
|/
* Implementation of File Exists Function; Delete FileInfos upon Permanent User ...Daniel Schalla2018-06-2511-0/+270
* MM-10570: Make permissions reset command clear custom role assignments. (#8976)George Goldberg2018-06-2512-1/+489
* Fix plugins serving after subpath changes (#8982)Joram Wilander2018-06-221-1/+1
* MM-8716: Security Update Check URL should have recognisable name. (#8983)George Goldberg2018-06-221-1/+1
* MM-8810: Add CSV Compliance export (#8966)Jesús Espino2018-06-2211-30/+129
* MM-10934 Update server dependencies. (#8981)Christopher Speller2018-06-21270-13474/+31365
* Using i18n extract to generate the i18n/en.json file (#8980)Jesús Espino2018-06-211-2105/+761
* MM-10370: serve subpath (#8968)Jesse Hallam2018-06-2114-148/+282
* MM-10425 Include active_channel in cluster update user status messages (#8967)Joram Wilander2018-06-213-13/+39
* Fixing mentionBg typo in import_test.go (#8970)Alex Goodman2018-06-211-2/+2
* Add back the ability to reply to push notifications in iOS (#8977)Elias Nahum2018-06-211-0/+1
* fix typo in en.json and remove trailing spaces (#8975)Carlos Tadeu Panato Junior2018-06-212-7/+7
* MM-10730 Added support for empty environment variables to viper (#8973)Harrison Healey2018-06-219-12/+1855
* MM-10233: Add scheme importing to bulk importer. (#8928)George Goldberg2018-06-2145-127/+1224
* translations PR 20180619 (#8963)Elias Nahum2018-06-2014-268/+164
* Add missed translations (#8959)Jesús Espino2018-06-1910-23/+101
* MM-6992 Added highlighting to elasticsearch results (#8861)Harrison Healey2018-06-196-8/+65
* MM-8701 Limit the number of client config fields sent before user logs in (#8...Harrison Healey2018-06-188-106/+246
* Small translation fixes (#8940)Jesús Espino2018-06-163-9/+6
* Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to...cpanato2018-06-153-2/+19
|\
| * Add more oauth logging and note about GitLab ToS for login (#8949)Joram Wilander2018-06-142-1/+18
| * MM-10767: Adding ordering to the system-admin list all teams (#8950)Jesús Espino2018-06-141-1/+1
* | Update html2text lib to use the original repo (#8900)Carlos Tadeu Panato Junior2018-06-1435-948/+3659
* | Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to...cpanato2018-06-149-347/+409
|\|
| * MM-10863: Handle non-API errors with redirect to webapp (#8943)Jesús Espino2018-06-142-2/+64
| * translations PR 20180613 (#8947)Elias Nahum2018-06-147-345/+345
* | MM-10367: rewrite subpath assets on startup (#8944)Jesse Hallam2018-06-145-2/+286
* | MM-10769 Rename references to spf13/viper to mattermost/viper (#8948)Harrison Healey2018-06-1410-3/+3
* | Merge branch 'release-5.0-merge-to-master-20180613'cpanato2018-06-130-0/+0
|\ \
| * | Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to...cpanato2018-06-130-0/+0
|/| | | |/
| * Fix idempotency of scheme migrations. (#8935)George Goldberg2018-06-112-4/+12
| * MM-10264: Adds system scheme to permissions import/export. (#8924)Martin Kraft2018-06-082-4/+55
| * MM-10803: remove premature user sanitization on deactivation (#8926)Jesse Hallam2018-06-074-85/+140
| * Fix push notification styling backwards compatibility (#8913)Elias Nahum2018-06-062-0/+3
| * Add missing diagnostics (#8911)Jason Blais2018-06-061-1/+6
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-26 14:26:43 +0000