summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Collapse)AuthorAgeFilesLines
* merging=Corey Hulen2016-01-151-3/+3
|\
| * Merge pull request #1894 from mattermost/release-1.4Corey Hulen2016-01-141-3/+3
| |\ | | | | | | Release 1.4
| | * Encode url query properly for SSO switchingJoramWilander2016-01-141-3/+3
| | |
* | | finishing up commands UI=Corey Hulen2016-01-141-67/+249
| | |
* | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-1420-83/+507
|\| |
| * | Fix error messageJoramWilander2016-01-141-5/+10
| | |
| * | Minor update to about modalJoramWilander2016-01-141-4/+1
| | |
| * | Added license validation and settingsJoramWilander2016-01-146-21/+329
| | |
| * | Merge pull request #1855 from rgarmsen2295/plt-1006Corey Hulen2016-01-133-6/+43
| |\ \ | | | | | | | | PLT-1006 Changed team statistics page to show usernames with email shown in a tooltip
| | * | Changed statistics to show usernames with an email tooltipReed Garmsen2016-01-113-6/+43
| | | |
| * | | Merge pull request #1853 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-132-1/+2
| |\ \ \ | | | | | | | | | | Adding away icon and changing online and offline icons
| | * | | Adding away icon and changing online and offline iconsAsaad Mahmood2016-01-112-1/+2
| | | | |
| * | | | Merge pull request #1850 from mattermost/preview-modeCorey Hulen2016-01-131-1/+1
| |\ \ \ \ | | | | | | | | | | | | Documenting how Preview Mode is disabled
| | * | | | Update email_settings.jsxit332016-01-091-1/+1
| | | | | |
| | * | | | Documenting how Preview Mode turns offit332016-01-091-1/+1
| | | | | |
| * | | | | Merge pull request #1830 from rgarmsen2295/plt-1599Joram Wilander2016-01-121-2/+8
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | | PLT-1599 Help text in invite member modal now reflects the default channel name
| | * | | | Help text in invite member modal now updates according to town-square ↵Reed Garmsen2016-01-071-2/+8
| | | | | | | | | | | | | | | | | | | | | | | | display name
| * | | | | Adding push-test.mattermost.comit332016-01-111-2/+2
| | |_|_|/ | |/| | |
| * | | | Merge pull request #1849 from hmhealey/plt1578Corey Hulen2016-01-111-8/+21
| |\ \ \ \ | | |_|_|/ | |/| | | PLT-571 Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs
| | * | | Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugshmhealey2016-01-111-8/+21
| | | |/ | | |/|
| * | | Merge pull request #1822 from asaadmahmoodspin/ui-improvementsHarrison Healey2016-01-113-3/+8
| |\ \ \ | | | | | | | | | | Multiple UI Improvements
| | * | | Updating fixAsaad Mahmood2016-01-081-1/+1
| | | | |
| | * | | Multiple UI ImprovementsAsaad Mahmood2016-01-073-3/+8
| | | |/ | | |/|
| * | | Merge pull request #1824 from hmhealey/plt1525Joram Wilander2016-01-112-20/+60
| |\ \ \ | | |_|/ | |/| | PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel
| | * | Added a loading screen to ChannelMembersModal and made it pull all channel ↵hmhealey2016-01-071-13/+36
| | | | | | | | | | | | | | | | members before rendering
| | * | Made ChannelInviteModal pull all channel members before renderinghmhealey2016-01-071-7/+24
| | | |
| * | | Fixed FileUpload to properly unbind drag handlers when unmountedhmhealey2016-01-081-0/+12
| | | |
| * | | Removed ability to drag n' drop text; drag n' drop ui no longer appears when ↵Reed Garmsen2016-01-063-24/+24
| | |/ | |/| | | | | | | non-files are dragged
* | | Adding UI=Corey Hulen2016-01-112-0/+295
| | |
* | | partial fix for UI=Corey Hulen2016-01-081-6/+1
|/ /
* | Merge pull request #1813 from mattermost/PLT-1558Harrison Healey2016-01-061-1/+132
|\ \ | |/ |/| PLT-1558 adding session length to config file
| * Adding UI for session length settings=Corey Hulen2016-01-051-1/+132
| |
* | Removed temporary fix for old filenames that used absolute urls pointing to ↵hmhealey2016-01-062-10/+1
| | | | | | | | the get file api
* | Changed Audio/Video preview to just display a file info when encountering a ↵hmhealey2016-01-063-78/+171
| | | | | | | | file that cannot be played
* | Merge pull request #1802 from hmhealey/plt1449Christopher Speller2016-01-052-117/+183
|\ \ | | | | | | PLT-1449 Made Youtube previews stop when the current channel is changed
| * | Make Youtube previews stop when the channel is changedhmhealey2016-01-042-1/+20
| | |
| * | Move Youtube preview into its own filehmhealey2016-01-042-117/+164
| | |
* | | Merge pull request #1810 from hmhealey/plt644Christopher Speller2016-01-051-4/+0
|\ \ \ | |_|/ |/| | PLT-644 Updated about dialog
| * | Updated about dialoghmhealey2016-01-051-4/+0
| | |
* | | Fixed issue where font would remain changed even after cancelling changesReed Garmsen2016-01-041-7/+13
|/ /
* | Merge pull request #1801 from hmhealey/plt1602Christopher Speller2016-01-041-17/+25
|\ \ | | | | | | PLT-1602 Fix ViewImageModal incorrectly assuming it has a file's info in certain cases
| * | Fixed ViewImage modal to clear its loaded state when its file list changeshmhealey2016-01-041-9/+9
| | |
| * | Changed the ViewImageModal to only store info for the current imagehmhealey2016-01-041-8/+16
| |/
* | Merge pull request #1745 from mattermost/plt-1118Christopher Speller2016-01-045-125/+494
|\ \ | | | | | | PLT-1118 Add ability to switch between SSO and email account
| * | Add ability to switch between SSO and email accountJoramWilander2015-12-175-125/+494
| | |
* | | Made links in help text open in a new tabReed Garmsen2016-01-043-3/+26
| |/ |/|
* | Merge pull request #1785 from mattermost/plt-1492Corey Hulen2016-01-041-11/+14
|\ \ | | | | | | PLT-1492 Fix default for teammate name display setting
| * | Fix default for teammate name display settingJoramWilander2015-12-281-11/+14
| | |
* | | Merge pull request #1784 from mattermost/plt-1591Corey Hulen2016-01-041-3/+6
|\ \ \ | | | | | | | | PLT-1591 Fix appearance settings scroll bug
| * | | Fix appearance settings scroll bugJoramWilander2015-12-281-3/+6
| |/ /