summaryrefslogtreecommitdiffstats
path: root/model
Commit message (Collapse)AuthorAgeFilesLines
...
| * 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
* MM-8701 Limit the number of client config fields sent before user logs in ↵Harrison Healey2018-06-181-0/+5
| | | | | | | | | | (#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
* Prototype for CBA (#8475)Corey Hulen2018-06-122-1/+29
| | | | | | | | | | | | | | * Prototype for CBA * Fixing gofmt issues * Do not require password if logging in with certificate * Fixing issues from feedback * Adding unit tests * Fixing feedback
* Get the count of the all system users at endpoint /users/stats (#8847)lisakycho2018-06-072-0/+39
| | | | | | | | * 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-071-0/+2
| | | | | | | | | | * Add missing diagnostics (#8911) * Update diagnostics.go * Update diagnostics.go * Fix push notification styling backwards compatibility (#8913)
* Uncomment upgrade for 5.0.0 (#8914)Carlos Tadeu Panato Junior2018-06-051-0/+1
|
* Fixed invalid CustomUrlSchemes error message (#8902)Harrison Healey2018-06-051-1/+1
|
* MM-9730 & MM-9729: Missing Server PRs (#8908)George Goldberg2018-06-052-0/+36
| | | | | | * 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-041-0/+5
| | | | | | * Adding experimental hardened mode. * Sanitizing all 500 errors.
* [MM-10718] Move custom branding to TE (#8871)Saturnino Abril2018-06-022-11/+0
| | | | | * move custom branding to TE * move brand's enterprise code to server and remove BrandInterface
* MM-10412: Adds deleteBy prop to posts. (#8896)Martin Kraft2018-06-011-0/+1
|
* Merge branch 'advanced-permissions-phase-2'George Goldberg2018-05-3113-45/+410
|\
| * MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)Jesús Espino2018-05-291-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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.
| * Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-282-1/+7
| |\
| * \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-252-1/+5
| |\ \
| * | | Merge fix.Martin Kraft2018-05-241-14/+15
| | | |
| * | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-248-73/+134
| |\ \ \
| * \ \ \ Merge branch 'master' into advanced-permissions-phase-2Martin Kraft2018-05-222-11/+17
| |\ \ \ \
| * \ \ \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-222-15/+18
| |\ \ \ \ \
| * | | | | | MM-10264: Adds CLI command to import and export permissions. (#8787)Martin Kraft2018-05-171-5/+48
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10264: Adds CLI command to import and export permissions. * MM-10264: Changes Scheme Name to DisplayName and adds Name slug field. * MM-10264: Changes display name max size. * MM-10264: Another merge fix. * MM-10264: Changes for more Schemes methods checking for migration. * MM-10264: More updates for Schemes migration checking.
| * | | | | | MM-10606: License feature flag for custom schemes. (#8804)George Goldberg2018-05-172-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * MM-10606: Add new field to license for custom schemes. * Add feature flag to license check for Schemes.
| * | | | | | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-174-2411/+76
| |\ \ \ \ \ \
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 13:32:13 +0000