summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #1937 from hmhealey/plt1695Corey Hulen2016-01-211-1/+5
|\ | | | | PLT-1695 Completely disabled broken pasting of images on IE11
| * Completely disabled broken pasting of images on IE11hmhealey2016-01-201-1/+5
| |
* | Merge pull request #1935 from hmhealey/plt1664Corey Hulen2016-01-211-1/+1
|\ \ | | | | | | PLT-1664 Fix unread channel indicators so that they work on IE11
| * | Changed UnreadChannelIndicator display style so that it uses a value that ↵hmhealey2016-01-201-1/+1
| |/ | | | | | | IE11 supports
* | Merge pull request #1933 from hmhealey/plt1661Corey Hulen2016-01-212-41/+31
|\ \ | | | | | | PLT-1661/PLT-1745 Scrolling fixes
| * | Added a small margin where the PostsView will be considered to be at the ↵hmhealey2016-01-201-1/+4
| | | | | | | | | | | | bottom even if it's not exactly at the bottom
| * | 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 ↵hmhealey2016-01-201-23/+29
| |/ | | | | | | magic numbers
* | Merge pull request #1924 from loafoe/masterChristopher Speller2016-01-212-1/+12
|\ \ | | | | | | [#1923] Make Websocket ports configurable
| * | 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
|\ \ | | | | | | PLT-1668 Removes duplicate short username error message
| * | 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 when constructing messages
| * | 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
|\ \ \ | | | | | | | | PLT-1232: More channel info
| * | | 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
|\ \ \ \ | | | | | | | | | | PLT-549 Fixed react warning issue with setState in RHS
| * | | | 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
|\ \ \ \ \ | |_|_|_|/ |/| | | | PLT-406 Fixes issues with drag and drop overlay in IE11
| * | | | Fix issue with drag n drop overlay in ie11Reed Garmsen2016-01-121-0/+4
| | |/ / | |/| |
* | | | Merge pull request #1894 from mattermost/release-1.4Corey Hulen2016-01-141-3/+3
|\ \ \ \ | |_|_|/ |/| | | Release 1.4
| * | | Encode url query properly for SSO switchingJoramWilander2016-01-141-3/+3
| | | |
* | | | 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
|\ \ \ | | | | | | | | PLT-1006 Changed team statistics page to show usernames with email shown in a tooltip
| * | | Changed statistics to show usernames with an email tooltipReed Garmsen2016-01-114-7/+45
| | | |
* | | | Merge pull request #1853 from asaadmahmoodspin/ui-improvementsCorey Hulen2016-01-134-4/+18
|\ \ \ \ | | | | | | | | | | Adding away icon and changing online and offline icons
| * | | | Adding away icon and changing online and offline iconsAsaad Mahmood2016-01-114-4/+18
| | | | |
* | | | | Merge pull request #1850 from mattermost/preview-modeCorey Hulen2016-01-131-1/+1
|\ \ \ \ \ | |_|_|_|/ |/| | | | Documenting how Preview Mode is disabled
| * | | | Update email_settings.jsxit332016-01-091-1/+1
| | | | |
| * | | | Documenting how Preview Mode turns offit332016-01-091-1/+1
| | | | |
* | | | | Merge pull request #1830 from rgarmsen2295/plt-1599Joram Wilander2016-01-121-2/+8
|\ \ \ \ \ | |_|_|_|/ |/| | | | PLT-1599 Help text in invite member modal now reflects the default channel name
| * | | | Help text in invite member modal now updates according to town-square ↵Reed Garmsen2016-01-071-2/+8
| | | | | | | | | | | | | | | | | | | | display name
* | | | | Adding push-test.mattermost.comit332016-01-111-2/+2
| |_|_|/ |/| | |
* | | | Merge pull request #1849 from hmhealey/plt1578Corey Hulen2016-01-112-8/+36
|\ \ \ \ | |_|_|/ |/| | | PLT-571 Restricted file uploads on iOS Chrome and the iOS app to work around iOS bugs
| * | | 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
|\ \ \ | | | | | | | | Multiple UI Improvements
| * | | 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
|\ \ \ | |_|/ |/| | PLT-1525 Fixed ChannelInviteModal displaying some users that are already in the channel
| * | Added a loading screen to ChannelMembersModal and made it pull all channel ↵hmhealey2016-01-071-13/+36
| | | | | | | | | | | | members before rendering
| * | 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
| |/ |/| | | | | non-files are dragged
* | Merge pull request #1813 from mattermost/PLT-1558Harrison Healey2016-01-061-1/+132
|\ \ | |/ |/| PLT-1558 adding session length to config file