summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | | | | | | | | | | Merge pull request #28 from rgarmsen2295/mm-1290Corey Hulen2015-06-252-4/+7
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | Added logic to clear error messages that are not relevant to the current erro...Reed Garmsen2015-06-182-4/+7
| |/ / / / / / / / / / /
| * | | | | | | | | | | Merge pull request #8 from mattermost/masterReed Garmsen2015-06-181-2/+9
| |\ \ \ \ \ \ \ \ \ \ \ | | |_|_|/ / / / / / / / | |/| | | | | | | | | |
* | | | | | | | | | | | Merge pull request #27 from mattermost/mm-1240Corey Hulen2015-06-2525-36/+664
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | revert debug config changesJoramWilander2015-06-181-2/+2
| * | | | | | | | | | | | fix command comparator and team storeJoramWilander2015-06-183-31/+28
| * | | | | | | | | | | | added unit tests for new team API servicesJoramWilander2015-06-182-0/+121
| * | | | | | | | | | | | added team store, team settings menu, and the ability to turn on valet featur...JoramWilander2015-06-1816-20/+445
| * | | | | | | | | | | | add API service to turn on valet featureJoramWilander2015-06-181-0/+51
| * | | | | | | | | | | | move valet feature switch to DB from configJoramWilander2015-06-179-17/+51
* | | | | | | | | | | | | Merge pull request #26 from rgarmsen2295/mm-454Corey Hulen2015-06-252-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Changed Invite Members to Add Members in channel options for mobile and browserReed Garmsen2015-06-172-2/+2
| | |/ / / / / / / / / / / | |/| | | | | | | | | | |
| * | | | | | | | | | | | Merge pull request #7 from mattermost/masterReed Garmsen2015-06-172-4/+4
| |\ \ \ \ \ \ \ \ \ \ \ \
* | \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #19 from mattermost/mm-1235Corey Hulen2015-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fixes mm-1235 clicking on mentions now works properlyJoramWilander2015-06-171-1/+1
| | |_|/ / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #18 from mattermost/mm-1269Corey Hulen2015-06-251-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fixes mm-1269 don't show blue bar for internet connection issueJoramWilander2015-06-171-0/+2
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #13 from rgarmsen2295/mm-1215Corey Hulen2015-06-251-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Changed text when previewing an image from Downloading to PreviewingReed Garmsen2015-06-161-1/+1
| | |_|_|_|_|_|_|_|/ / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #9 from mattermost/mm-1263Corey Hulen2015-06-251-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | fixes mm-1263 mentions are highlighted properly nowJoramWilander2015-06-161-2/+2
* | | | | | | | | | | | | | | Merge pull request #8 from rgarmsen2295/mm-1097Corey Hulen2015-06-251-2/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Simplified hour conversion logicReed Garmsen2015-06-151-2/+1
| * | | | | | | | | | | | | | Changed format of the time in the security tab to a 12hr clock from a 24hr clockReed Garmsen2015-06-151-2/+4
* | | | | | | | | | | | | | | updating ding=Corey Hulen2015-06-231-0/+0
* | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform=Corey Hulen2015-06-230-0/+0
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | | Correcting capitalization typo, f -> Fit332015-06-231-1/+1
| * | | | | | | | | | | | | | | Merge pull request #54 from asaadmahmoodspin/masterCorey Hulen2015-06-234-4/+9
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Updating spellingAsaad Mahmood2015-06-231-1/+1
| | * | | | | | | | | | | | | | | MM-1339 - Updating Ui for sign up pageAsaad Mahmood2015-06-234-4/+9
| * | | | | | | | | | | | | | | | Listing golang-lruit332015-06-231-0/+8
| |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | Delete periodit332015-06-231-1/+1
| * | | | | | | | | | | | | | | Updated wording for configuration filesit332015-06-231-1/+1
| * | | | | | | | | | | | | | | "server" -> "Mattermost server"it332015-06-231-1/+1
| * | | | | | | | | | | | | | | Update README.mdit332015-06-231-4/+4
| * | | | | | | | | | | | | | | Update README.mdit332015-06-231-1/+4
| * | | | | | | | | | | | | | | Update LICENSE.txtit332015-06-231-6/+18
| * | | | | | | | | | | | | | | Update README.mdit332015-06-231-3/+1
| * | | | | | | | | | | | | | | Create LICENSE.txtit332015-06-231-0/+26
| * | | | | | | | | | | | | | | Merge pull request #52 from mattermost/readmeCorey Hulen2015-06-221-27/+35
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | Spacing in the notes sectionChristopher Speller2015-06-221-0/+1
| | * | | | | | | | | | | | | | | Sections for install instructionsChristopher Speller2015-06-221-27/+34
| * | | | | | | | | | | | | | | | Merge pull request #50 from mattermost/mm-1320Corey Hulen2015-06-2246-11460/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * | | | | | | | | | | | | | | | use proper dimensions for generated profile imageJoramWilander2015-06-221-1/+1
| | * | | | | | | | | | | | | | | | fixes mm-1320 removes freetype libs and only use solid color for generated pr...JoramWilander2015-06-2246-11460/+5
| | |/ / / / / / / / / / / / / / /
| * | | | | | | | | | | | | | | | Merge branch 'master' of https://github.com/mattermost/platform=Corey Hulen2015-06-220-0/+0
| |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge branch 'master' of https://github.com/mattermost/platform=Corey Hulen2015-06-226-1/+1
| | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \
| | | * \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ Merge pull request #47 from mattermost/image-cleanupJoram Wilander2015-06-226-1/+1
| | | |\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | | | | |/ / / / / / / / / / / / / / / | | | |/| | | | | | | | | | | | | | |
| | | | * | | | | | | | | | | | | | | Changing test imagesChristopher Speller2015-06-226-1/+1
| | | | | |_|_|_|_|_|_|_|_|_|_|_|_|/ | | | | |/| | | | | | | | | | | | |
| | | * / | | | | | | | | | | | | | fixing header=Corey Hulen2015-06-222-4/+12
| | | |/ / / / / / / / / / / / / /