summaryrefslogtreecommitdiffstats
path: root/i18n/en.json
Commit message (Collapse)AuthorAgeFilesLines
* Minor grammar & spelling fixes (#9325)der-test2018-09-111-199/+199
| | | | | | | | | | | | | | | | | | | | | | | * Minor grammar & spelling fixes Minor grammar & spelling fixes * Harmonizing error messages First step to harmonize the error messges by using three formulations that basically mean the same. * Changed string after feedback. * Change after feedback * Removed typo Head hit keyboard or something... * Updated second occurence of an already changed string Changed ssecond occurence of "Unable to know if the file exists. An error ocurred when trying to check file existence."
* MM-12007 Add max dimensions to emoji images (#9379)Harrison Healey2018-09-101-0/+4
|
* MM-11728: Avoid Archived channels editions throught Patch (#9335)Jesús Espino2018-09-031-0/+4
|
* MM-11270: Forbid react/de-react in archived channels (#9323)Jesús Espino2018-08-291-0/+8
|
* translations PR 20180827 (#9317)Elias Nahum2018-08-281-4/+4
|
* MM-11327: Restrict Teams by Email (#9142)Gabe Van Engel2018-08-281-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Check a team's AllowedDomains setting before adding users to the team. * Updated AddUser tests to validate AllowedDomains restriction. * Updated variable name to match convention. * Removed AllowedDomains from team sanitization. * Update AppError's Where to match the calling function. * Added tests for user matching allowedDomains, and multi domain values of allowedDomains. * Added test to make sure we block users who have a subdomain of a whitelisted domain. * Revert "Removed AllowedDomains from team sanitization." This reverts commit 17c2afea584da40c7d769787ae86408e9700510c. * Update sanitization tests to include dockerhost, now that we enforce AllowedDomains. * Added tests to verify the interplay between the global and per team domain restrictions. * Validate AllowedDomains property against RestrictCreationToDomains before updating a team. * Remove team.AllowedDomains from sanitization. * Add i18n string for the team allowed domains restriction app error.
* Update en.json typo (#9312)Cosmin M2018-08-271-1/+1
| | | "id": "plugin.api.update_user_status.bad_status",Unable to set the user statys. Unknown user status.
* MM-11572: Force correct order on messages generated in the bulk (#9244)Jesús Espino2018-08-241-0/+4
|
* MM-11348: Add telemetry for advanced permissions. (#9249)George Goldberg2018-08-231-0/+4
|
* Add/Remove translations (#9280)Jesús Espino2018-08-221-18/+42
|
* [MM-11593] Prevent user to remove from a direct channel (#9251)Saturnino Abril2018-08-211-0/+4
| | | | | | * prevent user to remove from a direct channel * only allow removing of a member in private or public channel
* translations PR 20180813 (#9252)Elias Nahum2018-08-151-4/+4
| | | | | | * translations PR 20180813 * Fix french translation
* MM-11384: Add system install date information to the client config (#9218)Jesús Espino2018-08-081-0/+8
| | | | | | | | * MM-11384: Add system install date information to the client config * Fixing translation text * Fixes from Peer Review
* MM-11576: Allow to join and add members to archived channels (#9214)Jesús Espino2018-08-031-8/+0
|
* Fixed inconsistencies (#9120)der-test2018-08-011-4/+4
| | | | | | | | * Fixed inconsistencies See https://pre-release.mattermost.com/core/pl/339m9zipst8n7kc19fossntose * Update en.json
* translations PR 20180730 (#9191)Elias Nahum2018-08-011-39/+40
| | | | | | * translations PR 20180730 * Fix japanese
* MM-11243: Make Elasticsearch work after enabling without restart. (#9146)George Goldberg2018-07-261-0/+8
| | | | | | * MM-11243: Make Elasticsearch work after enabling without restart. * Also cope with config vars changing whilst enabled.
* unpack prepacked plugins on plugins initialization (#9149)Jesse Hallam2018-07-261-0/+4
| | | | | | * unpack prepackaged plugins on plugins initialization * leverage utils.FindDir
* added the custom icon and username for the outgoing webhook and its response ↵Pradeep Murugesan2018-07-251-0/+7
| | | | | | | | | | | | (#9141) * 8272 added the username and icon as part of the model and persisted the same * 8272 added the custome icon and name when set to the web hook response * 8272 changed the infinte loop to timeout after 5 seconds * 8272 fixed review comments
* Break HTML blocks to individual strings (#8903)Yusuke Nemoto2018-07-201-17/+45
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Modifying message and templates about mfa_change * Modifying message and templates about password_change * Modify message and template about password_reset * Modify message and template about singin_change * Modify message and template about email_info * Modify message and template about change_username * Modify message about change_email * Add missing props * Add argument * Modify message and template about token_added * Modify messages and template about notification_email * Modify message and template about deactivate_email * Fix style * Remove unused message * Remove br tags * Modify message and code about invite_mail * Add missing message
* MM-11003: Global Relay Export Refactor (#9136)Jesús Espino2018-07-201-0/+44
|
* Renamed translation in actiance export (#9132)Jesús Espino2018-07-201-1/+1
|
* Support attachments in post and replies - Bulk import (#9124)Pradeep Murugesan2018-07-201-0/+8
| | | | | | | | | | * 9006 - process the attachments of the post * 9006 enabling the import of attachments in the reply post * 9006 assert if the post and files are linked * 9006 fixed the typo
* Add missed plugin error translation (#9131)Jesús Espino2018-07-191-0/+4
|
* Support for Embeded chat (#9129)Chris Duarte2018-07-181-0/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add ucLive support crazy testing lovely logs more cookie work arounds Added Access-Control-Expose-Headers to user login Add complete_saml_body template and revert loginWithSaml endpoint Set Access-Control-Allow-Credentials to true in user login Login via email instead of username Clean up code Add comment to give some context Move faml logic into saml function Communicate via chrome sendMessage api Remove unused code Add config to support multiple extensions Clean up embedded complete_saml template Fix indentation for templates Added license header to extension.go Add EnableExperimentalExtensions flag Extension validated for email auth Clean up api auth code Remove complete_saml_body.html * Add extension support in saml * Clean up code * Clean up extension validation
* translations PR 20180718 (#9123)Elias Nahum2018-07-181-20/+20
|
* Update en.json (#9096)Jason Blais2018-07-181-1/+1
|
* MM-11172: Don't allow reacting in read-only town square. (#9106)George Goldberg2018-07-161-0/+4
|
* Merge remote-tracking branch 'upstream/release-5.1' into ↵cpanato2018-07-121-24/+24
|\ | | | | | | release-5.1-daily-merge-20180712
| * translations PR 20180711 (#9099)Elias Nahum2018-07-111-24/+24
| |
* | Merge remote-tracking branch 'upstream/release-5.1' into ↵cpanato2018-07-101-1/+25
|\| | | | | | | release-5.1-daily-merge-20180710
| * MM-11229: Fix invite people slash command and add test case. (#9074)George Goldberg2018-07-101-0/+4
| |
| * MM-11228: Fix channel update/patch API endpoints. (#9073)George Goldberg2018-07-101-0/+4
| |
| * MM-11227: Fix group msg slash command. (#9070)George Goldberg2018-07-101-0/+4
| |
| * MM-11120 Adding setting to disable email invitations and rate limiting. (#9063)Christopher Speller2018-07-101-0/+8
| | | | | | | | | | | | | | | | | | | | * Adding setting to disable email invitations. * Adding a setting and rate limiting for email invite sending. * Modifying email rate limit to 20/user/hour * Adding EnableEmailInvitations to client side config and command.
| * MM-11174: Fix /msg slash command. (#9059)George Goldberg2018-07-101-0/+4
| |
| * Update custom url schemes error message to reflect what we actually support ↵Harrison Healey2018-07-091-1/+1
| | | | | | | | (#9061)
* | Merge remote-tracking branch 'upstream/release-5.1' into ↵cpanato2018-07-061-0/+4
|\| | | | | | | release-5.1-daily-merge-20180706
| * MM-11118: disallow deleting direct or group channels (#9054)Jesse Hallam2018-07-051-0/+4
| |
* | Add ability to bulk import emoji (#9048)Joram Wilander2018-07-051-0/+16
|/ | | | | | | | * Add ability to bulk import emoji * Improve error handling * Update test config
* translations PR 20180702 (#9038)Elias Nahum2018-07-031-4/+4
|
* add MaxLifetimeconns to server (#9004)Jerry Kurian2018-06-281-27/+31
| | | | | | | | | | | | | | | | | | | | | Update e.json string names and remove console log reorder variables update db.setConnMaxLifetime to take in *settings.MaxLifetimeConns Add MaxLifetimeConns to test Update variable names like MaxLifetimeConns to ConnMaxLifetimeMilliseconds Update time passed to SetConnMaxLifetime Revert "Update time passed to SetConnMaxLifetime" This reverts commit dc1c1b6d5a6404d4ee11c65d4756c19f9316794f. update en.json Update supplier_test.go and docker.go ConnMaxLifetimeMilliseconds to 3600000
* Add english missed texts to i18n/en.json (#8987)Jesús Espino2018-06-281-616/+88
| | | | | * Add English missed texts to i18n/en.json * Update en.json
* translations PR 20180625 (#8998)Elias Nahum2018-06-271-60/+60
|
* MM-11008: Fix translation and change the code to be auto-extracted (#9009)Jesús Espino2018-06-261-0/+8
|
* MM-10570: Make permissions reset command clear custom role assignments. (#8976)George Goldberg2018-06-251-0/+60
|
* MM-8810: Add CSV Compliance export (#8966)Jesús Espino2018-06-221-9/+17
| | | | | | | | | | | | * MM-8810: Add CSV Compliance export * Only allowing to schedule actiances export throught the cli * De-duplicating some code * Fixes on texts * Fixes on translations
* Using i18n extract to generate the i18n/en.json file (#8980)Jesús Espino2018-06-211-2105/+761
| | | | | | * Sort translations * Added untranslated and removed unussed strings
* fix typo in en.json and remove trailing spaces (#8975)Carlos Tadeu Panato Junior2018-06-211-1/+1
|
* MM-10233: Add scheme importing to bulk importer. (#8928)George Goldberg2018-06-211-0/+72
|