IntenseWebs/mattermost
3
0
Fork 0
mirror of https://github.com/mattermost/mattermost.git synced 2025-02-25 18:55:24 -06:00
Code Issues Packages Projects Releases Wiki Activity
9,999 Commits 845 Branches 1,202 Tags
85a75526c7c03fca1d14a39cfb3f2638d98d3fe1
Commit Graph

9999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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
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
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
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
ffb1d5d8e3 disable Supervisor_PluginRepeatedlyCrash (#8918) 
* disable Supervisor_PluginRepeatedlyCrash

This test is failing sporadically, largely due to the use of a timeout
to verify results. A more robust solution is required.

* disable Supervisor_PluginCrash

This test is failing sporadically, largely due to the use of a timeout
to verify results. A more robust solution is required.
v5.0.0-rc1 		2018-06-05 22:53:08 +02:00
Carlos Tadeu Panato Junior
bfba142e2b Uncomment upgrade for 5.0.0 (#8914) 2018-06-05 20:17:53 +02:00
Elias Nahum
3bae2f3b37 translations PR 20180604 (#8909) 2018-06-05 19:57:40 +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
Harrison Healey
fb00ce951e Fixed invalid CustomUrlSchemes error message (#8902) 2018-06-05 19:18:59 +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
Christopher Speller
2c75247c97 MM-10348 Adding experimental hardened mode. (#8881) 
* Adding experimental hardened mode.

* Sanitizing all 500 errors.
 2018-06-04 09:48:26 -07: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
Christopher Speller
ebdceb8e52 Adding mlog to context. (#8882) 2018-06-01 13:07:56 -07:00
Martin Kraft
260d7a0f85 MM-10412: Adds deleteBy prop to posts. (#8896) 2018-06-01 12:45:46 -04:00
Jesús Espino
5992a729c5 MM-10760: Using master for any Exec call (#8895) 2018-06-01 14:11:22 +01: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
Harrison Healey
2fe8878749 MM-9547 Added config setting to control url autolinking schemes (#8862) 
* MM-9547 Added config setting to control autolinking schemes

* Renamed AutolinkingSchemes to CustomUrlSchemes
 2018-05-30 10:48:04 -04:00
Elias Nahum
81852ab191 Changelog link (#8805) 2018-05-30 10:23:25 -04:00
Elias Nahum
009f72f075 translations PR 20180528 (#8864) 2018-05-30 10:22:37 -04:00
Christopher Speller
af4e907f5e MM-10731 Revert site url kill server (#8877) 
* Revert "MM-9983 Requiring SiteURL to be set. (#8769)"

This reverts commit 0432f995ec.

* Add log message for SiteURL not being set.
 2018-05-30 09:58:24 -04:00
George Goldberg
994ccf475f Add note about clearing caches when permissions reset CLI done. (#8823) 
* Add note about clearing caches when permissions reset CLI done.

* Adjust text.
 2018-05-30 11:21:36 +01:00
Christopher Speller
2f6039f23f Revert "MM-6839: search relative to executable (#8853)" (#8876) 
This reverts commit d3cf110620.
 2018-05-29 13:21:42 -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
Jesse Hallam
d3cf110620 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
 2018-05-29 10:55:49 -04:00
Carlos Tadeu Panato Junior
4f5fdb6f89 fix bad merge (#8869) 2018-05-29 14:00:46 +02:00
Jesús Espino
bf4cefc349 Allow to update the teams scheme to default scheme (#8855) 2018-05-29 09:32:07 +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
George Goldberg
7225abddee MM-8814: Remove implicit permission grants from post ownership. (#8391) 2018-05-28 09:46:52 -04:00
Martin Kraft
be177caf5f Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-28 08:20:12 -04:00
Carlos Tadeu Panato Junior
b6d5cc4f69 re-enabling TestSendMailUsingConfigAdvanced (#8836) 2018-05-27 09:56:44 -04:00
Jason Blais
05460ac3a7 Update CONTRIBUTING.md (#8828) 
* Update CONTRIBUTING.md

* Fix typo
 2018-05-27 09:55:37 -04:00
Martin Kraft
123f33d05c Merge branch 'advanced-permissions-phase-2' of github.com:mattermost/mattermost-server into advanced-permissions-phase-2 2018-05-25 11:30:16 -04:00
Martin Kraft
baf697e348 Merge remote-tracking branch 'origin/master' into advanced-permissions-phase-2 2018-05-25 11:25:40 -04:00
Jesús Espino
f1cd33c822 Add autogenerate scheme.name for new schemes without explicit name (#8848) 2018-05-25 11:24:29 -04:00
Saturnino Abril
58abb4204e [MM-10645] Remove desktop duration notify props (#8851) 
* remove desktop duration notify props

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

* fix test

Signed-off-by: Saturnino Abril <saturnino.abril@gmail.com>
 2018-05-25 07:52:17 -07:00
Saturnino Abril
94b2eca2d1 add ExperimentalHideTownSquareinLHS in config setting (#8751) 2018-05-24 16:41:30 -04:00
Martin Kraft
a51b2367a3 MM-10402: Adds RunJobs to client config API. (#8846) 2018-05-24 16:22:54 +02:00
Martin Kraft
5f654079c0 Merge fixes. 2018-05-24 09:29:35 -04:00