summaryrefslogtreecommitdiffstats
path: root/webapp
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2320 from mozilla/msg-commandJoram Wilander2016-04-041-6/+9
|\ | | | | PLT-2231 /msg command and tests
| * msg commandAlan Mooiman2016-03-241-6/+9
| |
* | PLT-2395 - Improvements to backstage cssAsaad Mahmood2016-04-0415-341/+476
| |
* | Merge pull request #2621 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-04-0410-48/+228
|\ \ | | | | | | PLT-2027- Improvements to about dialog
| * | Adding modal changes back againAsaad Mahmood2016-04-018-53/+105
| | |
| * | Adding the build date and the build hashAsaad Mahmood2016-04-013-0/+128
| | |
* | | Merge pull request #2618 from ZBoxApp/email-imagesChristopher Speller2016-04-011-1/+3
|\ \ \ | | | | | | | | Add email images to webpack
| * | | Add email images to webpackElias Nahum2016-04-011-1/+3
| | | |
* | | | Merge pull request #2602 from ZBoxApp/autolinkerHarrison Healey2016-04-012-34/+7
|\ \ \ \ | |_|/ / |/| | | Replace Autolinker in extractLinks with a pattern
| * | | Rename extractLinks to extractFirstLinkElias Nahum2016-04-012-10/+8
| | | |
| * | | Replace Autolinker in extractLinks with a patternElias Nahum2016-03-311-31/+6
| |/ /
* | | Merge pull request #2614 from mattermost/plt-2388Harrison Healey2016-04-012-1/+82
|\ \ \ | | | | | | | | PLT-2388 Visiting invalid URLs and bad APIs causes redirect to error page
| * | | Visiting invalid URLs and bad APIs causes redirect to error pageChristopher Speller2016-04-012-1/+82
| |/ /
* | | Merge pull request #2611 from mattermost/mfa-typoChristopher Speller2016-04-011-1/+1
|\ \ \ | | | | | | | | Fix typo preventing saving of MFA setting in system console
| * | | Fix typo preventing saving of MFA setting in system consoleJoramWilander2016-04-011-1/+1
| | | |
* | | | Merge pull request #2609 from mattermost/plt-2311Christopher Speller2016-04-018-16/+73
|\ \ \ \ | | | | | | | | | | PLT-2311 Update tutorial channel names to reflect actual display names
| * | | | Update tutorial channel names to reflect actual display namesJoramWilander2016-04-018-16/+73
| | | | |
* | | | | 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 dialog
| * | | | | 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
|\ \ \ \ \ | | | | | | | | | | | | PLT-2473 Fixing new messages jump
| * | | | | Fixing new messages jumpChristopher Speller2016-03-311-2/+2
| | |_|/ / | |/| | |
* | | | | Merge pull request #2601 from mattermost/permalink-view-fixHarrison Healey2016-04-011-2/+2
|\ \ \ \ \ | |_|/ / / |/| | | | PLT-2382 Fixing reply from permalinks
| * | | | Fixing reply from permalinksChristopher Speller2016-03-311-2/+2
| |/ / /
* | | | Merge pull request #2599 from ZBoxApp/locsJoram Wilander2016-04-017-35/+123
|\ \ \ \ | | | | | | | | | | Add missing en locs and translations to es
| * | | | Add missing en locs and translations to esElias Nahum2016-03-317-35/+123
| |/ / /
* / / / MFA translationsRodrigo Corsi2016-03-311-1/+57
|/ / /
* | | 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 #2589 from mattermost/plt-1812Harrison Healey2016-03-314-17/+12
|\ \ \ \ | | | | | | | | | | PLT-1812 Update webhook posts to never show in collapsed view
| * | | | Update webhook posts to never show in collapsed viewJoramWilander2016-03-314-17/+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
| |/ /
* / / Improvements to preview textarea and about modalAsaad Mahmood2016-03-314-33/+34
|/ /
* | 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-3012-334/+693
|\ \ \ | |/ / |/| | PLT-2187 Add MFA functionality
| * | Add MFA functionalityJoramWilander2016-03-3012-334/+693
| | |
* | | Merge pull request #2580 from hmhealey/plt2482Corey Hulen2016-03-301-0/+1
|\ \ \ | |/ / |/| | PLT-2482 Fixed function binding in FileStore