summaryrefslogtreecommitdiffstats
path: root/web/react/utils
Commit message (Expand)AuthorAgeFilesLines
* Fixing merge=Corey Hulen2016-02-012-1/+2
|\
| * Adding reply functionalityAsaad Mahmood2016-01-282-1/+2
* | merging=Corey Hulen2016-01-251-2/+16
|\|
| * Merge pull request #1956 from mattermost/plt-1779Corey Hulen2016-01-221-2/+16
| |\
| | * Add system analytics pageJoramWilander2016-01-211-2/+2
| | * Generalize analytics server functions and begin componentizing client analyti...JoramWilander2016-01-211-2/+16
* | | merging=Corey Hulen2016-01-225-5/+82
|\| |
| * | PLT-7 adding loc feature to preview=Corey Hulen2016-01-221-0/+4
| * | PLT-7 adding lang selector=Corey Hulen2016-01-221-0/+15
| * | Merge pull request #1948 from hmhealey/plt1652Christopher Speller2016-01-221-2/+3
| |\ \
| | * | Added download param to getFile api callhmhealey2016-01-211-2/+3
| * | | PLT-7 Adding react-intl libs=Corey Hulen2016-01-213-0/+38
| |/ /
| * | Merge pull request #1924 from loafoe/masterChristopher Speller2016-01-211-0/+11
| |\ \
| | * | Fix indentationAndy Lo-A-Foe2016-01-201-7/+7
| | * | Optionally specify ws:// and wss:// port in configAndy Lo-A-Foe2016-01-191-0/+11
| * | | Merge pull request #1927 from rgarmsen2295/plt-1668Christopher Speller2016-01-212-3/+7
| |\ \ \ | | |_|/ | |/| |
| | * | Removed extraneous error when providing a short usernameReed Garmsen2016-01-202-3/+7
| | |/
| * | 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
* | | finishing up commands UI=Corey Hulen2016-01-141-1/+59
* | | Merge branch 'master' into PLT-1429=Corey Hulen2016-01-144-11/+112
|\| |
| * | Added license validation and settingsJoramWilander2016-01-142-4/+62
| * | Merge pull request #1855 from rgarmsen2295/plt-1006Corey Hulen2016-01-131-1/+2
| |\ \
| | * | Changed statistics to show usernames with an email tooltipReed Garmsen2016-01-111-1/+2
| | |/
| * | Merge pull request #1853 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-132-3/+16
| |\ \ | | |/ | |/|
| | * Adding away icon and changing online and offline iconsAsaad Mahmood2016-01-112-3/+16
| * | Merge pull request #1849 from hmhealey/plt1578Corey Hulen2016-01-111-0/+15
| |\ \ | | |/ | |/|
| | * Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugshmhealey2016-01-111-0/+15
| * | Merge pull request #1824 from hmhealey/plt1525Joram Wilander2016-01-112-3/+11
| |\ \ | | |/ | |/|
| | * Made ChannelInviteModal pull all channel members before renderinghmhealey2016-01-072-3/+11
| * | Removed ability to drag n' drop text; drag n' drop ui no longer appears when ...Reed Garmsen2016-01-061-0/+6
| |/
* | Fixing unit tests=Corey Hulen2016-01-091-1/+1
* | partial fix for UI=Corey Hulen2016-01-082-7/+29
|/
* Merge pull request #1819 from hmhealey/plt1401Joram Wilander2016-01-061-3/+3
|\
| * Removed email regexhmhealey2016-01-061-3/+3
* | Removed temporary fix for old filenames that used absolute urls pointing to t...hmhealey2016-01-061-16/+2
* | Changed Audio/Video preview to just display a file info when encountering a f...hmhealey2016-01-061-0/+19
|/
* Merge pull request #1801 from hmhealey/plt1602Christopher Speller2016-01-041-0/+10
|\
| * Fixed ViewImage modal to clear its loaded state when its file list changeshmhealey2016-01-041-0/+10
* | Merge pull request #1745 from mattermost/plt-1118Christopher Speller2016-01-042-0/+36
|\ \ | |/ |/|
| * Add ability to switch between SSO and email accountJoramWilander2015-12-172-0/+36
* | Merge pull request #1769 from mattermost/PLT-1488Christopher Speller2016-01-041-0/+3
|\ \
| * | PLT-1488 fixing error message from session revoke=Corey Hulen2015-12-231-0/+3
* | | Merge pull request #1740 from hmhealey/plt730Joram Wilander2015-12-282-2/+29
|\ \ \
| * | | Added theme styling to floating timestamphmhealey2015-12-161-2/+2
| * | | Added DelayedAction class to use to handle stopping scrollinghmhealey2015-12-161-0/+27
* | | | Merge pull request #1755 from hmhealey/plt1108Joram Wilander2015-12-283-1/+32
|\ \ \ \ | |_|/ / |/| | |
| * | | Refactored ViewImage modal and made it automatically play animated gifshmhealey2015-12-183-1/+32
| | |/ | |/|
* | | Multiple UI ImprovementsAsaad Mahmood2015-12-211-2/+3
* | | Merge pull request #1756 from mattermost/lfbrock-emojisCorey Hulen2015-12-181-21/+21
|\ \ \