summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Improving css for form hints in signup flowAsaad Mahmood2015-07-291-1/+1
* Fixing error markup in signup flowAsaad Mahmood2015-07-291-2/+2
* mm-1762 - Search improvements with some other minor Ui changesAsaad Mahmood2015-07-295-44/+100
* Merge branch 'master' of https://github.com/mattermost/platform into mm-1762Asaad Mahmood2015-07-2926-176/+597
|\
| * Merge pull request #268 from mattermost/mm-1358Joram Wilander2015-07-294-1/+318
| |\
| | * Fixing spelling and clarifying a few parts of style guide.Christopher Speller2015-07-291-14/+16
| | * Minor tweaks to style guideChristopher Speller2015-07-281-2/+6
| | * Adding style guideChristopher Speller2015-07-281-0/+161
| | * Adding rest of directories to eslint listChristopher Speller2015-07-281-0/+4
| | * Adding check target to makefile to run eslint. Adding eslint to package.jsonChristopher Speller2015-07-282-1/+8
| | * Configuration for eslintrcChristopher Speller2015-07-281-0/+139
| * | Merge pull request #252 from rgarmsen2295/ie10-image-regression-fixChristopher Speller2015-07-298-15/+28
| |\ \
| | * | Removed usage of window.location.origin throughout the codebaseReed Garmsen2015-07-274-8/+15
| | * | Fixes issue with images not displaying due to window.origin not being defined...Reed Garmsen2015-07-275-10/+16
| * | | Merge pull request #267 from nickago/MM-1652Christopher Speller2015-07-291-1/+1
| |\ \ \
| | * | | Fixed typo in delete_post_modalnickago2015-07-281-1/+1
| * | | | Merge pull request #265 from mattermost/mm-1711Joram Wilander2015-07-2914-159/+250
| |\ \ \ \
| | * | | | added use of strings.Team to replace hardcoded mentions of 'team'JoramWilander2015-07-291-3/+3
| | * | | | updated changing email in sign up flow to work properlyJoramWilander2015-07-281-4/+8
| | * | | | updated user sign up page and login page with new UI detailsJoramWilander2015-07-283-5/+4
| | * | | | updates to sign-up flow, remove company name and marketing checkboxJoramWilander2015-07-287-41/+16
| | * | | | Signup Ui changesAsaad Mahmood2015-07-288-114/+227
* | | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1762Asaad Mahmood2015-07-290-0/+0
|\| | | | |
| * | | | | Merge pull request #264 from asaadmahmoodspin/mm-1732Corey Hulen2015-07-2811-18/+18
| |\ \ \ \ \
* | | | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1762Asaad Mahmood2015-07-285-7/+10
|\| | | | | | | |/ / / / / |/| | | | |
| * | | | | Merge pull request #270 from mattermost/mm-1763Joram Wilander2015-07-281-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| | | |
| | * | | | 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
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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 file...hmhealey2015-07-281-1/+1
| | * | | Allow files without extensions to be uploaded as attachments to postshmhealey2015-07-281-1/+1
| |/ / /
* | | | 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 #253 from nickago/MM-1654Christopher Speller2015-07-282-0/+13
|\ \ \
| * | | 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
|\ \ \ \ | |_|_|/ |/| | |
| * | | Changed title of Active Devices to Active Sessions; added help text explainin...Reed Garmsen2015-07-273-2/+6
* | | | Merge pull request #262 from mattermost/it33-patch-1Joram Wilander2015-07-281-3/+3
|\ \ \ \
| * | | | Removed version number from dev build READMEit332015-07-271-3/+3
| |/ / /
* | | | Merge pull request #239 from nickago/MM-1295Christopher Speller2015-07-286-0/+91
|\ \ \ \
| * | | | 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 mod...nickago2015-07-271-2/+5
| * | | | When user is removed, a modal appears, which on closing redirects thenickago2015-07-275-2/+60
| * | | | When removed from a channel, user is sent back to town square and thatnickago2015-07-273-0/+13
| | |_|/ | |/| |
* | | | Merge pull request #257 from mattermost/mm-1502Christopher Speller2015-07-281-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | 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
|\ \ \ \