summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
...
* 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
|/
* FIXES PLT-6648 Add support for Server Side Encryption on S3 (#6467)Tejay Cardon2017-08-082-5/+25
| | | | | Help from Jason Blais on wording Update storage_settings.jsx Update en.json
* PLT-7263: truncate long issue descriptions (#7142)Chris2017-08-081-0/+4
| | | | | | | | | | | | * truncate long issue descriptions, add tests * minor tweak to text template * add license header * remove tests for now (since dependency is blocked) * remove second jira link
* System Console: Email notification content setting (#7122)Jonathan2017-08-064-68/+528
| | | | | | | | | | | | | | | | * PLT-7195: Added new config option, new license feature, and config UI to system console. Still need to implement behaviour change in email batching code * PLT-7195: Modified batch emails to respect email notification content type setting * PLT-7195: Tweaking the colours a bit * PLT-7195: Added support for email notification content type setting in immediate (non-batched) notification messages. Attempted to clean up the code somewhat. Unit tests coming in a future commit * PLT-7195: Added unit tests for non-batched emails * Checked license when applying email content settings * Changed return type of getFormattedPostTime
* PLT-7212: fix missing webhook post attachments (#7011)Chris2017-08-031-0/+47
| | | | | | * fix missing webhook post attachments * make ProcessSlackAttachments return a new slice instead of modifying it
* PLT-6484 Add /leave command to leave a channel (#6402)David Meza2017-08-031-0/+55
| | | | | | | | | | | | | | | | | | * PLT-6484 Add /leave command to leave a channel * Text changes requeted on review. * PLT-6484 Display the right error message when trying to /leave town-square * PLT-6484 Be able to execute /leave command in direct and group message channels with the same effect as clicking x * PLT-6484 Refactor to create new leave_private_channel_modal.jsx * PLT-6484 Remove previous leave private channel logic to use new leave_private_channel_modal.jsx * Remove dot in command description. Change localized error when leaving Town square. * disable /leave command in reply threads on the right-hand sidebar, since it is not obvious which channel you should leave
* PLT-7194 Add email when adding user access tokens (#7087)Joram Wilander2017-08-032-1/+33
| | | | | | | | * Add email when adding user access tokens * Update en.json * Update en.json
* PLT-7130 adding more generic push notificaiton message. (#7044)Corey Hulen2017-08-031-0/+9
| | | | | | * PLT-7130 adding more generic push notificaiton message. * Fixing strings
* If login is using mobile respond with JSON object (#7030)enahum2017-08-031-6/+6
|
* Add more debugging info to server logs for failed OAuth requests (#7039)Joram Wilander2017-08-021-4/+7
|
* Fix TestUpdateOAuthUserAttrs unit test (#7037)Joram Wilander2017-08-021-1/+1
|
* PLT-7275: Configure replica/shard count for Elasticsearch indexes. (#7093)George Goldberg2017-08-021-0/+2
|
* PLT-6965 jira integration (plus plugin scaffolding) (#6918)Chris2017-08-0212-21/+481
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * plugin scaffolding / jira integration * add vendored testify packages * webhook fix * don't change i18n ids * support configuration watching * add basic jira plugin configuration to admin console * fix eslint errors * fix another eslint warning * polish * undo unintentional config.json commit >:( * test fix * add jira plugin diagnostics, remove dm support, add bot tag, generate web-safe secrets * rebase, implement requested changes * requested changes * remove tests and minimize makefile change * add missing license headers * add missing comma * remove bad line from Makefile
* PLT-6987 User access token UI (#7007)Joram Wilander2017-08-012-1/+2
| | | | | | | | | | * Add user access token UI * Fix enter press and update mattermost-redux * Updating UI for access token stuff (#7066) * Revert segment key
* Revert " #4755 Combining consecutive user join/leave system messages to ↵Saturnino Abril2017-08-014-399/+46
| | | | | | | | | | | | single message and few other changes." (#7072) * Revert "PLT-6603: Don't return all posts on invalid query. (#7061)" This reverts commit 25a2013890c7e07b4621fa9b18342e7f35363049. * Revert " #4755 Combining consecutive user join/leave system messages to single message and few other changes. (#5945)" This reverts commit 8a91235fb3cdc8d094dbc2eaa0d7baa447132b3c.
* PLT-6603: Don't return all posts on invalid query. (#7061)George Goldberg2017-07-311-0/+5
| | | | | | If the query contains only * or invalid punctuation only components, don't return all posts - instead return no results. This also fixes PLT-6608
* #4755 Combining consecutive user join/leave system messages to single ↵Debanshu Kundu2017-08-014-46/+399
| | | | | | | | | message and few other changes. (#5945) fix 7 and 8 remove @ at "{username} joined the channel" refactor and update test
* PLT-6763 Implement user access tokens and new roles (server-side) (#6972)Joram Wilander2017-07-312-9/+125
| | | | | | | | | | | | | | | | * Implement user access tokens and new roles * Update config.json * Add public post permission to apiv3 * Remove old comment * Fix model unit test * Updates to store per feedback * Updates per feedback from CS
* [PLT-6710] /rename [text] slash command: Rename the channel (#6570)Carlos Tadeu Panato Junior2017-07-311-0/+69
| | | | | | * /rename [text] slash command: Rename the channel * update strings per review
* Allow regions to be set and honored for S3 driver. (#7010)Harshavardhana2017-07-311-6/+16
| | | | | | | | | 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-6961: Add Elasticsearch settings to diagnostics. (#7021)George Goldberg2017-07-311-21/+31
|
* make cli team / channel delete operations also delete webhooks and slash ↵Chris2017-07-314-1/+120
| | | | commands (#7028)
* PLT-7177: Change the default email frequency to 15 minutes if batching is ↵Jonathan2017-07-313-7/+87
| | | | | | | | | | | | | | | | enabled on the server. (#7036) * PLT-7177: Found default preference that needs to be changed * PLT-7177: Front end behaves as desired * PLT-7177: Changed default batching interval on server side * PLT-7177: Added unit tests for new default interval * PLT-7177: Removed unused import * PLT-7177: Renamed constants to increase clarity
* fix away/offline/online commands repeating user message (#7060)Chris2017-07-313-15/+3
|
* PLT-5308 Caching layer part 2 (#6973)Christopher Speller2017-07-313-26/+0
| | | | | | | | | | | | * Adding Reaction store cache layer example * Implementing reaction store in new caching system. * Redis for reaction store * Adding redis library * Adding invalidation for DeleteAllWithEmojiName and other minor enhancements
* Don't send last view message for null channels (#7051)Corey Hulen2017-07-311-1/+1
|
* Fix TestCreateOAuthUser unit test (#7034)Joram Wilander2017-07-281-1/+1
|
* Added websocket event and webapp handler for updating user roles (#6953)Nick Frazier2017-07-271-0/+9
|