summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * MM-11728: Avoid Archived channels editions throught Patch (#9335)Jesús Espino2018-09-033-0/+15
| |
* | MM-11703: Update incoming and outgoing webhook description to 500 characters ↵n1aba2018-09-046-10/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | (#9265) * MM-11703: Update incoming and outgoing webhook description to 500 characters * MM-11703: Add upgrade code * MM-11703: Remove MAX_DESCRIPTION_LENGTH constants * MM-11703: GOFMT * MM-11703: Move upgrade code to version 5.3 * MM-11703: Comment back upgrade to 5.3.0 * MM-11703: Add API errors back * MM-11703: Copy-Paste
* | Merge remote-tracking branch 'upstream/merge-release-5.3-20180903124813'cpanato2018-09-033-3/+144
|\ \
| * | Merge release-5.3Carlos Tadeu Panato Junior2018-09-033-3/+144
|/| | | |/
| * MM-11693 Allow connections to /plugins for interactive message buttons. (#9333)Christopher Speller2018-09-023-3/+144
| | | | | | | | | | | | | | | | * Allow connetions to /plugins for interactive message buttons. * Adding siteurl to exclusions for AllowedUntrustedInternalConnections * Adding subpath support for allowing interactive message buttons plugin connections.
* | add megacheck as makefile target (#9288)Daniel Schalla2018-09-0350-213/+182
|/ | | | | | | | | | | | | | | | | | | | | | | | | Fix code issues in channel_test.go Fix Channel Test Issues detected by Megacheck Fix API Emoji Test Issues detected by Megacheck Fixed API Issues Reported by Megacheck Fixed App issues reported by megacheck Remaining fixes removed test added by mistake from old HEAD gofmt Store Fixes simplified returns Fix test for multi member channel delete revert to delete unused function
* Fix store cache invalidation for reactions (#9331)Harrison Healey2018-08-301-2/+2
|
* Invalidate store cache after making changes (#9211)Harrison Healey2018-08-303-10/+15
| | | | | | | | * Invalidate store cache after making changes * Address feedback * Make cache invalidation in stores always use defer
* MM-11710 Add a check to webhook messages to populate username from DM ↵Sudheer2018-08-301-1/+1
| | | | channel for email subject (#9314)
* bug fix: after and before search flags should not be inclusive of the ↵Dmitry Samuylov2018-08-292-5/+17
| | | | | | | | selected date (#9327) * fix for date based flag support to make the after and before flags not inclusive of the selected date * updated search posts tests using date flags to take into account new non inclusive of the selected date behavior of those flags
* Remove testing imports from non-test code. (#9324)George Goldberg2018-08-292-59/+58
|
* Add GetLDAPUserAttributes method to the plugin API (#9326)Joram Wilander2018-08-294-0/+77
|
* add --username in the example for the commands (#9320)Carlos Tadeu Panato Junior2018-08-291-6/+6
| | | | | | * add --username in the example for the commands * update per review
* MM-11270: Forbid react/de-react in archived channels (#9323)Jesús Espino2018-08-293-43/+109
|
* 9304 added the attachments import to direct post (#9308)Pradeep Murugesan2018-08-293-3/+64
|
* translations PR 20180827 (#9317)Elias Nahum2018-08-2815-258/+762
|
* MM-10532: Add EnableSyncWithLdapIncludeAuth config (#9319)Jesús Espino2018-08-283-4/+11
|
* Feature/search after before on (#9219)Dmitry Samuylov2018-08-2811-36/+401
| | | | | | | | | | | | | | | | | | | | | | | | | | * initial implementation of after, before, on search flags allowing to restrict the search to a specific day or a date range * missed setting beforeDate in SearchParams in one place * fixed condition when only flags are used for search without any plain terms * changed date format used for after/before/on flags to be in ISO8601 format as suggested in PR comments, added a helper function to pad month and day with zeroes allowing the user user either format, with or without leading zeroes * corrected expected compare to date setting for the TestParseDateFilterToTimeISO8601 test * fixed a bug for the scenario when you only have the date flags without any terms, added a couple of tests for that scenario * updated the date filter logic to use parameters to construct the query instead of simply appending strings together, as suggested in the pull request comments * added search unit test using date flags * added a helper function to create a test post with a createat date manually set, updated the test for search using date flags to create test posts with different createat dates to be able to better test the functionality * MM-11817 Add support for after/before/on search flags with Elasticsearch * add support to search posts to perform the search in context of the client's timezone when filtering by createat date using on: after: before: flags * updated tests to match the new signature
* Updating dependancies. (#9303)Christopher Speller2018-08-28255-5111/+11042
|
* MM-11327: Restrict Teams by Email (#9142)Gabe Van Engel2018-08-285-113/+273
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Check a team's AllowedDomains setting before adding users to the team. * Updated AddUser tests to validate AllowedDomains restriction. * Updated variable name to match convention. * Removed AllowedDomains from team sanitization. * Update AppError's Where to match the calling function. * Added tests for user matching allowedDomains, and multi domain values of allowedDomains. * Added test to make sure we block users who have a subdomain of a whitelisted domain. * Revert "Removed AllowedDomains from team sanitization." This reverts commit 17c2afea584da40c7d769787ae86408e9700510c. * Update sanitization tests to include dockerhost, now that we enforce AllowedDomains. * Added tests to verify the interplay between the global and per team domain restrictions. * Validate AllowedDomains property against RestrictCreationToDomains before updating a team. * Remove team.AllowedDomains from sanitization. * Add i18n string for the team allowed domains restriction app error.
* Adding IdAttribute setting for SAML (#9291)Jesús Espino2018-08-283-0/+8
| | | | | | | | * Adding IdAttribute setting for SAML * Adding Saml Id Attribute to the diagnostics information * Adding entry to default.json
* Update en.json typo (#9312)Cosmin M2018-08-271-1/+1
| | | "id": "plugin.api.update_user_status.bad_status",Unable to set the user statys. Unknown user status.
* Add debug-server task to make file to run mattermost using delve (#9290)Jesús Espino2018-08-271-0/+10
|
* Moving magic number to constant in team import (#9298)Jesús Espino2018-08-271-2/+3
|
* MM-11786: Adds API endpoint to retrieve redirect locations. (#9284)Martin Kraft2018-08-243-0/+81
|
* Fix sampledata reset LastPostAt when the channels are empty (#9295)Jesús Espino2018-08-241-1/+8
|
* translations PR 20180820 (#9277)Elias Nahum2018-08-241-12/+12
|
* Support for interactive menus in message attachments (#9285)Joram Wilander2018-08-244-8/+89
|
* If no origin header is set for WebSocket, do not fail upgrade (#9287)Joram Wilander2018-08-241-0/+4
|
* Merge release-5.2Carlos Tadeu Panato Junior2018-08-247-9/+29
|\
| * MM-11782: Make archived channels experimental and off-by-default. (#9281)George Goldberg2018-08-227-9/+29
| | | | | | | | | | | | * MM-11782: Make archived channels experimental and off-by-default. * Fix test.
* | MM-11572: Force correct order on messages generated in the bulk (#9244)Jesús Espino2018-08-246-7/+66
| |
* | MM-11348: Add telemetry for advanced permissions. (#9249)George Goldberg2018-08-236-32/+226
| |
* | Add/Remove translations (#9280)Jesús Espino2018-08-221-18/+42
| |
* | [MM-11593] Prevent user to remove from a direct channel (#9251)Saturnino Abril2018-08-213-0/+33
| | | | | | | | | | | | * prevent user to remove from a direct channel * only allow removing of a member in private or public channel
* | Adding Permissions check and reactions function to plugins API (#9273)Jesús Espino2018-08-204-0/+325
| | | | | | | | | | | | * Adding reactions functions * Adding permissions checking in the plugins api
* | Add ToJson() to PostActionIntegrationResponse (#9247)Hanzei2018-08-202-6/+61
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ToJson() to PostActionIntegrationResponse This commits adds a ToJson() methode to PostActionIntegrationResponse. It also adds tests for other ToJson() methods * Add PostActionIntegrationResponseFromJson function * Add PostActionIntegrationRequesteFromJson() function * Fix test names * Add testcase
* | Add FileInfo and get file []byte in plugin api (#9269)Elias Nahum2018-08-204-0/+122
| | | | | | | | | | | | | | | | * Add FileInfo and get file []byte in plugin api * Regenerated plugin mocks * Rename ReadFileAtPath to ReadFile
* | Add PostId to PostActionIntegrationRequest (#9270)Hanzei2018-08-182-0/+2
| |
* | Update default.json (#9256)Jason Blais2018-08-161-1/+2
| |
* | Merge release-5.2Carlos Tadeu Panato Junior2018-08-1617-314/+320
|\|
| * translations PR 20180813 (#9252)Elias Nahum2018-08-1515-307/+307
| | | | | | | | | | | | * translations PR 20180813 * Fix french translation
| * MM-11678: Split the cache for includeDeleted and not includeDeleted ↵Jesús Espino2018-08-141-2/+7
| | | | | | | | | | | | | | | | memberships requests (#9254) * MM-11678: Split the cache for includeDeleted and not includeDeleted memberships requests * Updating properly the cache on sucess
| * clarify CopyFileInfos godocs (#9243)Jesse Hallam2018-08-101-5/+6
| |
* | Add link to developer docs in readme/contributing.md (#9248)Jason Blais2018-08-142-1/+2
| | | | | | | | | | | | * Update README.md * Update CONTRIBUTING.md
* | Update mockery before generate mocks (#9250)Jesús Espino2018-08-141-3/+3
| |
* | Merge remote-tracking branch 'upstream/release-5.2' into ↵cpanato2018-08-104-14/+79
|\| | | | | | | release-5.2-daily-merge-20180810
| * MM-11382 Remove special handling of PluginSettings when loading config (#9234)Harrison Healey2018-08-102-6/+73
| | | | | | | | | | | | | | | | * MM-11382 Only override PluginSettings from environment when necessary * MM-11382 Remove special handling of PluginSettings when loading config * Add extra unit test
| * MM-11637: avoid stopping unstarted jobs (#9240)Jesse Hallam2018-08-092-8/+6
| | | | | | | | | | The new locking primitives in 5.2 around jobs assume the worker/scheduler was actually started, so don't try to stop if not started.
* | avoid t.Fatal() in tests (#9189)Jesse Hallam2018-08-0918-362/+153
| | | | | | | | | | | | 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".
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 17:09:47 +0000