Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2146 from ttyniwa/feature/PLT-1908 | Corey Hulen | 2016-02-14 | 1 | -0/+4 |
|\ | | | | | PLT-1908 Add a warning when demoting yourself from System Administrator from the team Manage Members menu | ||||
| * | add translated messages to es.json. | Tatsuya Niwa | 2016-02-12 | 1 | -0/+4 |
| | | |||||
| * | delete not translated messages in es.json | Tatsuya Niwa | 2016-02-12 | 1 | -4/+0 |
| | | |||||
| * | Add a warning when demoting yourself from System Administrator from the team ↵ | Tatsuya Niwa | 2016-02-11 | 1 | -0/+4 |
| | | | | | | | | Manage Members menu | ||||
* | | Merge pull request #2168 from ZBoxApp/permalink-spanish | Corey Hulen | 2016-02-14 | 1 | -0/+2 |
|\ \ | | | | | | | RHS spanish translations for permalink | ||||
| * | | RHS spanish translations for permalink | Elias Nahum | 2016-02-14 | 1 | -0/+2 |
| |/ | |||||
* / | Update loc strings | Elias Nahum | 2016-02-12 | 1 | -1/+1 |
|/ | |||||
* | A few cmds strings | Elias Nahum | 2016-02-09 | 1 | -1/+26 |
| | |||||
* | Merge pull request #2122 from hmhealey/plt1544 | Christopher Speller | 2016-02-09 | 1 | -2/+1 |
|\ | | | | | PLT-1544 Replaced Permalink popover with a Permalink modal | ||||
| * | Replaced Permalink popover with a Permalink modal | hmhealey | 2016-02-09 | 1 | -2/+1 |
| | | |||||
* | | Fixing slash command help | =Corey Hulen | 2016-02-09 | 1 | -22/+0 |
| | | |||||
* | | Add/Remove & Fix loc strings | Elias Nahum | 2016-02-09 | 1 | -0/+1 |
| | | |||||
* | | Removed the ability to disable file storage from the admin console | Reed Garmsen | 2016-02-08 | 1 | -1/+0 |
|/ | |||||
* | PLT-1900 removing lang from preview and making spanish beta | =Corey Hulen | 2016-02-08 | 1 | -1/+0 |
| | |||||
* | Add new localizations in english and spanish | Elias Nahum | 2016-02-08 | 1 | -5/+8 |
| | |||||
* | Merge pull request #2089 from mattermost/plt-1205 | Joram Wilander | 2016-02-08 | 1 | -7/+4 |
|\ | | | | | PLT-1205 Remove appearance settings tab and move theme management to display s… | ||||
| * | Remove appearance settings tab and move theme management to display settings tab | JoramWilander | 2016-02-05 | 1 | -7/+4 |
| | | |||||
* | | Fixing slash commands | =Corey Hulen | 2016-02-05 | 1 | -1/+0 |
|/ | |||||
* | New localizations | Elias Nahum | 2016-02-04 | 1 | -9/+10 |
| | |||||
* | Merge pull request #2079 from mattermost/help-text-updates | Corey Hulen | 2016-02-04 | 1 | -2/+2 |
|\ | | | | | Changing URL for testing push notifications | ||||
| * | Update es.json | it33 | 2016-02-04 | 1 | -1/+1 |
| | | |||||
| * | Update es.json | it33 | 2016-02-04 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #2076 from ZBoxApp/loc-fix | Corey Hulen | 2016-02-04 | 1 | -2/+48 |
|\ \ | | | | | | | PLT-7: Fix and Add new loc strings | ||||
| * | | PLT-7: Fix and Add new loc strings | Elias Nahum | 2016-02-04 | 1 | -2/+48 |
| |/ | |||||
* | | Merge pull request #2073 from mattermost/ee-updates | Corey Hulen | 2016-02-04 | 1 | -1/+1 |
|\ \ | | | | | | | Some general updates to EE | ||||
| * | | Fix license info localization | JoramWilander | 2016-02-04 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #2064 from hmhealey/plt882 | Christopher Speller | 2016-02-04 | 1 | -2/+2 |
|\ \ | |/ |/| | PLT-882 Ephemeral Messages and Out-Of-Channel mentions | ||||
| * | Changed PostStore to not clear a deleted post's message | hmhealey | 2016-02-04 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #2052 from mattermost/PLT-1429 | Harrison Healey | 2016-02-04 | 1 | -4/+0 |
|\ \ | |/ |/| | PLT-1429 adding user created slash commands | ||||
| * | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 1 | -62/+147 |
| |\ | |||||
| * \ | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 1 | -1/+91 |
| |\ \ | |||||
| * | | | Adding props to admin console | =Corey Hulen | 2016-02-02 | 1 | -4/+0 |
| | | | | |||||
* | | | | Fix claim translations | Elias Nahum | 2016-02-03 | 1 | -2/+2 |
| |_|/ |/| | | |||||
* | | | Fix socketError message in spanish | Elias Nahum | 2016-02-03 | 1 | -1/+1 |
| | | | |||||
* | | | Add missing translations | Elias Nahum | 2016-02-03 | 1 | -47/+58 |
| | | | |||||
* | | | Messages for SocketStore and small fixes | Elias Nahum | 2016-02-03 | 1 | -1/+8 |
| | | | |||||
* | | | PLT-7: Refactoring frontend (chunk 11) | Elias Nahum | 2016-02-03 | 1 | -14/+81 |
| |/ |/| | | | | | | | | | - channel view - Added translations for previous commits - Fix bug on signup_team email body | ||||
* | | Merge pull request #2045 from mattermost/plt-1849 | Christopher Speller | 2016-02-03 | 1 | -1/+1 |
|\ \ | | | | | | | PLT-1849 Added extra system-wide statistics for EE | ||||
| * | | Remove missing ES translations | JoramWilander | 2016-02-02 | 1 | -7/+0 |
| | | | |||||
| * | | Added extra system-wide statistics for EE | JoramWilander | 2016-02-02 | 1 | -1/+8 |
| |/ | |||||
* / | PLT-7: Refactoring frontend (chunk 10) | Elias Nahum | 2016-02-02 | 1 | -0/+90 |
|/ | | | | | | - Modals - Fix bug on msg_typing - Add missing translations in es.json for EE | ||||
* | fix hour12 React warning for FormattedDate | Elias Nahum | 2016-02-01 | 1 | -1/+1 |
| | |||||
* | PLT-7: Refactoring frontend (chunk 9) | Elias Nahum | 2016-02-01 | 1 | -1/+46 |
| | | | | - sidebar right & rhs | ||||
* | PLT-7: Refactoring frontend (chunk 8) | Elias Nahum | 2016-02-01 | 1 | -4/+155 |
| | | | | | - Sidebar and related components - Small Tweak to demotion and add msg for terminal cmd | ||||
* | Merge pull request #2029 from ZBoxApp/PLT-7-user | Christopher Speller | 2016-02-01 | 1 | -1/+264 |
|\ | | | | | PLT-7: Refactoring frontend (chunk 7) | ||||
| * | PLT-7: Refactoring frontend (chunk 7) | Elias Nahum | 2016-01-31 | 1 | -2/+1 |
| | | | | | | | | - Elegant way to include react Component into FormattedMessage | ||||
| * | PLT-7: Refactoring frontend (chunk 6) | Elias Nahum | 2016-01-30 | 1 | -1/+265 |
| | | | | | | | | - User settings | ||||
* | | Merge pull request #1966 from ↵ | Christopher Speller | 2016-02-01 | 1 | -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 Niwa | 2016-01-30 | 1 | -0/+3 |
| | | |||||
* | | PLT-7: Refactoring frontend (chunk 6) | Elias Nahum | 2016-01-29 | 1 | -0/+2 |
|/ | | | | | | - Authorize - Signup Team Confirm - Footer |