summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* MM-10233: Add scheme importing to bulk importer. (#8928)George Goldberg2018-06-216-94/+986
|
* MM-6992 Added highlighting to elasticsearch results (#8861)Harrison Healey2018-06-191-5/+5
| | | | | | | | * MM-6992 Added highlighting to elasticsearch results * Added a unique type for post search matches * Fixed Elasticsearch matches not being sent through API
* MM-8701 Limit the number of client config fields sent before user logs in ↵Harrison Healey2018-06-182-3/+26
| | | | | | | | | | (#8954) * MM-8701 Limit the number of client config fields sent before user logs in * Fixed missing client config field * Reduced duplication between limited and regular client config
* Small translation fixes (#8940)Jesús Espino2018-06-162-6/+3
|
* Merge remote-tracking branch 'upstream/release-5.0' into ↵cpanato2018-06-151-1/+14
|\ | | | | | | release-5.0-merge-to-master-20180615
| * Add more oauth logging and note about GitLab ToS for login (#8949)Joram Wilander2018-06-141-1/+14
| |
| * MM-10264: Adds system scheme to permissions import/export. (#8924)Martin Kraft2018-06-082-4/+55
| | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * MM-10803: remove premature user sanitization on deactivation (#8926)Jesse Hallam2018-06-072-37/+0
| | | | | | | | | | | | | | | | | | | | | | * 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
| * Fix push notification styling backwards compatibility (#8913)Elias Nahum2018-06-061-0/+1
| |
| * Add missing diagnostics (#8911)Jason Blais2018-06-061-1/+6
| | | | | | | | | | | | * Update diagnostics.go * Update diagnostics.go
* | Prototype for CBA (#8475)Corey Hulen2018-06-122-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prototype for CBA * Fixing gofmt issues * Do not require password if logging in with certificate * Fixing issues from feedback * Adding unit tests * Fixing feedback
* | MM-10791: Don't try and generate thumbnails for non-images/svgs. (#8937)George Goldberg2018-06-121-4/+6
| |
* | MM-10790: Fix Slack Import logs that got broken in refactoring. (#8938)George Goldberg2018-06-111-10/+10
| |
* | Skip notifications for expired sessions (#8934)Daniel Schalla2018-06-081-0/+5
| |
* | Relese5.0 merge master 20180608 (#8933)Carlos Tadeu Panato Junior2018-06-084-41/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
* | Get the count of the all system users at endpoint /users/stats (#8847)lisakycho2018-06-071-0/+11
| | | | | | | | | | | | | | | | * Get the count of the all system users at endpoint /users/stats * Added GetTotalUsersStats test in api4 * Changed pluralization and added the test back.
* | Relese5.0 merge master 20180607 (#8927)Carlos Tadeu Panato Junior2018-06-072-1/+7
|/ | | | | | | | | | * Add missing diagnostics (#8911) * Update diagnostics.go * Update diagnostics.go * Fix push notification styling backwards compatibility (#8913)
* MM-10597 Improved handling of punctuation around notifications (#8901)Harrison Healey2018-06-052-14/+59
|
* Include the daily and monthly active user counts in telemetry. (#8887)George Goldberg2018-06-051-6/+15
|
* MM-9730 & MM-9729: Missing Server PRs (#8908)George Goldberg2018-06-053-2/+73
| | | | | | * MM-9730: API endpoint to update scheme-derived roles of TeamMembers. * MM-9729: API to update scheme-derived roles of ChannelMembers.
* Remove plugin sandbox warning message (#8897)Joram Wilander2018-06-041-6/+1
|
* [MM-10718] Move custom branding to TE (#8871)Saturnino Abril2018-06-022-21/+45
| | | | | * move custom branding to TE * move brand's enterprise code to server and remove BrandInterface
* MM-10412: Adds deleteBy prop to posts. (#8896)Martin Kraft2018-06-012-3/+3
|
* MM-10757: Default roles from scheme should be keyed by name not ID. (#8894)George Goldberg2018-06-013-31/+30
| | | | | | * MM-10757: Default roles from scheme should be keyed by name not ID. * Update permissions import/export.
* Merge branch 'advanced-permissions-phase-2'George Goldberg2018-05-3111-53/+1065
|\
| * MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)Jesús Espino2018-05-294-10/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-282-0/+28
| |\
| * | MM-8814: Remove implicit permission grants from post ownership. (#8391)George Goldberg2018-05-281-13/+0
| | |
| * | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-253-50/+29
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-246-42/+306
| |\ \ \
| * \ \ \ Merge branch 'master' into advanced-permissions-phase-2Martin Kraft2018-05-222-0/+5
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-226-11/+13
| |\ \ \ \ \
| * | | | | | Refactors migrations check. (#8814)Martin Kraft2018-05-212-0/+19
| | | | | | |
| * | | | | | MM-10264: Adds CLI command to import and export permissions. (#8787)Martin Kraft2018-05-174-1/+445
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-171-0/+15
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10235: Make permissions reset CLI shcemes-aware. * Add i18n strings.
| * | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-179-58/+99
| |\ \ \ \ \ \
| * | | | | | | MM-10591: Well known error for all scheme endpoints pre-migration. (#8812)George Goldberg2018-05-171-1/+30
| | | | | | | |
| * | | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-168-63/+280
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-155-27/+305
| |\ \ \ \ \ \ \ \
| * | | | | | | | | MM-9728: Online migration for advanced permissions phase 2 (#8744)George Goldberg2018-05-142-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-116-71/+63
| |\ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-05-101-1/+1
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-098-41/+124
| |\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | MM-10140: API Implementation for Schemes related Endpoints (#8615)George Goldberg2018-05-031-0/+101
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-024-43/+42
| |\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | MM-10182 & MM-10183: Adds channel scheme and team scheme API endpoint. (#8680)Martin Kraft2018-05-024-0/+71
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10183: Adds channel scheme API endpoint. MM-10182: Adds team scheme API endpoint. MM-10182_3: Switch from scheme_id in path to body. * MM-10182/MM-10183: Changes path from 'schemes' to 'scheme'. * MM-10182: Fix merge error.
| * | | | | | | | | | | | | Merge branch 'advanced-permissions-phase-2' of ↵Martin Kraft2018-05-011-2/+2
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | github.com:mattermost/mattermost-server into advanced-permissions-phase-2
| | * \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into advanced-permissions-phase-2Christopher Speller2018-04-2746-389/+422
| | |\ \ \ \ \ \ \ \ \ \ \ \ \
| * | \ \ \ \ \ \ \ \ \ \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-0147-392/+486
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | |/ / / / / / / / / / / / / / | |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | | Merge branch 'master' into advanced-permissions-phase-2George Goldberg2018-04-271-2/+3
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-01 16:09:53 +0000