summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-2439-259/+1064
|\
| * translations PR 20180522 (#8837)Elias Nahum2018-05-2414-118/+482
| * MM-8622: Improved plugin error reporting (#8737)Jesse Hallam2018-05-2317-93/+516
| * allow tuning *IdleConn* for intra-cluster messages (#8799)Jesse Hallam2018-05-232-9/+27
| * MM-10649: soften Channels.ExtraUpdateAt deprecation (#8843)Jesse Hallam2018-05-232-0/+20
| * remove license check when enforcing password requirements (#8840)Saturnino Abril2018-05-235-24/+6
* | fmt fix.Martin Kraft2018-05-221-1/+1
* | Merge branch 'master' into advanced-permissions-phase-2Martin Kraft2018-05-229-12/+53
|\|
| * add EnablePreviewModeBanner in config (#8834)Saturnino Abril2018-05-224-0/+8
| * MM-10352: Add locking incoming webhooks to a single channel. (#8835)George Goldberg2018-05-225-11/+45
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-22199-8872/+20286
|\|
| * Change order of web endpoints (#8817)Elias Nahum2018-05-211-1/+1
| * Skip cluster send when getting non-cached statuses (#8824)Joram Wilander2018-05-181-2/+2
| * Fixing TE login. (#8826)Christopher Speller2018-05-181-3/+5
| * Fixing CMD docs. (#8827)Christopher Speller2018-05-182-3/+3
| * MM-9983 Requiring SiteURL to be set. (#8769)Christopher Speller2018-05-186-18/+33
| * Upgrading server dependency. (#8807)Christopher Speller2018-05-18178-8816/+20199
| * MM-10640 Set EnableUserCreation to true by default (#8815)Balasankar C2018-05-188-14/+19
| * Add config setting for API team deletion (#8800)Joram Wilander2018-05-185-15/+24
* | Refactors migrations check. (#8814)Martin Kraft2018-05-215-89/+39
* | Merge fix.Martin Kraft2018-05-181-0/+0
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1841-264/+288
|\|
| * fix `make run-server` (#8819)Jesse Hallam2018-05-171-1/+2
| * Renaming platform binary to mattermost. (#8801)Christopher Speller2018-05-1741-262/+284
* | Reinstate upgrade code that mysteriously vanished during some merge.George Goldberg2018-05-181-1/+14
* | Fix tests.George Goldberg2018-05-183-0/+4
* | MM-10264: Adds CLI command to import and export permissions. (#8787)Martin Kraft2018-05-1714-14/+670
* | MM-10606: License feature flag for custom schemes. (#8804)George Goldberg2018-05-175-15/+32
* | MM-10235: Make permissions reset CLI shcemes-aware. (#8773)George Goldberg2018-05-1718-0/+281
* | Merge error fix.Martin Kraft2018-05-171-522/+0
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1786-22384/+1539
|\|
| * MM-8708 Remove api package (#8784)Joram Wilander2018-05-1687-22892/+1539
* | MM-10615: Reset teams/channels to default scheme on delete scheme. (#8811)George Goldberg2018-05-174-61/+34
* | MM-10591: Well known error for all scheme endpoints pre-migration. (#8812)George Goldberg2018-05-173-32/+63
* | MM-10234: Make CLI roles command advanced-permissions aware. (#8771)George Goldberg2018-05-172-5/+58
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1641-2003/+2461
|\|
| * Update email notification subject line and contents for Group Messages (#8689)Ugurcan Turkdogan2018-05-153-56/+171
| * MM-10249 Adding plugin ability to intercept posts before they reach the DB. (...Christopher Speller2018-05-1513-299/+1100
| * Merge branch 'merge410rc5'Derrick Anderson2018-05-1528-1648/+1190
| |\
| | * Merge remote-tracking branch 'origin/release-4.10' into merge410rc5Derrick Anderson2018-05-1528-1648/+1190
| |/|
| | * translations PR 20180511 (#8774)Elias Nahum2018-05-1414-380/+380
| | * Updating NOTICE.txt (#8732)amyblais2018-05-141-1234/+464
| | * drop 401s from info to debug (#8778)Jesse Hallam2018-05-141-4/+8
| | * [MM-9720] fix bugs when trying to change for a in use email and check the num...Carlos Tadeu Panato Junior2018-05-112-1/+17
| | * add notification when @user, @here, @all and @channel has colon ":" at the en...Saturnino Abril2018-05-112-6/+59
| | * fix mlog-ing before initialized (#8753)Jesse Hallam2018-05-114-16/+210
| | * More potential panic fixes (#8776)Joram Wilander2018-05-111-6/+9
| | * [MM-10458] Change system response to "Could not find the channel" - bug fix (...Carlos Tadeu Panato Junior2018-05-114-1/+43
* | | Fix build failure from bad merge.George Goldberg2018-05-161-4/+0
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1529-902/+1300
|\| |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-24 13:23:06 +0000