Commit Graph

10040 Commits

Author SHA1 Message Date
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
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
Joram Wilander
1c194e5fbd Fix plugins serving after subpath changes (#8982) 2018-06-22 22:09:31 -04:00
George Goldberg
454522cc30 MM-8716: Security Update Check URL should have recognisable name. (#8983) 2018-06-22 10:14:33 -07:00
Jesús Espino
d9390244af MM-8810: Add CSV Compliance export (#8966)
* 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
2018-06-22 11:15:19 +02:00
Christopher Speller
8526739066 MM-10934 Update server dependencies. (#8981)
* Changing throttled import path.

* Upgrading dependencies.
2018-06-21 16:10:40 -04:00
Jesús Espino
a59ccaa8b3 Using i18n extract to generate the i18n/en.json file (#8980)
* Sort translations

* Added untranslated and removed unussed strings
2018-06-21 14:58:36 -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
Carlos Tadeu Panato Junior
0d741301a3 fix typo in en.json and remove trailing spaces (#8975) 2018-06-21 16:50:35 +02:00
Harrison Healey
07c785e294 MM-10730 Added support for empty environment variables to viper (#8973) 2018-06-21 16:30:20 +02:00
George Goldberg
1f65f0e3d6 MM-10233: Add scheme importing to bulk importer. (#8928) 2018-06-21 12:02:35 +01:00
Elias Nahum
8e24dd78fb translations PR 20180619 (#8963) 2018-06-20 08:19:57 -04:00
Jesús Espino
344836dfb2 Add missed translations (#8959) 2018-06-19 19:40:26 +02: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
Carlos Tadeu Panato Junior
c8b99b97df Update html2text lib to use the original repo (#8900) 2018-06-14 19:27:21 +02:00
Joram Wilander
85a75526c7 Add more oauth logging and note about GitLab ToS for login (#8949) v5.0.1 v5.0.0 v5.0.0-rc7 v5.0.0-rc6 v5.0.1-rc1 2018-06-14 19:27:00 +02:00
Jesús Espino
8d29f8f58b MM-10767: Adding ordering to the system-admin list all teams (#8950) 2018-06-14 19:26:32 +02:00
cpanato
8883f48788 Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to-master-20180614-1 2018-06-14 18:46:19 +02:00
Jesse Hallam
f106417103 MM-10367: rewrite subpath assets on startup (#8944)
Examine ServiceSettings.SiteURL on startup and rewrite assets
accordingly if not in a development environment.

Also export `mattermost config subpath` command to manually do same.

This accompanies a webapp PR to use the updated `root.html` to define
the necessary webpack asset path for dynamically loading assets.
2018-06-14 08:26:22 -07:00
Harrison Healey
d0cda0500e MM-10769 Rename references to spf13/viper to mattermost/viper (#8948) 2018-06-14 08:15:02 -07:00
Jesús Espino
695c5d6bf8 MM-10863: Handle non-API errors with redirect to webapp (#8943)
* MM-10863: Handle non-API errors with redirect to webapp

* Properly shutdown the app in the new test
v5.0.0-rc5
2018-06-14 09:00:40 +02:00
Elias Nahum
a6d815e05a translations PR 20180613 (#8947) 2018-06-14 09:00:15 +02:00
cpanato
337b121bfb Merge branch 'release-5.0-merge-to-master-20180613' 2018-06-13 15:03:30 +02:00
cpanato
23035483f6 Merge remote-tracking branch 'upstream/release-5.0' into release-5.0-merge-to-master-20180613 2018-06-13 13:46:52 +02:00
Carlos Tadeu Panato Junior
2f0fe81da1 Add preparatory upgrade code for 5.1.0 (#8920) 2018-06-13 10:33:38 +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
Carlos Tadeu Panato Junior
9517cccab0 Relese5.0 merge master 20180611 (#8939)
* 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.

* Fix idempotency of scheme migrations. (#8935)

This fixes the issue where if the migration tries to migrate an already
scheme-aware member object it would end up removing it's scheme-derived
roles.

Instead, only if the member object is unmigrated do we default to
setting the scheme-derived role booleans to false. We tell if it is an
unmigrated member object by checking if the booleans are set to null.
2018-06-11 20:09:38 +02:00
George Goldberg
1b821c7319 MM-10684: Show logs on Slack Import CLI. (#8936) 2018-06-11 15:48:32 +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
George Goldberg
d4761a94ce Fix idempotency of scheme migrations. (#8935)
This fixes the issue where if the migration tries to migrate an already
scheme-aware member object it would end up removing it's scheme-derived
roles.

Instead, only if the member object is unmigrated do we default to
setting the scheme-derived role booleans to false. We tell if it is an
unmigrated member object by checking if the booleans are set to null.
v5.0.0-rc4 v5.0.0-rc3
2018-06-11 16:24:08 +02: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
v5.0.0-rc2
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
Jesse Hallam
c8d9595833 allow client4 http keep-alive (#8854)
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.
2018-06-07 12:45:03 -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
Jesse Hallam
0ba0af889e MM-6839: searching for paths relative to executable (#8915)
* MM-6839: search relative to executable (#8853)

* MM-6839: searching for paths relative to executable

In addition to searching relative to the current working directory, also
search relative to the location of the binary. This helps locate config
and i18n files when invoking an absolute path to the mattermost binary.

* MM-6839: find mattermost/ binary using utils.FindFile

* add unit tests for utils.FindFile to exclude directories

* fix filtering out directories in FindFile

* fix platform invoking ./bin/mattermost
2018-06-06 07:18:24 -07:00
Carlos Tadeu Panato Junior
7df3498947 use minio release instead of latest (#8917) 2018-06-06 09:08:14 -04:00