Commit Graph

9158 Commits

Author SHA1 Message Date
Christopher Speller
77709ccdda Merge release-4.2 2017-09-06 20:43:18 -07:00
Joram Wilander
e589accdaf Fix webapp plugins for production builds (#7392) 2017-09-06 20:39:44 -07:00
Corey Hulen
fd86a2490e Fixing EE build for master (#7394) 2017-09-06 20:38:13 -07:00
Chris
2205f6d074 add commented 4.3 upgrade func (#7388) 2017-09-06 17:47:52 -05:00
Chris
c68b866ef7 more robust file upload extension (#7389) 2017-09-06 17:16:25 -05:00
Chris
1adfd0e9be app type transition (#7167) 2017-09-06 17:12:54 -05:00
Chris
b84bd21089 more robust file upload extension (#7390) 2017-09-06 18:23:37 -03:00
David Meza
9ed1d956ee Fix 'Get Team Invite Link' logic on RHS menu to match LHS menu. (#7376) 2017-09-06 17:19:21 -04:00
Alex Moon
06a959e19e [GH-7260] Add check for verified email when required by server settings (#7275)
* Add check for verified email when required by server settings

* remove debug and simplify logic with continue
2017-09-06 16:43:48 -04:00
JoramWilander
d38328976e Various patches 2017-09-06 16:24:34 -04:00
Alex Moon
cb266eb942 [PLT-959] Browser Compatibility (#6945)
* Error page implimentation

* Update Browser Compatibility check to check Chrome, FF, IE, Edge, and Safai

* Update strings with proper edge version

* undo uneeded changes and move to go template.

* more unneeded additions

* eliminate js and add local triangle

* fix typo

* Correct debug logging of browser version

* Modify Browser Check to pass user_agent object only and write test.

* Fix chrome version typo and correct testing change that broke chrome UA chack

* simplity browser version detection by using maps instead of string splitting
2017-09-06 13:23:14 -07:00
Joram Wilander
66a4d01125 Update IsUniqueConstraint to check error codes instead of message text (#7385) 2017-09-06 14:00:56 -04:00
Saturnino Abril
f968c56890 Revert "[PLT-7475] Add S3 region to system console and add S3 validation (#7373)" (#7387)
This reverts commit 8d680cf64e.

Move to 4.3.
Will discuss more if validation is necessary.
v4.2.0-rc1
2017-09-06 11:02:42 -05:00
Chris
90da40b54c pre 4.2 cut (#7380) 2017-09-05 19:29:26 -05:00
David Meza
1605fa5102 Configs for themes in Display Settings: hide themes options, hide custom themes, specific list of themes (#7173)
* Add configuration to enable or disable choosing themes in Display Settings. Only for Licensed servers.

* Add configuration to enable or disable choosing custom themes in Display Settings. Only for Licensed servers.

* Add configuration to enable or disable a specific list of themes to choose in Display Settings. Only for Licensed servers.

* Added config value and logic for "DefaultTheme"

* Fix problem with undefined values when the server is not licensed
2017-09-05 19:28:46 -05:00
Chris
7cee7b3342 PLT-7300: Add use_user_icon prop to allow bots to just use their user icon (#7381)
* add use_user_icon prop to allow bots to just use their user icon

* revert unintentional change
2017-09-05 19:20:47 -05:00
Joram Wilander
df085d273d Experimental plugin system console UI (#7338)
* Add system console UI for uploading/listing/removing plugins

* Add localization strings

* Add banner to plugin settings

* Updating UI for experimental plugins (#7362)

* Text updates

* Updating UI for experimental plugin stuff (#7377)

* Properly clear file input after upload
2017-09-05 18:12:55 -04:00
Harrison Healey
e30e4cfe3d PLT-7468 Moved more error pages to use predefined error types (#7378)
* PLT-7468 Moved more errors to use error types

* PLT-7468 Moved 404 error page to use error types

* Made helper function for rendering external links on error page
2017-09-05 17:40:35 -04:00
Harrison Healey
6ca443a255 PLT-7522 Cleaned up translation of templates (#7351)
* PLT-7522 Cleaned up translation of templates

* Added unit tests

* Changed TranslateAsHtml to not be variadic
2017-09-05 17:39:45 -04:00
Jonathan
016b5daa1c PLT-7444: If there is activity in Mattermost before the email batch is sent, do not send the email (#7342)
* Changed email batching short-circuit logic to look at last viewed at timestamp in channel member struct instead of in user's status struct, since the latter is only updated if the user's status is set to online

* Fixed unit tests

* Reduced right-hand drift

* Reduced total number of store calls by loading all channel member objects for user exactly once per team that the user received notifications for
2017-09-05 16:39:07 -04:00
Saturnino Abril
2977b31a39 slight modifications to keyboards dialog and also fix error with non-Mac (#7367) 2017-09-06 04:34:53 +08:00
Saturnino Abril
8d680cf64e [PLT-7475] Add S3 region to system console and add S3 validation (#7373)
* add S3 region to system console and add S3 validation

* update translation message

* add bool as return value to Validate* functions

* update Validate* functions to be pure
2017-09-06 03:42:18 +08:00
George Goldberg
7405f66036 PLT-7519: Better rate-limiting. (#7365) 2017-09-05 15:34:17 -04:00
Harrison Healey
09f8267751 PLT-7517 Added setting to enable tracing of Amazon S3 connections (#7349)
* PLT-7517 Added setting to enable tracing of Amazon S3 connections

* Removed unnecessary placeholders on boolean settings

* Added AmazonS3Trace to diagnostics

* Updated AmazonS3Trace setting name in system console

* Removing extra colon
2017-09-05 15:24:21 -04:00
Joram Wilander
cc289d7061 Skip personal access token sessions in view sessions modal (#7350) 2017-09-05 13:43:36 -04:00
Asaad Mahmood
e089a88f18 Minor bug fixes (#7357)
* PLT-7514 - Adjusting help text

* PLT-7499 - Fixing word wrapping in delete modal

* PLT-7523 - Fixing autocomplete in header modal
2017-09-05 13:43:14 -04:00
Chris
c4e32060be fix svg thumbnails and non-png copy/pastes (#7348) 2017-09-05 13:13:03 -04:00
Harrison Healey
575864c917 PLT-7474 Stopped requiring confirmation for mentions in code blocks (#7375)
* PLT-7474 Stopped requiring confirmation for mentions in code blocks

* Stopped mentioning people from code blocks using ~~~
2017-09-06 00:39:07 +08:00
Saturnino Abril
daed8ffbf6 fix email notifications settings appearing save despite cancel (#7359) 2017-09-05 23:13:39 +08:00
Corey Hulen
d6383643cb PLT-6226 fixing race in IsAuth (#7296)
* Fixing race in isAuth function

* PLT-6226 fixing race in IsAuth

* Moving int64 to top so it's aligned

* Adding comment and fixing asymmetric call
2017-09-05 07:58:47 -07:00
Corey Hulen
7843dc3cfa Fixing leader election (#7267) 2017-09-05 07:58:30 -07:00
enahum
44e58bd100 translations PR 20170904 (#7371) 2017-09-05 10:33:03 -03:00
George Goldberg
6569c76779 Add status codes to model/config.go errors. (#7369) 2017-09-05 13:54:05 +01:00
Joram Wilander
4c522155da Temporarily place plugins into E20 (#7370) 2017-09-05 11:35:07 +01:00
George Goldberg
ba2868775d PLT-7216: CLI Command to move channels between teams. (#7149)
* PLT-7216: CLI Command to move channels between teams.

* Add comment
2017-09-04 18:54:24 +01:00
George Goldberg
1e78ff831e Fix elasticsearch purge index url in client4. (#7368) 2017-09-05 01:45:45 +08:00
George Goldberg
3c717b514d Add error codes to SqlChannelStore errors. (#7364) 2017-09-04 23:37:13 +08:00
Harrison Healey
98bb4c31a1 PLT-7473 Ignore text surrounded by multiple backquotes when parsing mentions (#7347) 2017-09-04 21:31:20 +08:00
Harrison Healey
c8d51b6465 Fixed code blocks causing minor scroll pop on first load (#7288) 2017-09-04 21:31:01 +08:00
Yusuke Nemoto
a1af7033b2 Remove duplicated message (#7360) 2017-09-04 13:42:50 +01:00
George Goldberg
ce5d81582a Revert "[PLT-7471] Slight modifications to keyboards dialog (#7325)" (#7363)
This reverts commit 967a0df0f8.
2017-09-04 11:01:25 +01:00
Corey Hulen
9c1f6c9fd5 PLT-7497 adding DMs to complinace export (#7353) 2017-09-04 10:49:40 +01:00
Harrison Healey
670bfbf626 PLT-7518 Added unit tests for channel linking (#7352)
* PLT-7518 Added unit tests for channel linking

* Removed unused escaping function
2017-09-04 10:48:17 +01:00
Chris
8391ef6288 PLT-7521: improve regex pattern (#7345)
* PLT-7521: improve regex pattern

* style fix
2017-09-04 10:45:37 +01:00
Saturnino Abril
6a10941cb3 [PLT-6996] On "About Mattermost", add notes with links to notice.txt which has list of copyrights of open source components used (#7315)
* on "About Mattermost", add notes with links to notice.txt which has list of copyrights of open source components used

* remove apps from link

* Minor UI update
2017-09-04 04:13:46 +08:00
Saturnino Abril
967a0df0f8 [PLT-7471] Slight modifications to keyboards dialog (#7325)
* slight modifications to keyboards dialog

* Updating shortcuts modal
2017-09-04 04:12:38 +08:00
Saturnino Abril
94c9138c19 [PLT-7385] Add AuthData to IsUniqueConstraintError to indicate duplicated email entry (#7197)
* add AuthData to IsUniqueConstraintError to indicate duplicated email entry

* add unique constraint for postgres
2017-09-02 05:59:01 +08:00
Chris
196cdbe9d1 only highlight relevant fields on ldap/email switch error (#7339) 2017-09-02 05:57:57 +08:00
Joram Wilander
e2042c4b65 Add built-in plugin for getting LDAP attributes (#7317) 2017-09-01 14:28:15 -04:00
David Meza
b6456a675d Add x to be able to leave public and private channels (#7145)
* Add config value EnableXToLeaveChannelsFromLHS that if true displays x to the right of private and public channels on the LHS.

* Displays x to the right of private and public channels on the LHS based on if EnableXToLeaveChannelsFromLHS=true.

* change the tooltip for private and public channels to `Leave channel`

* Add client-side event for when user clicks the "x" button. Different for public, private, DM.
2017-09-01 14:21:09 -04:00