summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into plugins-2JoramWilander2018-06-2747-26268/+12238
|\
| * Gfycat integration (#8971)Kenny Au2018-06-273-0/+21
| | | | | | | | | | | | * Gfycat integration * Added gfycat api credentials to config.
| * MM-10910 fix join and open channel commands to work with tilde (#8984)Sudheer2018-06-272-2/+97
| | | | | | | | | | | | | | | | * MM-10910 fix join and open channel commands to work with tilde * Fix lint * Add basic tests for command_join
| * translations PR 20180625 (#8998)Elias Nahum2018-06-2714-26173/+11561
| |
| * Lock bulk importing to master database node (#9012)Joram Wilander2018-06-279-1/+57
| |
| * Simplify oauth (#8972)Emil Velikov2018-06-264-28/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Remove unused OauthProvider::GetIdentifier Signed-off-by: Emil Velikov <emil.velikov@collabora.com> * Reuse gitlab's getAuthData() instead of open-coding it Signed-off-by: Emil Velikov <emil.velikov@collabora.com> * Remove OauthProvider::GetAuthDataFromJson interface The data is already available via GetUserFromJson().AuthData Signed-off-by: Emil Velikov <emil.velikov@collabora.com>
| * MM-11034: Reply properly to incomming webhooks on errors (#9010)Jesús Espino2018-06-262-2/+8
| |
| * MM-10833: send down computed channel props (#8953)Jesse Hallam2018-06-266-54/+411
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10833: send down computed channel props This allows channel headers to reference channel mentions for a client that doesn't already know about the channels in question. We intentionally don't send down the props for the autocomplete and search endpoints since they aren't used in that context, and would add unnecessary overhead. * update channel props on patch * revert to treating channel purpose as plaintext
| * MM-11008: Fix translation and change the code to be auto-extracted (#9009)Jesús Espino2018-06-262-4/+12
| |
| * Add Purpose as a searchable field (#8067)Chris Duarte2018-06-263-3/+47
| | | | | | | | | | | | | | | | | | | | * Add Purpose as a searchable field * Add New Index and Remove old for Channels * Include Purpose in FullTextSearch Clause * Move removeIndex for Channels into upgrade.go
| * Update diagnostics.go (#8989)Jason Blais2018-06-261-0/+7
| |
| * MM-10700 - Updating default image preview size (#9002) (#9003)Joram Wilander2018-06-261-1/+1
| |
| * MM-10269: Make jobserver work without restart. (#9005)George Goldberg2018-06-262-0/+5
| |
* | MM-9674 Add plugin API for publishing custom WebSocket events (#8999)Joram Wilander2018-06-275-2/+49
| | | | | | | | | | | | | | | | * Add plugin API for publishing custom WebSocket events * Add clearer payload comment * Update comment
* | MM-10702 Moving plugins to use hashicorp go-plugin. (#8978)Christopher Speller2018-06-25303-9370/+52116
|/ | | | | | * Moving plugins to use hashicorp go-plugin. * Tweaks from feedback.
* Implementation of File Exists Function; Delete FileInfos upon Permanent User ↵Daniel Schalla2018-06-2511-0/+270
| | | | | | | Delete (#8958) Check if file was deleted on FS Warning message if file couldnt be removed
* MM-10570: Make permissions reset command clear custom role assignments. (#8976)George Goldberg2018-06-2512-1/+489
|
* Fix plugins serving after subpath changes (#8982)Joram Wilander2018-06-221-1/+1
|
* MM-8716: Security Update Check URL should have recognisable name. (#8983)George Goldberg2018-06-221-1/+1
|
* MM-8810: Add CSV Compliance export (#8966)Jesús Espino2018-06-2211-30/+129
| | | | | | | | | | | | * MM-8810: Add CSV Compliance export * Only allowing to schedule actiances export throught the cli * De-duplicating some code * Fixes on texts * Fixes on translations
* MM-10934 Update server dependencies. (#8981)Christopher Speller2018-06-21270-13474/+31365
| | | | | | * Changing throttled import path. * Upgrading dependencies.
* Using i18n extract to generate the i18n/en.json file (#8980)Jesús Espino2018-06-211-2105/+761
| | | | | | * Sort translations * Added untranslated and removed unussed strings
* MM-10370: serve subpath (#8968)Jesse Hallam2018-06-2114-148/+282
| | | | | | | | | | | | | | | | | | | | | | | * 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.
* MM-10425 Include active_channel in cluster update user status messages (#8967)Joram Wilander2018-06-213-13/+39
| | | | | | | | * Include active_channel in cluster update user status messages * Update to use new ToJson method * Update tests
* Fixing mentionBg typo in import_test.go (#8970)Alex Goodman2018-06-211-2/+2
|
* Add back the ability to reply to push notifications in iOS (#8977)Elias Nahum2018-06-211-0/+1
|
* fix typo in en.json and remove trailing spaces (#8975)Carlos Tadeu Panato Junior2018-06-212-7/+7
|
* MM-10730 Added support for empty environment variables to viper (#8973)Harrison Healey2018-06-219-12/+1855
|
* MM-10233: Add scheme importing to bulk importer. (#8928)George Goldberg2018-06-2145-127/+1224
|
* translations PR 20180619 (#8963)Elias Nahum2018-06-2014-268/+164
|
* Add missed translations (#8959)Jesús Espino2018-06-1910-23/+101
|
* MM-6992 Added highlighting to elasticsearch results (#8861)Harrison Healey2018-06-196-8/+65
| | | | | | | | * 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-188-106/+246
| | | | | | | | | | (#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-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
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-29 08:02:47 +0000