summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1849 from hmhealey/plt1578Corey Hulen2016-01-112-8/+36
|\
| * Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugshmhealey2016-01-112-8/+36
* | Merge pull request #1822 from asaadmahmoodspin/ui-improvementsHarrison Healey2016-01-113-3/+8
|\ \
| * | Updating fixAsaad Mahmood2016-01-081-1/+1
| * | Multiple UI ImprovementsAsaad Mahmood2016-01-073-3/+8
* | | Merge pull request #1824 from hmhealey/plt1525Joram Wilander2016-01-114-23/+71
|\ \ \ | |_|/ |/| |
| * | Added a loading screen to ChannelMembersModal and made it pull all channel me...hmhealey2016-01-071-13/+36
| * | Made ChannelInviteModal pull all channel members before renderinghmhealey2016-01-073-10/+35
* | | 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-064-24/+30
| |/ |/|
* | Merge pull request #1813 from mattermost/PLT-1558Harrison Healey2016-01-061-1/+132
|\ \ | |/ |/|
| * Adding UI for session length settings=Corey Hulen2016-01-051-1/+132
* | 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-063-26/+3
* | | Changed Audio/Video preview to just display a file info when encountering a f...hmhealey2016-01-064-78/+190
|/ /
* | Merge pull request #1802 from hmhealey/plt1449Christopher Speller2016-01-053-118/+184
|\ \
| * | Make Youtube previews stop when the channel is changedhmhealey2016-01-043-2/+21
| * | Move Youtube preview into its own filehmhealey2016-01-042-117/+164
* | | Merge pull request #1810 from hmhealey/plt644Christopher Speller2016-01-051-4/+0
|\ \ \ | |_|/ |/| |
| * | 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-042-17/+35
|\ \
| * | Fixed ViewImage modal to clear its loaded state when its file list changeshmhealey2016-01-042-9/+19
| * | 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-048-125/+549
|\ \
| * | Add ability to switch between SSO and email accountJoramWilander2015-12-178-125/+549
* | | 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
|\ \
| * | Fix default for teammate name display settingJoramWilander2015-12-281-11/+14
* | | Merge pull request #1784 from mattermost/plt-1591Corey Hulen2016-01-041-3/+6
|\ \ \
| * | | Fix appearance settings scroll bugJoramWilander2015-12-281-3/+6
| |/ /
* | | Merge pull request #1800 from asaadmahmoodspin/ui-improvementsJoram Wilander2016-01-042-16/+18
|\ \ \
| * | | Multiple UI ImprovementsAsaad Mahmood2016-01-042-16/+18
* | | | 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 #1790 from hjf288/PLT-1587Corey Hulen2016-01-031-1/+1
|\ \ \ \
| * | | | Correct typo in email_settings.jsx that prevents enabling the 'Send push noti...Hjf2882015-12-291-1/+1
| | |/ / | |/| |
* | | | Update team_settings.jsxEric Sethna2015-12-301-1/+1
* | | | Update team_general_tab.jsxEric Sethna2015-12-301-1/+1
|/ / /
* | | Merge pull request #1740 from hmhealey/plt730Joram Wilander2015-12-283-19/+172
|\ \ \
| * | | Added theme styling to floating timestamphmhealey2015-12-161-2/+2
| * | | Cleaned up floating post componentshmhealey2015-12-161-35/+54
| * | | Added scroll to bottom arrows for mobilehmhealey2015-12-161-3/+24
| * | | Hid floating timestamp header on non-mobilehmhealey2015-12-161-0/+5
| * | | Added DelayedAction class to use to handle stopping scrollinghmhealey2015-12-162-1/+45
| * | | Added floating post timestamphmhealey2015-12-161-14/+78
* | | | Merge pull request #1755 from hmhealey/plt1108Joram Wilander2015-12-285-200/+249
|\ \ \ \
| * | | | Changed 'Previewing' to 'Loading' in ViewImage modalhmhealey2015-12-181-1/+1
| * | | | Refactored ViewImage modal and made it automatically play animated gifshmhealey2015-12-185-200/+249
| | |_|/ | |/| |