summaryrefslogtreecommitdiffstats
path: root/web/static/i18n/en.json
Commit message (Collapse)AuthorAgeFilesLines
* Fix intro messageElias Nahum2016-02-081-1/+1
|
* Fix english messages with white spacesElias Nahum2016-02-081-15/+15
|
* Add new localizations in english and spanishElias Nahum2016-02-081-24/+23
|
* Merge pull request #2089 from mattermost/plt-1205Joram Wilander2016-02-081-7/+6
|\ | | | | PLT-1205 Remove appearance settings tab and move theme management to display s…
| * Remove appearance settings tab and move theme management to display settings tabJoramWilander2016-02-051-8/+7
| |
* | Merge pull request #2083 from mattermost/plt-1879Christopher Speller2016-02-081-1/+3
|\ \ | | | | | | PLT-1879 Add config setting to accept unsigned TLS certs for SSO and outgoing hooks, also fix delete…
| * | Make insecure TLS connections configurableJoramWilander2016-02-051-1/+3
| |/
* / Fixing slash commands=Corey Hulen2016-02-051-1/+0
|/
* New localizationsElias Nahum2016-02-041-69/+69
|
* Merge pull request #2079 from mattermost/help-text-updatesCorey Hulen2016-02-041-3/+3
|\ | | | | Changing URL for testing push notifications
| * Update en.jsonit332016-02-041-1/+1
| |
| * Update en.jsonit332016-02-041-1/+1
| |
| * Update en.jsonit332016-02-041-2/+2
| |
* | Merge pull request #2076 from ZBoxApp/loc-fixCorey Hulen2016-02-041-33/+38
|\ \ | | | | | | PLT-7: Fix and Add new loc strings
| * | fix typosElias Nahum2016-02-041-2/+2
| | |
| * | PLT-7: Fix and Add new loc stringsElias Nahum2016-02-041-33/+38
| |/
* | Merge pull request #2073 from mattermost/ee-updatesCorey Hulen2016-02-041-52/+53
|\ \ | | | | | | Some general updates to EE
| * | Convert audit_table to a proper tableJoramWilander2016-02-041-54/+48
| | |
| * | Rename audits tabJoramWilander2016-02-041-1/+8
| | |
| * | Fix license info localizationJoramWilander2016-02-041-1/+1
| |/
* | Merge pull request #2064 from hmhealey/plt882Christopher Speller2016-02-041-2/+2
|\ \ | |/ |/| PLT-882 Ephemeral Messages and Out-Of-Channel mentions
| * Changed PostStore to not clear a deleted post's messagehmhealey2016-02-041-2/+2
| |
* | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-031-61/+123
|\|
| * Add missing translationsElias Nahum2016-02-031-52/+52
| |
| * Messages for SocketStore and small fixesElias Nahum2016-02-031-0/+7
| |
| * PLT-7: Refactoring frontend (chunk 11)Elias Nahum2016-02-031-9/+64
| | | | | | | | | | | | - channel view - Added translations for previous commits - Fix bug on signup_team email body
* | Merge branch 'master' into PLT-1429=Corey Hulen2016-02-031-48/+162
|\|
| * Merge pull request #2049 from mattermost/plt-1856Christopher Speller2016-02-031-47/+51
| |\ | | | | | | PLT-1856 Add basic server audit tab to system console for EE
| | * Add basic server audit tab to system console for EEJoramWilander2016-02-021-48/+52
| | |
| * | Merge pull request #2045 from mattermost/plt-1849Christopher Speller2016-02-031-1/+8
| |\ \ | | | | | | | | PLT-1849 Added extra system-wide statistics for EE
| | * | Added extra system-wide statistics for EEJoramWilander2016-02-021-1/+8
| | |/
| * | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modalsJoram Wilander2016-02-031-0/+90
| |\ \ | | | | | | | | PLT-7: Refactoring frontend (chunk 10)
| | * | PLT-7: Refactoring frontend (chunk 10)Elias Nahum2016-02-021-0/+90
| | |/ | | | | | | | | | | | | | | | - Modals - Fix bug on msg_typing - Add missing translations in es.json for EE
| * | Merge pull request #1991 from rgarmsen2295/plt-976Joram Wilander2016-02-031-0/+12
| |\ \ | | | | | | | | PLT-976 Adds ability to sign in with username
| | * | Added ability to sign in via username; separated email sign in and sign up ↵Reed Garmsen2016-02-021-0/+12
| | |/ | | | | | | | | | config settings
| * / Properly disable the get team link functionality when user creation is disabledReed Garmsen2016-02-021-0/+1
| |/
* | Adding props to admin console=Corey Hulen2016-02-021-4/+8
| |
* | Adding loc to front-end=Corey Hulen2016-02-021-0/+33
|/
* fix hour12 React warning for FormattedDateElias Nahum2016-02-011-0/+1
|
* PLT-7: Refactoring frontend (chunk 9)Elias Nahum2016-02-011-0/+44
| | | | - sidebar right & rhs
* PLT-7: Refactoring frontend (chunk 8)Elias Nahum2016-02-011-3/+153
| | | | | - Sidebar and related components - Small Tweak to demotion and add msg for terminal cmd
* Merge pull request #2029 from ZBoxApp/PLT-7-userChristopher Speller2016-02-011-1/+264
|\ | | | | PLT-7: Refactoring frontend (chunk 7)
| * PLT-7: Refactoring frontend (chunk 7)Elias Nahum2016-01-311-2/+1
| | | | | | | | - Elegant way to include react Component into FormattedMessage
| * PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-301-1/+265
| | | | | | | | - User settings
* | Merge pull request #1966 from ↵Christopher Speller2016-02-011-0/+3
|\ \ | |/ |/| | | | | ttyniwa/feature/warning_when_demote_own_role_from_system_admin PLT-588 Add a warning when a user demotes themselves from System Admi…
| * fix text localization.Tatsuya Niwa2016-01-301-0/+3
| |
* | PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-291-2/+4
|/ | | | | | - Authorize - Signup Team Confirm - Footer
* PLT-7: Refactoring frontend (chunk 5)Elias Nahum2016-01-291-0/+80
| | | | | | - Signup Team Complete - Signup User Complete - Email Verify
* PLT-7: Refactoring frontend (chunk 4)Elias Nahum2016-01-281-1/+71
|
* PLT-7: Refactoring frontend (chunk 3)Elias Nahum2016-01-281-1/+34
| | | | | | - Tutorial components - Claim components - Suggestion components