summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Fixing merge=Corey Hulen2016-02-01126-1589/+7199
|\
| * Merge pull request #2042 from ZBoxApp/PLT-7-sidebar-rightCorey Hulen2016-02-0114-75/+355
| |\ | | | | | | PLT-7: Refactoring frontend (chunk 9)
| | * fix hour12 React warning for FormattedDateElias Nahum2016-02-014-4/+8
| | |
| | * PLT-7: Refactoring frontend (chunk 9)Elias Nahum2016-02-0114-74/+350
| | | | | | | | | | | | - sidebar right & rhs
| * | Removed escope and upgraded babel-eslintJoramWilander2016-02-011-2/+1
| |/
| * Temporary fix for babel-eslintJoramWilander2016-02-011-7/+8
| |
| * 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
| | |
| * | Merge pull request #2039 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-02-013-32/+31
| |\ \ | | | | | | | | Fixing system console and changing swapping icon with reply icon
| | * | Fixing system console and changing swapping icon with reply iconAsaad Mahmood2016-02-013-32/+31
| | | |
| * | | PLT-7: Refactoring frontend (chunk 8)Elias Nahum2016-02-0121-217/+999
| |/ / | | | | | | | | | | | | - 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-0121-329/+1728
| |\ \ | | | | | | | | PLT-7: Refactoring frontend (chunk 7)
| | * | PLT-7: Refactoring frontend (chunk 7)Elias Nahum2016-01-311-14/+6
| | | | | | | | | | | | | | | | - Elegant way to include react Component into FormattedMessage
| | * | PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-3021-329/+1736
| | |/ | | | | | | | | | - User settings
| * | Merge pull request #1966 from ↵Christopher Speller2016-02-011-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 Niwa2016-01-301-4/+22
| | |
| | * 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.
| * | Remove authorElias Nahum2016-01-292-6/+0
| | |
| * | PLT-7: Refactoring frontend (chunk 6)Elias Nahum2016-01-293-43/+161
| |/ | | | | | | | | | | - Authorize - Signup Team Confirm - Footer
| * PLT-7: Refactoring frontend (chunk 5)Elias Nahum2016-01-2910-98/+539
| | | | | | | | | | | | - 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-2914-88/+553
| |\ \ | | | | | | | | PLT-7: Refactoring frontend (chunk 4)
| | * | PLT-7: Refactoring frontend (chunk 4)Elias Nahum2016-01-2814-88/+553
| | |/
| * | Adding reply iconAsaad Mahmood2016-01-291-1/+7
| | |
| * | Adding reply functionalityAsaad Mahmood2016-01-283-18/+18
| |/
| * Merge pull request #2010 from ZBoxApp/PLT-7-tutorialCorey Hulen2016-01-287-40/+227
| |\ | | | | | | PLT-7: Refactoring frontend (chunk 3)
| | * PLT-7: Refactoring frontend (chunk 3)Elias Nahum2016-01-287-40/+227
| | | | | | | | | | | | | | | | | | - Tutorial components - Claim components - Suggestion components
| * | Merge pull request #2009 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-282-4/+7
| |\ \ | | | | | | | | Multiple UI Improvements
| | * | Improving jump to recent messages UIAsaad Mahmood2016-01-281-4/+2
| | | |
| | * | Fixing modals for IEAsaad Mahmood2016-01-281-0/+5
| | | |
| * | | Merge pull request #2002 from ZBoxApp/PLT-7-reactHarrison Healey2016-01-2818-437/+1857
| |\ \ \ | | |/ / | |/| / | | |/ PLT-7: Refactoring frontend (chunk 2)
| | * PLT-7: Refactoring frontend (chunk 2)Elias Nahum2016-01-2718-437/+1857
| | | | | | | | | | | | - System Console complete
| * | Updating tutorial gif for sidebarAsaad Mahmood2016-01-271-1/+1
| |/
| * 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
| | |
| * | Clear user typing text on channel switchJoramWilander2016-01-271-3/+11
| | |
| * | Merge pull request #1995 from mattermost/PLT-1586bChristopher Speller2016-01-273-2/+7
| |\ \ | | | | | | | | Fixing small issue with displaying activity log
| | * | Fixing small issue with displaying activity log=Corey Hulen2016-01-273-2/+7
| | | |
| * | | Merge pull request #1992 from ZBoxApp/PLT-7-reactCorey Hulen2016-01-278-99/+481
| |\ \ \ | | |/ / | |/| | PLT-7: Refactoring frontend (chunk 1)
| | * | Update mm-intl referenceElias Nahum2016-01-271-1/+1
| | | |
| | * | PLT-7: Refactoring frontend (chunk 1)Elias Nahum2016-01-268-99/+481
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - System console sidebar - Sytem console email settings - Error Bar - Loading Screen - Select Team Modal - Add npm mm-intl package
| * | | Merge pull request #1993 from mattermost/PLT-1586Christopher Speller2016-01-272-13/+23
| |\ \ \ | | |/ / | |/| | PLT-1586 adding LDAP/OAuth to iOS
| | * | Fixing naming=Corey Hulen2016-01-261-1/+1
| | | |