summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | 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
| |/ / /
* | | | Merge pull request #226 from nickago/MM-1546Joram Wilander2015-07-245-5/+64
|\ \ \ \ | |/ / / |/| | | MM-1546 Clear error messages on modal close and channel switch
| * | | Added a condition to close event listeners on modals when the componentnickago2015-07-234-27/+40
| | | | | | | | | | | | | | | | is unmounted, and set all unsaved data to be cleared from user settings
| * | | When closing out of a modal, unsaved data and text inside of it is erased.nickago2015-07-235-5/+51
| |/ /
* | | Merge pull request #170 from mattermost/mm-1420Corey Hulen2015-07-2349-151/+9362
|\ \ \ | | | | | | | | Fixes mm-1420 adding initial support for postgres
| * | | removing old bindVars methods=Corey Hulen2015-07-231-1/+1
| | | |
| * | | Fixing merges for latest postgres=Corey Hulen2015-07-236-35/+76
| | | |
| * | | Merge branch 'master' into mm-1420=Corey Hulen2015-07-2343-257/+922
| |\ \ \ | | | |/ | | |/|
| * | | Merge branch 'master' into mm-1420=Corey Hulen2015-07-2244-446/+1080
| |\ \ \
| * | | | Fixing merge=Corey Hulen2015-07-211-1/+2
| | | | |
| * | | | fixing merge conflicts=Corey Hulen2015-07-21149-2589/+2303
| |\ \ \ \
| * \ \ \ \ merging=Corey Hulen2015-07-120-0/+0
| |\ \ \ \ \
| | * | | | | minor tweaks to make sure mysql still runs=Corey Hulen2015-07-125-9/+28
| | | | | | |
| | * | | | | Patching remainder of the sql stmts to work with postgres=Corey Hulen2015-07-129-73/+121
| | | | | | |
| | * | | | | Fixes mm-1420 adding postgres support=Corey Hulen2015-07-1243-95/+9241
| | | | | | |
| * | | | | | minor tweaks to make sure mysql still runs=Corey Hulen2015-07-125-9/+28
| | | | | | |
| * | | | | | Patching remainder of the sql stmts to work with postgres=Corey Hulen2015-07-129-74/+122
| | | | | | |
| * | | | | | Fixes mm-1420 adding postgres support=Corey Hulen2015-07-1243-95/+9241
| | | | | | |
* | | | | | | Merge pull request #242 from asaadmahmoodspin/masterChristopher Speller2015-07-239-11/+24
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | UI Fixes