summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #264 from asaadmahmoodspin/mm-1732Corey Hulen2015-07-2811-18/+18
|\ | | | | mm-1732 - Decreasing font size for footer in emails
| * MM-1730 - Updating logo in emailsAsaad Mahmood2015-07-2811-9/+9
| |
| * mm-1732 - Decrease font size for footer in emailsAsaad Mahmood2015-07-289-9/+9
| |
* | Merge pull request #270 from mattermost/mm-1763Joram Wilander2015-07-281-1/+1
|\ \ | | | | | | MM-1763 update our postgresql index check to work with 9.2.4+ versions of postgresql
| * | update our postgresql index check to work with 9.2+ versions of postgresqlJoramWilander2015-07-281-1/+1
|/ /
* | Merge pull request #255 from hmhealey/mm1682Christopher Speller2015-07-284-6/+9
|\ \ | |/ |/| MM-1682 Allow files without file extensions to be attached to messages
| * Added non-capturing group to regex used for matching local file urlshmhealey2015-07-281-1/+1
| |
| * Display thumbnails for files without file extensionshmhealey2015-07-282-4/+7
| |
| * Allow users to download file attachments with names that don't include a ↵hmhealey2015-07-281-1/+1
| | | | | | | | file extension
| * Allow files without extensions to be uploaded as attachments to postshmhealey2015-07-281-1/+1
|/
* Merge pull request #253 from nickago/MM-1654Christopher Speller2015-07-282-0/+13
|\ | | | | MM-1654 Anti-clickjacking measures
| * Limited the added headers to only non-api callsnickago2015-07-271-2/+6
| |
| * Centralized header additions and removed duplicate codenickago2015-07-272-32/+2
| |
| * Removed ability to place MM in an iframenickago2015-07-242-0/+39
| |
* | Merge pull request #260 from rgarmsen2295/mm-1724Joram Wilander2015-07-283-2/+6
|\ \ | | | | | | MM-1724 Changed title of Active Devices to Active Sessions and added help text explaining Active Sessions
| * | Changed title of Active Devices to Active Sessions; added help text ↵Reed Garmsen2015-07-273-2/+6
| | | | | | | | | | | | explaining Active Sessions
* | | Merge pull request #262 from mattermost/it33-patch-1Joram Wilander2015-07-281-3/+3
|\ \ \ | | | | | | | | Removed version number from dev build README
| * | | Removed version number from dev build READMEit332015-07-271-3/+3
| |/ /
* | | Merge pull request #239 from nickago/MM-1295Christopher Speller2015-07-286-0/+91
|\ \ \ | | | | | | | | MM-1295 Removal from a channel occurs in real time
| * | | Changed from Jquery style modal modification to using browserStorenickago2015-07-272-9/+26
| | | |
| * | | Added precautions to avoid incorrect data display to the user by clearing ↵nickago2015-07-271-2/+5
| | | | | | | | | | | | | | | | modal after every close
| * | | When user is removed, a modal appears, which on closing redirects thenickago2015-07-275-2/+60
| | | | | | | | | | | | | | | | user to town square.
| * | | When removed from a channel, user is sent back to town square and thatnickago2015-07-273-0/+13
| | | | | | | | | | | | | | | | channel is removed from their sidebar
* | | | Merge pull request #257 from mattermost/mm-1502Christopher Speller2015-07-281-2/+2
|\ \ \ \ | |_|/ / |/| | | Fixes mm-1502 changing session age to 30 days
| * | | Fixes mm-1502 changing session age to 30 days=Corey Hulen2015-07-271-2/+2
| | | |
* | | | Merge pull request #251 from asaadmahmoodspin/masterCorey Hulen2015-07-271-7/+5
|\ \ \ \ | | | | | | | | | | Ui Updates to signup flow
| * | | | Ui Updates to signup flowAsaad Mahmood2015-07-251-7/+5
| | |/ / | |/| |
* | | | Merge pull request #254 from hmhealey/mm1674Joram Wilander2015-07-271-1/+1
|\ \ \ \ | | | | | | | | | | MM-1674 Replaced call to String.prototype.startsWith which only works in browsers that support ES6
| * | | | Replaced instance of String.prototype.startsWith which only works in ↵hmhealey2015-07-271-1/+1
| |/ / / | | | | | | | | | | | | browsers that support ES6
* | | | Merge pull request #258 from mattermost/mm-1745Corey Hulen2015-07-273-8/+8
|\ \ \ \ | | | | | | | | | | MM-1754 fixes unread channels showing as read and forever new message indicator
| * | | | fixes some database queries that broke with postgres, fixes the unread/new ↵JoramWilander2015-07-273-8/+8
|/ / / / | | | | | | | | | | | | mesasge issues
* | | | Merge pull request #248 from hmhealey/mm1494Joram Wilander2015-07-276-38/+128
|\ \ \ \ | | | | | | | | | | MM-1494 Change Makefile to use local dependencies, update nfnt/resize library, and change image rescaling to use Lanczos3
| * | | | Reverted accidental change to the Makefile that occurred while rebasing ↵hmhealey2015-07-241-1/+1
| | | | | | | | | | | | | | | | | | | | hmhealey/mm1494 branch
| * | | | Changed Makefile to just look for godep in the GOPATH to make the process ↵hmhealey2015-07-241-6/+1
| | | | | | | | | | | | | | | | | | | | simpler
| * | | | Changed make cover to run godep go to match the rest of Makefilehmhealey2015-07-241-6/+6
| | | | |
| * | | | Fixed detection of godep when it doesn't exist on the pathhmhealey2015-07-241-1/+1
| | | | |
| * | | | Change Makefile to use local copies of dependencies by running go through godephmhealey2015-07-241-22/+27
| | | | |
| * | | | Change image rescaling algorithm back to Lanczos3 now that it works ↵hmhealey2015-07-241-2/+2
| | | | | | | | | | | | | | | | | | | | correctly in all cases
| * | | | Update nfnt/resize library to the most recent version (as of July 20)hmhealey2015-07-244-9/+99
| | |_|/ | |/| |
* | | | Merge pull request #246 from rgarmsen2295/mm-1657Joram Wilander2015-07-271-32/+5
|\ \ \ \ | |_|_|/ |/| | | MM-1657 Removes tag highlighting for mentions
| * | | Removed vestige textdiv code that is also no longer necessary due to ↵Reed Garmsen2015-07-241-21/+1
| | | | | | | | | | | | | | | | removing the mention tags
| * | | Removes the blue tag highlighting from mentions that would appear after ↵Reed Garmsen2015-07-231-13/+6
| | | | | | | | | | | | | | | | typing a mention
* | | | Merge pull request #245 from nickago/MM-1662Corey Hulen2015-07-271-3/+5
|\ \ \ \ | |_|_|/ |/| | | MM-1662 Added support for png profile pictures
| * | | Added support for png profile picturesnickago2015-07-231-3/+5
| | | |
* | | | Merge pull request #247 from nickago/MM-552Joram Wilander2015-07-241-1/+1
|\ \ \ \ | | | | | | | | | | Mm 552 Enables email from a name instead of just an address
| * | | | Set the 'From' field to include the FeedbackName from the confignickago2015-07-241-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #249 from asaadmahmoodspin/masterJoram Wilander2015-07-243-8/+69
|\ \ \ \ | | | | | | | | | | Complete signup page UI changes
| * | | | Adding hint text for username back inAsaad Mahmood2015-07-241-0/+1
| | | | |
| * | | | Minor class changesAsaad Mahmood2015-07-242-5/+5
| | | | |
| * | | | Complete signup page UI changesAsaad Mahmood2015-07-243-8/+68
| |/ / /