summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Fixing version=Corey Hulen2016-02-021-1/+1
|
* Fixing console=Corey Hulen2016-02-022-6/+6
|
* Adding props to admin console=Corey Hulen2016-02-023-12/+108
|
* Fixing unit test=Corey Hulen2016-02-021-1/+1
|
* Adding loc to front-end=Corey Hulen2016-02-024-57/+308
|
* Switching defaults=Corey Hulen2016-02-012-2/+2
|
* Adding loc to new command backend=Corey Hulen2016-02-0112-259/+280
|
* Fixing merge=Corey Hulen2016-02-01201-2301/+12602
|\
| * Merge pull request #2042 from ZBoxApp/PLT-7-sidebar-rightCorey Hulen2016-02-0116-76/+446
| |\ | | | | | | PLT-7: Refactoring frontend (chunk 9)
| | * fix hour12 React warning for FormattedDateElias Nahum2016-02-016-5/+10
| | |
| | * PLT-7: Refactoring frontend (chunk 9)Elias Nahum2016-02-0116-75/+440
| | | | | | | | | | | | - sidebar right & rhs
| * | Merge pull request #2043 from mattermost/upgrade-babel-eslintJoram Wilander2016-02-011-2/+1
| |\ \ | | |/ | |/| Removed escope and upgraded babel-eslint
| | * Removed escope and upgraded babel-eslintJoramWilander2016-02-011-2/+1
| |/
| * Merge pull request #2040 from mattermost/fix-emailHarrison Healey2016-02-0114-130/+130
| |\ | | | | | | Fixing email unit tests
| | * Merge branch 'master' into fix-email=Corey Hulen2016-02-011-7/+8
| | |\ | | |/ | |/|
| * | Merge pull request #2041 from mattermost/temp-babel-eslint-fixChristopher Speller2016-02-011-7/+8
| |\ \ | | | | | | | | Temporary fix for babel-eslint
| | * | Temporary fix for babel-eslintJoramWilander2016-02-011-7/+8
| |/ /
| | * Merge branch 'master' into fix-email=Corey Hulen2016-02-012-3/+10
| | |\ | | |/ | |/|
| * | Merge pull request #2037 from mattermost/plt-1862Corey Hulen2016-02-012-3/+10
| |\ \ | | | | | | | | PLT-1862 Fix console errors
| | * | Fix console errorsJoramWilander2016-02-012-3/+10
| | | |
| | | * Fixing email unit tests=Corey Hulen2016-02-0114-130/+130
| | |/ | |/|
| * | Merge pull request #2039 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-02-015-54/+53
| |\ \ | | | | | | | | Fixing system console and changing swapping icon with reply icon
| | * | Fixing system console and changing swapping icon with reply iconAsaad Mahmood2016-02-015-54/+53
| | | |
| * | | Merge pull request #2038 from ZBoxApp/PLT-7-sidebarJoram Wilander2016-02-0123-224/+1307
| |\ \ \ | | |/ / | |/| | PLT-7: Refactoring frontend (chunk 8)
| | * | PLT-7: Refactoring frontend (chunk 8)Elias Nahum2016-02-0123-224/+1307
| |/ / | | | | | | | | | | | | - Sidebar and related components - Small Tweak to demotion and add msg for terminal cmd
| * | Merge pull request #2029 from ZBoxApp/PLT-7-userChristopher Speller2016-02-0123-331/+2256
| |\ \ | | | | | | | | PLT-7: Refactoring frontend (chunk 7)
| | * | PLT-7: Refactoring frontend (chunk 7)Elias Nahum2016-01-313-18/+8
| | | | | | | | | | | | | | | | - Elegant way to include react Component into FormattedMessage
| | * | PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-3023-331/+2266
| | | | | | | | | | | | | | | | - User settings
| * | | Merge pull request #1966 from ↵Christopher Speller2016-02-013-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 Niwa2016-01-303-4/+28
| | | |
| | * | fix ESLint warnings.Tatsuya Niwa2016-01-301-4/+4
| | | |
| | * | fix role bug.Tatsuya Niwa2016-01-301-5/+12
| | | | | | | | | | | | | | | | add redirect after demote own role.
| | * | fix ESLint warnings.Tatsuya Niwa2016-01-301-1/+2
| | | |
| | * | delete DemoteOwnRoleModalTatsuya Niwa2016-01-302-109/+36
| | | |
| | * | fix ESLint warnings.Tatsuya Niwa2016-01-301-1/+1
| | | |
| | * | fix ESLint warnings.Tatsuya Niwa2016-01-301-4/+1
| | | |
| | * | PLT-588 Add a warning when a user demotes themselves from System Admin to ↵Tatsuya Niwa2016-01-302-25/+177
| | | | | | | | | | | | | | | | another role.
| * | | Merge pull request #2031 from mattermost/Typos-and-tweaksCorey Hulen2016-01-311-2/+2
| |\ \ \ | | |_|/ | |/| | occured > occurred
| | * | occured > occurredit332016-01-311-2/+2
| |/ /
| * | Merge pull request #2023 from ZBoxApp/PLT-7-templatesChristopher Speller2016-01-2911-70/+208
| |\ \ | | |/ | |/| PLT-7: Refactoring frontend (chunk 6)
| | * Remove authorElias Nahum2016-01-292-6/+0
| | |
| | * PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-2911-70/+214
| | | | | | | | | | | | | | | | | | - Authorize - Signup Team Confirm - Footer
| * | Merge pull request #2022 from asaadmahmoodspin/ui-improvementsChristopher Speller2016-01-291-0/+9
| |\ \ | | |/ | |/| Improvements to system console
| | * Improvements to system consoleAsaad Mahmood2016-01-291-0/+9
| |/
| * Merge pull request #2020 from ZBoxApp/PLT-7-pages2Harrison Healey2016-01-2912-99/+700
| |\ | | | | | | PLT-7: Refactoring frontend (chunk 5)
| | * PLT-7: Refactoring frontend (chunk 5)Elias Nahum2016-01-2912-99/+700
| |/ | | | | | | | | | | - Signup Team Complete - Signup User Complete - Email Verify
| * Merge pull request #2018 from fallenby/PLT-1592Christopher Speller2016-01-291-4/+4
| |\ | | | | | | PLT-1592 String changes to make password reset expiry experience more obvious and forgiving
| | * Revised PLT-1592Frank Allenby2016-01-292-5/+1
| | |
| | * Completed PLT-1592Frank Allenby2016-01-292-6/+10
| | |
| * | Merge pull request #2016 from mattermost/PLT-1765Christopher Speller2016-01-295-50/+93
| |\ \ | | | | | | | | PLT-1765 allowing support of 2 previous versions