summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1168 from rgarmsen2295/plt-816Corey Hulen2015-10-243-16/+13
|\
| * Fixed various React warnings during the team signup processReed Garmsen2015-10-233-16/+13
* | Fixed react warning in more_direct_channels.jsxReed Garmsen2015-10-231-1/+1
* | Fixed react warnings in channel_notifications.jsxReed Garmsen2015-10-231-15/+9
* | Fixed react warning for the search bar tooltipReed Garmsen2015-10-231-0/+1
|/
* Merge pull request #1133 from hmhealey/plt718Corey Hulen2015-10-234-6/+304
|\
| * Added keyboard selection to search autocompletehmhealey2015-10-234-46/+156
| * Added styling to search autocompletehmhealey2015-10-231-1/+11
| * Added an autocomplete dropdown to the search barhmhealey2015-10-233-0/+178
* | Updating indentation for settingsAsaad Mahmood2015-10-231-1/+1
* | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-233-5/+5
|\|
| * Merge pull request #1160 from mattermost/force-last-viewedChristopher Speller2015-10-232-3/+3
| |\
| | * Force updating last viewed at for new postsJoramWilander2015-10-232-3/+3
| * | Fixing issue with saving/getting drafts=Corey Hulen2015-10-231-2/+2
| |/
* | Updating nav active bg and Send invitation buttonAsaad Mahmood2015-10-232-1/+8
* | Updating bot stylingAsaad Mahmood2015-10-231-1/+1
* | Multiple UI ImprovementsAsaad Mahmood2015-10-236-78/+94
|/
* Merge pull request #1140 from mattermost/plt-787Harrison Healey2015-10-233-5/+71
|\
| * Make sure gif only loads onceJoramWilander2015-10-231-0/+7
| * Auto-embed gifs from .gif linksJoramWilander2015-10-233-5/+64
* | Merge pull request #1157 from mattermost/websocket-fixChristopher Speller2015-10-231-1/+1
|\ \
| * | Fix websocket not connecting when session index is 0JoramWilander2015-10-231-1/+1
| |/
* | Merge pull request #1149 from mattermost/plt-808Christopher Speller2015-10-233-26/+62
|\ \
| * | In webhooks UI handle error if channel can't be found, also use display name ...JoramWilander2015-10-223-26/+62
* | | Improving UI for the search popoverAsaad Mahmood2015-10-231-3/+3
* | | Merge branch 'master' of https://github.com/mattermost/platform into ui-impro...Asaad Mahmood2015-10-2356-337/+444
|\ \ \ | | |/ | |/|
| * | Fixing merge=Corey Hulen2015-10-221-0/+1
| * | Merge pull request #1150 from hmhealey/plt689Corey Hulen2015-10-221-28/+28
| |\ \
| | * | Fixed handling of whitespace surrounding emoticonshmhealey2015-10-221-28/+28
| | |/
| * | Merge pull request #1147 from hmhealey/plt721Corey Hulen2015-10-221-1/+1
| |\ \
| | * | Changed Direct Channel modal to only show active usershmhealey2015-10-221-1/+1
| | |/
| * | Merge pull request #1146 from hmhealey/plt759Corey Hulen2015-10-221-5/+7
| |\ \
| | * | Made searching case insensitive in Direct Messages modalhmhealey2015-10-221-5/+7
| | |/
| * | Merge pull request #1145 from hmhealey/plt719Corey Hulen2015-10-221-1/+32
| |\ \
| | * | Added help popover to search boxhmhealey2015-10-221-1/+32
| * | | Fixing merge=Corey Hulen2015-10-221-1/+1
| * | | Merge branch 'master' into PLT-44=Corey Hulen2015-10-222-41/+52
| |\ \ \
| | * \ \ Merge pull request #1138 from rgarmsen2295/plt-777Harrison Healey2015-10-222-41/+52
| | |\ \ \ | | | |_|/ | | |/| |
| | | * | Fixed typos in create_post.jsx resizing codeReed Garmsen2015-10-212-13/+11
| | | * | Changed post list resize code to use react state; fixed various eslint warningsReed Garmsen2015-10-211-38/+51
| * | | | Fixing group code review issues=Corey Hulen2015-10-221-2/+2
| * | | | Addressing issues from group code review=Corey Hulen2015-10-221-7/+20
| * | | | Fixing merge conflict=Corey Hulen2015-10-2211-34/+333
| |\| | |
| * | | | Fixing admin console=Corey Hulen2015-10-202-2/+2
| * | | | fixing eslint errors=Corey Hulen2015-10-205-3/+5
| * | | | Merge branch 'master' into PLT-44=Corey Hulen2015-10-208-41/+104
| |\ \ \ \
| * | | | | Multi-session login=Corey Hulen2015-10-2020-29/+43
| * | | | | Adding multi-session cookie=Corey Hulen2015-10-201-8/+8
| * | | | | Fixing merge conflicts=Corey Hulen2015-10-197-29/+422
| |\ \ \ \ \
| * \ \ \ \ \ Merging from master=Corey Hulen2015-10-1926-314/+460
| |\ \ \ \ \ \