summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Adding loc to front-end=Corey Hulen2016-02-023-51/+302
|
* Fixing merge=Corey Hulen2016-02-01153-1784/+9627
|\
| * 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
| * | Removed escope and upgraded babel-eslintJoramWilander2016-02-011-2/+1
| |/
| * Merge branch 'master' into fix-email=Corey Hulen2016-02-011-7/+8
| |\
| | * 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-011-2/+2
| |/ /
| * | 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
| | | |
| * | | 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 #2023 from ZBoxApp/PLT-7-templatesChristopher Speller2016-01-299-70/+176
| |\ \ | | |/ | |/| PLT-7: Refactoring frontend (chunk 6)
| | * Remove authorElias Nahum2016-01-292-6/+0
| | |
| | * PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-299-70/+182
| | | | | | | | | | | | | | | | | | - Authorize - Signup Team Confirm - Footer
| * | Improvements to system consoleAsaad Mahmood2016-01-291-0/+9
| |/
| * PLT-7: Refactoring frontend (chunk 5)Elias Nahum2016-01-2912-99/+700
| | | | | | | | | | | | - Signup Team Complete - Signup User Complete - Email Verify
| * Merge pull request #2013 from mattermost/plt-1749Christopher Speller2016-01-291-1/+2
| |\ | | | | | | PLT-1749 Return channel type in new post websocket events
| | * Return channel type in new post websocket eventsJoramWilander2016-01-281-1/+2
| | |
| * | Merge pull request #2015 from ZBoxApp/PLT-7-pagesJoram Wilander2016-01-2922-93/+791
| |\ \ | | | | | | | | PLT-7: Refactoring frontend (chunk 4)
| | * | Fix docs route to include the user localeElias Nahum2016-01-283-2/+93
| | | | | | | | | | | | | | | | - Move Messaging_{locale}.md files to static/help
| | * | PLT-7: Refactoring frontend (chunk 4)Elias Nahum2016-01-2821-92/+699
| | |/
| * | Adding reply iconAsaad Mahmood2016-01-292-10/+36
| | |
| * | Adding reply functionalityAsaad Mahmood2016-01-285-22/+34
| |/
| * Merge pull request #2010 from ZBoxApp/PLT-7-tutorialCorey Hulen2016-01-289-44/+297
| |\ | | | | | | PLT-7: Refactoring frontend (chunk 3)
| | * PLT-7: Refactoring frontend (chunk 3)Elias Nahum2016-01-289-44/+297
| | | | | | | | | | | | | | | | | | - Tutorial components - Claim components - Suggestion components
| * | Merge pull request #2009 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-286-5/+22
| |\ \ | | | | | | | | Multiple UI Improvements
| | * | Fixing code block and comment icon in FirefoxAsaad Mahmood2016-01-282-1/+9
| | | |
| | * | Improving jump to recent messages UIAsaad Mahmood2016-01-282-4/+3
| | | |
| | * | Fixing modals for IEAsaad Mahmood2016-01-282-0/+10
| | | |
| * | | Merge pull request #2002 from ZBoxApp/PLT-7-reactHarrison Healey2016-01-2820-437/+2485
| |\ \ \ | | |/ / | |/| / | | |/ PLT-7: Refactoring frontend (chunk 2)
| | * PLT-7: Refactoring frontend (chunk 2)Elias Nahum2016-01-2720-437/+2485
| | | | | | | | | | | | - System Console complete
| * | Updating tutorial gif for sidebarAsaad Mahmood2016-01-272-1/+2
| |/
| * Merge pull request #1996 from mattermost/plt-1768Harrison Healey2016-01-272-2/+5
| |\ | | | | | | PLT-1768 Clear deleted messages after channel leave and fix missig postlist error
| | * Clear deleted messages after channel leave and fix missig postlist errorJoramWilander2016-01-272-2/+5
| | |