summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* PLT-451 - Adding visual effect for logout active sessions buttonAsaad Mahmood2015-10-062-1/+7
* Merge pull request #939 from asaadmahmoodspin/plt-424Corey Hulen2015-10-066-142/+145
|\
| * PLT-432 - Status icon for active LHS item the same as text colorAsaad Mahmood2015-10-061-0/+1
| * Admin console UI ImprovementsAsaad Mahmood2015-10-065-142/+144
* | Merge pull request #941 from hmhealey/plt515Corey Hulen2015-10-061-11/+18
|\ \ | |/ |/|
| * Hid Copy Link button when unable to copy the team signup linkhmhealey2015-10-061-11/+18
* | Merge pull request #935 from mattermost/remove-zeroclipboardChristopher Speller2015-10-061-1/+0
|\ \
| * | Remove npm reference to unused zeroclipboard.JoramWilander2015-10-061-1/+0
* | | Merge pull request #934 from asaadmahmoodspin/ui-improvementsChristopher Speller2015-10-062-12/+25
|\ \ \ | |_|/ |/| |
| * | Updating form-control focusAsaad Mahmood2015-10-061-2/+3
| * | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-062-3/+3
| |\ \
| * | | Adding mention highlight setting and improving search highlight tooAsaad Mahmood2015-10-062-6/+17
| * | | Multiple UI ImprovementsAsaad Mahmood2015-10-062-6/+7
| | |/ | |/|
* | | Merge pull request #936 from mattermost/signup-fixJoram Wilander2015-10-061-13/+14
|\ \ \ | |_|/ |/| |
| * | Fixing broken signup pageChristopher Speller2015-10-061-13/+14
| |/
* / Fixed Get Public Link buttonhmhealey2015-10-052-3/+3
|/
* Merge pull request #925 from asaadmahmoodspin/ui-improvementsHarrison Healey2015-10-053-6/+5
|\
| * Multiple UI ImprovementsAsaad Mahmood2015-10-053-6/+5
* | Merge pull request #922 from mattermost/plt-360Harrison Healey2015-10-0533-308/+350
|\ \ | |/ |/|
| * Disabling complexity warning. Allowing non-nested ternary. Upgrading ESList. ...Christopher Speller2015-10-0533-308/+350
* | Merge pull request #923 from mattermost/fix-load-scrollCorey Hulen2015-10-051-1/+1
|\ \
| * | Fix missed binding for youtube data callback.JoramWilander2015-10-051-1/+1
* | | Merge pull request #914 from mattermost/plt-297Joram Wilander2015-10-055-9/+121
|\ \ \ | |_|/ |/| |
| * | Update help text to mention the BOT tag for webhook posts.JoramWilander2015-10-051-1/+1
| * | Add config options for overriding username and icon, and add BOT indicator ne...JoramWilander2015-10-054-14/+91
| * | Add ability to override username and icon for posts from incoming webhooks.JoramWilander2015-10-024-8/+43
* | | Merge pull request #915 from mattermost/plt-300Christopher Speller2015-10-051-8/+8
|\ \ \
| * | | Update allow/deny oauth page UI, and add ouath as reserved word.JoramWilander2015-10-021-8/+8
| | |/ | |/|
* | | Merge pull request #903 from mattermost/PLT-44Christopher Speller2015-10-054-6/+17
|\ \ \
| * | | Fixing issues=Corey Hulen2015-10-021-1/+1
| * | | PLT-44 allow team switching without the need to login=Corey Hulen2015-10-014-5/+16
| | |/ | |/|
* | | Merge pull request #887 from asaadmahmoodspin/plt-375Joram Wilander2015-10-053-22/+32
|\ \ \
| * | | Updating theme colours for popovers, drop downs etcAsaad Mahmood2015-10-051-14/+18
| * | | Updating search coloursAsaad Mahmood2015-10-051-1/+2
| * | | Updating jpg to png for theme namesAsaad Mahmood2015-10-051-1/+1
| * | | Merge branch 'master' of https://github.com/mattermost/platform into plt-375Asaad Mahmood2015-10-0211-150/+226
| |\ \ \ | | | |/ | | |/|
| * | | pot-375 - Making modals compatible with themesAsaad Mahmood2015-10-014-24/+30
* | | | Merge branch 'master' into PLT-462=Corey Hulen2015-10-0210-143/+200
|\ \ \ \ | | |/ / | |/| |
| * | | Merge pull request #912 from hmhealey/plt174Christopher Speller2015-10-021-2/+4
| |\ \ \
| | * | | Added emailto: to the beginning of email linkshmhealey2015-10-021-2/+4
| * | | | Merge pull request #909 from mattermost/plt-446Harrison Healey2015-10-021-0/+2
| |\ \ \ \
| | * | | | Added help text for incoming webhooks.JoramWilander2015-10-021-0/+2
| | | |_|/ | | |/| |
| * | | | Change text to avoid confusion with Slack Importit332015-10-021-1/+1
| * | | | Removed $ from time tooltiphmhealey2015-10-021-1/+1
| | |/ / | |/| |
| * | | Merge pull request #881 from hmhealey/plt194Joram Wilander2015-10-026-139/+192
| |\ \ \ | | |/ / | |/| |
| | * | Moved ChannelMember.NotifyLevel into ChannelMember.NotifyPropshmhealey2015-10-013-27/+7
| | * | Replaced ChannelMember.MarkUnreadLevel with ChannelMember.NotifyPropshmhealey2015-10-014-15/+12
| | * | Changed notification preference submission to only be updated when options ha...hmhealey2015-09-301-0/+10
| | * | Added channel id to updateLastViewed api calls to prevent multiple updates to...hmhealey2015-09-301-7/+9
| | * | Implemented ChannelMember.MarkUnreadLevel so that it actually functionshmhealey2015-09-302-2/+2