Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | 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 | 6 | -2/+322 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | 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 | 6 | -2/+322 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | 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 | 3 | -8/+28 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | 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 | 3 | -8/+28 | |
| |/ / / / / / | ||||||
* / / / / / / | Fixed React invalid prop warning in Team Settings | Reed Garmsen | 2016-02-02 | 1 | -1/+3 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2042 from ZBoxApp/PLT-7-sidebar-right | Corey Hulen | 2016-02-01 | 16 | -76/+446 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-7: Refactoring frontend (chunk 9) | |||||
| * | | | | | | fix hour12 React warning for FormattedDate | Elias Nahum | 2016-02-01 | 6 | -5/+10 | |
| | | | | | | | ||||||
| * | | | | | | PLT-7: Refactoring frontend (chunk 9) | Elias Nahum | 2016-02-01 | 16 | -75/+440 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | - sidebar right & rhs | |||||
* | | | | | | | Removed escope and upgraded babel-eslint | JoramWilander | 2016-02-01 | 1 | -2/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge branch 'master' into fix-email | =Corey Hulen | 2016-02-01 | 1 | -7/+8 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Temporary fix for babel-eslint | JoramWilander | 2016-02-01 | 1 | -7/+8 | |
| | | | | | | | ||||||
* | | | | | | | Merge branch 'master' into fix-email | =Corey Hulen | 2016-02-01 | 2 | -3/+10 | |
|\| | | | | | | ||||||
| * | | | | | | 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 | |
| | | | | | | | | ||||||
* | | | | | | | | Fixing email unit tests | =Corey Hulen | 2016-02-01 | 1 | -2/+2 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #2039 from asaadmahmoodspin/ui-improvements | Joram Wilander | 2016-02-01 | 5 | -54/+53 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | 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 | 5 | -54/+53 | |
| | | | | | | | | ||||||
* | | | | | | | | PLT-7: Refactoring frontend (chunk 8) | Elias Nahum | 2016-02-01 | 23 | -224/+1307 | |
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 | 23 | -331/+2256 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-7: Refactoring frontend (chunk 7) | |||||
| * | | | | | | | PLT-7: Refactoring frontend (chunk 7) | Elias Nahum | 2016-01-31 | 3 | -18/+8 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Elegant way to include react Component into FormattedMessage | |||||
| * | | | | | | | PLT-7: Refactoring frontend (chunk 6) | Elias Nahum | 2016-01-30 | 23 | -331/+2266 | |
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | - User settings | |||||
* | | | | | | | Merge pull request #1966 from ↵ | Christopher Speller | 2016-02-01 | 3 | -24/+132 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | | | | | | | | | | | | | | | 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 | 3 | -4/+28 | |
| | | | | | | | ||||||
| * | | | | | | 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. | |||||
* | | | | | | | Merge pull request #2023 from ZBoxApp/PLT-7-templates | Christopher Speller | 2016-01-29 | 9 | -70/+176 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | PLT-7: Refactoring frontend (chunk 6) | |||||
| * | | | | | | Remove author | Elias Nahum | 2016-01-29 | 2 | -6/+0 | |
| | | | | | | | ||||||
| * | | | | | | PLT-7: Refactoring frontend (chunk 6) | Elias Nahum | 2016-01-29 | 9 | -70/+182 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Authorize - Signup Team Confirm - Footer | |||||
* | | | | | | | Improvements to system console | Asaad Mahmood | 2016-01-29 | 1 | -0/+9 | |
|/ / / / / / | ||||||
* | | | | | | PLT-7: Refactoring frontend (chunk 5) | Elias Nahum | 2016-01-29 | 12 | -99/+700 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Signup Team Complete - Signup User Complete - Email Verify | |||||
* | | | | | | Merge pull request #2013 from mattermost/plt-1749 | Christopher Speller | 2016-01-29 | 1 | -1/+2 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-1749 Return channel type in new post websocket events | |||||
| * | | | | | | Return channel type in new post websocket events | JoramWilander | 2016-01-28 | 1 | -1/+2 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #2015 from ZBoxApp/PLT-7-pages | Joram Wilander | 2016-01-29 | 22 | -93/+791 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | PLT-7: Refactoring frontend (chunk 4) | |||||
| * | | | | | | | Fix docs route to include the user locale | Elias Nahum | 2016-01-28 | 3 | -2/+93 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Move Messaging_{locale}.md files to static/help | |||||
| * | | | | | | | PLT-7: Refactoring frontend (chunk 4) | Elias Nahum | 2016-01-28 | 21 | -92/+699 | |
| |/ / / / / / | ||||||
* | | | | | | | Adding reply icon | Asaad Mahmood | 2016-01-29 | 2 | -10/+36 | |
| | | | | | | | ||||||
* | | | | | | | Adding reply functionality | Asaad Mahmood | 2016-01-28 | 5 | -22/+34 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2010 from ZBoxApp/PLT-7-tutorial | Corey Hulen | 2016-01-28 | 9 | -44/+297 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | PLT-7: Refactoring frontend (chunk 3) | |||||
| * | | | | | | PLT-7: Refactoring frontend (chunk 3) | Elias Nahum | 2016-01-28 | 9 | -44/+297 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Tutorial components - Claim components - Suggestion components | |||||
* | | | | | | | Merge pull request #2009 from asaadmahmoodspin/ui-improvements | Corey Hulen | 2016-01-28 | 6 | -5/+22 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Multiple UI Improvements | |||||
| * | | | | | | | Fixing code block and comment icon in Firefox | Asaad Mahmood | 2016-01-28 | 2 | -1/+9 | |
| | | | | | | | |