summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)Jesús Espino2018-05-2916-37/+427
* Allow to update the teams scheme to default scheme (#8855)Jesús Espino2018-05-292-10/+16
* Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-2811-2/+157
|\
| * [MM-10519] Send websocket event whenever the channel has changed it's type (p...Saturnino Abril2018-05-283-1/+39
| * [MM-1915] Add Deactivate Account - server side (#8699)Carlos Tadeu Panato Junior2018-05-288-1/+118
* | MM-8814: Remove implicit permission grants from post ownership. (#8391)George Goldberg2018-05-282-19/+35
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-283-8/+13
|\|
| * re-enabling TestSendMailUsingConfigAdvanced (#8836)Carlos Tadeu Panato Junior2018-05-272-6/+11
| * Update CONTRIBUTING.md (#8828)Jason Blais2018-05-271-2/+2
* | Merge branch 'advanced-permissions-phase-2' of github.com:mattermost/mattermo...Martin Kraft2018-05-251-0/+3
|\ \
| * | Add autogenerate scheme.name for new schemes without explicit name (#8848)Jesús Espino2018-05-251-0/+3
* | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-258-55/+37
|\ \ \ | |/ / |/| / | |/
| * [MM-10645] Remove desktop duration notify props (#8851)Saturnino Abril2018-05-254-29/+2
| * add ExperimentalHideTownSquareinLHS in config setting (#8751)Saturnino Abril2018-05-244-26/+35
* | MM-10402: Adds RunJobs to client config API. (#8846)Martin Kraft2018-05-241-0/+2
* | Merge fixes.Martin Kraft2018-05-241-0/+5
* | Merge fix.Martin Kraft2018-05-241-14/+15
* | 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
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-12 09:06:31 +0000