| Commit message (Collapse) | Author | Age | Files | Lines | |
|---|---|---|---|---|---|
| * | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-28 | 12 | -14/+105 |
| |\ | |||||
| | * | Merge pull request #262 from mattermost/it33-patch-1 | Joram Wilander | 2015-07-28 | 1 | -3/+3 |
| | |\ | | | | | | | Removed version number from dev build README | ||||
| | | * | Removed version number from dev build README | it33 | 2015-07-27 | 1 | -3/+3 |
| | | | | |||||
| | * | | Merge pull request #239 from nickago/MM-1295 | Christopher Speller | 2015-07-28 | 6 | -0/+91 |
| | |\ \ | | | | | | | | | MM-1295 Removal from a channel occurs in real time | ||||
| | | * | | Changed from Jquery style modal modification to using browserStore | nickago | 2015-07-27 | 2 | -9/+26 |
| | | | | | |||||
| | | * | | Added precautions to avoid incorrect data display to the user by clearing ↵ | nickago | 2015-07-27 | 1 | -2/+5 |
| | | | | | | | | | | | | | | | | | modal after every close | ||||
| | | * | | When user is removed, a modal appears, which on closing redirects the | nickago | 2015-07-27 | 5 | -2/+60 |
| | | | | | | | | | | | | | | | | | user to town square. | ||||
| | | * | | When removed from a channel, user is sent back to town square and that | nickago | 2015-07-27 | 3 | -0/+13 |
| | | | | | | | | | | | | | | | | | channel is removed from their sidebar | ||||
| | * | | | Merge pull request #257 from mattermost/mm-1502 | Christopher Speller | 2015-07-28 | 1 | -2/+2 |
| | |\ \ \ | | |_|/ | |/| | | Fixes mm-1502 changing session age to 30 days | ||||
| | | * | | Fixes mm-1502 changing session age to 30 days | =Corey Hulen | 2015-07-27 | 1 | -2/+2 |
| | | | | | |||||
| | * | | | Merge pull request #251 from asaadmahmoodspin/master | Corey Hulen | 2015-07-27 | 1 | -7/+5 |
| | |\ \ \ | | | | | | | | | | | Ui Updates to signup flow | ||||
| | * \ \ \ | Merge pull request #254 from hmhealey/mm1674 | Joram Wilander | 2015-07-27 | 1 | -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 ↵ | hmhealey | 2015-07-27 | 1 | -1/+1 |
| | | | |_|/ | | |/| | | | | | | | | | | | | browsers that support ES6 | ||||
| | * | | | | Merge pull request #258 from mattermost/mm-1745 | Corey Hulen | 2015-07-27 | 3 | -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 ↵ | JoramWilander | 2015-07-27 | 3 | -8/+8 |
| | |/ / / / | | | | | | | | | | | | | | | | mesasge issues | ||||
| * | | / / | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-28 | 8 | -73/+138 |
| |\| | | | | |_|/ / |/| | | | |||||
| | * | | | Merge pull request #248 from hmhealey/mm1494 | Joram Wilander | 2015-07-27 | 6 | -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 ↵ | hmhealey | 2015-07-24 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | hmhealey/mm1494 branch | ||||
| | | * | | | Changed Makefile to just look for godep in the GOPATH to make the process ↵ | hmhealey | 2015-07-24 | 1 | -6/+1 |
| | | | | | | | | | | | | | | | | | | | | | simpler | ||||
| | | * | | | Changed make cover to run godep go to match the rest of Makefile | hmhealey | 2015-07-24 | 1 | -6/+6 |
| | | | | | | |||||
| | | * | | | Fixed detection of godep when it doesn't exist on the path | hmhealey | 2015-07-24 | 1 | -1/+1 |
| | | | | | | |||||
| | | * | | | Change Makefile to use local copies of dependencies by running go through godep | hmhealey | 2015-07-24 | 1 | -22/+27 |
| | | | | | | |||||
| | | * | | | Change image rescaling algorithm back to Lanczos3 now that it works ↵ | hmhealey | 2015-07-24 | 1 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | correctly in all cases | ||||
| | | * | | | Update nfnt/resize library to the most recent version (as of July 20) | hmhealey | 2015-07-24 | 4 | -9/+99 |
| | | | | | | |||||
| | * | | | | Merge pull request #246 from rgarmsen2295/mm-1657 | Joram Wilander | 2015-07-27 | 1 | -32/+5 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | MM-1657 Removes tag highlighting for mentions | ||||
| | | * | | | Removed vestige textdiv code that is also no longer necessary due to ↵ | Reed Garmsen | 2015-07-24 | 1 | -21/+1 |
| | | | | | | | | | | | | | | | | | | | | | removing the mention tags | ||||
| | | * | | | Removes the blue tag highlighting from mentions that would appear after ↵ | Reed Garmsen | 2015-07-23 | 1 | -13/+6 |
| | | | | | | | | | | | | | | | | | | | | | typing a mention | ||||
| | * | | | | Merge pull request #245 from nickago/MM-1662 | Corey Hulen | 2015-07-27 | 1 | -3/+5 |
| | |\ \ \ \ | | |_|_|/ | |/| | | | MM-1662 Added support for png profile pictures | ||||
| | | * | | | Added support for png profile pictures | nickago | 2015-07-23 | 1 | -3/+5 |
| | | | | | | |||||
| * | | | | | Ui Updates to signup flow | Asaad Mahmood | 2015-07-25 | 1 | -7/+5 |
| |/ / / / | |||||
| * | | | | Merge pull request #247 from nickago/MM-552 | Joram Wilander | 2015-07-24 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | Mm 552 Enables email from a name instead of just an address | ||||
| | * | | | | Set the 'From' field to include the FeedbackName from the config | nickago | 2015-07-24 | 1 | -1/+1 |
| | | |_|/ | |/| | | |||||
| * | | | | Merge pull request #249 from asaadmahmoodspin/master | Joram Wilander | 2015-07-24 | 3 | -8/+69 |
| |\ \ \ \ | | | | | | | | | | | Complete signup page UI changes | ||||
| | * | | | | Adding hint text for username back in | Asaad Mahmood | 2015-07-24 | 1 | -0/+1 |
| | | | | | | |||||
| | * | | | | Minor class changes | Asaad Mahmood | 2015-07-24 | 2 | -5/+5 |
| | | | | | | |||||
| | * | | | | Complete signup page UI changes | Asaad Mahmood | 2015-07-24 | 3 | -8/+68 |
| | |/ / / | |||||
| * | | | | Merge pull request #226 from nickago/MM-1546 | Joram Wilander | 2015-07-24 | 5 | -5/+64 |
| |\ \ \ \ | |/ / / |/| | | | MM-1546 Clear error messages on modal close and channel switch | ||||
| | * | | | Added a condition to close event listeners on modals when the component | nickago | 2015-07-23 | 4 | -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. | nickago | 2015-07-23 | 5 | -5/+51 |
| | |/ / | |||||
| * | | | Merge pull request #170 from mattermost/mm-1420 | Corey Hulen | 2015-07-23 | 49 | -151/+9362 |
| |\ \ \ | | | | | | | | | Fixes mm-1420 adding initial support for postgres | ||||
| | * | | | removing old bindVars methods | =Corey Hulen | 2015-07-23 | 1 | -1/+1 |
| | | | | | |||||
| | * | | | Fixing merges for latest postgres | =Corey Hulen | 2015-07-23 | 6 | -35/+76 |
| | | | | | |||||
| | * | | | Merge branch 'master' into mm-1420 | =Corey Hulen | 2015-07-23 | 43 | -257/+922 |
| | |\ \ \ | | | |/ | | |/| | |||||
| | * | | | Merge branch 'master' into mm-1420 | =Corey Hulen | 2015-07-22 | 44 | -446/+1080 |
| | |\ \ \ | |||||
| | * | | | | Fixing merge | =Corey Hulen | 2015-07-21 | 1 | -1/+2 |
| | | | | | | |||||
| | * | | | | fixing merge conflicts | =Corey Hulen | 2015-07-21 | 149 | -2589/+2303 |
| | |\ \ \ \ | |||||
| | * \ \ \ \ | merging | =Corey Hulen | 2015-07-12 | 0 | -0/+0 |
| | |\ \ \ \ \ | |||||
| | | * | | | | | minor tweaks to make sure mysql still runs | =Corey Hulen | 2015-07-12 | 5 | -9/+28 |
| | | | | | | | | |||||
| | | * | | | | | Patching remainder of the sql stmts to work with postgres | =Corey Hulen | 2015-07-12 | 9 | -73/+121 |
| | | | | | | | | |||||
| | | * | | | | | Fixes mm-1420 adding postgres support | =Corey Hulen | 2015-07-12 | 43 | -95/+9241 |
| | | | | | | | | |||||
 |
server / chat | |
| chat | spline |
| summaryrefslogtreecommitdiffstats |