summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
Commit message (Collapse)AuthorAgeFilesLines
* fixed typo (#3450)David Lu2016-06-301-1/+1
|
* daily translations 20160629 (#3452)enahum2016-06-301-2/+2
|
* Adding expand icon for RHS (#3386)Asaad Mahmood2016-06-291-0/+4
| | | | | | | | | | | | | | | | * Adding expand icon for RHS Fixing errors Adding back getTeamInviteLink with better functionality for mobile Adding vertical align to post__link Updating improvements for expand RHS stuff * Improving transition on mobile * Removing irrelevant changes
* EE: Add the ability to restrict the user roles that can send team invites ↵Joram Wilander2016-06-291-1/+7
| | | | (#3442)
* PLT-3328 Added Title for Direct Message Desktop Notifications (#3438)David Lu2016-06-291-0/+1
| | | | * Added title for DM desktop notifications
* daily translations 20160628 (#3444)enahum2016-06-291-2/+2
|
* Update permalink error message (#3427)Eric Sethna2016-06-281-1/+1
| | | | | | | | | | * Clarify permalink error message * Clarify permalink error message en.json * Update global_actions.jsx * Update en.json
* PLT-3417 Missing localization on Account Settings and Backstage (#3437)enahum2016-06-281-3/+18
|
* PLT-3191 E20: Updates to Reload Configuration from Disk and Recycle Database ↵David Lu2016-06-281-0/+2
| | | | | | | | | | Connections (#3424) * added help text to reload configuration and recycle db * Update reload_config.jsx * Update en.json
* UI text upgrades (#3375)it332016-06-271-7/+7
| | | | | | | | | | | | | | | | | | | | | | * Clarifying auth user join button * Update team_general_tab.jsx * Update generated_setting.jsx * Update public_link_settings.jsx * Update signup_settings.jsx * Update login_settings.jsx * Update team_general_tab.jsx * Update en.json * Clarifying help text * Clarifying help text
* changed edit header title for DM channels (#3415)David Lu2016-06-271-0/+1
|
* Added error message for unchanged email (#3420)David Lu2016-06-271-0/+1
|
* Fixing team creation flow and switching from bootstrap to react bootstrap ↵Asaad Mahmood2016-06-241-0/+1
| | | | (#3408)
* Clarifying help text (#3370)it332016-06-241-2/+2
| | | | | | | | | | | | | | | | | | | | * Making help text more clear * Clarifying help text * Changing "No results" to question * Changing "No results" to question * Update search_results.jsx * Update en.json * Update en.json * Update search_results.jsx * Update search_results.jsx
* PLT-3415 Fix Sending Test email fails with error (#3396)enahum2016-06-221-0/+1
|
* PLT-3341 Add missing localization support for System Console (#3385)enahum2016-06-211-0/+30
|
* daily translations 20160620 (#3384)enahum2016-06-201-2/+2
|
* Fix typo: Attrubute (#3368)it332016-06-181-1/+1
| | | | | | * Fix typo: Attrubute * Fix typo: Attrubute
* PLT-2971 Added email footer for address (#3319)David Lu2016-06-161-0/+3
| | | | | | | | | | * Added email footer for address * added default * Update html.go * Changed according to PM
* Improving about modal and colon issue with webhooks (#3343)Asaad Mahmood2016-06-161-4/+5
| | | | | Updating word break Updating improvements for about modal
* Shorten sentence to avoid word-wrap (#3347)it332016-06-151-1/+1
| | | | | | * Update about_build_modal.jsx * Update en.json
* PLT-3344 Set Localization config to always have by default all languages ↵enahum2016-06-151-1/+1
| | | | available (#3339)
* daily translations 20160614 (#3340)enahum2016-06-151-3/+3
|
* Multiple UI improvements (#3317)Asaad Mahmood2016-06-141-0/+1
| | | | | | | Removing break all Replacing jquery selectors and some other UI improvements Removing jquery selector
* Fix bad condition on hiding email addresses and update user etag to include ↵Joram Wilander2016-06-141-1/+0
| | | | privacy settings (#3327)
* PLT-3143 Added serverside code for custom Emoji (#3311)Harrison Healey2016-06-141-0/+8
| | | | | | | | | | | | | | * Added model objects for emoji * Added database tables for emoji * Added settings for custom emoji * Added serverside APIs and unit tests for custom emoji * Added additional validation to catch duplicate emoji names earlier on * Added additional validation to prevent users from adding emoji as another user
* Merge branch 'release-3.1'JoramWilander2016-06-131-1/+3
|\ | | | | | | | | Conflicts: webapp/components/create_comment.jsx
| * Add server restart note to LDAP sync setting (#3303)jasonblais2016-06-091-1/+1
| | | | | | | | | | | | * Add server restart note to LDAP sync setting * Add server restart note to LDAP sync setting
| * PLT-3236 Click in little x for admin console localization settings causes ↵enahum2016-06-091-0/+2
| | | | | | | | error (#3292)
* | PLT-2058 Debugging incoming web hook content (#3150)Martin Schenck2016-06-101-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PLT-2058 Debugging incoming web hook content This change debugs contents of incoming webhooks using l4g. The problem is that in order to debug the request body, it neads to be read. And a Reader can only be read once. Hence, the body is only read for Debugging if it is actually enabled. Furthermore, a new reader is created from the content of the old reader in order for the rest of the method to work as usual (with or without debugging). The debug statement is wrapped in a closure, so that the content is only copied if Debug is actually enabled. It is not possible to return `(string, string)` from the closure to `l4g.Debug()`. That is the reason the debugging is not done with `=%v`, but the translations strings end with a space. I tested the change with a `application/json` HTTP header as well as `payload=` The debug method is extracted into util/log.go in order to be re-usable for debugging `io.Reader` * Added a config flag to turn off incoming webhook debugging Setting `EnableWebhookDebugging` to false in the `config.json` will disable the printing of the content of incoming webhooks to the console * Defaulting webhook debugging to true * Added the setting of debugging incoming webhooks to the system console
* | PLT-3156 Typo in 'Edit Nickname' message when nickname is set through login ↵Anthony M. Powers2016-06-101-0/+1
| | | | | | | | | | | | | | | | | | provider (#3204) * Fixed a typo to an error message regarding editing an account field handled by a login provider. (PLT-3156) * Added 'field_handled_externally' to the en language file. Other languages are needed.
* | daily translations 20160607 (#3288)enahum2016-06-071-1/+1
| |
* | PLT-2406 Add "Database:" to Mattermost About Dialog (#3261)Thomas Balthazar2016-06-071-0/+1
|/ | | | | | | | | * Add "Database:" to Mattermost About Dialog The property has been named SQLDriverName to make a difference with the FileSettings DriverName. * Add missing string for 'Database' in i18n file
* daily translations 20160606 (#3275)enahum2016-06-061-18/+18
|
* Removed placeholder text on channel switch modal (#3262)David Lu2016-06-061-1/+0
|
* PLT-3185 Added support for DMs in Channel Switcher (#3260)David Lu2016-06-061-0/+1
| | | | | | * Added support for DMs * Checked username beginning characters
* Added error when both session and local storage are unusable (#3263)David Lu2016-06-061-0/+5
|
* PLT-3114 Moved preview collapse out of pre-release features (#3206)Joram Wilander2016-06-061-0/+4
| | | | | | | | | | * Added user setting to auto collapse image previews * Added slash commands for collapsing/expanding image previews * Added translation strings for collapse setting * Add default props for preview collapse setting
* Updating help text on channel switcher (#3256)Joram Wilander2016-06-061-1/+1
|
* Removing outdated ldap note from system console (#3247)Christopher Speller2016-06-061-1/+0
|
* Update help text for localization settings (#3252)jasonblais2016-06-061-0/+3
| | | | | | * Update help text for localization settings * Add to en.json
* Edit to Segment help text to explain what it offers. (#3257)it332016-06-051-1/+1
| | | | | | | | | | * Update Segment text * Update Segment text * Correcting typo * Fixed typo
* Added sign in link to the signup_user_complete page (#3248)Harrison Healey2016-06-051-0/+2
|
* Changed noLoginId error message to be specified in i18n (#3239)Harrison Healey2016-06-051-1/+8
|
* PLT-2994 Added @all (#3233)David Lu2016-06-041-2/+2
| | | | | | * Added @all * Uncomment @all server side
* PLT-2981 Disabled Push Notifications section in Settings if disabled by ↵David Lu2016-06-041-0/+2
| | | | | | | | admin (#3225) * Added push notifications disabled message to settings * Update user_settings_notifications.jsx
* daily translations 20160603 (#3251)enahum2016-06-041-5/+5
|
* Added hint (#3232)David Lu2016-06-031-0/+1
|
* Fix typo on help text (#3227)jasonblais2016-06-031-1/+1
| | | | | | | | * Fix typo on help text Fix typo on `allow anyone to join this team` help text. * Added fix to webapp/i18n/en.json
* Adding LDAP Syncronization (#3219)Christopher Speller2016-06-031-0/+2
|