summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Add missing en locs and translations to esElias Nahum2016-03-319-89/+249
|
* Merge pull request #2594 from mattermost/plt-2476Harrison Healey2016-03-315-54/+38
|\ | | | | PLT-2476 Fixing username display in center channel
| * Fixing username display in center channelChristopher Speller2016-03-315-54/+38
| |
* | Merge pull request #2595 from hmhealey/plt2480Joram Wilander2016-03-314-8/+6
|\ \ | | | | | | PLT-2480 Fixed errors when joining a channel that doesn't exist yet
| * | 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
|\ \ | | | | | | PLT-2474 Fixing typing message on channel switch.
| * | Fixing typing message on channel switchChristopher Speller2016-03-311-5/+7
| | |
* | | Merge pull request #2597 from mattermost/plt-2011Harrison Healey2016-03-311-2/+1
|\ \ \ | | | | | | | | PLT-2011 Fixing sidebar jump warning
| * | | Fixing sidebar jump warningChristopher Speller2016-03-311-2/+1
| |/ /
* | | Merge pull request #2592 from ZBoxApp/editorconfigJoram Wilander2016-03-311-1/+7
|\ \ \ | | | | | | | | Update .editorconfig
| * | | Update .editorconfigElias Nahum2016-03-311-1/+7
| |/ /
* | | Merge pull request #2590 from mattermost/plt-2287Harrison Healey2016-03-312-0/+9
|\ \ \ | | | | | | | | PLT-2287 Disable previously created public links with the config setting
| * | | 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
|\ \ \ | | | | | | | | PLT-1812 Update webhook posts to never show in collapsed view
| * | | 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
|\ \ \ \ | |_|_|/ |/| | | PLT-2491/PLT-2492 Fixed saving changes in ServiceSettings when MFA isn't available
| * | | 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 modal
| * | 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 email
| * 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
|\ \ | | | | | | PLT-2463, PLT-2465 Fixing session and logout errors
| * | Fixing session and logout errorsChristopher Speller2016-03-304-9/+9
|/ /
* | Merge pull request #2582 from hmhealey/emojiChristopher Speller2016-03-308-2/+60
|\ \ | |/ |/| Added a few missing emojis
| * Added South Africa emojiHarrison Healey2016-03-302-0/+10
| |
| * Added slight smiling, slighting frowning, upside-down smiling, Canada, and ↵Harrison Healey2016-03-307-2/+50
| | | | | | | | Pakistan emojis
* | Merge pull request #2518 from mattermost/plt-2187Christopher Speller2016-03-3049-355/+5839
|\ \ | |/ |/| PLT-2187 Add MFA functionality
| * Add MFA functionalityJoramWilander2016-03-3049-355/+5839
| |
* | Merge pull request #2580 from hmhealey/plt2482Corey Hulen2016-03-301-0/+1
|\ \ | |/ |/| PLT-2482 Fixed function binding in FileStore
| * Fixed function binding in FileStoreHarrison Healey2016-03-301-0/+1
| |
* | Merge pull request #2577 from mattermost/plt-2349Christopher Speller2016-03-306-282/+407
|\ \ | | | | | | PLT-2349 Update email/password settings text depending on sign-in method
| * | Update email/password settings text depending on sign-in methodJoramWilander2016-03-306-282/+407
| | |
* | | Merge pull request #2576 from hmhealey/plt2450Christopher Speller2016-03-304-28/+4
|\ \ \ | | | | | | | | PLT-2450 Updated out of channel notification message
| * | | Updated out of channel notification messageHarrison Healey2016-03-304-28/+4
| |/ /
* | | Merge pull request #2579 from asaadmahmoodspin/ui-improvementsHarrison Healey2016-03-303-13/+6
|\ \ \ | |_|/ |/| | Multiple UI Improvements
| * | Multiple UI ImprovementsAsaad Mahmood2016-03-303-13/+6
| |/
* | Merge pull request #2575 from hmhealey/plt2480Joram Wilander2016-03-302-6/+11
|\ \ | | | | | | PLT-2478/PLT-2480 Fixing direct channels in sidebar
| * | Fixed leaving a direct channel so that it doesn't open the channel you just leftHarrison Healey2016-03-301-3/+5
| | |
| * | Fixed adding direct channels to the sidebarHarrison Healey2016-03-301-3/+6
| | |
* | | Merge pull request #2573 from mattermost/plt-2453Joram Wilander2016-03-302-0/+20
|\ \ \ | |_|/ |/| | PLT-2453 Resetting theme upon logout.
| * | Resetting theme upon logout. Displaying loading page when logging in so user ↵Christopher Speller2016-03-302-0/+20
| | | | | | | | | | | | does not see their theme switch.
* | | Merge pull request #2574 from asaadmahmoodspin/ui-improvementsHarrison Healey2016-03-302-18/+44
|\ \ \ | | | | | | | | PLT-2296 - Adding back button to main create team page
| * | | Fixing linkAsaad Mahmood2016-03-301-1/+1
| | | |
| * | | Fixing eslint errorAsaad Mahmood2016-03-301-1/+0
| | | |
| * | | Adding back button to main create team pageAsaad Mahmood2016-03-302-18/+45
| |/ /
* | | Merge pull request #2561 from hmhealey/plt1736Christopher Speller2016-03-3033-836/+2026
|\ \ \ | | | | | | | | PLT-1736 Initial Backstage Work