summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
Commit message (Collapse)AuthorAgeFilesLines
...
* | Merge branch 'release-3.3' RC3Elias Nahum2016-08-091-0/+3
|\|
| * Changed autodetection of SiteURL (#3764)Harrison Healey2016-08-091-0/+3
| | | | | | | | | | | | * Changed autoconfiguration of SiteURL to be done on every request * Added SiteURL to system console
* | Add missing periods in error messages (#3757)Jason Blais2016-08-091-3/+3
|/
* PLT-3847 Fix bad merge in the System Console help text (for Office 365) (#3762)enahum2016-08-081-1/+1
|
* Fix missing and bad localization strings (#3755)enahum2016-08-081-3/+4
|
* PLT-3811 Fix OAuth 2.0 provider help text (#3748)enahum2016-08-081-29/+29
| | | | | | * PLT-3811 Fix OAuth 2.0 provider help text * Fix Ids for RHS translations
* Adding beta label to HA (#3744)Corey Hulen2016-08-041-1/+2
|
* PLT-3767 Promote localizations on System Console and Account Settings (#3734)enahum2016-08-041-3/+4
|
* PLT-2899 adding clustering of app servers (#3682)Corey Hulen2016-08-041-0/+19
| | | | | | | | | | | | | | | | | | * PLT-2899 adding clustering of app servers * PLT-2899 base framework * PLT-2899 HA backend * PLT-2899 Fixing config file * PLT-2899 adding config syncing * PLT-2899 set System console to readonly when clustering enabled. * PLT-2899 Fixing publish API * PLT-2899 fixing strings
* Update text for OAuth 2.0 and Google SSO (#3740)Jason Blais2016-08-041-2/+2
| | | | | | | | * Update help text for OAuth * Update oauth_settings.jsx * Update en.json
* New Languages and translations (#3729)enahum2016-08-041-28/+28
|
* PLT-3506 Added flagged posts functionality (#3679)Joram Wilander2016-08-041-0/+11
| | | | | | | | | | | | | | | | | | | | | | | | | | | | * Added flagged posts functionality * UI Improvements to flags (#3697) * Added flag functionality for mobile * Updating flagged text (#3699) * Add back button to RHS thread when coming from flagged posts * Updating position of flags (#3708) * Plt 3506 - Reverting flag position (#3724) * Revert "Updating position of flags (#3708)" This reverts commit aaa05632c5d9eda35a048300a5bd7e99584c5b58. * Fixing the icon in search * Help text and white space improvements (#3730) * Updatng help text and some white spacing. * Updating help text
* Update help text for Google/Office 365 OAuth (#3725)Jason Blais2016-08-031-2/+2
| | | | | | | | | | * Update help text for Google/Office 365 OAuth * Update en.json * Change " to ' in .jsx * Fix errors caused by "
* PLT-3484 OAuth2 Service Provider (#3632)enahum2016-08-031-27/+40
| | | | | | | | | | | | | | * PLT-3484 OAuth2 Service Provider * PM text review for OAuth 2.0 Service Provider * PLT-3484 OAuth2 Service Provider UI tweaks (#3668) * Tweaks to help text * Pushing OAuth improvements (#3680) * Re-arrange System Console for OAuth 2.0 Provider
* PLT-3728 Updated help text on integration pages (#3721)Harrison Healey2016-08-021-7/+23
|
* PLT-3640 Add mobile landing pages (#3674)Harrison Healey2016-08-021-0/+9
| | | | | | | | | | | | * PLT-3640 Moved all clientside user agent snooping into a single file * PLT-3640 Added mobile landing pages on login to iOS and Android web apps * PLT-3640 Moved landing page to appear before first login * PLT-3640 Fixed detection of Chrome on Android * PLT-3640 Disabled mobile landing pages when their respective URLs are set to blank
* PLT-3740 Terms of Service link updates (#3707)enahum2016-08-021-1/+1
|
* Added custom branding to login description (#3710)David Lu2016-08-021-1/+4
|
* PLT-3691 tweaking sytem console text (#3712)Corey Hulen2016-08-021-6/+6
|
* Update help text for compliance settings (#3705)Jason Blais2016-08-011-1/+1
| | | | | | * Update help text for compliance settings * Update en.json
* PLT-3633 EE: Add Google and Office365 SSO through OAuth2 (#3660)Joram Wilander2016-07-291-1/+37
| | | | | | | | | | | | | | | | * EE: Add Google and Office365 SSO through OAuth2 * Add localization strings * Text tweaks for PLT-3633 * Added sign-up button for Office 365 * Updated some error messages and a bit of licensing * Updated sign-in method section in user settings to include Google and Office365 * Added more localization strings
* Policy help text (#3681)Eric Sethna2016-07-291-3/+3
| | | | | | * Update policy_settings.jsx * Update en.json
* Update LDAP help text (#3695)lfbrock2016-07-281-1/+1
| | | | | | | | | | * Update ldap-settings.jsx * Update en.json * Update ldap_settings.jsx * Update en.json
* Add option to trigger outgoing webhook if first word starts with trigger ↵Pierre Rudloff2016-07-261-0/+4
| | | | word (#3611)
* daily + include nederlands (#3659)enahum2016-07-221-4/+4
|
* Updated custom emoji help text (#3653)Harrison Healey2016-07-221-1/+2
|
* PLT-1866/PLT-3509 Added links to download the native apps (#3651)Harrison Healey2016-07-221-0/+11
| | | | | | | | | | | | * PLT-1866 Added configurable links for native app downloads * PLT-1866 Added native app download link to main menu * PLT-3509 Added native app link to tutorial * PLT-3509 Added native app link to welcome email * PLT-3509 Made link to apps in welcome email conditional on being set
* PLT-2408 Adds here mention for online users (#3619)Joram Wilander2016-07-211-0/+1
| | | | | | | | | | * Added @here mention that notifies online users * Fixed existing race condition that would sometime cause clients to miss mention count changes * Added missing localization strings * Prevent @here from mentioning the user who posted it
* PLT-2712 Added view members for non-admins in channel and team (#3618)David Lu2016-07-201-0/+2
| | | | | | * Added view members for non-admins in channel and team * changed variable name
* PLT-914 Add mention notifications for replies on a comment thread (#3130)samogot2016-07-191-0/+5
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PLT-914 Add mention notifications for replies on a comment thread * remove useless store method fix highlighting comments posted before th user write something to thread * refactor out isCommentMention function after rebase * change comment bar highlighting to replay icon mention highlighting * settings and always visible highlight * fix unit tests for new settings * change highlight behaviour - if any message in comment thread generates mention - all thread is highlighted - remove always visible highlightion * fix bug about the textarea in the center channel not clearing * fix default settings value notify_props.comments * do not highlight own comments if there is no other user's messages in thread * refactor out ReactDOM.findDOMNode * refactor out using of UserStore from component
* Update incorrect Google API key help text (#3595)lfbrock2016-07-141-1/+1
| | | | | | * Update Youtube API key help text * Update en.json
* added channel header to view channel info modal (#3584)David Lu2016-07-141-0/+1
|
* PLT-3266 Added channel header to create channel modal (#3559)David Lu2016-07-141-0/+2
| | | | | | | | * Added channel header to create channel modal removed React FindDOMNode * made css changes
* Merged release-3.2 into masterHarrison Healey2016-07-121-2/+2
|\
| * Update en.json (#3551)Harrison Healey2016-07-121-2/+2
| |
| * daily translations 20160708 (#3533)enahum2016-07-081-37/+32
| |
* | Merge release 3.2 into master (#3548)Harrison Healey2016-07-111-37/+32
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Bumping version to: 3.2.0-rc1 * PLT-2863 fixing bad merge that broke this PR (#3523) * PLT-2863 adding remove user from team * PLT-2863 adding the client side UI * Fixing trailing space * Fixing reported issues * Adding documentatino * Switching to final javascript driver * Fixing bad merge * Fixing bad merge * PLT-3538 Fix Login page doesn't show SAML option if gitlab is enabled (#3524) * Login error messages fix (#3525) * daily translations 20160708 (#3533) * Fixed permissions when getting a file attachment to use the correct user id (#3535) * PLT-3575 Fix Cannot upload certificates with .cer file extension on SAML (#3534) * PLT-3560 blocking adding to channel once user is removed (#3537) * Always allow system admins to see the Integrations sidebar (#3536) * Plt 3475 - Post control improvements (#3538) * Adding class to post when dropdown is active. * plt-3475 - Post controls improvements * daily translations 20160711 (#3544)
* | Add doc links to System Console > Integrations > Webhooks and Commands help ↵Jason Blais2016-07-111-3/+3
|/ | | | | | text (#3540) * Add links to docs
* Update emoji-list.jsx (#3520)lfbrock2016-07-071-0/+1
| | | | | | | | | | | | | | * Update emoji-list.jsx * Update en.json * Update emoji_list.jsx * Update en.json * Update emoji_list.jsx * Update en.json
* Added getStateFromConfig (#3517)David Lu2016-07-071-0/+1
|
* PLT-1465 Added password requirements (#3489)David Lu2016-07-061-2/+37
| | | | | | | | | | * Added password requirements * added tweaks * fixed error code * removed http.StatusNotAcceptable
* PLT-2863 adding remove user from team (#3429)Corey Hulen2016-07-061-0/+2
| | | | | | | | | | | | | | * PLT-2863 adding remove user from team * PLT-2863 adding the client side UI * Fixing trailing space * Fixing reported issues * Adding documentatino * Switching to final javascript driver
* Adding sync now button to system console (#3510)Christopher Speller2016-07-061-0/+3
|
* Added help text to integrations pages in backstage (#3513)Harrison Healey2016-07-061-0/+6
|
* Update ldap_settings.jsx (#3508)lfbrock2016-07-061-1/+1
| | | | | | | | * Update ldap_settings.jsx Changed help text for consistency * Update en.json
* updated text in select team (#3478)David Lu2016-07-061-4/+5
|
* Adding webserver mode to the system console. Automatic enabling of gzip on ↵Christopher Speller2016-07-061-0/+8
| | | | existing servers (#3458)
* daily translations 20160705 (#3500)enahum2016-07-061-6/+6
|
* PLT-3346/PLT-3342/PLT-3360 EE: Add the ability to restrict channel ↵Joram Wilander2016-07-061-4/+8
| | | | | | | | management permissions (#3453) * EE: Add the ability to restrict channel management permissions * Always allow last user in a channel to delete that channel
* SAML support (#3494)enahum2016-07-051-1/+62
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PLT-3073: Implement SAML/Okta Server side (EE) (#3422) * PLT-3137 Support for SAML configuration * PLT-3410 SAML Database Store * PLT-3411 CLI to add Identity Provider Certificate and Service Provider Private Key * PLT-3409 SAML Interface for EE * PLT-3139 Handle SAML authentication server side * Add localization messages * PLT-3443 SAML Obtain SP metadata * PLT-3142 Login & Switch to/from SAML * Remove Certs for Database & Clean SAML Request * Make required Username, FirstName and LastName * PLT-3140 Add SAML to System Console (#3476) * PLT-3140 Add SAML to System Console * Move web_client functions to client.jsx * Fix issues found by PM * update package.json mattermost driver * Fix text messages for SAML