summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* Renaming repoChristopher Speller2017-09-0693-195/+195
|
* Adding jenkinsfile for new build server.Christopher Speller2017-09-061-10/+2
|
* app type transition (#7167)Chris2017-09-0675-1779/+1869
|
* [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
* Revert "[PLT-7475] Add S3 region to system console and add S3 validation ↵Saturnino Abril2017-09-061-30/+1
| | | | | | | | (#7373)" (#7387) This reverts commit 8d680cf64ec7fb6c8b242b8048989d0f0550cb68. Move to 4.3. Will discuss more if validation is necessary.
* Configs for themes in `Display Settings`: hide themes options, hide custom ↵David Meza2017-09-051-0/+8
| | | | | | | | | | | | | | 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-051-2/+3
| | | | | | | | (#7381) * add use_user_icon prop to allow bots to just use their user icon * revert unintentional change
* PLT-7522 Cleaned up translation of templates (#7351)Harrison Healey2017-09-052-24/+23
| | | | | | | | * 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-052-53/+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
* [PLT-7475] Add S3 region to system console and add S3 validation (#7373)Saturnino Abril2017-09-061-1/+30
| | | | | | | | | | * 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-7517 Added setting to enable tracing of Amazon S3 connections (#7349)Harrison Healey2017-09-051-0/+1
| | | | | | | | | | | | * 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
* PLT-7474 Stopped requiring confirmation for mentions in code blocks (#7375)Harrison Healey2017-09-062-2/+8
| | | | | | * PLT-7474 Stopped requiring confirmation for mentions in code blocks * Stopped mentioning people from code blocks using ~~~
* PLT-6226 fixing race in IsAuth (#7296)Corey Hulen2017-09-052-30/+65
| | | | | | | | | | * 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-051-1/+1
|
* 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-042-0/+73
| | | | | | * PLT-7216: CLI Command to move channels between teams. * Add comment
* PLT-7473 Ignore text surrounded by multiple backquotes when parsing mentions ↵Harrison Healey2017-09-042-2/+8
| | | | (#7347)
* Add built-in plugin for getting LDAP attributes (#7317)Joram Wilander2017-09-014-1/+155
|
* Add x to be able to leave public and private channels (#7145)David Meza2017-09-011-0/+1
| | | | | | | | | | * 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-011-1/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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
* App: NewLocAppError -> NewAppError (#7327)George Goldberg2017-09-0117-162/+148
| | | | | | * App: NewLocAppError -> NewAppError * Remove statuscode that got missed.
* Fix rename command error message (#7323)Joram Wilander2017-09-011-2/+2
|
* Config to make town square read only (#7140)David Meza2017-09-013-11/+46
| | | | | | | | | | | | | | | | | | | | | | * 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-012-0/+176
| | | | | | | | | | | | | | | | | | * 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-5170] Add join the channel system message for the person who created ↵Saturnino Abril2017-08-301-0/+7
| | | | | | | | the channel (#7299) * add join the channel system message for the person who created the channel * update test
* set to default value with config is missing (#7320)Saturnino Abril2017-08-309-22/+22
|
* PLT-6403: Interactive messages (#7274)Chris2017-08-294-7/+138
| | | | | | | | | | * wip * finish first pass * requested changes * add DoPostAction to Client4
* Enforce channel display name limits on slash command (#7309)Joram Wilander2017-08-292-0/+35
|
* Manage version configurations client versions (#7220)Chris Duarte2017-08-281-0/+10
| | | | | | | | | | | | * Add config values for client versions. Return client versions in ping response. * Manage client version through System Console. * Added client versions to diagnostics * Added translations messages en.json file. * Hide Client Versions on System Console.
* Include post_id and root_id to handle actions from the PN (#7286)enahum2017-08-281-4/+7
|
* PLT-5745 Cleaning up duplicate calls (#7298)Corey Hulen2017-08-2814-75/+75
| | | | | | | | * PLT-5745 Cleaning up duplicate calls * Fixing missing calls * Fixing broken test
* PLT-???? Prepare file upload infrastructure for Data Retention. (#7266)George Goldberg2017-08-256-256/+81
| | | | | | | | | | | | | | | | | * Prepare file upload infrastructure for Data Retention. This commit prepares the file upload infrastructure for the data retention feature that is under construction. Changes are: * Move file management code to utils to allow access to it from jobs. * From now on, store all file uploads in a top level folder which is the date of the day on which they were uploaded. This commit is based on Harrison Healey's branch, but updated to work with the latest master. * Use NewAppError
* Fix log error message for UpdateLastActivityAtIfNeeded (#7282)enahum2017-08-251-1/+1
|
* [PLT-1015] Make all Mattermost system emails Multi-Part, with both a HTML ↵Carlos Tadeu Panato Junior2017-08-213-4/+3
| | | | | | | | | | | | and Plain Text version. (#5698) * Implementation to Make all Mattermost system emails Multi-Part, with both a HTML and Plain Text version * update lib * update code per review * update to use the mattermost repo
* Adding check for file write or minio/s3 bucket before server start. (#7254)Christopher Speller2017-08-181-0/+45
|
* [PLT-3377] Open up a shortcuts dialog instead of printing help text (#7064)Saturnino Abril2017-08-181-59/+4
| | | | | | | | | | | | | | | | | | * open up a shortcuts dialog instead of printing help text * Updating UI for keyboard shortcuts modal * update PR per PLT-7284 * fix typo error * fix mixed up shortcut keys * move to client side * fix shortcuts list, remove unused function and revert server side code for autocompletion * remove quick team switcher
* Fixing bad merge (#7247)Corey Hulen2017-08-171-2/+2
|
* Merge branch 'release-4.1'Christopher Speller2017-08-173-7/+14
|\
| * PLT-7375: Email batching not on by default for accounts that have never ↵Jonathan2017-08-151-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | touched their email settings (#7206) * PLT-7375: Send batched emails if batching is enabled and user has not explicitly set their email interval preference * PLT-7375: Reverting 4cf316fcd * PLT-7375: Send batched emails if batching is enabled and user has not explicitly set their email interval preference * PLT-7375: EnableEmailBatching was accidentally flipped to true in 10dcdeca4b, causing config_test.go::TestConfigFromEnviroVars to fail * PLT-7375: EnableEmailBatching was accidentally flipped to true in 10dcdeca4b, causing config_test.go::TestConfigFromEnviroVars to fail * PLT-7375: Reverted accidental changes to config * PLT-7375: Manually fixing config.
| * PLT-7360 Adding SSE to compliance (#7165)Corey Hulen2017-08-111-2/+9
| | | | | | | | | | | | | | | | * Adding SSE to E20 * Fixing UI bug * Fixing loc strings
| * Merge 4.0.3 into release-4.1 (#7169)Saturnino Abril2017-08-111-3/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * fix dm custom slash command regression (#7008) * point mattermost-redux to webapp-4.0 latest (#7040) * If login is using mobile respond with JSON object (#7030) * Allow regions to be set and honored for S3 driver. (#7010) (#7073) This is necessary for certain users where GetBucketLocation API is disabled using IAM policies. There is a field AmazonS3Region which we need to re-purpose and use to support this properly. Fixes https://github.com/mattermost/platform/issues/6999 * [PLT-7231/PLT-7306] Fix GitLab SSO failure with non-English locale and make config locales more forgiving (#7106) * make config locales more forgiving by assigning default values * fix error text * update per comment * Minor updates to team * Another team update
* | PLT-6079 Adding leader election (#7105)Corey Hulen2017-08-161-1/+1
| |
* | PLT-6226 Fixing races with licensing (#7213)Corey Hulen2017-08-1611-25/+25
| | | | | | | | | | | | | | | | | | | | * PLT-6226 Fixing races with licensing * Fixing build issue * Fixing licensing issue * removing commented code
* | PLT-1649: add response_url support for custom slash commands (#6739)Chris2017-08-162-5/+60
| | | | | | | | | | | | | | | | | | | | * add response_url support for custom slash commands * pr suggestions * pr update / suggestion * test fix
* | Fix out-of-channel mentions for usernames with dashes (#7151)Joram Wilander2017-08-101-3/+5
| |
* | PLT-6358: Server HTTP client improvements (#6980)Chris2017-08-098-78/+66
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * restrict untrusted, internal http connections by default * command test fix * more test fixes * change setting from toggle to whitelist * requested ui changes * add isdefault diagnostic * fix tests
* | PLT-7288: Allow CLI to delete teams with no channels. (#7135)George Goldberg2017-08-092-1/+23
| |
* | lint all the things (#7154)Chris2017-08-093-3/+3
| | | | | | | | | | | | * lint all the things * remove extra echo
* | testify (#7116)Chris2017-08-081-92/+34
|/