summaryrefslogtreecommitdiffstats
path: root/store
Commit message (Collapse)AuthorAgeFilesLines
* 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 ↵cpanato2018-06-151-1/+1
|\ | | | | | | release-5.0-merge-to-master-20180615
| * 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
| | | | | | | | | | | | | | | | | | This fixes the issue where if the migration tries to migrate an already scheme-aware member object it would end up removing it's scheme-derived roles. Instead, only if the member object is unmigrated do we default to setting the scheme-derived role booleans to false. We tell if it is an unmigrated member object by checking if the booleans are set to null.
* | 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
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add missing diagnostics (#8911) * Update diagnostics.go * Update diagnostics.go * Fix push notification styling backwards compatibility (#8913) * MM-10803: remove premature user sanitization on deactivation (#8926) * remove unused UpdateNonSSOUserActive * MM-10803: stop prematurely sanitizing users on deactivate This change was preceded by the removal of UpdateNonSSOUserActive to ensure there are no APIs relying on the sanitized return value. * MM-10803: test websocket events after UpdateUserActive * MM-10264: Adds system scheme to permissions import/export. (#8924) * MM-10264: Adds system scheme to permissions import/export. * MM-10264: Switches to more likely unique name. * MM-10264: Changed collision prevention string. * MM-10264: Rolls back created schemes in all error cases. * MM-10264: Test fix for more rollback cases. * Fix idempotency of scheme migrations. (#8935) This fixes the issue where if the migration tries to migrate an already scheme-aware member object it would end up removing it's scheme-derived roles. Instead, only if the member object is unmigrated do we default to setting the scheme-derived role booleans to false. We tell if it is an unmigrated member object by checking if the booleans are set to null.
* 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-10757: Default roles from scheme should be keyed by name not ID. * Update permissions import/export.
* MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)Jesús Espino2018-05-291-0/+4
| | | | | | | | | | | | | | | | * MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions * MM-8853: Removing unnecesary emoji enterprise feature * Create emojis migration * Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS always to system admins * Simplifing permissions checks * Revert "Simplifing permissions checks" This reverts commit e2cafc1905fc9e20125dd9a1552d2d0c7340ae59.
* 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
| | | | | | | | | | | | | | | | The previous complete removal of this field resulted in an incompatibility with 4.x servers that could not handle the now null column field. Instead, ensure this field is at least always set to 0, with a plan to remove it altogether in a future release.
* | 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-10264: Adds CLI command to import and export permissions. * MM-10264: Changes Scheme Name to DisplayName and adds Name slug field. * MM-10264: Changes display name max size. * MM-10264: Another merge fix. * MM-10264: Changes for more Schemes methods checking for migration. * MM-10264: More updates for Schemes migration checking.
* | MM-10235: Make permissions reset CLI shcemes-aware. (#8773)George Goldberg2018-05-1716-0/+254
| | | | | | | | | | | | * MM-10235: Make permissions reset CLI shcemes-aware. * Add i18n strings.
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-9728: Online migration for advanced permissions phase 2 * Add unit tests for new store functions. * Move migration specific code to own file. * Add migration state function test. * Style fixes. * Add i18n strings. * Fix mocks. * Add TestMain to migrations package tests. * Fix typo. * Fix review comments. * Fix up the "Check if migration is done" check to actually work.
* | 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | without losing their account (#8756) * Adding LoginIdAttribute * Modifying LDAP to use loginIDAttribute. * Adding IDAttribute migration and AD objectGUID support. * Removing unused idea. * Fix typo.
* | 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
| | | | | | | | | | | | | | | | * uncomment upgrade code * ping jenkins * add 4.10.0 to version.go
| * 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
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implement basic scheme CRUD endpoints. * Get All Schemes (Paged) Endpoint and store plumbing. * Add get teams/channels for schemes. * Fix unit tests. * Review fixes. * More review fixes.
* | 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)" ↵Derrick Anderson2018-04-302-215/+118
| | | | | | | | | | (#8659) (#8694) This reverts commit 4b675b347b5241def7807fab5e01ce9b98531815.
* | Merge branch 'advanced-permissions-phase-2' of ↵Martin Kraft2018-05-012-4/+4
|\ \ | | | | | | | | | github.com:mattermost/mattermost-server into advanced-permissions-phase-2
| * | 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
| |/ | | | | | | | | | | | | | | * set team.LastTeamIconUpdate to 0 when removing team icon * add APIv4 for removing team icon * removed comment and updated typo on AppError
| * Fixing some merge conflicts with structured logging. (#8685)Christopher Speller2018-04-271-2/+2
| |
| * Structured logging (#8673)Christopher Speller2018-04-2717-102/+105
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Implementing structured logging * Changes to en.json to allow refactor to run. * Fixing global logger * Structured logger initalization. * Add caller. * Do some log redirection. * Auto refactor * Cleaning up l4g reference and removing dependancy. * Removing junk. * Copyright headers. * Fixing tests * Revert "Changes to en.json to allow refactor to run." This reverts commit fd8249e99bcad0231e6ea65cd77c32aae9a54026. * Fixing some auto refactor strangeness and typo. * Making keys more human readable.
* | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-04-271-0/+31
|\|
| * modestly extend SQLite support (#8677)Jesse Hallam2018-04-271-0/+31
| | | | | | | | | | This is primarily to unblock the advanced permissions merge. There's still more work to do if we wanted this to be mainstream, but as it's mainly for unit tests, I'm just focussing on the minimum.
* | MM-8796: Full implementation of "Schemes" in Store/Model/App layers. (#8357)George Goldberg2018-04-2031-75/+3172
|/ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add Scheme model and stub store. * Port ChannelStore to be Scheme aware. * Make almost all the API/APP layer work with ChannelSchemes. Only thing still hacky is UpdateChannelMemberRoles(). * Add basic SchemeStore implementation. * Migrate UpdateChannelMemberRoles properly and fix tests. * Update store tests and mocks so they work. * Include creating default roles in Scheme create store function. * Implement role deletion and start scheme deletion. * Only use non-deleted roles for authorization. * Add GetByScheme method to Team store. * Add GetChannelsByScheme. * Update store mocks. * Implement scheme deletion in the store. * Rename is valid function. * Add offset and limit to queries to fetch teams and channels by scheme. * Fix queries. * Implement scheme awareness in Team store and add a migration. * Tidy up ChannelStore mapping functions and add exhaustive unit tests. * Add all missing i18n. * Proper tests for TeamStore internal functions and fix them. * Make additional TeamMember fields nullable. * Make new ChannelMember fields nullable. * Create new nullable columns without defaults. * Make new fields in large tables nullalble. * Fix empty list of TeamMembers. * Deduplicate SQL queries. * Fix spelling. * Fix review comment. * More review fixes. * More review fixes.
* MM-10121: CLI command to reset permissions system to default state. (#8637)George Goldberg2018-04-1814-15/+221
| | | | | | * MM-10121: CLI command to reset permissions system to default state. * Review comment.
* MM-10020: avoid duplicating unique indexes (#8587)Jesse Hallam2018-04-164-16/+265
| | | | | | | | | | | | | | * unit test TestGet(Search)Replica This adds partial, testing-focused support for SQLite, as well as removing some translated log messages that required initializing i18n just for testing. * avoid returning master twice when no replicas are configured * remove duplicate indexes * unit test GetAllConns
* uncomment 4.9 upgrade code (#8582)Derrick Anderson2018-04-051-10/+19
| | | | | | | | * set db to 4.9 * add prepatory code for 4.10 * bug from old example