summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* merging=Corey Hulen2016-01-2229-113/+421
|\
| * Updating favicon stuffAsaad Mahmood2016-01-221-2/+2
| * Merge pull request #1955 from mattermost/PLT-7-client-user-locCorey Hulen2016-01-224-0/+166
| |\
| | * PLT-7 adding loc feature to preview=Corey Hulen2016-01-221-1/+0
| | * PLT-7 adding loc feature to preview=Corey Hulen2016-01-222-37/+43
| | * PLT-7 adding lang selector=Corey Hulen2016-01-224-0/+161
| * | Merge pull request #1929 from esethna/patch-54Joram Wilander2016-01-221-1/+1
| |\ \ | | |/ | |/|
| | * Update team_general_tab.jsxEric Sethna2016-01-211-1/+1
| | * Update team_general_tab.jsxEric Sethna2016-01-201-1/+1
| * | PLT-7 fixing unit test for chunk 2 server=Corey Hulen2016-01-222-2/+2
| * | Merge pull request #1948 from hmhealey/plt1652Christopher Speller2016-01-222-3/+5
| |\ \
| | * | Added download param to getFile api callhmhealey2016-01-212-3/+5
| * | | PLT-7 fixing dist build=Corey Hulen2016-01-211-2/+0
| * | | PLT-7 client side infra=Corey Hulen2016-01-211-6/+3
| * | | PLT-7 client side infra=Corey Hulen2016-01-211-2/+15
| * | | PLT-7 Adding react-intl libs=Corey Hulen2016-01-215-8/+102
| |/ /
| * | Merge pull request #1937 from hmhealey/plt1695Corey Hulen2016-01-211-1/+5
| |\ \
| | * | Completely disabled broken pasting of images on IE11hmhealey2016-01-201-1/+5
| | |/
| * | Merge pull request #1935 from hmhealey/plt1664Corey Hulen2016-01-211-1/+1
| |\ \
| | * | Changed UnreadChannelIndicator display style so that it uses a value that IE1...hmhealey2016-01-201-1/+1
| | |/
| * | Merge pull request #1933 from hmhealey/plt1661Corey Hulen2016-01-212-41/+31
| |\ \
| | * | Added a small margin where the PostsView will be considered to be at the bott...hmhealey2016-01-201-1/+4
| | * | Removed some vestigial code from the post textboxhmhealey2016-01-201-19/+0
| | * | Changed the post textbox resizing code to be more reliable and not rely on ma...hmhealey2016-01-201-23/+29
| | |/
| * | Merge pull request #1924 from loafoe/masterChristopher Speller2016-01-212-1/+12
| |\ \
| | * | Fix indentationAndy Lo-A-Foe2016-01-201-7/+7
| | * | Optionally specify ws:// and wss:// port in configAndy Lo-A-Foe2016-01-192-1/+12
| | |/
| * | Merge pull request #1927 from rgarmsen2295/plt-1668Christopher Speller2016-01-219-44/+57
| |\ \
| | * | Removed extraneous error when providing a short usernameReed Garmsen2016-01-209-44/+57
| | |/
| * | Merge pull request #1922 from cloudron-io/check_auth_serviceHarrison Healey2016-01-211-2/+2
| |\ \
| | * | Check auth_service for constructing messagegirish@cloudron.io2016-01-191-1/+1
| | * | Check auth_service to describe user login messagegirish@cloudron.io2016-01-191-1/+1
| * | | Merge pull request #1882 from trashcan/PLT-1232-more-channel-infoHarrison Healey2016-01-211-2/+10
| |\ \ \
| | * | | Show correct channel URL in channel info modalPat Lathem2016-01-131-1/+4
| | * | | Rename 'Channel Handle' to Channel URL'Pat Lathem2016-01-131-1/+1
| | * | | Add channel purposePat Lathem2016-01-131-0/+5
| * | | | Merge pull request #1886 from rgarmsen2295/plt-549cJoram Wilander2016-01-211-2/+10
| |\ \ \ \
| | * | | | Fixed react warning issue with setState in RHSReed Garmsen2016-01-131-2/+10
| * | | | | Merge pull request #1885 from rgarmsen2295/plt-406Joram Wilander2016-01-211-0/+4
| |\ \ \ \ \ | | |_|_|_|/ | |/| | | |
| | * | | | Fix issue with drag n drop overlay in ie11Reed Garmsen2016-01-121-0/+4
| | | |/ / | | |/| |
* | | | | merging=Corey Hulen2016-01-151-3/+3
|\| | | |
| * | | | Merge pull request #1894 from mattermost/release-1.4Corey Hulen2016-01-141-3/+3
| |\ \ \ \ | | |_|_|/ | |/| | |
| | * | | Encode url query properly for SSO switchingJoramWilander2016-01-141-3/+3
* | | | | finishing up commands UI=Corey Hulen2016-01-142-68/+308
* | | | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-1424-94/+619
|\| | | |
| * | | | Fix error messageJoramWilander2016-01-141-5/+10
| * | | | Minor update to about modalJoramWilander2016-01-141-4/+1
| * | | | Added license validation and settingsJoramWilander2016-01-148-25/+391
| | |_|/ | |/| |
| * | | Merge pull request #1855 from rgarmsen2295/plt-1006Corey Hulen2016-01-134-7/+45
| |\ \ \
| | * | | Changed statistics to show usernames with an email tooltipReed Garmsen2016-01-114-7/+45