summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | Merge pull request #1824 from hmhealey/plt1525Joram Wilander2016-01-1110-38/+144
|\ \ \ \ | | | | | | | | | | 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
| | | | |
| * | | | Added the ability to get more channel members from getChannelExtraInfohmhealey2016-01-066-15/+73
| | | | |
* | | | | Merge pull request #1828 from hmhealey/plt1397Joram Wilander2016-01-111-15/+6
|\ \ \ \ \ | | | | | | | | | | | | PLT-1397/PLT-1580/PLT-1614 Fixed spacing around markdown lists and paragraphs
| * | | | | Fixed spacing between paragraphs in a posthmhealey2016-01-071-1/+4
| | | | | |
| * | | | | Fixed vertical spacing between lists and paragraphs in post bodieshmhealey2016-01-071-11/+3
| | | | | |
| * | | | | Removed extra space below unordered listshmhealey2016-01-071-5/+1
| | |/ / / | |/| | |
* | | | | Update Upgrade-Guide.mdit332016-01-101-1/+1
| |_|_|/ |/| | |
* | | | Merge pull request #1839 from mattermost/lfbrock-patch-2Corey Hulen2016-01-091-0/+43
|\ \ \ \ | | | | | | | | | | Create test-search.md
| * | | | Create test-search.mdlfbrock2016-01-081-0/+43
| | | | |
* | | | | Merge pull request #1840 from mattermost/lfbrock-patch-1Corey Hulen2016-01-091-0/+128
|\ \ \ \ \ | | | | | | | | | | | | Update changelog
| * | | | | Update CHANGELOG.mdlfbrock2016-01-081-6/+11
| | | | | |
| * | | | | Update CHANGELOG.mdlfbrock2016-01-081-2/+2
| | | | | |
| * | | | | Update CHANGELOG.mdlfbrock2016-01-081-2/+2
| | | | | |
| * | | | | Update CHANGELOG.mdlfbrock2016-01-071-0/+1
| | | | | |
| * | | | | Merge pull request #1831 from mattermost/Adding-highlights,-minor-tweakslfbrock2016-01-071-10/+26
| |\ \ \ \ \ | | | | | | | | | | | | | | Adding highlights, minor tweaks
| | * | | | | Adding highlights, minor tweaksit332016-01-071-10/+26
| | | | | | |
| * | | | | | Update CHANGELOG.mdlfbrock2016-01-071-5/+5
| |/ / / / /
| * | | | | Update CHANGELOG.mdlfbrock2016-01-071-2/+2
| | | | | |
| * | | | | Update CHANGELOG.mdlfbrock2016-01-071-4/+4
| | | | | |
| * | | | | Update CHANGELOG.mdlfbrock2016-01-071-1/+1
| | | | | |
| * | | | | Update CHANGELOG.mdlfbrock2016-01-071-0/+106
| | |/ / / | |/| | |
* | | | | Merge pull request #1846 from mattermost/react-dbgCorey Hulen2016-01-081-3/+7
|\ \ \ \ \ | | | | | | | | | | | | Adding debugging for react
| * | | | | Adding debugging for react=Corey Hulen2016-01-081-3/+7
|/ / / / /
* | | | | Merge pull request #1843 from mattermost/revert-1842-react-debugCorey Hulen2016-01-081-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Revert "Removing minified for react to track down an issues."
| * | | | | Revert "Removing minified for react to track down an issues."Corey Hulen2016-01-081-3/+3
|/ / / / /
* | | | | Merge pull request #1842 from mattermost/react-debugCorey Hulen2016-01-081-3/+3
|\ \ \ \ \ | | | | | | | | | | | | Removing minified for react to track down an issues.
| * | | | | Removing minified for react to track down an issues.=Corey Hulen2016-01-081-3/+3
|/ / / / /
* | | | | Merge pull request #1836 from hmhealey/plt1578Christopher Speller2016-01-081-0/+12
|\ \ \ \ \ | |_|/ / / |/| | | / | | |_|/ | |/| | PLT-1578 Fixed FileUpload to properly unbind drag handlers when unmounted
| * | | Fixed FileUpload to properly unbind drag handlers when unmountedhmhealey2016-01-081-0/+12
|/ / /
* | | Merge pull request #1829 from mattermost/lfbrock-patch-2Corey Hulen2016-01-071-24/+69
|\ \ \ | | | | | | | | Update Configuration-Settings.md
| * | | Update Configuration-Settings.mdlfbrock2016-01-071-24/+69
| |/ /
* | | Merge pull request #1821 from rgarmsen2295/plt-846Corey Hulen2016-01-074-24/+30
|\ \ \ | |/ / |/| | PLT-846 Disable the ability to drag and drop text
| * | 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-0610-25/+192
|\ \ | |/ |/| PLT-1558 adding session length to config file
| * Adding UI for session length settings=Corey Hulen2016-01-052-9/+133
| |
| * PLT-1558 adding session length to config file=Corey Hulen2016-01-059-24/+67
| |
* | Merge pull request #1819 from hmhealey/plt1401Joram Wilander2016-01-061-3/+3
|\ \ | | | | | | PLT-1401 Removed email regex
| * | Removed email regexhmhealey2016-01-061-3/+3
| | |
* | | Merge pull request #1815 from hmhealey/plt771Corey Hulen2016-01-066-97/+186
|\ \ \ | |/ / |/| | PLT-771 Improved Audio/Video preview for unsupported formats
| * | Removed temporary fix for old filenames that used absolute urls pointing to ↵hmhealey2016-01-063-26/+3
| | | | | | | | | | | | the get file api
| * | Changed Audio/Video preview to just display a file info when encountering a ↵hmhealey2016-01-064-78/+190
|/ / | | | | | | file that cannot be played
* | Merge pull request #1816 from mattermost/PLT-1607Christopher Speller2016-01-065-5/+19
|\ \ | | | | | | PLT-1607 adding more debugging info for email and push notifications
| * | Adding missing config properties=Corey Hulen2016-01-052-2/+10
| | |
| * | Cleaning up config=Corey Hulen2016-01-051-23/+0
| | |
| * | PLT-1607 adding more debugging info for email and push notifications=Corey Hulen2016-01-052-4/+31
| | |
| * | PLT-1607 adding more debugging info for email and push notifications=Corey Hulen2016-01-052-0/+2
| | |
* | | Merge pull request #1814 from mattermost/PLT-1485aChristopher Speller2016-01-063-1/+20
|\ \ \ | | | | | | | | PLT-1485 Adding last view channel sticky
| * | | PLT-1485 Adding last view channel sticky=Corey Hulen2016-01-053-1/+20
| | | |