summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Small translation fixes (#8940)Jesús Espino2018-06-163-9/+6
|
* Merge remote-tracking branch 'upstream/release-5.0' into ↵cpanato2018-06-153-2/+19
|\ | | | | | | release-5.0-merge-to-master-20180615
| * Add more oauth logging and note about GitLab ToS for login (#8949)Joram Wilander2018-06-142-1/+18
| |
| * MM-10767: Adding ordering to the system-admin list all teams (#8950)Jesús Espino2018-06-141-1/+1
| |
* | Update html2text lib to use the original repo (#8900)Carlos Tadeu Panato Junior2018-06-1435-948/+3659
| |
* | Merge remote-tracking branch 'upstream/release-5.0' into ↵cpanato2018-06-149-347/+409
|\| | | | | | | release-5.0-merge-to-master-20180614-1
| * MM-10863: Handle non-API errors with redirect to webapp (#8943)Jesús Espino2018-06-142-2/+64
| | | | | | | | | | | | * MM-10863: Handle non-API errors with redirect to webapp * Properly shutdown the app in the new test
| * translations PR 20180613 (#8947)Elias Nahum2018-06-147-345/+345
| |
* | MM-10367: rewrite subpath assets on startup (#8944)Jesse Hallam2018-06-145-2/+286
| | | | | | | | | | | | | | | | | | Examine ServiceSettings.SiteURL on startup and rewrite assets accordingly if not in a development environment. Also export `mattermost config subpath` command to manually do same. This accompanies a webapp PR to use the updated `root.html` to define the necessary webpack asset path for dynamically loading assets.
* | MM-10769 Rename references to spf13/viper to mattermost/viper (#8948)Harrison Healey2018-06-1410-3/+3
| |
* | Merge branch 'release-5.0-merge-to-master-20180613'cpanato2018-06-130-0/+0
|\ \
| * | Merge remote-tracking branch 'upstream/release-5.0' into ↵cpanato2018-06-130-0/+0
|/| | | |/ | | | | release-5.0-merge-to-master-20180613
| * 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.
| * 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-074-85/+140
| | | | | | | | | | | | | | | | | | | | | | * 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-062-0/+3
| |
| * Add missing diagnostics (#8911)Jason Blais2018-06-061-1/+6
| | | | | | | | | | | | * Update diagnostics.go * Update diagnostics.go
* | Add preparatory upgrade code for 5.1.0 (#8920)Carlos Tadeu Panato Junior2018-06-131-0/+10
| |
* | Prototype for CBA (#8475)Corey Hulen2018-06-128-1/+170
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
| |
* | 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.
* | MM-10684: Show logs on Slack Import CLI. (#8936)George Goldberg2018-06-111-1/+10
| |
* | MM-10790: Fix Slack Import logs that got broken in refactoring. (#8938)George Goldberg2018-06-112-26/+10
| |
* | Skip notifications for expired sessions (#8934)Daniel Schalla2018-06-081-0/+5
| |
* | Relese5.0 merge master 20180608 (#8933)Carlos Tadeu Panato Junior2018-06-086-89/+195
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-075-20/+80
| | | | | | | | | | | | | | | | * Get the count of the all system users at endpoint /users/stats * Added GetTotalUsersStats test in api4 * Changed pluralization and added the test back.
* | allow client4 http keep-alive (#8854)Jesse Hallam2018-06-071-11/+0
| | | | | | | | | | | | | | | | | | | | Some years ago, we explicitly disallowed keep-alive on connections initiated by the golang driver to the mattermost-server, possibly due to memory leak issues. While this path isn't used directly via a typical werver/webapp setup, it makes sense to allow keep-alive for any third-party programmatic use of the API. This commit will allow us to test `master` with the behaviour over some time to identify any potential new troubles.
* | Relese5.0 merge master 20180607 (#8927)Carlos Tadeu Panato Junior2018-06-073-1/+9
| | | | | | | | | | | | | | | | | | | | * Add missing diagnostics (#8911) * Update diagnostics.go * Update diagnostics.go * Fix push notification styling backwards compatibility (#8913)
* | MM-6839: searching for paths relative to executable (#8915)Jesse Hallam2018-06-063-45/+366
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-6839: search relative to executable (#8853) * MM-6839: searching for paths relative to executable In addition to searching relative to the current working directory, also search relative to the location of the binary. This helps locate config and i18n files when invoking an absolute path to the mattermost binary. * MM-6839: find mattermost/ binary using utils.FindFile * add unit tests for utils.FindFile to exclude directories * fix filtering out directories in FindFile * fix platform invoking ./bin/mattermost
* | use minio release instead of latest (#8917)Carlos Tadeu Panato Junior2018-06-061-1/+1
|/
* disable Supervisor_PluginRepeatedlyCrash (#8918)Jesse Hallam2018-06-051-2/+2
| | | | | | | | | | | | * disable Supervisor_PluginRepeatedlyCrash This test is failing sporadically, largely due to the use of a timeout to verify results. A more robust solution is required. * disable Supervisor_PluginCrash This test is failing sporadically, largely due to the use of a timeout to verify results. A more robust solution is required.
* Uncomment upgrade for 5.0.0 (#8914)Carlos Tadeu Panato Junior2018-06-052-14/+14
|
* translations PR 20180604 (#8909)Elias Nahum2018-06-0514-643/+2723
|
* 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
|
* Fixed invalid CustomUrlSchemes error message (#8902)Harrison Healey2018-06-051-1/+1
|
* MM-9730 & MM-9729: Missing Server PRs (#8908)George Goldberg2018-06-059-3/+312
| | | | | | * MM-9730: API endpoint to update scheme-derived roles of TeamMembers. * MM-9729: API to update scheme-derived roles of ChannelMembers.
* MM-10348 Adding experimental hardened mode. (#8881)Christopher Speller2018-06-044-7/+32
| | | | | | * Adding experimental hardened mode. * Sanitizing all 500 errors.
* Remove plugin sandbox warning message (#8897)Joram Wilander2018-06-041-6/+1
|
* [MM-10718] Move custom branding to TE (#8871)Saturnino Abril2018-06-028-59/+50
| | | | | * move custom branding to TE * move brand's enterprise code to server and remove BrandInterface
* Adding mlog to context. (#8882)Christopher Speller2018-06-012-9/+29
|
* MM-10412: Adds deleteBy prop to posts. (#8896)Martin Kraft2018-06-018-17/+39
|
* 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-018-73/+104
| | | | | | * 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-3193-220/+8286
|\
| * Add note about clearing caches when permissions reset CLI done. (#8823)George Goldberg2018-05-301-1/+3
| | | | | | | | | | | | * Add note about clearing caches when permissions reset CLI done. * Adjust text.
| * MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)Jesús Espino2018-05-2916-37/+427
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * Allow to update the teams scheme to default scheme (#8855)Jesús Espino2018-05-292-10/+16
| |
| * Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-2811-2/+157
| |\
| * | MM-8814: Remove implicit permission grants from post ownership. (#8391)George Goldberg2018-05-282-19/+35
| | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 21:44:45 +0000