summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' into advanced-permissions-phase-1Martin Kraft2018-03-2353-163/+2848
|\
| * Improved bulkload error handling (#8491)Jesse Hallam2018-03-233-18/+20
| * MM-9853 Fix Team invite does not carry through SAML login (#8495)Elias Nahum2018-03-221-1/+5
| * MM-9804: emit defaults for all enterprise config (#8490)Jesse Hallam2018-03-222-8/+148
| * Timezone feature (#8185)Chris Duarte2018-03-2217-0/+1397
| * Fix various segfaults when running `go test` manually (#8448)Jesse Hallam2018-03-2115-41/+60
| * Fix paging for GET /teams and GET /teams/{id}/members endpoints (#8488)Joram Wilander2018-03-212-3/+29
| * Receive the email date as parameter (#8484)Jesús Espino2018-03-211-3/+3
| * Fixed missing error in log message (#8485)Harrison Healey2018-03-211-1/+1
| * Update plugin.go (#8486)Jason Blais2018-03-211-1/+1
| * add config for saml home realm discovery bypass (#8480)Chris2018-03-202-0/+5
| * translations PR 20180319 (#8479)Elias Nahum2018-03-2014-87/+1179
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-1925-341/+570
|\|
| * MM-9770: rewrite getParentsPosts to improve performance (#8467)Jesse Hallam2018-03-162-118/+215
| * Merge branch 't0merge48master'Derrick Anderson2018-03-158-76/+77
| |\
| | * Merge remote-tracking branch 'origin/release-4.8' into t0merge48masterDerrick Anderson2018-03-158-76/+77
| |/|
| | * Add content type to API error response (#8460)Joram Wilander2018-03-141-0/+1
| | * translations PR 20180314 (#8458)Elias Nahum2018-03-147-76/+76
| * | Isolating configuration, sending emails and connection to SMTP. (#8452)Jesús Espino2018-03-152-57/+142
| * | [MM-9703] Push notifications are sent for own DM's (#8439)Carlos Tadeu Panato Junior2018-03-151-4/+9
| * | Merge branch 't2releasetomaster'Derrick Anderson2018-03-131-0/+3
| |\ \
| | * | Merge remote-tracking branch 'origin/release-4.8' into t2releasetomasterDerrick Anderson2018-03-131-0/+3
| |/| | | | |/
| | * MM-9795: Fix theme chooser for non-EE builds (#8440)Michał Odziemczyk2018-03-131-0/+3
| * | remove s3 region to be mandatory and fix when user call test s3 when the conf...Carlos Tadeu Panato Junior2018-03-144-23/+15
| * | MM-9688: Better error message for plugin enabling in HA mode (#8433)Chris2018-03-132-0/+7
| * | update email test in the driver to be able to send the config in the body (#8...Carlos Tadeu Panato Junior2018-03-132-19/+25
| * | Delete mkdocs.yml (#8447)Florian Vogt2018-03-131-11/+0
| * | Better error handling for failed plugin activation (#8361)Joram Wilander2018-03-132-9/+46
| * | Merge remote-tracking branch 'origin/t3mergetomaster'Derrick Anderson2018-03-133-24/+31
| |\ \
| | * | Merge remote-tracking branch 'origin/release-4.8' into t3mergetomasterDerrick Anderson2018-03-123-24/+31
| |/| | | | |/
| | * Fix saml users.json parameter (#8435)Jesús Espino2018-03-121-2/+2
| | * ICU-682 Stopped sending out of channel mention warnings for system messages (...Harrison Healey2018-03-091-1/+1
| | * fix sandbox cleanup (#8421)Chris2018-03-081-21/+28
* | | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-13167-3042/+5007
|\| |
| * | Adding new global relay settings to diagnostics and default.json (#8441)Jesús Espino2018-03-122-6/+16
| * | Removed mssola/user_agent library (#8417)Harrison Healey2018-03-1213-1497/+17
| * | [MM-9720] Platform command to change user email address (#8422)Carlos Tadeu Panato Junior2018-03-122-0/+68
| * | [MM-9725] Slack compatibility code in webhooks captures incorrect text (#8428)Carlos Tadeu Panato Junior2018-03-122-1/+59
| * | using inbucket docker image tag release-1.2.0 instead of latest (#8406)Carlos Tadeu Panato Junior2018-03-122-2/+2
| * | MM-8839: Adds ChannelType to compliance-related model. (#8424)Martin Kraft2018-03-094-0/+9
| * | Remove query to update channel extra_update_at field on user activation/deact...Joram Wilander2018-03-096-93/+10
| * | MM-9274- Sort Users in Channel by status (#8181)Stephen Kiers2018-03-0914-29/+538
| * | Merge branch 'merge-4.8'Derrick Anderson2018-03-0817-42/+398
| |\ \
| | * | Merge branch 'release-4.8' into merge-4.8JoramWilander2018-03-0817-42/+398
| |/| | | | |/
| | * respect plugin manifest webapp bundle_path (#8393)Chris2018-03-072-4/+22
| | * plugin sandbox fixes (#8418)Chris2018-03-071-1/+10
| | * translations PR 20180306 (#8414)Elias Nahum2018-03-0714-37/+349
| | * register additional gob types to support arrays and dicts in post props (#8412)Chris2018-03-062-5/+40
| | * Uncomment upgrade code to 4.8 (#8409)Derrick Anderson2018-03-052-4/+4
| * | Moved team icon upgrade code to 4.9 since it didn't make it in for 4.8 (#8410)Joram Wilander2018-03-081-1/+1
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-02 18:31:02 +0000