Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2064 from hmhealey/plt882 | Christopher Speller | 2016-02-04 | 2 | -4/+4 |
|\ | | | | | PLT-882 Ephemeral Messages and Out-Of-Channel mentions | ||||
| * | Changed PostStore to not clear a deleted post's message | hmhealey | 2016-02-04 | 2 | -4/+4 |
| | | |||||
* | | Merge pull request #2052 from mattermost/PLT-1429 | Harrison Healey | 2016-02-04 | 2 | -8/+41 |
|\ \ | |/ |/| | PLT-1429 adding user created slash commands | ||||
| * | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 2 | -123/+270 |
| |\ | |||||
| * \ | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 2 | -49/+253 |
| |\ \ | |||||
| * | | | Adding props to admin console | =Corey Hulen | 2016-02-02 | 2 | -8/+8 |
| | | | | |||||
| * | | | Adding loc to front-end | =Corey Hulen | 2016-02-02 | 1 | -0/+33 |
| | | | | |||||
* | | | | 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 | 2 | -99/+110 |
| | | | |||||
* | | | Messages for SocketStore and small fixes | Elias Nahum | 2016-02-03 | 2 | -1/+15 |
| | | | |||||
* | | | PLT-7: Refactoring frontend (chunk 11) | Elias Nahum | 2016-02-03 | 2 | -23/+145 |
| |/ |/| | | | | | | | | | - channel view - Added translations for previous commits - Fix bug on signup_team email body | ||||
* | | Merge pull request #2049 from mattermost/plt-1856 | Christopher Speller | 2016-02-03 | 1 | -47/+51 |
|\ \ | | | | | | | PLT-1856 Add basic server audit tab to system console for EE | ||||
| * | | Add basic server audit tab to system console for EE | JoramWilander | 2016-02-02 | 1 | -48/+52 |
| |/ | |||||
* | | Merge pull request #2045 from mattermost/plt-1849 | Christopher Speller | 2016-02-03 | 2 | -2/+9 |
|\ \ | | | | | | | 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 | 2 | -2/+16 |
| |/ | |||||
* | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modals | Joram Wilander | 2016-02-03 | 2 | -0/+180 |
|\ \ | | | | | | | PLT-7: Refactoring frontend (chunk 10) | ||||
| * | | PLT-7: Refactoring frontend (chunk 10) | Elias Nahum | 2016-02-02 | 2 | -0/+180 |
| |/ | | | | | | | | | | | - Modals - Fix bug on msg_typing - Add missing translations in es.json for EE | ||||
* | | Merge pull request #1991 from rgarmsen2295/plt-976 | Joram Wilander | 2016-02-03 | 1 | -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 Garmsen | 2016-02-02 | 1 | -0/+12 |
| |/ | | | | | | | config settings | ||||
* / | Properly disable the get team link functionality when user creation is disabled | Reed Garmsen | 2016-02-02 | 1 | -0/+1 |
|/ | |||||
* | fix hour12 React warning for FormattedDate | Elias Nahum | 2016-02-01 | 2 | -1/+2 |
| | |||||
* | PLT-7: Refactoring frontend (chunk 9) | Elias Nahum | 2016-02-01 | 2 | -1/+90 |
| | | | | - sidebar right & rhs | ||||
* | PLT-7: Refactoring frontend (chunk 8) | Elias Nahum | 2016-02-01 | 2 | -7/+308 |
| | | | | | - 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 | 2 | -2/+528 |
|\ | | | | | PLT-7: Refactoring frontend (chunk 7) | ||||
| * | PLT-7: Refactoring frontend (chunk 7) | Elias Nahum | 2016-01-31 | 2 | -4/+2 |
| | | | | | | | | - Elegant way to include react Component into FormattedMessage | ||||
| * | PLT-7: Refactoring frontend (chunk 6) | Elias Nahum | 2016-01-30 | 2 | -2/+530 |
| | | | | | | | | - User settings | ||||
* | | Merge pull request #1966 from ↵ | Christopher Speller | 2016-02-01 | 2 | -0/+6 |
|\ \ | |/ |/| | | | | | 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 | 2 | -0/+6 |
| | | |||||
* | | PLT-7: Refactoring frontend (chunk 6) | Elias Nahum | 2016-01-29 | 2 | -2/+6 |
|/ | | | | | | - Authorize - Signup Team Confirm - Footer | ||||
* | PLT-7: Refactoring frontend (chunk 5) | Elias Nahum | 2016-01-29 | 2 | -1/+161 |
| | | | | | | - Signup Team Complete - Signup User Complete - Email Verify | ||||
* | PLT-7: Refactoring frontend (chunk 4) | Elias Nahum | 2016-01-28 | 2 | -2/+142 |
| | |||||
* | PLT-7: Refactoring frontend (chunk 3) | Elias Nahum | 2016-01-28 | 2 | -4/+70 |
| | | | | | | - Tutorial components - Claim components - Suggestion components | ||||
* | PLT-7: Refactoring frontend (chunk 2) | Elias Nahum | 2016-01-27 | 2 | -0/+628 |
| | | | | - System Console complete | ||||
* | PLT-7: Refactoring frontend (chunk 1) | Elias Nahum | 2016-01-26 | 2 | -6/+170 |
| | | | | | | | | | - System console sidebar - Sytem console email settings - Error Bar - Loading Screen - Select Team Modal - Add npm mm-intl package | ||||
* | PLT-7 fixing error bar msg | =Corey Hulen | 2016-01-25 | 2 | -2/+4 |
| | |||||
* | PLT-7 client side infra | =Corey Hulen | 2016-01-21 | 2 | -4/+4 |
| | |||||
* | PLT-7 Adding react-intl libs | =Corey Hulen | 2016-01-21 | 2 | -0/+8 |