summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Expand)AuthorAgeFilesLines
* 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
* MM-10020: avoid duplicating unique indexes (#8587)Jesse Hallam2018-04-161-0/+1
* MM-9977: test config.SetDefaults leaves nothing nil (#8610)Jesse Hallam2018-04-134-1/+289
* Websocket custom dialer support (#8592)Guy B2018-04-121-3/+19
* Add Auto Responder handler (#8386)Stan Chan2018-04-123-0/+8
* MM-9849 Added tracking of which settings are set through environment variable...Harrison Healey2018-04-091-0/+12
* uncomment 4.9 upgrade code (#8582)Derrick Anderson2018-04-051-0/+1
* Add missing timezone setting to app/diagnostics.go (#8572)Jason Blais2018-04-041-1/+3
* Initialize timezone to a default state (#8560)Chris Duarte2018-03-292-1/+5
* fix user timezone initialization (#8547)Jesse Hallam2018-03-292-1/+4
* Fixing misspell errors (#8544)Jesús Espino2018-03-293-6/+6
* Add ExperimentalTimezone flag (#8539)Chris Duarte2018-03-291-0/+12
* Remove the index on Channels.DisplayName. (#8530)Jesse Hallam2018-03-281-2/+4
* Add defaults for SAML settings (#8536)Joram Wilander2018-03-281-0/+8
* [PLT-4340] Channel Mute and "/mute" command #7617 (#7713)Christian Claus2018-03-281-37/+38
* Merge branch 'advanced-permissions-phase-1'George Goldberg2018-03-279-211/+559
|\
| * Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Martin Kraft2018-03-276-19/+49
| |\
| * | Fix typo in MANAGE_SYSTEM_WIDE_OAUTH permission. (#8516)George Goldberg2018-03-271-3/+3
| * | Merge branch 'master' into advanced-permissions-phase-1Martin Kraft2018-03-234-0/+669
| |\ \
| * \ \ Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-191-2/+2
| |\ \ \
| * \ \ \ Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-1319-111/+187
| |\ \ \ \