summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | merging=Corey Hulen2016-01-2221-98/+278
| |\ \ \ \ \
| * \ \ \ \ \ merging=Corey Hulen2016-01-151-3/+3
| |\ \ \ \ \ \
| * | | | | | | finishing up commands UI=Corey Hulen2016-01-141-67/+249
| | | | | | | |
| * | | | | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-1420-83/+507
| |\ \ \ \ \ \ \
| * | | | | | | | Adding UI=Corey Hulen2016-01-112-0/+295
| | | | | | | | |
| * | | | | | | | partial fix for UI=Corey Hulen2016-01-081-6/+1
| | | | | | | | |
* | | | | | | | | Merge pull request #2068 from hmhealey/plt1767Corey Hulen2016-02-041-3/+2
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | PLT-1767 Fixed editing your last comment in the RHS
| * | | | | | | | | Fixed editing your last comment in the RHShmhealey2016-02-041-3/+2
| | | | | | | | | |
* | | | | | | | | | Fixed localization issues in file_upload.jsxhmhealey2016-02-041-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2062 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-02-042-54/+74
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | Multiple UI Improvements
| * | | | | | | | | Multiple UI ImprovementsAsaad Mahmood2016-02-032-54/+74
| | |_|_|_|_|_|/ / | |/| | | | | | |
* | | | | | | | | Merge pull request #2063 from mattermost/fix-locCorey Hulen2016-02-031-1/+1
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Fixing loc error
| * | | | | | | | Fixing loc error=Corey Hulen2016-02-031-1/+1
| |/ / / / / / /
* | | | | | | | Messages for SocketStore and small fixesElias Nahum2016-02-033-7/+69
| | | | | | | |
* | | | | | | | PLT-7: Refactoring frontend (chunk 11)Elias Nahum2016-02-0315-71/+318
|/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - channel view - Added translations for previous commits - Fix bug on signup_team email body
* | | | | | | Merge pull request #2055 from khoa-le/PLT-1693Christopher Speller2016-02-031-1/+2
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | PLT-1693: Clear the password input boxes when user enter incorrect Retype New P…
| * | | | | | | Clear the password input boxes when user enter incorrect Retype New Password.Khoa, Le Ngoc2016-02-031-1/+2
| | | | | | | |
* | | | | | | | Merge pull request #2049 from mattermost/plt-1856Christopher Speller2016-02-035-535/+700
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-1856 Add basic server audit tab to system console for EE
| * | | | | | | | Add basic server audit tab to system console for EEJoramWilander2016-02-025-535/+700
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #2045 from mattermost/plt-1849Christopher Speller2016-02-035-85/+342
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-1849 Added extra system-wide statistics for EE
| * | | | | | | | Added extra system-wide statistics for EEJoramWilander2016-02-025-85/+342
| |/ / / / / / /
* | | | | | | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modalsJoram Wilander2016-02-0318-119/+641
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-7: Refactoring frontend (chunk 10)
| * | | | | | | | PLT-7: Refactoring frontend (chunk 10)Elias Nahum2016-02-0218-119/+641
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Modals - Fix bug on msg_typing - Add missing translations in es.json for EE
* | | | | | | | Merge pull request #2048 from rgarmsen2295/plt-1317Joram Wilander2016-02-034-7/+25
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-1317 Replaces the clock icon for same user posts with a simple timestamp
| * | | | | | | | Changed clock icon in repeat posts to simple timestampReed Garmsen2016-02-024-7/+25
| |/ / / / / / /
* | | | | | | | 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 #1991 from rgarmsen2295/plt-976Joram Wilander2016-02-033-2/+278
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | 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-023-2/+278
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | 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 #2026 from rgarmsen2295/plt-1720Corey Hulen2016-02-022-8/+27
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | 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-022-8/+27
| |/ / / / / /
* / / / / / / Fixed React invalid prop warning in Team SettingsReed Garmsen2016-02-021-1/+3
|/ / / / / /
* | | | | | 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
* | | | | | 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.