| Commit message (Collapse) | Author | Age | Files | Lines |
|---|
| |
|
|
|
|
| |
* Changing throttled import path.
* Upgrading dependencies.
|
| |
|
|
|
|
| |
* Sort translations
* Added untranslated and removed unussed strings
|
| |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
| |
* factor out GetSubpathFromConfig
* mv web/subpath.go to utils/subpath.go
* serve up web, api and ws on /subpath if configured
* pass config to utils.RenderWeb(App)?Error
This allows the methods to extract the configured subpath and redirect
to the appropriate `/subpath/error` handler.
* ensure GetSubpathFromConfig returns trailing slashes deterministically
* fix error 404 handling
* redirect /subpath to /subpath/
This is necessary for the static handler to match, otherwise none of the
registered routes find anything. This also makes it no longer necessary
to add trailing slashes in the root router.
|
| |
|
|
|
|
|
|
| |
* Include active_channel in cluster update user status messages
* Update to use new ToJson method
* Update tests
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
|
|
| |
* MM-6992 Added highlighting to elasticsearch results
* Added a unique type for post search matches
* Fixed Elasticsearch matches not being sent through API
|
| |
|
|
|
|
|
|
|
|
| |
(#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
|
| | |
|
| |\
| |
| |
| | |
release-5.0-merge-to-master-20180615
|
| | | |
|
| | | |
|
| | | |
|
| |\|
| |
| |
| | |
release-5.0-merge-to-master-20180614-1
|
| | |
| |
| |
| |
| |
| | |
* MM-10863: Handle non-API errors with redirect to webapp
* Properly shutdown the app in the new test
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | | |
|
| |\ \ |
|
| |/| |
| |/
| |
| | |
release-5.0-merge-to-master-20180613
|
| | |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
* 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.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| | | |
|
| | |
| |
| |
| |
| |
| | |
* Update diagnostics.go
* Update diagnostics.go
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Prototype for CBA
* Fixing gofmt issues
* Do not require password if logging in with certificate
* Fixing issues from feedback
* Adding unit tests
* Fixing feedback
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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.
|
| | | |
|
| | | |
|
| | | |
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
* Added GetTotalUsersStats test in api4
* Changed pluralization and added the test back.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
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.
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* Add missing diagnostics (#8911)
* Update diagnostics.go
* Update diagnostics.go
* Fix push notification styling backwards compatibility (#8913)
|
| | |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| |
| | |
* 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
|
| |/ |
|
| |
|
|
|
|
|
|
|
|
|
|
| |
* 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.
|
| | |
|
| | |
|
| | |
|
| | |
|
| | |
|
| |
|
|
|
|
| |
* MM-9730: API endpoint to update scheme-derived roles of TeamMembers.
* MM-9729: API to update scheme-derived roles of ChannelMembers.
|
