summaryrefslogtreecommitdiffstats
path: root/store
Commit message (Expand)AuthorAgeFilesLines
* MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)Jesús Espino2018-05-291-0/+4
* 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-241-0/+18
|\
| * MM-10649: soften Channels.ExtraUpdateAt deprecation (#8843)Jesse Hallam2018-05-231-0/+18
* | fmt fix.Martin Kraft2018-05-221-1/+1
* | Merge branch 'master' into advanced-permissions-phase-2Martin Kraft2018-05-221-1/+2
|\|
| * MM-10352: Add locking incoming webhooks to a single channel. (#8835)George Goldberg2018-05-221-0/+2
* | 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-174-2/+25
* | MM-10235: Make permissions reset CLI shcemes-aware. (#8773)George Goldberg2018-05-1716-0/+254
* | MM-10615: Reset teams/channels to default scheme on delete scheme. (#8811)George Goldberg2018-05-172-17/+20
* | 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-152-67/+3
|\|
| * MM-9739: deprecate the now unused Channels.ExtraUpdateAt (#8762)Jesse Hallam2018-05-142-71/+3
* | MM-9728: Online migration for advanced permissions phase 2 (#8744)George Goldberg2018-05-147-0/+317
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-1132-81/+41
|\|
| * MM-4998 Adding LoginIdAttribute to allow LDAP users to change their login ID ...Christopher Speller2018-05-1032-81/+41
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-091-18/+14
|\|
| * prep code for 5.0 (#8743)Derrick Anderson2018-05-081-0/+9
| * Uncomment upgrade for 4.10 (#8727)Derrick Anderson2018-05-041-8/+7
| * MM-10319: Use normalized email for Saml (migration) (#8711)Jesús Espino2018-05-041-0/+1
* | MM-10140: API Implementation for Schemes related Endpoints (#8615)George Goldberg2018-05-0313-4/+177
* | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-022-215/+118
|\|
| * Revert "MM-9770: rewrite getParentsPosts to improve performance (#8467)" (#86...Derrick Anderson2018-04-302-215/+118
* | Merge branch 'advanced-permissions-phase-2' of github.com:mattermost/mattermo...Martin Kraft2018-05-012-4/+4
|\ \
| * | Fixing structured logging conflicts.Christopher Speller2018-04-272-4/+4
| * | Merge branch 'master' into advanced-permissions-phase-2Christopher Speller2018-04-2717-104/+107
| |\ \
* | \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-0118-105/+107
|\ \ \ \ | |/ / / |/| | / | | |/ | |/|
| * | [MM-10354] Add feature to remove team icon (#8684)Saturnino Abril2018-04-301-1/+0
| |/
| * Fixing some merge conflicts with structured logging. (#8685)Christopher Speller2018-04-271-2/+2
| * Structured logging (#8673)Christopher Speller2018-04-2717-102/+105
* | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-04-271-0/+31
|\|
| * modestly extend SQLite support (#8677)Jesse Hallam2018-04-271-0/+31
* | MM-8796: Full implementation of "Schemes" in Store/Model/App layers. (#8357)George Goldberg2018-04-2031-75/+3172
|/
* MM-10121: CLI command to reset permissions system to default state. (#8637)George Goldberg2018-04-1814-15/+221
* MM-10020: avoid duplicating unique indexes (#8587)Jesse Hallam2018-04-164-16/+265
* uncomment 4.9 upgrade code (#8582)Derrick Anderson2018-04-051-10/+19
* Fixing misspell errors (#8544)Jesús Espino2018-03-292-4/+4
* MM-9661: tweak post message size log (#8517)Jesse Hallam2018-03-291-2/+2
* Remove the index on Channels.DisplayName. (#8530)Jesse Hallam2018-03-282-3/+21
* Add unit test coverage for SqlStatusStore.GetAllFromTeam (#8520)Jesse Hallam2018-03-281-0/+90
* Fix roles table ID max length so MySQL 5.6 doesn't fail. (#8532)George Goldberg2018-03-281-0/+1
* Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-1Martin Kraft2018-03-274-57/+170
|\
| * Relax 4k post message limit (#8478)Jesse Hallam2018-03-264-57/+170
* | Merge branch 'master' into advanced-permissions-phase-1Martin Kraft2018-03-232-0/+8
|\|
| * Timezone feature (#8185)Chris Duarte2018-03-222-0/+8
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-192-118/+215
|\|
| * MM-9770: rewrite getParentsPosts to improve performance (#8467)Jesse Hallam2018-03-162-118/+215
* | Merge branch 'master' into advanced-permissions-phase-1George Goldberg2018-03-1318-136/+560
|\|