summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2047 from hmhealey/helpurlJoram Wilander2016-02-031-8/+2
|\ | | | | Updated post help link
| * Updated post help linkhmhealey2016-02-021-8/+2
| |
* | Merge pull request #2044 from khoa-le/PLT-1864Joram Wilander2016-02-031-0/+10
|\ \ | | | | | | PLT-1864 Added help text indicating valid email required
| * | Fixed Eslint validation.Khoa, Le Ngoc2016-02-021-2/+2
| | |
| * | Added help text indicating valid email required when user sign up from link.Khoa, Le Ngoc2016-02-021-0/+10
| | |
* | | Merge pull request #2028 from mozilla/Makefile-fixesJoram Wilander2016-02-031-3/+3
|\ \ \ | | | | | | | | Adjustments to makefile
| * | | Adjustments to makefileAlan Mooiman2016-01-291-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-976Joram Wilander2016-02-0314-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 Garmsen2016-02-0214-4/+407
| | |_|/ | |/| | | | | | | | | | config settings
* | | | Update center_panel.jsxEric Sethna2016-02-021-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-2Corey Hulen2016-02-021-3/+4
|\ \ \ \ | | | | | | | | | | Update test-attachments.md
| * | | | Update test-attachments.mdlfbrock2016-02-021-3/+4
| |/ / /
* | | | Merge pull request #2026 from rgarmsen2295/plt-1720Corey Hulen2016-02-023-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 disabledReed Garmsen2016-02-023-8/+28
| |/ / /
* | | | Merge pull request #2025 from rgarmsen2295/plt-1721Corey Hulen2016-02-021-1/+3
|\ \ \ \ | |/ / / |/| | | PLT-1721 Fixed React invalid prop warning in Team Settings
| * | | Fixed React invalid prop warning in Team SettingsReed Garmsen2016-02-021-1/+3
|/ / /
* | / EE FixesChristopher Speller2016-02-022-0/+34
| |/ |/|
* | 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
| |