summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | | | 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
| |/ / / / / / / /
* | | | | | | | | Merge pull request #2060 from ZBoxApp/PLT-7-channelHarrison Healey2016-02-0325-268/+788
|\ \ \ \ \ \ \ \ \ | |/ / / / / / / / |/| | | | | | | | PLT-7: Refactoring frontend (chunk 11)
| * | | | | | | | Fix socketError message in spanishElias Nahum2016-02-031-1/+1
| | | | | | | | |
| * | | | | | | | Add missing translationsElias Nahum2016-02-032-99/+110
| | | | | | | | |
| * | | | | | | | Messages for SocketStore and small fixesElias Nahum2016-02-038-43/+96
| | | | | | | | |
| * | | | | | | | PLT-7: Refactoring frontend (chunk 11)Elias Nahum2016-02-0319-126/+582
| | |_|_|_|_|_|/ | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - channel view - Added translations for previous commits - Fix bug on signup_team email body
* / | | | | | | Fix katex sanitizationJoramWilander2016-02-031-1/+1
|/ / / / / / /
* | | | | | | 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 #2054 from khoa-le/PLT-1433Christopher Speller2016-02-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-1433 OGG files render as audio files with preview
| * | | | | | | | OGG files render as audio files with previewKhoa, Le Ngoc2016-02-031-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #2049 from mattermost/plt-1856Christopher Speller2016-02-0310-583/+823
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-1856 Add basic server audit tab to system console for EE
| * | | | | | | | Add basic server audit tab to system console for EEJoramWilander2016-02-0210-584/+824
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #2045 from mattermost/plt-1849Christopher Speller2016-02-038-89/+354
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-1849 Added extra system-wide statistics for EE
| * | | | | | | | Remove missing ES translationsJoramWilander2016-02-021-7/+0
| | | | | | | | |
| * | | | | | | | Added extra system-wide statistics for EEJoramWilander2016-02-028-89/+361
| |/ / / / / / /
* | | | | | | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modalsJoram Wilander2016-02-0320-119/+821
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-7: Refactoring frontend (chunk 10)
| * | | | | | | | PLT-7: Refactoring frontend (chunk 10)Elias Nahum2016-02-0220-119/+821
| |/ / / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Modals - Fix bug on msg_typing - Add missing translations in es.json for EE
* | | | | | | | Merge pull request #2048 from rgarmsen2295/plt-1317Joram Wilander2016-02-036-28/+31
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | 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-026-24/+31
| | | | | | | | |
| * | | | | | | | Removed css clock from sub-postsReed Garmsen2016-02-021-4/+0
| |/ / / / / / /
* | | | | | | | 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-036-2/+322
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | 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-026-2/+322
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | 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-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
| |/ / / / / /
* / / / / / / Fixed React invalid prop warning in Team SettingsReed Garmsen2016-02-021-1/+3
|/ / / / / /
* | | | | | 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…