summaryrefslogtreecommitdiffstats
path: root/app
Commit message (Collapse)AuthorAgeFilesLines
* 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
* 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
|
* PLT-7040: Fix capitalisation of Elasticsearch in Config. (#7020)George Goldberg2017-07-272-8/+8
|
* PLT-7183: User/Channel NotifyProps Bulk Import. (#7019)George Goldberg2017-07-262-4/+305
|
* PLT-6706: add /code command (#6936)Chris2017-07-242-0/+70
| | | | | | * add /code command * return an error for empty /code message
* [PLT-6708] /purpose [text] slash command: Edit the channel purpose (#6569)Carlos Tadeu Panato Junior2017-07-212-12/+74
| | | | | | | | | | | | | | | | * /purpose [text] slash command: Edit the channel purpose * update command on server side to check for direct or group channels * update stings and block the dialog when is DM or GM * update per review * remove duplicate websocker event and apply the same for /header command * update per review * update
* PLT-7123: Add tutorial, flags and favorites to bulk importer. (#7000)George Goldberg2017-07-212-111/+387
|
* PLT-6596: Elasticsearch interface changes. (#6993)George Goldberg2017-07-211-1/+1
|
* Upgrading server dependancies (#6984)Christopher Speller2017-07-201-4/+7
|
* PLT-6595-Server: Job Management APIs. (#6931)George Goldberg2017-07-202-7/+28
| | | | | | | | * PLT-6595-Server: Job Management APIs. * MANAGE_JOBS Permission * Fix test.
* PLT-6971: Fix Slack Import of non-ascii channel names. (#6969)George Goldberg2017-07-192-11/+19
|
* PLT-6595: API to purge Elasticsearch indexes. (#6971)George Goldberg2017-07-191-0/+13
|
* Merge branch 'release-4.0'Christopher Speller2017-07-184-25/+162
|\
| * PLT-7126 Do not version detect on saml endpoints and remove config reloading ↵Joram Wilander2017-07-181-6/+0
| | | | | | | | | | | | | | | | (#6955) * Do not version detect on saml endpoints and remove config reloading * Update mattermost-redux
| * Only apply never edit policy setting when message changes (#6947)Joram Wilander2017-07-181-7/+7
| |
| * Only apply edit policy setting if message changed (#6930)Joram Wilander2017-07-151-1/+1
| |
| * Tweak WebSocket header-processing (#6929)Chris2017-07-131-3/+2
| | | | | | | | | | | | * fix * consolidate code
| * Minor fixJoramWilander2017-07-122-0/+54
| |
| * Minor fixJoramWilander2017-07-061-11/+100
| |
* | [PLT-6676] Make OutgoingWebhook to fire when post has no text content but ↵Saturnino Abril2017-07-181-50/+56
| | | | | | | | | | | | | | | | only attachment (#6935) * make OutgoingWebhook to fire when post has no text content but only attachment * update per comment and modify payload & test
* | Tweak WebSocket header-processing (#6929)Chris2017-07-131-3/+2
| | | | | | | | | | | | * fix * consolidate code
* | PLT-6659 Fixed upload thumbnails that weren't properly rotated (#6816)Rich Barton2017-07-101-8/+17
| | | | | | | | | | | | | | - Used client-side EXIF data to rotate profile picture thumbnails - Added a small package for correctly translating EXIF orientation into CSS transforms - Instead of displaying the image using FileReader, used URL.createObjectURL because it is faster - For upload thumbnails, the original behavior was scaling the entire original image, without accounting for EXIF rotate. I changed this to use the thumbnail image, which does respect rotation. - The preview image was not available when the upload request returned, because handling the preview image creation was in a goroutine. I used sync.WaitGroup to block until the preview image creation is done.