summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Expand)AuthorAgeFilesLines
* MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)Jesús Espino2018-05-291-0/+16
* Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-282-1/+7
|\
| * [MM-10519] Send websocket event whenever the channel has changed it's type (p...Saturnino Abril2018-05-281-1/+2
| * [MM-1915] Add Deactivate Account - server side (#8699)Carlos Tadeu Panato Junior2018-05-281-0/+5
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-252-1/+5
|\|
| * [MM-10645] Remove desktop duration notify props (#8851)Saturnino Abril2018-05-251-1/+0
| * add ExperimentalHideTownSquareinLHS in config setting (#8751)Saturnino Abril2018-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-248-73/+134
|\|
| * MM-8622: Improved plugin error reporting (#8737)Jesse Hallam2018-05-234-39/+96
| * allow tuning *IdleConn* for intra-cluster messages (#8799)Jesse Hallam2018-05-231-8/+23
| * MM-10649: soften Channels.ExtraUpdateAt deprecation (#8843)Jesse Hallam2018-05-231-0/+2
| * remove license check when enforcing password requirements (#8840)Saturnino Abril2018-05-232-11/+0
* | Merge branch 'master' into advanced-permissions-phase-2Martin Kraft2018-05-222-11/+17
|\|
| * add EnablePreviewModeBanner in config (#8834)Saturnino Abril2018-05-221-0/+5
| * MM-10352: Add locking incoming webhooks to a single channel. (#8835)George Goldberg2018-05-221-11/+12
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-222-15/+18
|\|
| * MM-9983 Requiring SiteURL to be set. (#8769)Christopher Speller2018-05-182-14/+7
| * MM-10640 Set EnableUserCreation to true by default (#8815)Balasankar C2018-05-181-1/+6
| * Add config setting for API team deletion (#8800)Joram Wilander2018-05-181-0/+5
* | MM-10264: Adds CLI command to import and export permissions. (#8787)Martin Kraft2018-05-171-5/+48
* | MM-10606: License feature flag for custom schemes. (#8804)George Goldberg2018-05-172-0/+16
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-174-2411/+76
|\|
| * MM-8708 Remove api package (#8784)Joram Wilander2018-05-164-2411/+76
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-151-5/+0
|\|
| * MM-9739: deprecate the now unused Channels.ExtraUpdateAt (#8762)Jesse Hallam2018-05-141-6/+0
* | MM-9728: Online migration for advanced permissions phase 2 (#8744)George Goldberg2018-05-142-0/+10
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-113-11/+57
|\|
| * Add Ping Timeout Signal for WebSocket Client (#8666)Daniel Schalla2018-05-101-10/+45
| * MM-4998 Adding LoginIdAttribute to allow LDAP users to change their login ID ...Christopher Speller2018-05-102-1/+12
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-092-1/+2
|\|
| * Uncomment upgrade for 4.10 (#8727)Derrick Anderson2018-05-041-0/+1
| * Add inactive user count to analytics and fix client analytics function (#8695)Joram Wilander2018-05-021-1/+1
* | MM-10140: API Implementation for Schemes related Endpoints (#8615)George Goldberg2018-05-032-0/+119
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-021-3/+3
|\|
| * MM-8622: improved plugin error handling (#8692)Jesse Hallam2018-05-011-3/+3
* | MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680)Martin Kraft2018-05-022-0/+45
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-013-58/+75
|\|
| * [MM-10354] Add feature to remove team icon (#8684)Saturnino Abril2018-04-301-53/+63
| * Structured logging (#8673)Christopher Speller2018-04-272-5/+12
* | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-04-274-98/+144
|\|
| * MM-10232, MM-10259: Improve error handling from invalid json (#8668)Jesse Hallam2018-04-264-98/+144
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-04-241-0/+10
|\|
| * add api to convert a channel from public to private and restrict that to syst...Saturnino Abril2018-04-231-0/+10
* | MM-8796: Full implementation of "Schemes" in Store/Model/App layers. (#8357)George Goldberg2018-04-207-45/+161
|/
* Properly implement session deep copy (#8602)Joram Wilander2018-04-202-2/+45
* MM-10007 Send an admin and regular WS events when a user is updated (#8588)Joram Wilander2018-04-205-4/+75
* MM-10122: Adds a mention for added-to-channel messages even when 'username me...Martin Kraft2018-04-191-0/+1
* MM-9779: Incorporate a Token into the invitations system (#8604)Jesús Espino2018-04-182-19/+19
* Initial Commit of Ephemeral Message Support for System Admins (#8611)Daniel Schalla2018-04-174-0/+33