summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | | | | Fixed localization issues in file_upload.jsxhmhealey2016-02-041-3/+3
|/ / / / / / / / /
* | | | | | | | | Merge pull request #2059 from mattermost/plt-1732Harrison Healey2016-02-044-6/+26
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | PLT-1732 Update user email when switching to SSO
| * | | | | | | | | Fix auth data unit testJoramWilander2016-02-031-1/+1
| | | | | | | | | |
| * | | | | | | | | Update user email when switching to SSOJoramWilander2016-02-033-5/+25
| | | | | | | | | |
* | | | | | | | | | Merge pull request #2062 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-02-045-65/+90
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Multiple UI Improvements
| * | | | | | | | | | Multiple UI ImprovementsAsaad Mahmood2016-02-035-65/+90
| | |_|_|_|_|_|_|/ / | |/| | | | | | | |
* | | | | | | | | | Merge pull request #2065 from ZBoxApp/PLT-7-fixCorey Hulen2016-02-031-2/+2
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | Fix claim translations
| * | | | | | | | | | Fix claim translationsElias Nahum2016-02-031-2/+2
| | |_|_|_|_|_|_|_|/ | |/| | | | | | | |
* | | | | | | | | | 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-0327-269/+797
|\ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | PLT-7: Refactoring frontend (chunk 11)
| * | | | | | | | | Fix socketError message in spanishElias Nahum2016-02-031-1/+1
| | | | | | | | | |
| * | | | | | | | | fix config.jsonElias Nahum2016-02-031-26/+1
| | | | | | | | | |
| * | | | | | | | | Add missing translationsElias Nahum2016-02-033-99/+118
| | | | | | | | | |
| * | | | | | | | | Messages for SocketStore and small fixesElias Nahum2016-02-039-44/+122
| | | | | | | | | |
| * | | | | | | | | PLT-7: Refactoring frontend (chunk 11)Elias Nahum2016-02-0320-127/+583
| | |/ / / / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - channel view - Added translations for previous commits - Fix bug on signup_team email body
* | | | | | | | | Update CONTRIBUTING.mdit332016-02-031-60/+1
| |/ / / / / / / |/| | | | | | |
* | | | | | | | Merge pull request #2061 from mattermost/plt-1817Corey Hulen2016-02-031-1/+1
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-1817 Fix katex sanitization
| * | | | | | | | Fix katex sanitizationJoramWilander2016-02-031-1/+1
| |/ / / / / / /
* | | | | | | | Merge pull request #2057 from khoa-le/PLT-1673Harrison Healey2016-02-031-2/+2
|\ \ \ \ \ \ \ \ | |/ / / / / / / |/| | | | | | | PLT-1673: Make hashtag searching independent of case
| * | | | | | | Make hashtag searching independent of caseKhoa, Le Ngoc2016-02-031-2/+2
| | | | | | | |
* | | | | | | | 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-0315-587/+908
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-1856 Add basic server audit tab to system console for EE
| * | | | | | | | Add basic server audit tab to system console for EEJoramWilander2016-02-0215-588/+909
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #2045 from mattermost/plt-1849Christopher Speller2016-02-0316-95/+630
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-1849 Added extra system-wide statistics for EE
| * | | | | | | | Remove missing ES translationsJoramWilander2016-02-022-15/+0
| | | | | | | | |
| * | | | | | | | Added extra system-wide statistics for EEJoramWilander2016-02-0217-95/+645
| |/ / / / / / /
* | | | | | | | Merge pull request #2051 from ZBoxApp/PLT-7-channel-modalsJoram Wilander2016-02-0322-153/+887
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | PLT-7: Refactoring frontend (chunk 10)
| * | | | | | | | PLT-7: Refactoring frontend (chunk 10)Elias Nahum2016-02-0222-153/+887
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - 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 #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