summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Make import compatible with scheme-roles. (#9028)George Goldberg2018-06-292-6/+162
| | | | | This doesn't introduce new fields as we would then break backwards compatability with old "roles" fields. We can add custom fields if/when we go to "version 2" of the bulk import format.
* add MaxLifetimeconns to server (#9004)Jerry Kurian2018-06-281-7/+8
| | | | | | | | | | | | | | | | | | | | | 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
* Add english missed texts to i18n/en.json (#8987)Jesús Espino2018-06-281-1/+1
| | | | | * Add English missed texts to i18n/en.json * Update en.json
* Reset status to away after web conn disconnect if necessary (#8988)Joram Wilander2018-06-274-9/+68
|
* 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
* Lock bulk importing to master database node (#9012)Joram Wilander2018-06-271-0/+3
|
* Simplify oauth (#8972)Emil Velikov2018-06-261-1/+7
| | | | | | | | | | | | | | | | * 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-262-0/+270
| | | | | | | | | | | | | | | * 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-261-4/+4
|
* 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-261-0/+3
|
* Implementation of File Exists Function; Delete FileInfos upon Permanent User ↵Daniel Schalla2018-06-253-0/+79
| | | | | | | 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-251-0/+15
|
* MM-8716: Security Update Check URL should have recognisable name. (#8983)George Goldberg2018-06-221-1/+1
|
* MM-10934 Update server dependencies. (#8981)Christopher Speller2018-06-211-2/+2
| | | | | | * Changing throttled import path. * Upgrading dependencies.
* MM-10370: serve subpath (#8968)Jesse Hallam2018-06-212-8/+31
| | | | | | | | | | | | | | | | | | | | | | | * 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-211-1/+1
| | | | | | | | * 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
|
* MM-10233: Add scheme importing to bulk importer. (#8928)George Goldberg2018-06-216-94/+986
|
* MM-6992 Added highlighting to elasticsearch results (#8861)Harrison Healey2018-06-191-5/+5
| | | | | | | | * 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-182-3/+26
| | | | | | | | | | (#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-162-6/+3
|
* Merge remote-tracking branch 'upstream/release-5.0' into ↵cpanato2018-06-151-1/+14
|\ | | | | | | release-5.0-merge-to-master-20180615
| * Add more oauth logging and note about GitLab ToS for login (#8949)Joram Wilander2018-06-141-1/+14
| |
| * 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-072-37/+0
| | | | | | | | | | | | | | | | | | | | | | * 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-061-0/+1
| |
| * Add missing diagnostics (#8911)Jason Blais2018-06-061-1/+6
| | | | | | | | | | | | * Update diagnostics.go * Update diagnostics.go
* | Prototype for CBA (#8475)Corey Hulen2018-06-122-0/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Prototype for CBA * Fixing gofmt issues * Do not require password if logging in with certificate * Fixing issues from feedback * Adding unit tests * Fixing feedback
* | MM-10791: Don't try and generate thumbnails for non-images/svgs. (#8937)George Goldberg2018-06-121-4/+6
| |
* | MM-10790: Fix Slack Import logs that got broken in refactoring. (#8938)George Goldberg2018-06-111-10/+10
| |
* | Skip notifications for expired sessions (#8934)Daniel Schalla2018-06-081-0/+5
| |
* | Relese5.0 merge master 20180608 (#8933)Carlos Tadeu Panato Junior2018-06-084-41/+55
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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 (#8847)lisakycho2018-06-071-0/+11
| | | | | | | | | | | | | | | | * Get the count of the all system users at endpoint /users/stats * Added GetTotalUsersStats test in api4 * Changed pluralization and added the test back.
* | Relese5.0 merge master 20180607 (#8927)Carlos Tadeu Panato Junior2018-06-072-1/+7
|/ | | | | | | | | | * Add missing diagnostics (#8911) * Update diagnostics.go * Update diagnostics.go * Fix push notification styling backwards compatibility (#8913)
* MM-10597 Improved handling of punctuation around notifications (#8901)Harrison Healey2018-06-052-14/+59
|
* Include the daily and monthly active user counts in telemetry. (#8887)George Goldberg2018-06-051-6/+15
|
* MM-9730 & MM-9729: Missing Server PRs (#8908)George Goldberg2018-06-053-2/+73
| | | | | | * MM-9730: API endpoint to update scheme-derived roles of TeamMembers. * MM-9729: API to update scheme-derived roles of ChannelMembers.
* Remove plugin sandbox warning message (#8897)Joram Wilander2018-06-041-6/+1
|
* [MM-10718] Move custom branding to TE (#8871)Saturnino Abril2018-06-022-21/+45
| | | | | * 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-012-3/+3
|
* MM-10757: Default roles from scheme should be keyed by name not ID. (#8894)George Goldberg2018-06-013-31/+30
| | | | | | * MM-10757: Default roles from scheme should be keyed by name not ID. * Update permissions import/export.
* Merge branch 'advanced-permissions-phase-2'George Goldberg2018-05-3111-53/+1065
|\
| * MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)Jesús Espino2018-05-294-10/+222
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-0/+28
| |\
| * | MM-8814: Remove implicit permission grants from post ownership. (#8391)George Goldberg2018-05-281-13/+0
| | |
| * | Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-253-50/+29
| |\ \
| * \ \ Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2Martin Kraft2018-05-246-42/+306
| |\ \ \
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-06-02 19:18:50 +0000