| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | 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 #2028 from mozilla/Makefile-fixes | Joram Wilander | 2016-02-03 | 1 | -3/+3 |
| |\ \ \ | | | | | | | | | Adjustments to makefile | ||||
| | * | | | Adjustments to makefile | Alan Mooiman | 2016-01-29 | 1 | -3/+3 |
| | | | | | | | | | | | | | | | | | | | | | | | | | Compass will compile on first run (instead of having to make a change to a sass file) Stop command won't kill virtualbox processes that are also named "mattermost". If we're going to wildcard kill processes, let's not go overboard. | ||||
| * | | | | Merge pull request #1991 from rgarmsen2295/plt-976 | Joram Wilander | 2016-02-03 | 14 | -4/+407 |
| |\ \ \ \ | | | | | | | | | | | 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 | 14 | -4/+407 |
| | | |_|/ | |/| | | | | | | | | | | 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 #2050 from mattermost/lfbrock-patch-2 | Corey Hulen | 2016-02-02 | 1 | -3/+4 |
| |\ \ \ \ | | | | | | | | | | | Update test-attachments.md | ||||
| | * | | | | Update test-attachments.md | lfbrock | 2016-02-02 | 1 | -3/+4 |
| | |/ / / | |||||
| * | | | | 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 |
| | |/ / / | |||||
| * | | | | Merge pull request #2025 from rgarmsen2295/plt-1721 | Corey Hulen | 2016-02-02 | 1 | -1/+3 |
| |\ \ \ \ | |/ / / |/| | | | PLT-1721 Fixed React invalid prop warning in Team Settings | ||||
| | * | | | Fixed React invalid prop warning in Team Settings | Reed Garmsen | 2016-02-02 | 1 | -1/+3 |
| |/ / / | |||||
| * | / | EE Fixes | Christopher Speller | 2016-02-02 | 2 | -0/+34 |
| | |/ |/| | |||||
| * | | 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 | ||||
| * | | | Merge pull request #2043 from mattermost/upgrade-babel-eslint | Joram Wilander | 2016-02-01 | 1 | -2/+1 |
| |\ \ \ | |/ / |/| | | Removed escope and upgraded babel-eslint | ||||
| | * | | Removed escope and upgraded babel-eslint | JoramWilander | 2016-02-01 | 1 | -2/+1 |
| |/ / | |||||
| * | | Merge pull request #2040 from mattermost/fix-email | Harrison Healey | 2016-02-01 | 14 | -130/+130 |
| |\ \ | | | | | | | Fixing email unit tests | ||||
| | * \ | Merge branch 'master' into fix-email | =Corey Hulen | 2016-02-01 | 1 | -7/+8 |
| | |\ \ | |/ / |/| | | |||||
| * | | | Merge pull request #2041 from mattermost/temp-babel-eslint-fix | Christopher Speller | 2016-02-01 | 1 | -7/+8 |
| |\ \ \ | | | | | | | | | Temporary fix for babel-eslint | ||||
| | * | | | 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 | 14 | -130/+130 |
| | |/ / |/| | | |||||
| * | | | 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 |
| | | | | | |||||
| * | | | | Merge pull request #2038 from ZBoxApp/PLT-7-sidebar | Joram Wilander | 2016-02-01 | 23 | -224/+1307 |
| |\ \ \ \ | |/ / / |/| | | | PLT-7: Refactoring frontend (chunk 8) | ||||
| | * | | | 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 #2031 from mattermost/Typos-and-tweaks | Corey Hulen | 2016-01-31 | 1 | -2/+2 |
| |\ \ \ | |_|/ |/| | | occured > occurred | ||||
| | * | | occured > occurred | it33 | 2016-01-31 | 1 | -2/+2 |
| |/ / | |||||
| * | | Merge pull request #2023 from ZBoxApp/PLT-7-templates | Christopher Speller | 2016-01-29 | 11 | -70/+208 |
| |\ \ | |/ |/| | PLT-7: Refactoring frontend (chunk 6) | ||||
| | * | Remove author | Elias Nahum | 2016-01-29 | 2 | -6/+0 |
| | | | |||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |