summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Add preparatory upgrade code for 5.1.0 (#8920)Carlos Tadeu Panato Junior2018-06-131-0/+10
* | Prototype for CBA (#8475)Corey Hulen2018-06-128-1/+170
* | MM-10791: Don't try and generate thumbnails for non-images/svgs. (#8937)George Goldberg2018-06-121-4/+6
* | Relese5.0 merge master 20180611 (#8939)Carlos Tadeu Panato Junior2018-06-112-4/+12
* | MM-10684: Show logs on Slack Import CLI. (#8936)George Goldberg2018-06-111-1/+10
* | MM-10790: Fix Slack Import logs that got broken in refactoring. (#8938)George Goldberg2018-06-112-26/+10
* | Skip notifications for expired sessions (#8934)Daniel Schalla2018-06-081-0/+5
* | Relese5.0 merge master 20180608 (#8933)Carlos Tadeu Panato Junior2018-06-086-89/+195
* | Get the count of the all system users at endpoint /users/stats (#8847)lisakycho2018-06-075-20/+80
* | allow client4 http keep-alive (#8854)Jesse Hallam2018-06-071-11/+0
* | Relese5.0 merge master 20180607 (#8927)Carlos Tadeu Panato Junior2018-06-073-1/+9
* | MM-6839: searching for paths relative to executable (#8915)Jesse Hallam2018-06-063-45/+366
* | use minio release instead of latest (#8917)Carlos Tadeu Panato Junior2018-06-061-1/+1
|/
* disable Supervisor_PluginRepeatedlyCrash (#8918)Jesse Hallam2018-06-051-2/+2
* Uncomment upgrade for 5.0.0 (#8914)Carlos Tadeu Panato Junior2018-06-052-14/+14
* translations PR 20180604 (#8909)Elias Nahum2018-06-0514-643/+2723
* MM-10597 Improved handling of punctuation around notifications (#8901)Harrison Healey2018-06-052-14/+59
* Include the daily and monthly active user counts in telemetry. (#8887)George Goldberg2018-06-051-6/+15
* Fixed invalid CustomUrlSchemes error message (#8902)Harrison Healey2018-06-051-1/+1