summaryrefslogtreecommitdiffstats
path: root/webapp/i18n/en.json
Commit message (Collapse)AuthorAgeFilesLines
* translations PR 20170619 (#6686)enahum2017-06-231-12/+7
|
* Fixed incorrect formatting of numbers and plural words (#6696)Harrison Healey2017-06-221-14/+10
| | | | | | | | * Fixed incorrect formatting of numbers and plural words * Removed unused i18n strings * Fixed eslint errors
* [PLT-6452] Remove edit button on mobile, and have the edit icon beside the ↵Carlos Tadeu Panato Junior2017-06-191-0/+4
| | | | | | | | value, and the value as a link (#6565) * Remove edit button on mobile, and have the edit icon beside the value, and the value as a link * update per review
* PLT-6080 moving clustering to memberlist (#6499)Corey Hulen2017-06-191-2/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PLT-6080 adding cluster discovery service * Adding memberlist lib * Adding memberlist lib * WIP * WIP * WIP * WIP * Rolling back config changes * Fixing make file * Fixing config for cluster * WIP * Fixing system console for clustering * Fixing default config * Fixing config * Fixing system console for clustering * Tweaking hub setting * Bumping up time * merging vendor dir * Updating vendor dir * Fixing unit test * Fixing bad merge * Remove some testing code * Moving comment * PLT-6868 adding db ping retry * Removing unused loc strings * Adding defer to cancel
* Unified quotation marks (#6682)Christian Arnold2017-06-191-5/+5
|
* PLT-6215 Major post list refactor (#6501)Joram Wilander2017-06-181-0/+1
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Major post list refactor * Fix post and thread deletion * Fix preferences not selecting correctly * Fix military time displaying * Fix UP key for editing posts * Fix ESLint error * Various fixes and updates per feedback * Fix for permalink view * Revert to old scrolling method and various fixes * Add floating timestamp, new message indicator, scroll arrows * Update post loading for focus mode and add visibility limit * Fix pinning posts and a react warning * Add loading UI updates from Asaad * Fix refreshing loop * Temporarily bump post visibility limit * Update infinite scrolling * Remove infinite scrolling
* Update help text after renaming /loadtest to /test (#6664)Jason Blais2017-06-161-1/+1
| | | PR that changed /loadtest to /test: https://github.com/mattermost/platform/pull/6624
* Merge release-3.10 into master (#6654)Joram Wilander2017-06-151-11/+20
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * PLT-6787 Fixed being able to send a post before files finished uploading (#6617) * Fix quick switcher for channels/users not stored locally (#6610) * Fix button text on confirm mention modal (#6609) * fix post delete permission of channel admin (#6608) * open comment thread for the most recent reply-able message (#6605) * Use mutex flag with yarn to prevent concurrent builds interfering (#6619) * Use mutex flag with yarn to prevent concurrent builds interfering * Remove yarn mutex file with clean * Minor bug fixes (#6615) * PLT-6774 - Fixing color for offline icon * PLT-6784 - Fixing status icon * Fixing icon margin * Updating caret position * PLT-6070 Have ChannelMentionProvider stop searching after a term returns no results (#6620) * Fixing JS error (#6623) * Minor bug fixes (#6622) * PLT-6808 - Updating channel switcher on mobile * PLT-6743 - Updating scrollbar styling * Login instead of failing if user exists in OAuth sign-up flow (#6627) * PLT-6802 Disable team switcher (#6626) * Disable team switcher * Fix ESLint errors * PLT-6807 Ensured select teams page can scroll on iOS (#6630) * Do not redirect from account switch pages on 401 (#6631) * Fixing loadtest command and renaming to /test (#6624) * PLT-6820 Update mattermost-redux dependency (#6632) * translations PR 20170612 (#6629) * Bump HTTP client timeout to 30 seconds (#6633) * For team unreads return empty array instead of null (#6636) * PLT-6831 Fix status modal localization IDs (#6637) * Fix status modal localization IDs * Update test snapshot
* Tweak System Console > Configuration note (#6598)Jason Blais2017-06-121-1/+1
| | | | | | * Update configuration_settings.jsx * Update en.json
* Fix spelling of single sign-on (#6621)lfbrock2017-06-091-2/+2
| | | | | | | | * Create signup_controller.jsx * Create email_authentication_settings.jsx * Create en.json
* Update help text for quick switcher (#6599)Joram Wilander2017-06-061-2/+2
|
* translations PR 20170606 (#6592)enahum2017-06-061-12/+13
|
* Channel switcher UI improvements (#6564)Asaad Mahmood2017-06-061-6/+4
| | | | | | | | | | | | * Channel switcher UI improvements * Reverting mattermost theme * Fixing spacing above the button * Updating switcher button * PLT-6691 - Fixing tablet header
* PLT-4257 Add pop-up asking if user wants to reset status (#6526)Joram Wilander2017-06-061-0/+5
| | | | | | | | | | | | * Add pop-up asking if user wants to reset status * Update test snapshot * Update prop name for old uses of confirm modal * Updating checkbox (#6586) * Updating style for checkbox (#6596)
* Updating Site URL help text in System Console (#6582)Jeff Schering2017-06-061-1/+1
| | | | | | | | | | * Updating Site URL help text in System Console * Replacing single quotes with double quotes * Corrected statement about non-standard ports * Converted double quotes to single quotes
* PLT 6416 Add StatusDropdown to profile picture in top left (#6327) (#6418)David Rojas Camaggi2017-06-061-1/+4
| | | | | | | | | | | | | | | | | | | | | | | | * PLT-6416 the profile picture is always shown in the top left (#6327) * PLT-6416 Add status icon to profile picture in left sidebar (#6327) * PLT-6416 Add StatusDropdown to profile picture in top left (#6327) * Fixing theme stuff for status picker * PLT-6416 Automatically close status dropdown after selection (#6327) * PLT-6416 Avoid render status dropdown in sidebar if isMobile (#6327) * PLT-6416 Change icon for status change to caret-down (#6327) * PLT-6416 Update visibility of status dropdown after window size (#6327) * PLT-6416 Refactor status dropdown for better mouse usability (#6327) * PLT-6416 Change status dropdown to the redux way (#6327) * PLT-6416 Fix header style of admin sidebar (#6327)
* translations PR 20170529 (#6514)enahum2017-06-051-3/+7
|
* PLT-3466 E10: Add announcement bar feature (#6509)Joram Wilander2017-06-051-0/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | * E10 - Add announcement bar feature * Updates per feedback * Add component tests and snapshots * Update snapshots * Updating color picker UI (#6543) * Add class to body tag when banner is not dismissable and clean up localstorage items when banner changes * Fixing links (#6544) * Updating UI for fixed error bar (#6552) * Truncating text on fixed banner (#6561) * Plt 3466 - Error bar link states (#6577) * Updating error bar hover state * Updating error bar link states
* PLT-5699 Improvements to channel switcher (#6486)Joram Wilander2017-05-311-1/+13
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Refactor channel switcher to not wait on server results * Change channel switcher to quick switcher and include team switching * Add sections, update ordering and add discoverability button * Fix styling error * Use CMD in text if on mac * Clean yarn cache on every install * Various UX updates per feedback * Add shortcut help text for team switcher * Couple more updates per feedback * Some minor fixes for GM and autocomplete race * Updating UI for channel switcher (#6504) * Updating channel switcher button (#6506) * Updating switcher modal on mobile (#6507) * Removed jQuery usage * Rename function to toggleQuickSwitchModal
* Implement PLT-6246 - Confirm before sending (at)all, (at)channel message (#6250)Carlos Tadeu Panato Junior2017-05-301-0/+3
| | | | | | | | * implement PLT-6246 - Confirm before sending (at)all, (at)channel message * refactor per review * add constant to define the notify all modal
* PLT-6485 Add ability to disable `@here` notifications (#6372)David Meza2017-05-301-1/+1
|
* PLT-6341/PLT-6342 Update gorp to mattermost fork and add connection timeout ↵Joram Wilander2017-05-291-0/+3
| | | | | | | | | | | | setting (#6410) * Update gorp to mattermost fork and add connection timeout setting * Add go dependency * Rename from connection timeout to query timeout * Properly add gorp dependency
* translations PR 20170522 (#6475)enahum2017-05-261-2/+5
|
* Update legal and support help texts (#6407)Jason Blais2017-05-181-4/+4
| | | | | | | | | | * Update legal_and_support_settings.jsx * Update en.json * Update en.json * Update legal_and_support_settings.jsx
* Add "markdown help" and a preview option to "Edit Channel Header" modal (#6342)Carlos Tadeu Panato Junior2017-05-161-0/+2
|
* Merge branch 'release-3.9' into merge-3.9JoramWilander2017-05-121-1/+1
|\
| * translations PR 20170509 (#6367)enahum2017-05-111-1/+1
| |
* | Fix some issues in English (#5714)William Gathoye2017-05-111-2/+2
| |
* | [PLT-5440] Add Options to System Console Dropdown Menu (#5939)Ryan Wang2017-05-091-0/+3
|/ | | | | | * Add options to system console dropdown menu * Updating modal css
* PLT-6381 Keyboard Shortcuts Menu Link. (#6332)George Goldberg2017-05-041-0/+1
|
* translations PR 20170501 (#6291)enahum2017-05-041-4/+7
| | | | | | * translations PR 20170501 * Add polish to webapp
* PLT-6262 Add config setting to disable file attachments (#6301)Joram Wilander2017-05-041-0/+3
| | | | | | | | | | | | | | * Add config setting to disable file attachments * Add unit tests * Updating UI for no attachments (#6312) * Update UI text on file upload System Console setting (#6313) * Update storage_settings.jsx * Update en.json
* PLT-6444 switching SAML props to default true (#6330)Corey Hulen2017-05-041-2/+2
|
* Add back button to RHS threads from pinned posts (#6306)Joram Wilander2017-05-031-0/+1
|
* Create seperate field for current email (#6197)Ryan Wang2017-04-271-1/+2
|
* implement fix for PLT-6383 - Add "CAUTION" to @all auto-complete (#6240)Carlos Tadeu Panato Junior2017-04-271-1/+1
|
* translations PR 20170424 (#6224)enahum2017-04-271-8/+14
|
* PLT-3885 Add help text to System Console > Logs page (#6252)Eric Sethna2017-04-271-0/+1
| | | | | | | | * Add help text about user ID lookup * logs banner * Update logs.jsx
* Add confirmation modal for deactivating user (#6119)Ryan Wang2017-04-251-0/+4
|
* Add confirm dialog before leaving private channel (#6206)Ryan Wang2017-04-251-0/+3
|
* [PLT-2181] Change wording for deactivating a user from "Make Inactive" to ↵Carlos Tadeu Panato Junior2017-04-241-6/+6
| | | | | | | | | | "Deactivate" (#6106) * change text to fix issue PLT-2181 * update strings * update per review
* PLT-6376: Button for "Add Members to Team" modal should say "Add", not "Go" ↵Carlos Tadeu Panato Junior2017-04-241-0/+1
| | | | (#6185)
* implement [PLT-4118] Help text on "Private Channel --> Set Channel Purpose" ↵Carlos Tadeu Panato Junior2017-04-201-0/+1
| | | | is incorrect (#6144)
* Fix accidentally reverted English strings (#6148)Harrison Healey2017-04-201-8/+12
|
* GH-5847 Add missing localization string (#6130)Jason Blais2017-04-181-0/+1
| | | | | | | | * Add missing localization string to channel_intro_messages.jsx * Update en.json * Fix indentation
* Add missing GM locs (#6116)enahum2017-04-181-0/+2
|
* Merge branch 'release-3.8'Christopher Speller2017-04-171-8/+7
|\
| * translations PR 20170407 (#6031)enahum2017-04-101-3/+2
| |
| * PLT-6263 Updated timing and text of Site URL warning bar (#6016)Harrison Healey2017-04-071-3/+3
| |
| * [PLT-6232] Remove "(Beta)" tag from HA in System Console (#6008)Eric Sethna2017-04-071-1/+1
| |