| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' into PLT-1429 | =Corey Hulen | 2016-02-03 | 42 | -767/+2031 |
| |\ | |||||
| | * | Merge pull request #2055 from khoa-le/PLT-1693 | Christopher Speller | 2016-02-03 | 1 | -1/+2 |
| | |\ | | | | | | | PLT-1693: Clear the password input boxes when user enter incorrect Retype New P… | ||||
| | | * | Clear the password input boxes when user enter incorrect Retype New Password. | Khoa, Le Ngoc | 2016-02-03 | 1 | -1/+2 |
| | | | | |||||
| | * | | Merge pull request #2049 from mattermost/plt-1856 | Christopher Speller | 2016-02-03 | 5 | -535/+700 |
| | |\ \ | | | | | | | | | 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 | 5 | -535/+700 |
| | | | | | |||||
| | * | | | Merge pull request #2045 from mattermost/plt-1849 | Christopher Speller | 2016-02-03 | 5 | -85/+342 |
| | |\ \ \ | | | | | | | | | | | PLT-1849 Added extra system-wide statistics for EE | ||||
| | | * | | | Added extra system-wide statistics for EE | JoramWilander | 2016-02-02 | 5 | -85/+342 |
| | | |/ / | |||||
| | * | | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modals | Joram Wilander | 2016-02-03 | 18 | -119/+641 |
| | |\ \ \ | | | | | | | | | | | PLT-7: Refactoring frontend (chunk 10) | ||||
| | | * | | | PLT-7: Refactoring frontend (chunk 10) | Elias Nahum | 2016-02-02 | 18 | -119/+641 |
| | | |/ / | | | | | | | | | | | | | | | | | | | | | - Modals - Fix bug on msg_typing - Add missing translations in es.json for EE | ||||
| | * | | | Merge pull request #2048 from rgarmsen2295/plt-1317 | Joram Wilander | 2016-02-03 | 4 | -7/+25 |
| | |\ \ \ | | | | | | | | | | | PLT-1317 Replaces the clock icon for same user posts with a simple timestamp | ||||
| | | * | | | Changed clock icon in repeat posts to simple timestamp | Reed Garmsen | 2016-02-02 | 4 | -7/+25 |
| | | |/ / | |||||
| | * | | | Merge pull request #2047 from hmhealey/helpurl | Joram Wilander | 2016-02-03 | 1 | -8/+2 |
| | |\ \ \ | | | | | | | | | | | Updated post help link | ||||
| | | * | | | Updated post help link | hmhealey | 2016-02-02 | 1 | -8/+2 |
| | | |/ / | |||||
| | * | | | Merge pull request #2044 from khoa-le/PLT-1864 | Joram Wilander | 2016-02-03 | 1 | -0/+10 |
| | |\ \ \ | | | | | | | | | | | PLT-1864 Added help text indicating valid email required | ||||
| | | * | | | Fixed Eslint validation. | Khoa, Le Ngoc | 2016-02-02 | 1 | -2/+2 |
| | | | | | | |||||
| | | * | | | Added help text indicating valid email required when user sign up from link. | Khoa, Le Ngoc | 2016-02-02 | 1 | -0/+10 |
| | | |/ / | |||||
| | * | | | Merge pull request #1991 from rgarmsen2295/plt-976 | Joram Wilander | 2016-02-03 | 3 | -2/+278 |
| | |\ \ \ | | |_|/ | |/| | | 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 | 3 | -2/+278 |
| | | |/ | | | | | | | | | | config settings | ||||
| | * | | Update center_panel.jsx | Eric Sethna | 2016-02-02 | 1 | -1/+1 |
| | | | | | | | | | | | | | As discussed in UX meeting. Text change to help users understand that they are just scrolled up in the channel view rather than in a different interface when they jump to a search result. "You are viewing the archives. Click here to jump to recent messages." -> "Click here to jump to recent messages" | ||||
| | * | | Merge pull request #2026 from rgarmsen2295/plt-1720 | Corey Hulen | 2016-02-02 | 2 | -8/+27 |
| | |\ \ | | | | | | | | | PLT-1720 Properly disable the get team link functionality when user creation is disabled | ||||
| | | * | | Properly disable the get team link functionality when user creation is disabled | Reed Garmsen | 2016-02-02 | 2 | -8/+27 |
| | | |/ | |||||
| | * / | Fixed React invalid prop warning in Team Settings | Reed Garmsen | 2016-02-02 | 1 | -1/+3 |
| | |/ | |||||
| * | | Fixing console | =Corey Hulen | 2016-02-02 | 1 | -1/+1 |
| | | | |||||
| * | | Adding props to admin console | =Corey Hulen | 2016-02-02 | 1 | -4/+100 |
| | | | |||||
| * | | Adding loc to front-end | =Corey Hulen | 2016-02-02 | 2 | -51/+269 |
| | | | |||||
| * | | Fixing merge | =Corey Hulen | 2016-02-01 | 113 | -1443/+6952 |
| |\| | |||||
| | * | fix hour12 React warning for FormattedDate | Elias Nahum | 2016-02-01 | 4 | -4/+8 |
| | | | |||||
| | * | PLT-7: Refactoring frontend (chunk 9) | Elias Nahum | 2016-02-01 | 14 | -74/+350 |
| | | | | | | | | | - sidebar right & rhs | ||||
| | * | Merge pull request #2037 from mattermost/plt-1862 | Corey Hulen | 2016-02-01 | 2 | -3/+10 |
| | |\ | | | | | | | PLT-1862 Fix console errors | ||||
| | | * | Fix console errors | JoramWilander | 2016-02-01 | 2 | -3/+10 |
| | | | | |||||
| | * | | Merge pull request #2039 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-02-01 | 3 | -32/+31 |
| | |\ \ | | | | | | | | | Fixing system console and changing swapping icon with reply icon | ||||
| | | * | | Fixing system console and changing swapping icon with reply icon | Asaad Mahmood | 2016-02-01 | 3 | -32/+31 |
| | | | | | |||||
| | * | | | PLT-7: Refactoring frontend (chunk 8) | Elias Nahum | 2016-02-01 | 21 | -217/+999 |
| | |/ / | | | | | | | | | | | | | - 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 | 21 | -329/+1728 |
| | |\ \ | | | | | | | | | PLT-7: Refactoring frontend (chunk 7) | ||||
| | | * | | PLT-7: Refactoring frontend (chunk 7) | Elias Nahum | 2016-01-31 | 1 | -14/+6 |
| | | | | | | | | | | | | | | | | | - Elegant way to include react Component into FormattedMessage | ||||
| | | * | | PLT-7: Refactoring frontend (chunk 6) | Elias Nahum | 2016-01-30 | 21 | -329/+1736 |
| | | |/ | | | | | | | | | | - User settings | ||||
| | * | | Merge pull request #1966 from ↵ | Christopher Speller | 2016-02-01 | 1 | -24/+126 |
| | |\ \ | | |/ | |/| | | | | | | | 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 | -4/+22 |
| | | | | |||||
| | | * | fix ESLint warnings. | Tatsuya Niwa | 2016-01-30 | 1 | -4/+4 |
| | | | | |||||
| | | * | fix role bug. | Tatsuya Niwa | 2016-01-30 | 1 | -5/+12 |
| | | | | | | | | | | | | | add redirect after demote own role. | ||||
| | | * | fix ESLint warnings. | Tatsuya Niwa | 2016-01-30 | 1 | -1/+2 |
| | | | | |||||
| | | * | delete DemoteOwnRoleModal | Tatsuya Niwa | 2016-01-30 | 2 | -109/+36 |
| | | | | |||||
| | | * | fix ESLint warnings. | Tatsuya Niwa | 2016-01-30 | 1 | -1/+1 |
| | | | | |||||
| | | * | fix ESLint warnings. | Tatsuya Niwa | 2016-01-30 | 1 | -4/+1 |
| | | | | |||||
| | | * | PLT-588 Add a warning when a user demotes themselves from System Admin to ↵ | Tatsuya Niwa | 2016-01-30 | 2 | -25/+177 |
| | | | | | | | | | | | | | another role. | ||||
| | * | | Remove author | Elias Nahum | 2016-01-29 | 1 | -3/+0 |
| | | | | |||||
| | * | | PLT-7: Refactoring frontend (chunk 6) | Elias Nahum | 2016-01-29 | 2 | -43/+94 |
| | |/ | | | | | | | | | | | - Authorize - Signup Team Confirm - Footer | ||||
| | * | PLT-7: Refactoring frontend (chunk 5) | Elias Nahum | 2016-01-29 | 10 | -98/+539 |
| | | | | | | | | | | | | | - Signup Team Complete - Signup User Complete - Email Verify | ||||
| | * | Merge pull request #2015 from ZBoxApp/PLT-7-pages | Joram Wilander | 2016-01-29 | 12 | -82/+498 |
| | |\ | | | | | | | PLT-7: Refactoring frontend (chunk 4) | ||||
| | | * | PLT-7: Refactoring frontend (chunk 4) | Elias Nahum | 2016-01-28 | 12 | -82/+498 |
| | | | | |||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |