Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | | | | | | Merge pull request #267 from nickago/MM-1652 | Christopher Speller | 2015-07-29 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | Fixed typo in delete_post_modal | nickago | 2015-07-28 | 1 | -1/+1 | |
* | | | | | | | | | | | Merge pull request #265 from mattermost/mm-1711 | Joram Wilander | 2015-07-29 | 14 | -159/+250 | |
|\ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | added use of strings.Team to replace hardcoded mentions of 'team' | JoramWilander | 2015-07-29 | 1 | -3/+3 | |
| * | | | | | | | | | | updated changing email in sign up flow to work properly | JoramWilander | 2015-07-28 | 1 | -4/+8 | |
| * | | | | | | | | | | updated user sign up page and login page with new UI details | JoramWilander | 2015-07-28 | 3 | -5/+4 | |
| * | | | | | | | | | | updates to sign-up flow, remove company name and marketing checkbox | JoramWilander | 2015-07-28 | 7 | -41/+16 | |
| * | | | | | | | | | | Signup Ui changes | Asaad Mahmood | 2015-07-28 | 8 | -114/+227 | |
| | |_|_|_|_|_|/ / / | |/| | | | | | | | | ||||||
* | | | | | | | | | | Merge pull request #264 from asaadmahmoodspin/mm-1732 | Corey Hulen | 2015-07-28 | 11 | -18/+18 | |
|\ \ \ \ \ \ \ \ \ \ | | |_|_|_|_|/ / / / | |/| | | | | / / / | |_|_|_|_|_|/ / / |/| | | | | | | | | ||||||
| * | | | | | | | | MM-1730 - Updating logo in emails | Asaad Mahmood | 2015-07-28 | 11 | -9/+9 | |
| * | | | | | | | | mm-1732 - Decrease font size for footer in emails | Asaad Mahmood | 2015-07-28 | 9 | -9/+9 | |
| | |/ / / / / / | |/| | | | | | | ||||||
* | | | | | | | | Merge pull request #270 from mattermost/mm-1763 | Joram Wilander | 2015-07-28 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ | |_|/ / / / / / |/| | | | | | | | ||||||
| * | | | | | | | update our postgresql index check to work with 9.2+ versions of postgresql | JoramWilander | 2015-07-28 | 1 | -1/+1 | |
|/ / / / / / / | ||||||
* | | | | | | | Merge pull request #255 from hmhealey/mm1682 | Christopher Speller | 2015-07-28 | 4 | -6/+9 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | ||||||
| * | | | | | | Added non-capturing group to regex used for matching local file urls | hmhealey | 2015-07-28 | 1 | -1/+1 | |
| * | | | | | | Display thumbnails for files without file extensions | hmhealey | 2015-07-28 | 2 | -4/+7 | |
| * | | | | | | Allow users to download file attachments with names that don't include a file... | hmhealey | 2015-07-28 | 1 | -1/+1 | |
| * | | | | | | Allow files without extensions to be uploaded as attachments to posts | hmhealey | 2015-07-28 | 1 | -1/+1 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #253 from nickago/MM-1654 | Christopher Speller | 2015-07-28 | 2 | -0/+13 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | Limited the added headers to only non-api calls | nickago | 2015-07-27 | 1 | -2/+6 | |
| * | | | | | | Centralized header additions and removed duplicate code | nickago | 2015-07-27 | 2 | -32/+2 | |
| * | | | | | | Removed ability to place MM in an iframe | nickago | 2015-07-24 | 2 | -0/+39 | |
* | | | | | | | Merge pull request #260 from rgarmsen2295/mm-1724 | Joram Wilander | 2015-07-28 | 3 | -2/+6 | |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | ||||||
| * | | | | | | Changed title of Active Devices to Active Sessions; added help text explainin... | Reed Garmsen | 2015-07-27 | 3 | -2/+6 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Merge pull request #262 from mattermost/it33-patch-1 | Joram Wilander | 2015-07-28 | 1 | -3/+3 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 | |
|\ \ \ \ \ \ | ||||||
| * | | | | | | 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 mod... | nickago | 2015-07-27 | 1 | -2/+5 | |
| * | | | | | | When user is removed, a modal appears, which on closing redirects the | nickago | 2015-07-27 | 5 | -2/+60 | |
| * | | | | | | When removed from a channel, user is sent back to town square and that | nickago | 2015-07-27 | 3 | -0/+13 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | 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 | =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 | Asaad Mahmood | 2015-07-25 | 1 | -7/+5 | |
| | |/ / / | |/| | | | ||||||
* | | | | | Merge pull request #254 from hmhealey/mm1674 | Joram Wilander | 2015-07-27 | 1 | -1/+1 | |
|\ \ \ \ \ | ||||||
| * | | | | | Replaced instance of String.prototype.startsWith which only works in browsers... | hmhealey | 2015-07-27 | 1 | -1/+1 | |
| |/ / / / | ||||||
* | | | | | Merge pull request #258 from mattermost/mm-1745 | Corey Hulen | 2015-07-27 | 3 | -8/+8 | |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | ||||||
| * | | | | fixes some database queries that broke with postgres, fixes the unread/new me... | JoramWilander | 2015-07-27 | 3 | -8/+8 | |
|/ / / / | ||||||
* | | | | Merge pull request #248 from hmhealey/mm1494 | Joram Wilander | 2015-07-27 | 6 | -38/+128 | |
|\ \ \ \ | ||||||
| * | | | | Reverted accidental change to the Makefile that occurred while rebasing hmhea... | hmhealey | 2015-07-24 | 1 | -1/+1 | |
| * | | | | Changed Makefile to just look for godep in the GOPATH to make the process sim... | hmhealey | 2015-07-24 | 1 | -6/+1 | |
| * | | | | 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 correctly... | hmhealey | 2015-07-24 | 1 | -2/+2 | |
| * | | | | 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 | |
|\ \ \ \ | |_|_|/ |/| | | | ||||||
| * | | | Removed vestige textdiv code that is also no longer necessary due to removing... | Reed Garmsen | 2015-07-24 | 1 | -21/+1 | |
| * | | | Removes the blue tag highlighting from mentions that would appear after typin... | Reed Garmsen | 2015-07-23 | 1 | -13/+6 |