summaryrefslogtreecommitdiffstats
path: root/store
Commit message (Expand)AuthorAgeFilesLines
* add MaxLifetimeconns to server (#9004)Jerry Kurian2018-06-283-25/+30
* Add english missed texts to i18n/en.json (#8987)Jesús Espino2018-06-281-1/+1
* Lock bulk importing to master database node (#9012)Joram Wilander2018-06-278-1/+54
* Add Purpose as a searchable field (#8067)Chris Duarte2018-06-263-3/+47
* Implementation of File Exists Function; Delete FileInfos upon Permanent User ...Daniel Schalla2018-06-254-0/+142
* MM-10570: Make permissions reset command clear custom role assignments. (#8976)George Goldberg2018-06-2510-1/+414
* MM-8810: Add CSV Compliance export (#8966)Jesús Espino2018-06-221-1/+7
* fix typo in en.json and remove trailing spaces (#8975)Carlos Tadeu Panato Junior2018-06-211-6/+6
* MM-10233: Add scheme importing to bulk importer. (#8928)George Goldberg2018-06-2137-32/+165
* Add missed translations (#8959)Jesús Espino2018-06-191-6/+6
* Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to...cpanato2018-06-151-1/+1
|\
| * MM-10767: Adding ordering to the system-admin list all teams (#8950)Jesús Espino2018-06-141-1/+1
| * Fix idempotency of scheme migrations. (#8935)George Goldberg2018-06-112-4/+12
* | Add preparatory upgrade code for 5.1.0 (#8920)Carlos Tadeu Panato Junior2018-06-131-0/+10
* | Relese5.0 merge master 20180611 (#8939)Carlos Tadeu Panato Junior2018-06-112-4/+12
|/
* Uncomment upgrade for 5.0.0 (#8914)Carlos Tadeu Panato Junior2018-06-051-14/+13
* MM-10412: Adds deleteBy prop to posts. (#8896)Martin Kraft2018-06-014-13/+34
* MM-10760: Using master for any Exec call (#8895)Jesús Espino2018-06-012-3/+3
* MM-10757: Default roles from scheme should be keyed by name not ID. (#8894)George Goldberg2018-06-014-24/+56
* 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