Commit Graph

808 Commits

Author SHA1 Message Date
JoramWilander
88c5e469ca Merge branch 'master' into plugins-2 2018-06-27 16:56:50 -04:00
Sudheer
9abd74c5e3 MM-10910 fix join and open channel commands to work with tilde (#8984)
* MM-10910 fix join and open channel commands to work with tilde

* Fix lint

* Add basic tests for command_join
2018-06-27 15:08:58 +02:00
Joram Wilander
d7976549a0 MM-9674 Add plugin API for publishing custom WebSocket events (#8999)
* Add plugin API for publishing custom WebSocket events

* Add clearer payload comment

* Update comment
2018-06-27 08:46:38 -04:00
Joram Wilander
0d91bf323e Lock bulk importing to master database node (#9012) 2018-06-27 10:08:40 +01:00
Emil Velikov
f17c15c9d8 Simplify oauth (#8972)
* 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>
2018-06-26 17:23:13 -07:00
Jesse Hallam
2d7cd02abc MM-10833: send down computed channel props (#8953)
* 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
2018-06-26 16:46:57 -04:00
Jesús Espino
164e030d33 MM-11008: Fix translation and change the code to be auto-extracted (#9009) 2018-06-26 16:06:01 -04:00
Jason Blais
3e9fe291f1 Update diagnostics.go (#8989) 2018-06-26 13:47:07 -04:00
Joram Wilander
cbf9571c68 MM-10700 - Updating default image preview size (#9002) (#9003) 2018-06-26 13:40:39 -04:00
George Goldberg
60359b4bae MM-10269: Make jobserver work without restart. (#9005) 2018-06-26 13:30:33 -04:00
Christopher Speller
1e5c432e10 MM-10702 Moving plugins to use hashicorp go-plugin. (#8978)
* Moving plugins to use hashicorp go-plugin.

* Tweaks from feedback.
2018-06-25 12:33:13 -07:00
Daniel Schalla
ecefa6cdd1 Implementation of File Exists Function; Delete FileInfos upon Permanent User Delete (#8958)
Check if file was deleted on FS

Warning message if file couldnt be removed
2018-06-25 12:12:59 -04:00
George Goldberg
fc158fce90 MM-10570: Make permissions reset command clear custom role assignments. (#8976) 2018-06-25 14:34:59 +01:00
George Goldberg
454522cc30 MM-8716: Security Update Check URL should have recognisable name. (#8983) 2018-06-22 10:14:33 -07:00
Christopher Speller
8526739066 MM-10934 Update server dependencies. (#8981)
* Changing throttled import path.

* Upgrading dependencies.
2018-06-21 16:10:40 -04:00
Jesse Hallam
dd35ad43ca MM-10370: serve subpath (#8968)
* 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.
2018-06-21 11:31:51 -07:00
Joram Wilander
46f969e5dd MM-10425 Include active_channel in cluster update user status messages (#8967)
* Include active_channel in cluster update user status messages

* Update to use new ToJson method

* Update tests
2018-06-21 10:42:20 -07:00
Alex Goodman
d36ad6cb54 Fixing mentionBg typo in import_test.go (#8970) 2018-06-21 13:28:25 -04:00
Elias Nahum
4f2bbc3448 Add back the ability to reply to push notifications in iOS (#8977) 2018-06-21 11:10:29 -04:00
George Goldberg
1f65f0e3d6 MM-10233: Add scheme importing to bulk importer. (#8928) 2018-06-21 12:02:35 +01:00
Harrison Healey
226d4b2ac8 MM-6992 Added highlighting to elasticsearch results (#8861)
* MM-6992 Added highlighting to elasticsearch results

* Added a unique type for post search matches

* Fixed Elasticsearch matches not being sent through API
2018-06-19 11:46:29 +02:00
Harrison Healey
6d8140337e MM-8701 Limit the number of client config fields sent before user logs in (#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
2018-06-18 12:39:22 -04:00
Jesús Espino
f48d31c7a4 Small translation fixes (#8940) 2018-06-16 09:35:24 +02:00
cpanato
e38b18565e Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to-master-20180615 2018-06-15 17:38:08 +02:00
Joram Wilander
85a75526c7 Add more oauth logging and note about GitLab ToS for login (#8949) 2018-06-14 19:27:00 +02:00
Corey Hulen
656c8a62d1 Prototype for CBA (#8475)
* Prototype for CBA

* Fixing gofmt issues

* Do not require password if logging in with certificate

* Fixing issues from feedback

* Adding unit tests

* Fixing feedback
2018-06-12 10:16:39 -07:00
George Goldberg
4ea7f6a2f7 MM-10791: Don't try and generate thumbnails for non-images/svgs. (#8937) 2018-06-12 10:48:45 +01:00
George Goldberg
e10665a5a5 MM-10790: Fix Slack Import logs that got broken in refactoring. (#8938) 2018-06-11 07:32:37 -07:00
Daniel Schalla
ed59e2b735 Skip notifications for expired sessions (#8934) 2018-06-08 14:49:36 -04:00
Carlos Tadeu Panato Junior
3bae67489f Relese5.0 merge master 20180608 (#8933)
* 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.
2018-06-08 17:04:17 +02:00
Martin Kraft
566539bc67 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.
2018-06-08 09:07:15 -04:00
Jesse Hallam
927b11f6e2 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
2018-06-07 20:19:19 +02:00
lisakycho
e09b3c566b Get the count of the all system users at endpoint /users/stats (#8847)
* Get the count of the all system users at endpoint /users/stats

* Added GetTotalUsersStats test in api4

* Changed pluralization and added the test back.
2018-06-07 12:45:49 -04:00
Carlos Tadeu Panato Junior
3d262bfc8d Relese5.0 merge master 20180607 (#8927)
* Add missing diagnostics (#8911)

* Update diagnostics.go

* Update diagnostics.go

* Fix push notification styling backwards compatibility (#8913)
2018-06-07 15:52:07 +02:00
Elias Nahum
1d961b1632 Fix push notification styling backwards compatibility (#8913) 2018-06-06 18:02:22 +02:00
Jason Blais
26f238af2a Add missing diagnostics (#8911)
* Update diagnostics.go

* Update diagnostics.go
2018-06-06 17:36:22 +02:00
Harrison Healey
bca7339e4c MM-10597 Improved handling of punctuation around notifications (#8901) 2018-06-05 19:34:21 +02:00
George Goldberg
5e36cbae09 Include the daily and monthly active user counts in telemetry. (#8887) 2018-06-05 19:19:20 +02:00
George Goldberg
0c4078b6b0 MM-9730 & MM-9729: Missing Server PRs (#8908)
* MM-9730: API endpoint to update scheme-derived roles of TeamMembers.

* MM-9729: API to update scheme-derived roles of ChannelMembers.
2018-06-05 07:41:03 -04:00
Joram Wilander
bd7c9f8642 Remove plugin sandbox warning message (#8897) 2018-06-04 12:34:47 -04:00
Saturnino Abril
312edbe531 [MM-10718] Move custom branding to TE (#8871)
* move custom branding to TE
* move brand's enterprise code to server and remove BrandInterface
2018-06-02 06:33:59 +08:00
Martin Kraft
260d7a0f85 MM-10412: Adds deleteBy prop to posts. (#8896) 2018-06-01 12:45:46 -04:00
George Goldberg
516a097e1a MM-10757: Default roles from scheme should be keyed by name not ID. (#8894)
* MM-10757: Default roles from scheme should be keyed by name not ID.

* Update permissions import/export.
2018-06-01 12:49:02 +01:00
George Goldberg
27e7841a73 Merge branch 'advanced-permissions-phase-2' 2018-05-31 10:25:31 +01:00
Elias Nahum
e39f5f46f3 Push notification styling improvements (#8818)
* Push notification styling improvements

* Fix unit tests
2018-05-30 10:11:19 -07:00
Jesús Espino
e88fe4bb1d MM-8853: Adding MANAGE_EMOJIS and MANAGE_OTHERS_EMOJIS permissions (#8860)
* 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 e2cafc1905.
2018-05-29 15:58:12 +01:00
Chris Duarte
792dae23ca Avoid emails if user status is OOO or post is an auto response (#8842) 2018-05-28 19:49:28 +02:00
Martin Kraft
c180cdbd1c Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-28 10:35:27 -04:00
Saturnino Abril
c37d153ffb [MM-10519] Send websocket event whenever the channel has changed it's type (public|private) (#8798)
* send websocket event whenever the channel has changed it's type (public|private)

* updated per comment

Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>

* add channel_converted websocket event

Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>

* only send channel_id via websocket message for "channel_converted" event

Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
2018-05-28 22:31:08 +08:00
Carlos Tadeu Panato Junior
c3e9c41440 [MM-1915] Add Deactivate Account - server side (#8699) 2018-05-28 16:20:08 +02:00