summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
...
* | avoid t.Fatal() in tests (#9189)Jesse Hallam2018-08-0910-272/+120
| | | | | | | | | | | | I've been burned a few times by tests that simply fatal, requiring me to run another build to learn more about what the mismatch was. Avoid this. This is part of a long running goal of mine to make testing "better".
* | Ignore link-local addresses in cluster advertisement (#9223)Daniel Malon2018-08-081-1/+1
|/
* MM-11384: Add system install date information to the client config (#9218)Jesús Espino2018-08-081-0/+1
| | | | | | | | * MM-11384: Add system install date information to the client config * Fixing translation text * Fixes from Peer Review
* Uncomment upgrade for 5.2.0 (#9216)Carlos Tadeu Panato Junior2018-08-061-0/+1
|
* CSRF Token Implementation for Plugins (#9192)Daniel Schalla2018-08-012-0/+29
| | | | | | | | | | | | | | | | | deleted test config fix test config Dont wipe the session token for plugins Simplified Tokens; Generate CSRF for other sessions Remove CSRF from Access Token; Remove Getter/Setter from Context fix removed setter remove getcsrf helper from plugin api enforce csrf only for cookie auth
* MM-11521/MM-11522 Fix being able to create users with invalid emails through ↵Harrison Healey2018-08-014-20/+101
| | | | | | | | | | | | | | API (#9199) * MM-11522 Fix being able to create users with invalid emails through API * Ensure store tests are using valid emails * Add missing license header * Remove invalid test case * Fix TestUpdateOAuthUserAttrs
* MM-11420: plugins: compute bundle hash on load (#9172)Jesse Hallam2018-07-312-5/+11
| | | | | | | | | | | | * plugins: compute bundle hash on load Use this hash to bust client caches whenever the plugin bundle changes. * eliminate redundant pluginHandler * switch to 64-bit FNV-1a * Fix test
* Adding support for code split plugins. (#9184)Christopher Speller2018-07-311-1/+1
|
* Pr 9039 (#9187)Martin Kraft2018-07-303-5/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-11065: Allow to search and get archived channels from the API * Fixing more tests * Add some unit tests * Add includeDeleted parameter to session permissions check function * More test fixing * Adding archive channels list in channels search * Add restriction for archived channel edition * Reverting permissions checks modification * Changed the query parameter to include_deleted * Enable search archive channels as true by default * Adding tests for verify search on deleted channels * Allowing to override archive channels during the imports * Fixed test * Search in archive channels from the API must be explicitly requested * Removing includeDeleted parameter from GetChannelByName and GetChannelByNameForTeam * Back to ViewArchivedChannels config * Fixing tests * Reverting GetChannelByName parameter * Add include deleted parameter on GetChannel functions in plugins api * Fixing tests
* MM-11301: Validates listen address config value. (#9138)Martin Kraft2018-07-303-1/+108
| | | | | | | | | | * MM-11301: Validates listen address config value. * MM-11301: Adds some invalid port test cases. * MM-11301: Accept domain names. * MM-11301: Fix for max port.
* Implement OAuth2 implicit grant flow (#9178)Joram Wilander2018-07-272-3/+2
|
* MM-11160 Adding proper CORS support. (#9152)Christopher Speller2018-07-261-0/+15
| | | | | | * Adding proper CORS support. * Better CORS tests.
* added the custom icon and username for the outgoing webhook and its response ↵Pradeep Murugesan2018-07-252-0/+30
| | | | | | | | | | | | (#9141) * 8272 added the username and icon as part of the model and persisted the same * 8272 added the custome icon and name when set to the web hook response * 8272 changed the infinte loop to timeout after 5 seconds * 8272 fixed review comments
* Add ExperimentalSidebarPreference in the config (#9013)Chris Duarte2018-07-231-0/+6
| | | | | | | | | | | | * Add ExperimentalSidebarPreference in the config * Override Sidebar preference based on GroupUnread settings * Rename to ExperimentalChannelOrganization * Add Sidebar config in diagnostics * Fix diagnostics for experimental_channel_organization
* Default Channel Functionality + Test Suite (#9068)Daniel Schalla2018-07-201-0/+5
| | | | | | | | | gofmt Make skipping for non public channels default Deduplication of Default Channels; Only post join to townsquare Post join channel message for all custom default channels
* MM-11389 Added diagnostics for FileSettings.Directory (#9125)Harrison Healey2018-07-191-1/+3
|
* Support `server`, deprecate `backend` in plugin manifest (#9127)Jesse Hallam2018-07-183-30/+192
| | | | | | | | | | | | | | * Support `server`, deprecate `backend` in plugin manifest This lets us converge on the use of the term `server` everywhere instead of sometimes `backend` and sometimes `server`. We're still using `webapp` and will eventually support `mobile` as well. The plan is actually to rip out these deprecations as part of releasing 5.2, but I want to coordinate the extra additional breakage at the same time, so for now this is a backwards compatible change. * fix failing tests
* Support for Embeded chat (#9129)Chris Duarte2018-07-182-0/+18
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ucLive support crazy testing lovely logs more cookie work arounds Added Access-Control-Expose-Headers to user login Add complete_saml_body template and revert loginWithSaml endpoint Set Access-Control-Allow-Credentials to true in user login Login via email instead of username Clean up code Add comment to give some context Move faml logic into saml function Communicate via chrome sendMessage api Remove unused code Add config to support multiple extensions Clean up embedded complete_saml template Fix indentation for templates Added license header to extension.go Add EnableExperimentalExtensions flag Extension validated for email auth Clean up api auth code Remove complete_saml_body.html * Add extension support in saml * Clean up code * Clean up extension validation
* MM-11366: support a plugin bundle with multiple executables (#9121)Jesse Hallam2018-07-172-3/+213
| | | This avoids the need to distribute multiple plugins per architecture.
* Make plugin IDs case insensitive (#9117)Joram Wilander2018-07-162-0/+6
|
* Add localized timestamp support for email notification (#8674)Chris Duarte2018-07-131-0/+8
| | | | | | * Add localized timestamp support for email notification * Move localTime logic over to getFormattedPostTime
* Merge remote-tracking branch 'upstream/release-5.1' into ↵cpanato2018-07-121-6/+6
|\ | | | | | | release-5.1-daily-merge-20180712
| * push notifications follow teammate name display user or server setting (#9049)Elias Nahum2018-07-111-6/+6
| | | | | | | | | | | | * push notifications follow teammate name display user or server setting * Feedback review
* | Merge branch 'plugins-2'JoramWilander2018-07-106-22/+28
|\ \
| * \ Merge branch 'master' into plugins-2JoramWilander2018-07-102-0/+2
| |\ \
| * | | Adding ability for plugin system to respect the defaults listed in the ↵Christopher Speller2018-07-091-2/+2
| | | | | | | | | | | | | | | | plugin manifest. (#9066)
| * | | Merge branch 'master' into plugins-2JoramWilander2018-07-075-14/+17
| |\ \ \
| * | | | Add back enable/disable WS events (#9052)Joram Wilander2018-07-051-1/+3
| | | | |
| * | | | Merge branch 'master' into plugins-2JoramWilander2018-06-301-9/+18
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' into plugins-2JoramWilander2018-06-275-45/+74
| |\ \ \ \ \
| * | | | | | MM-10702 Moving plugins to use hashicorp go-plugin. (#8978)Christopher Speller2018-06-255-19/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Moving plugins to use hashicorp go-plugin. * Tweaks from feedback.
* | | | | | | Merge remote-tracking branch 'upstream/release-5.1' into ↵cpanato2018-07-102-3/+13
|\ \ \ \ \ \ \ | |_|_|_|_|/ / |/| | | | | / | | |_|_|_|/ | |/| | | | release-5.1-daily-merge-20180710
| * | | | | MM-11120 Adding setting to disable email invitations and rate limiting. (#9063)Christopher Speller2018-07-101-0/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Adding setting to disable email invitations. * Adding a setting and rate limiting for email invite sending. * Modifying email rate limit to 20/user/hour * Adding EnableEmailInvitations to client side config and command.
| * | | | | Update custom url schemes error message to reflect what we actually support ↵Harrison Healey2018-07-092-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | (#9061)
* | | | | | Blacklist System as Username (#9060)Daniel Schalla2018-07-092-0/+2
| |_|_|_|/ |/| | | | | | | | | adapted tests
* | | | | Merge remote-tracking branch 'upstream/release-5.1' into ↵cpanato2018-07-061-2/+2
|\| | | | | | | | | | | | | | | | | | | release-5.1-daily-merge-20180706
| * | | | MM-10766 - Replacing default profile image font (#8955)Asaad Mahmood2018-07-051-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updating default profile pic font * Updating profile image font * Updating test * Use new default font if configured for old one * Update OFL.txt
* | | | | Add ability to bulk import emoji (#9048)Joram Wilander2018-07-052-7/+6
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ability to bulk import emoji * Improve error handling * Update test config
* | | | Uncomment upgrade for 5.1.0 (#9040)Carlos Tadeu Panato Junior2018-07-031-0/+1
| | | |
* | | | Adding RootId information to MessageExport (#9030)Jesús Espino2018-07-031-0/+1
| | | |
* | | | Disable Gfycat by default during Beta and move default keys to server (#9027)Jason Blais2018-07-031-5/+7
| |_|/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | * Update default.json * Update diagnostics.go * Added default Gfycat API credentials to server * Fixed default Gfycat credentials
* | | add MaxLifetimeconns to server (#9004)Jerry Kurian2018-06-281-9/+18
| |/ |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update e.json string names and remove console log reorder variables update db.setConnMaxLifetime to take in *settings.MaxLifetimeConns Add MaxLifetimeConns to test Update variable names like MaxLifetimeConns to ConnMaxLifetimeMilliseconds Update time passed to SetConnMaxLifetime Revert "Update time passed to SetConnMaxLifetime" This reverts commit dc1c1b6d5a6404d4ee11c65d4756c19f9316794f. update en.json Update supplier_test.go and docker.go ConnMaxLifetimeMilliseconds to 3600000
* | Gfycat integration (#8971)Kenny Au2018-06-271-0/+15
| | | | | | | | | | | | * Gfycat integration * Added gfycat api credentials to config.
* | Simplify oauth (#8972)Emil Velikov2018-06-261-15/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-10833: send down computed channel props (#8953)Jesse Hallam2018-06-263-30/+58
|/ | | | | | | | | | | | | | | * 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-8810: Add CSV Compliance export (#8966)Jesús Espino2018-06-222-6/+13
| | | | | | | | | | | | * 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-10425 Include active_channel in cluster update user status messages (#8967)Joram Wilander2018-06-212-12/+38
| | | | | | | | * Include active_channel in cluster update user status messages * Update to use new ToJson method * Update tests
* MM-10233: Add scheme importing to bulk importer. (#8928)George Goldberg2018-06-211-1/+1
|
* Add missed translations (#8959)Jesús Espino2018-06-193-7/+7
|
* MM-6992 Added highlighting to elasticsearch results (#8861)Harrison Healey2018-06-192-0/+51
| | | | | | | | * MM-6992 Added highlighting to elasticsearch results * Added a unique type for post search matches * Fixed Elasticsearch matches not being sent through API