summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* [PLT-7471] Slight modifications to keyboards dialog (#7325)Saturnino Abril2017-09-042-9/+35
| | | | | | * slight modifications to keyboards dialog * Updating shortcuts modal
* [PLT-7385] Add AuthData to IsUniqueConstraintError to indicate duplicated ↵Saturnino Abril2017-09-021-1/+1
| | | | | | | | email entry (#7197) * add AuthData to IsUniqueConstraintError to indicate duplicated email entry * add unique constraint for postgres
* only highlight relevant fields on ldap/email switch error (#7339)Chris2017-09-022-2/+28
|
* Add built-in plugin for getting LDAP attributes (#7317)Joram Wilander2017-09-015-1/+156
|
* Add x to be able to leave public and private channels (#7145)David Meza2017-09-016-3/+55
| | | | | | | | | | * 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.
* [PLT-7055] Modified code arrangement for compatibility with 32-bit ARM (#7281)Christopher Brown2017-09-012-3/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Squashed commit of the following: commit ba8e052d40f27123fbb5a94e9b30c05f51b90d36 Author: Christopher Brown <ccbrown112@gmail.com> Date: Fri Sep 1 12:08:57 2017 -0500 style fixes commit 121649f92f313813d9f105ddffb7d02ce5d3736f Author: Syakyr Surani <coding@syakyr.me> Date: Sat Aug 26 10:19:14 2017 +0800 Added comments for ARM/x86 (32-bit) compatibility commit 4bd13dd0e378cd4866bd5aed762f2b4fb75d7de9 Author: Syakyr Surani <coding@syakyr.me> Date: Sat Aug 26 05:20:43 2017 +0800 Added comments for ARM/x86 (32-bit) compatibility commit 78027f616ab736076cef0b1fd8b3266b3c3010dc Author: Syakyr Surani <coding@syakyr.me> Date: Thu Aug 24 03:01:06 2017 +0800 [PLT-7055] Modified code arrangement for compatibility with 32-bit ARM
* [PLT-7043] Update LDAP > Email help text (#7313)Eric Sethna2017-09-012-15/+7
| | | | | | | | * update help text * Update ldap_to_email.jsx * Update LDAP > email text
* PLT-7515: Fix getAllJobsPage test. (#7329)George Goldberg2017-09-011-3/+4
|
* App: NewLocAppError -> NewAppError (#7327)George Goldberg2017-09-0118-163/+149
| | | | | | * App: NewLocAppError -> NewAppError * Remove statuscode that got missed.
* Fix rename command error message (#7323)Joram Wilander2017-09-011-2/+2
|
* Api: NewLocAppError -> NewAppError (#7280)George Goldberg2017-09-0113-159/+92
|
* Update NOTICE.txt (#7321)Jason Blais2017-09-011-5/+73
|
* Config to make town square read only (#7140)David Meza2017-09-0111-14/+130
| | | | | | | | | | | | | | | | | | | | | | * Be able to make Town Square read-only (Disable typing messages for non admins). * Do not emit UserTypingEvent when TownSquareIsReadOnly and is Town Square. * Add unit tests for TownSquareIsReadOnly config value and logic. * Add TownSquareIsReadOnly to System console>Policy. Added Telemetry. * Add control for TownSquareIsReadOnly=true only for License Enterprise Edition E10 & E20. * Update en.json * Update en.json * Update policy_settings.jsx * Change config value from TownSquareIsReadOnly to ExperimentalTownSquareIsReadOnly. * Refactored to simplify. Avoid code repeat and multiple db calls.
* PLT-7496 Add missing telemetry for a few config settings (#7318)Jason Blais2017-09-011-0/+4
| | | | | | * Update diagnostics.go * Fix
* Implement experimental REST API endpoints for plugins (#7279)Joram Wilander2017-09-0128-76/+965
| | | | | | | | | | | | | | | | | | * Implement experimental REST API endpoints for plugins * Updates per feedback and rebase * Update tests * Further updates * Update extraction of plugins * Use OS temp dir for plugins instead of search path * Fail extraction on paths that attempt to traverse upward * Update pluginenv ActivePlugins()
* PLT-3893: Structured Logging Continues (#7252)Jonathan2017-08-316-12/+548
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PLT-3893: Imported logger work from https://github.com/MusikPolice/platform * PLT-3893: Integrated logger with system config * PLT-3893: Integrated Mattermost config with logging solution, modified log message serialization so entire message is serialized as a JSON object * PLT-3893: Added support for format strings in Debug methods. Added an overload that does not require a Context object for cases when one isn't available * PLT-3893: Added context and format string support to debug and error methods * PLT-3893: A few updates from pull request feedback * PLT-3893: Changed tests to use testify * Fixed TestAddRemoveConfigListener to no longer assume that there are zero config listeners when the test begins, since other tests could add config listeners * Updated TestGetDeletedChannelsForTeam so that it doesn't assume state when it begins * PLT-3893: Changed File property of log message so that it's relative to /mattermost directory, rather than to wherever the user is running the application from on their machine * Flipped expected/actual assert arguments, added an explicit test for getCallerFilename(...), since it's failing on Jenkins * Added printlns to debug failing tests on Jenkins * Relaxed test cases to avoid failure on Jenkins caused by code coverage calculations. Removed printlns. * Changed the way that caller filename is determined to make it more robust, updated tests to make them more lax, while not choking on the strange paths that Jenkins uses. * Fixed gofmt issues * Added debug output to tests to diagnose Jenkins build failures * Still trying to get some useful debug logging on Jenkins * Changed getCallerFilename to handle the strange paths that runtime.Caller(...) returns on Jenkins * Fixing checkstyle issues
* PLT-7448: Searching submits multiple API requests. (#7334)George Goldberg2017-08-311-2/+1
| | | | This fixes all the main cases where duplicate search API requests were issued.
* APIv4: NewLocAppError -> NewAppError (#7328)George Goldberg2017-08-319-68/+34
|
* Fix setting profile image for other users (#7306)Joram Wilander2017-08-312-1/+10
|
* Update mattermost-redux to latest (#7333)Joram Wilander2017-08-311-1/+1
|
* sort compliance report (#7326)Saturnino Abril2017-08-311-1/+5
|
* Add minimum channel name length in rename modal (#7308)Joram Wilander2017-08-312-0/+12
|
* [PLT-5170] Add join the channel system message for the person who created ↵Saturnino Abril2017-08-305-12/+46
| | | | | | | | the channel (#7299) * add join the channel system message for the person who created the channel * update test
* PLT-7220: Jumping to a GM from a flagged messages doesn't add the GM to your ↵Jonathan2017-08-301-1/+8
| | | | | | | | | | LHS (#7319) * Ensured that DM/GM channel is added to LHS when jump link is clicked in RHS * Moved sidebar channel loading logic into global_actions so that it happens after the users' channels have been loaded * Fixing checkstyle issues