summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2611 from mattermost/mfa-typoChristopher Speller2016-04-011-1/+1
|\
| * Fix typo preventing saving of MFA setting in system consoleJoramWilander2016-04-011-1/+1
* | Merge pull request #2609 from mattermost/plt-2311Christopher Speller2016-04-0112-29/+74
|\ \
| * | Remove old translationsJoramWilander2016-04-013-12/+0
| * | Update tutorial channel names to reflect actual display namesJoramWilander2016-04-019-17/+74
* | | Merge pull request #2616 from mattermost/revert-2608-ui-improvementsChristopher Speller2016-04-0110-196/+56
|\ \ \
| * | | Revert "PLT-2027- Improvements to about dialog"Christopher Speller2016-04-0110-196/+56
|/ / /
* | | Merge pull request #2608 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-04-0110-56/+196
|\ \ \
| * | | PLT-2027- Improvements to about dialogAsaad Mahmood2016-04-0110-56/+196
| | |/ | |/|
* | | Merge pull request #2600 from mattermost/new-messages-fixHarrison Healey2016-04-011-2/+2
|\ \ \
| * | | Fixing new messages jumpChristopher Speller2016-03-311-2/+2
* | | | Merge pull request #2601 from mattermost/permalink-view-fixHarrison Healey2016-04-011-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Fixing reply from permalinksChristopher Speller2016-03-311-2/+2
| |/ /
* | | Merge pull request #2599 from ZBoxApp/locsJoram Wilander2016-04-019-89/+249
|\ \ \
| * | | Add missing en locs and translations to esElias Nahum2016-03-319-89/+249
| |/ /
* | | Merge pull request #2603 from rodrigocorsi2/pt-translationsJoram Wilander2016-04-012-2/+130
|\ \ \ | |/ / |/| |
| * | MFA translationsRodrigo Corsi2016-03-312-2/+130
|/ /
* | Merge pull request #2594 from mattermost/plt-2476Harrison Healey2016-03-315-54/+38
|\ \
| * | Fixing username display in center channelChristopher Speller2016-03-315-54/+38
* | | Merge pull request #2595 from hmhealey/plt2480Joram Wilander2016-03-314-8/+6
|\ \ \
| * | | Changed ChannelHeader to pass channel to PopoverListMembers directlyHarrison Healey2016-03-312-11/+4
| * | | Fixed errors when joining a channel that doesn't exist yetHarrison Healey2016-03-312-2/+6
| * | | Fixed PostsView not unregistering it's PreferenceStore listener when unmountingHarrison Healey2016-03-311-0/+1
| |/ /
* | | Merge pull request #2598 from mattermost/plt-2474Harrison Healey2016-03-311-5/+7
|\ \ \
| * | | Fixing typing message on channel switchChristopher Speller2016-03-311-5/+7
| | |/ | |/|
* | | Merge pull request #2597 from mattermost/plt-2011Harrison Healey2016-03-311-2/+1
|\ \ \
| * | | Fixing sidebar jump warningChristopher Speller2016-03-311-2/+1
| |/ /
* | | Merge pull request #2592 from ZBoxApp/editorconfigJoram Wilander2016-03-311-1/+7
|\ \ \
| * | | Update .editorconfigElias Nahum2016-03-311-1/+7
| |/ /
* | | Merge pull request #2590 from mattermost/plt-2287Harrison Healey2016-03-312-0/+9
|\ \ \
| * | | Disable previously created public links with the config settingJoramWilander2016-03-312-0/+9
| | |/ | |/|
* | | Merge pull request #2589 from mattermost/plt-1812Harrison Healey2016-03-315-19/+12
|\ \ \
| * | | Update webhook posts to never show in collapsed viewJoramWilander2016-03-315-19/+12
* | | | Merge pull request #2588 from hmhealey/plt2490Christopher Speller2016-03-312-2/+8
|\ \ \ \ | |_|_|/ |/| | |
| * | | Fixed saving changes in ServiceSettings when MFA isn't availableHarrison Healey2016-03-311-1/+4
| * | | Fixed prop type warning in system consoleHarrison Healey2016-03-311-1/+4
| | |/ | |/|
* | | Merge pull request #2587 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-03-314-33/+34
|\ \ \ | |/ / |/| |
| * | Improvements to preview textarea and about modalAsaad Mahmood2016-03-314-33/+34
* | | Fix loginChristopher Speller2016-03-312-1/+8
| |/ |/|
* | Merge pull request #2585 from mattermost/fix-ldap-emailJoram Wilander2016-03-311-1/+1
|\ \ | |/ |/|
| * Fix for ldap ability to change emailChristopher Speller2016-03-301-1/+1
* | Merge pull request #2578 from mattermost/plt-2463Christopher Speller2016-03-304-9/+9
|\ \
| * | Fixing session and logout errorsChristopher Speller2016-03-304-9/+9
|/ /
* | Merge pull request #2582 from hmhealey/emojiChristopher Speller2016-03-308-2/+60
|\ \ | |/ |/|
| * Added South Africa emojiHarrison Healey2016-03-302-0/+10
| * Added slight smiling, slighting frowning, upside-down smiling, Canada, and Pa...Harrison Healey2016-03-307-2/+50
* | Merge pull request #2518 from mattermost/plt-2187Christopher Speller2016-03-3049-355/+5839
|\ \ | |/ |/|
| * Add MFA functionalityJoramWilander2016-03-3049-355/+5839
* | Merge pull request #2580 from hmhealey/plt2482Corey Hulen2016-03-301-0/+1
|\ \ | |/ |/|
| * Fixed function binding in FileStoreHarrison Healey2016-03-301-0/+1