summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* Disabling oauth testChristopher Speller2017-09-071-2/+2
|
* Adjustments to JenkinsfileChristopher Speller2017-09-072-21/+26
|
* Renaming repoChristopher Speller2017-09-06326-735/+734
|
* Removing webappChristopher Speller2017-09-062396-285726/+0
|
* Adding jenkinsfile for new build server.Christopher Speller2017-09-069-196/+336
|
* Merge release-4.2Christopher Speller2017-09-0610-13/+114
|\
| * Fix webapp plugins for production builds (#7392)Joram Wilander2017-09-062-2/+8
| |
| * more robust file upload extension (#7389)Chris2017-09-061-2/+10
| |
| * Various patchesJoramWilander2017-09-068-11/+106
| |
* | Fixing EE build for master (#7394)Corey Hulen2017-09-061-1/+1
| |
* | add commented 4.3 upgrade func (#7388)Chris2017-09-061-0/+8
| |
* | app type transition (#7167)Chris2017-09-06178-2806/+2919
| |
* | more robust file upload extension (#7390)Chris2017-09-061-2/+10
| |
* | Fix 'Get Team Invite Link' logic on RHS menu to match LHS menu. (#7376)David Meza2017-09-061-1/+1
| |
* | [GH-7260] Add check for verified email when required by server settings (#7275)Alex Moon2017-09-061-0/+6
| | | | | | | | | | | | * Add check for verified email when required by server settings * remove debug and simplify logic with continue
* | [PLT-959] Browser Compatibility (#6945)Alex Moon2017-09-067-42/+265
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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
* | Update IsUniqueConstraint to check error codes instead of message text (#7385)Joram Wilander2017-09-066-15/+25
|/
* Revert "[PLT-7475] Add S3 region to system console and add S3 validation ↵Saturnino Abril2017-09-0610-207/+38
| | | | | | | | (#7373)" (#7387) This reverts commit 8d680cf64ec7fb6c8b242b8048989d0f0550cb68. Move to 4.3. Will discuss more if validation is necessary.
* pre 4.2 cut (#7380)Chris2017-09-052-4/+4
|
* Configs for themes in `Display Settings`: hide themes options, hide custom ↵David Meza2017-09-059-83/+163
| | | | | | | | | | | | | | 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
* PLT-7300: Add use_user_icon prop to allow bots to just use their user icon ↵Chris2017-09-052-3/+4
| | | | | | | | (#7381) * add use_user_icon prop to allow bots to just use their user icon * revert unintentional change
* Experimental plugin system console UI (#7338)Joram Wilander2017-09-059-4/+381
| | | | | | | | | | | | | | | | * 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
* PLT-7468 Moved more error pages to use predefined error types (#7378)Harrison Healey2017-09-0510-92/+142
| | | | | | | | * 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
* PLT-7522 Cleaned up translation of templates (#7351)Harrison Healey2017-09-054-26/+99
| | | | | | | | * PLT-7522 Cleaned up translation of templates * Added unit tests * Changed TranslateAsHtml to not be variadic
* PLT-7444: If there is activity in Mattermost before the email batch is sent, ↵Jonathan2017-09-053-57/+74
| | | | | | | | | | | | 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
* slight modifications to keyboards dialog and also fix error with non-Mac (#7367)Saturnino Abril2017-09-066-17/+306
|
* [PLT-7475] Add S3 region to system console and add S3 validation (#7373)Saturnino Abril2017-09-0610-38/+207
| | | | | | | | | | * 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
* PLT-7519: Better rate-limiting. (#7365)George Goldberg2017-09-052-1/+65
|
* PLT-7517 Added setting to enable tracing of Amazon S3 connections (#7349)Harrison Healey2017-09-056-7/+43
| | | | | | | | | | | | * 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
* Skip personal access token sessions in view sessions modal (#7350)Joram Wilander2017-09-051-0/+4
|
* Minor bug fixes (#7357)Asaad Mahmood2017-09-054-7/+7
| | | | | | | | * PLT-7514 - Adjusting help text * PLT-7499 - Fixing word wrapping in delete modal * PLT-7523 - Fixing autocomplete in header modal
* fix svg thumbnails and non-png copy/pastes (#7348)Chris2017-09-052-10/+15
|
* PLT-7474 Stopped requiring confirmation for mentions in code blocks (#7375)Harrison Healey2017-09-064-5/+71
| | | | | | * PLT-7474 Stopped requiring confirmation for mentions in code blocks * Stopped mentioning people from code blocks using ~~~
* fix email notifications settings appearing save despite cancel (#7359)Saturnino Abril2017-09-053-57/+81
|
* PLT-6226 fixing race in IsAuth (#7296)Corey Hulen2017-09-054-31/+71
| | | | | | | | | | * 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
* Fixing leader election (#7267)Corey Hulen2017-09-052-1/+2
|
* translations PR 20170904 (#7371)enahum2017-09-0528-2581/+4367
|
* Add status codes to model/config.go errors. (#7369)George Goldberg2017-09-051-58/+58
|
* Temporarily place plugins into E20 (#7370)Joram Wilander2017-09-051-1/+1
|
* PLT-7216: CLI Command to move channels between teams. (#7149)George Goldberg2017-09-044-0/+154
| | | | | | * PLT-7216: CLI Command to move channels between teams. * Add comment
* Fix elasticsearch purge index url in client4. (#7368)George Goldberg2017-09-051-1/+1
|
* Add error codes to SqlChannelStore errors. (#7364)George Goldberg2017-09-041-59/+58
|
* PLT-7473 Ignore text surrounded by multiple backquotes when parsing mentions ↵Harrison Healey2017-09-042-2/+8
| | | | (#7347)
* Fixed code blocks causing minor scroll pop on first load (#7288)Harrison Healey2017-09-041-0/+2
|
* Remove duplicated message (#7360)Yusuke Nemoto2017-09-041-4/+0
|
* Revert "[PLT-7471] Slight modifications to keyboards dialog (#7325)" (#7363)George Goldberg2017-09-042-35/+9
| | | This reverts commit 967a0df0f87e6fe942e9a7a1183014d299526e94.
* PLT-7497 adding DMs to complinace export (#7353)Corey Hulen2017-09-042-3/+126
|
* PLT-7518 Added unit tests for channel linking (#7352)Harrison Healey2017-09-043-7/+65
| | | | | | * PLT-7518 Added unit tests for channel linking * Removed unused escaping function
* PLT-7521: improve regex pattern (#7345)Chris2017-09-041-1/+1
| | | | | | * PLT-7521: improve regex pattern * style fix
* [PLT-6996] On "About Mattermost", add notes with links to notice.txt which ↵Saturnino Abril2017-09-044-4/+47
| | | | | | | | | | 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