summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
Commit message (Collapse)AuthorAgeFilesLines
* Minor update to en.json (#7464)Jason Blais2017-09-181-1/+1
| | | | | | | | * Update en.json * Update en.json * Update en.json
* Fixing typo in name of "Mozzilla" Firefox (#7463)Harrison Healey2017-09-181-1/+1
|
* PLT-6558: Basic data retention job scheduler/worker implementation. (#7449)George Goldberg2017-09-151-0/+12
| | | | | | * PLT-7639: Batch delete methods for data retention. * PLT-6558: Basic data retention job worker/scheduler implementation.
* PLT-7639: Batch delete methods for data retention. (#7444)George Goldberg2017-09-151-0/+16
|
* PLT-7407: Back-end plugins (#7409)Chris2017-09-111-8/+4
| | | | | | | | | | | | * tie back-end plugins together * fix comment typo * add tests and a bit of polish * tests and polish * add test, don't let backend executable paths escape the plugin directory
* [PLT-959] Browser Compatibility (#6945)Alex Moon2017-09-061-28/+28
| | | | | | | | | | | | | | | | | | | | | | | | * 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
* Revert "[PLT-7475] Add S3 region to system console and add S3 validation ↵Saturnino Abril2017-09-061-32/+0
| | | | | | | | (#7373)" (#7387) This reverts commit 8d680cf64ec7fb6c8b242b8048989d0f0550cb68. Move to 4.3. Will discuss more if validation is necessary.
* PLT-7468 Moved more error pages to use predefined error types (#7378)Harrison Healey2017-09-051-12/+0
| | | | | | | | * 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-7444: If there is activity in Mattermost before the email batch is sent, ↵Jonathan2017-09-051-4/+0
| | | | | | | | | | | | 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-0/+32
| | | | | | | | | | * 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
* translations PR 20170904 (#7371)enahum2017-09-051-180/+180
|
* PLT-7216: CLI Command to move channels between teams. (#7149)George Goldberg2017-09-041-0/+4
| | | | | | * PLT-7216: CLI Command to move channels between teams. * Add comment
* Remove duplicated message (#7360)Yusuke Nemoto2017-09-041-4/+0
|
* Config to make town square read only (#7140)David Meza2017-09-011-0/+4
| | | | | | | | | | | | | | | | | | | | | | * 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.
* Implement experimental REST API endpoints for plugins (#7279)Joram Wilander2017-09-011-0/+60
| | | | | | | | | | | | | | | | | | * 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-6403: Interactive messages (#7274)Chris2017-08-291-0/+8
| | | | | | | | | | * wip * finish first pass * requested changes * add DoPostAction to Client4
* Enforce channel display name limits on slash command (#7309)Joram Wilander2017-08-291-0/+8
|
* add client4 apis needed for jira plugin (#7292)Chris2017-08-281-0/+4
|
* PLT-???? Prepare file upload infrastructure for Data Retention. (#7266)George Goldberg2017-08-251-12/+24
| | | | | | | | | | | | | | | | | * 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
* Rename SAML in the System Console to SAML 2.0 + access token string fixes ↵Jason Blais2017-08-181-6/+6
| | | | | | | | | | | | (#7182) * Update en.json * Update en.json * Update admin_sidebar.jsx * Update saml_settings.jsx
* [PLT-3377] Open up a shortcuts dialog instead of printing help text (#7064)Saturnino Abril2017-08-181-142/+2
| | | | | | | | | | | | | | | | | | * 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
* Merge branch 'release-4.1'Christopher Speller2017-08-171-1/+1
|\
| * Merge 4.0.3 into release-4.1 (#7169)Saturnino Abril2017-08-111-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * 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-7302: Aggregate Elasticsearch indexes over a certain age. (#7224)George Goldberg2017-08-171-0/+32
| | | | | | | | | | | | | | | | | | * PLT-7302: Aggregate Elasticsearch indexes over a certain age. This is done by a scheduled daily job, in order to keep the shard count to a sensible level in Elasticsearch. * Use map[string]string instead of StringMap
* | PLT-1649: add response_url support for custom slash commands (#6739)Chris2017-08-161-0/+60
|/ | | | | | | | | | * add response_url support for custom slash commands * pr suggestions * pr update / suggestion * test fix
* translations PR 20170807 (#7144)enahum2017-08-091-295/+295
| | | | | | * translations PR 20170807 * Fix pt-BR variable
* Updating user access token UI (#7091)Asaad Mahmood2017-08-061-14/+14
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Updating user access token UI Updating help text Updating tokenlistClass Updating string for token Updating translations Updating translations Updating translations * Updating translations * Minor UI fix * Update manage_tokens_modal.jsx * Update user_settings_security.jsx * Update en.json * Fix merge conflicts
* System Console: Email notification content setting (#7122)Jonathan2017-08-061-32/+52
| | | | | | | | | | | | | | | | * 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-7231/PLT-7306] Fix GitLab SSO failure with non-English locale and make ↵Saturnino Abril2017-08-061-1/+9
| | | | config locales more forgiving (#7125)
* Fix issue 4161 (#6919)William Gathoye2017-08-051-43/+43
| | | | | | | | * Fix issue 4161 * Minor tweaks * Fix log title
* PLT-7223: Update "Database schema cannot be upgraded" error message to ↵Jonathan2017-08-041-1/+1
| | | | | | | | | | indicate expected version (#7079) * PLT-7223: Updated error message to include relevant schema versions * PLT-7223: Removed unit test. It poisons database state, and there's no recovery mechanism, because the code under test causes an ungraceful exit, so we can't fix the database in a defer statement. This causes the next test execution or server start to fail. * PLT-7223: Incorporated @crspeller's suggestions into error message string
* PLT-6484 Add /leave command to leave a channel (#6402)David Meza2017-08-031-0/+24
| | | | | | | | | | | | | | | | | | * 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-031-0/+16
| | | | | | | | * 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/+8
| | | | | | * PLT-7130 adding more generic push notificaiton message. * Fixing strings
* PLT-6987 User access token UI (#7007)Joram Wilander2017-08-011-0/+16
| | | | | | | | | | * 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-011-11/+3
| | | | | | | | | | | | 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.
* #4755 Combining consecutive user join/leave system messages to single ↵Debanshu Kundu2017-08-011-3/+11
| | | | | | | | | 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-311-0/+96
| | | | | | | | | | | | | | | | * 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/+36
| | | | | | * /rename [text] slash command: Rename the channel * update strings per review
* make cli team / channel delete operations also delete webhooks and slash ↵Chris2017-07-311-0/+8
| | | | commands (#7028)
* PLT-7040: Fix capitalisation of Elasticsearch in Config. (#7020)George Goldberg2017-07-271-7/+7
|
* PLT-7183: User/Channel NotifyProps Bulk Import. (#7019)George Goldberg2017-07-261-0/+36
|
* PLT-6706: add /code command (#6936)Chris2017-07-241-0/+16
| | | | | | * 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-211-0/+32
| | | | | | | | | | | | | | | | * /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-211-0/+20
|
* PLT-6595-Server: Job Management APIs. (#6931)George Goldberg2017-07-201-0/+24
| | | | | | | | * PLT-6595-Server: Job Management APIs. * MANAGE_JOBS Permission * Fix test.
* PLT-6595: API to purge Elasticsearch indexes. (#6971)George Goldberg2017-07-191-0/+8
|
* Merge branch 'release-4.0'Christopher Speller2017-07-181-4/+8
|\
| * translations PR 20170710 (#6902)enahum2017-07-121-8/+8
| |
| * Minor fixJoramWilander2017-07-061-0/+4
| |