summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #309 from nickago/MM-1691Christopher Speller2015-08-042-4/+14
|\
| * User Settings modal resets to General tab with nothing open on closenickago2015-07-312-4/+14
* | fixing docker file=Corey Hulen2015-08-021-1/+1
* | incrementing to rc2=Corey Hulen2015-08-021-1/+1
* | Merge pull request #311 from mattermost/mm-1619Corey Hulen2015-08-0214-8/+462
|\ \
| * \ Merge branch 'master' into mm-1619=Corey Hulen2015-08-02210-24938/+8377
| |\ \ | |/ / |/| |
* | | Fixing upgrade=Corey Hulen2015-08-021-1/+1
* | | Merge pull request #278 from mattermost/mm-1702Corey Hulen2015-08-027-28/+185
|\ \ \
| * | | Moving the handing of extra_info etag before the extra info is retrieved from...Christopher Speller2015-07-301-10/+14
| * | | Adding etag to channel extra_info api call.Christopher Speller2015-07-297-23/+176
* | | | Merge pull request #273 from mattermost/mm-1355Corey Hulen2015-08-02142-24159/+7277
|\ \ \ \
| * \ \ \ Merge branch 'master' into mm-1355=Corey Hulen2015-07-3041-365/+1110
| |\ \ \ \
| * | | | | Fixing code review feedback=Corey Hulen2015-07-303-3/+8
| * | | | | Merge branch 'master' into mm-1355=Corey Hulen2015-07-2940-118/+290
| |\ \ \ \ \
| * | | | | | Fixes mm-1355 adds rate limiting apis=Corey Hulen2015-07-29142-24158/+7271
* | | | | | | Merge pull request #312 from mattermost/mm-1784Corey Hulen2015-08-021-1/+2
|\ \ \ \ \ \ \
| * | | | | | | switching to a new PM channel now works in the more modalJoramWilander2015-07-311-1/+2
* | | | | | | | Merge pull request #305 from nickago/MM-1681Corey Hulen2015-08-0214-46/+47
|\ \ \ \ \ \ \ \
| * | | | | | | | Changed all templates to use site url instead of team url for finding the 'st...nickago2015-07-3114-46/+47
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #302 from hmhealey/mm1788Corey Hulen2015-08-026-125/+5
|\ \ \ \ \ \ \ \
| * | | | | | | | Removed ^replying in preparation for 0.6.0hmhealey2015-07-306-125/+5
* | | | | | | | | Merge pull request #301 from lfbrock/patch-1Corey Hulen2015-08-021-1/+1
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | MM-1841 Corrected help textlfbrock2015-07-301-1/+1
| |/ / / / / / / /
* | | | | | | | | Merge pull request #300 from hmhealey/ubuntudevCorey Hulen2015-08-021-33/+73
|\ \ \ \ \ \ \ \ \
| * | | | | | | | | Updated developer setup instructions to include Ubuntu setupHarrison Healey2015-07-311-33/+73
* | | | | | | | | | Merge pull request #291 from mattermost/mm-1758Corey Hulen2015-08-022-1/+6
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | partially fixed postgres search so that multiple search terms workJoramWilander2015-07-302-1/+6
* | | | | | | | | | | Merge pull request #276 from mattermost/mm-1688Corey Hulen2015-08-024-5/+13
|\ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | removed ternary operator to make if statement clearerJoramWilander2015-07-301-1/+4
| * | | | | | | | | | | reset number of posts to fetch on channel switch and fresh page loadJoramWilander2015-07-294-5/+10
* | | | | | | | | | | | Merge pull request #274 from mattermost/mm-1497Corey Hulen2015-08-026-8/+33
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | center small thumbnails and top left larger thumbnailsJoramWilander2015-07-311-0/+11
| * | | | | | | | | | | | removed uneccessary utils loadThumbnails functionJoramWilander2015-07-311-44/+0
| * | | | | | | | | | | | updated docker config thumbnail width/heightJoramWilander2015-07-311-2/+2
| * | | | | | | | | | | | image thumbnails now scale appropriately so there is no whitespace, also gene...JoramWilander2015-07-315-6/+64
* | | | | | | | | | | | | Merge pull request #313 from mattermost/it33-patch-3Joram Wilander2015-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | |
| * | | | | | | | | | | | Update to give credit to MongoDB on licensingit332015-07-311-1/+1
|/ / / / / / / / / / / /
* | | | | | | | | | | | Merge pull request #298 from mattermost/mm-1789Joram Wilander2015-07-311-9/+19
|\ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | replaced 'fiddle' with 'adjust' to be more clearJoramWilander2015-07-311-1/+1
| * | | | | | | | | | | | update readme with basic config settings setup informationJoramWilander2015-07-301-9/+19
* | | | | | | | | | | | | Merge pull request #299 from nickago/MM-1734Christopher Speller2015-07-311-24/+22
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Updated actual text of error messagenickago2015-07-311-1/+1
| * | | | | | | | | | | | | Changed language in error message to reflect better English and did cosmetic ...nickago2015-07-301-24/+22
* | | | | | | | | | | | | | Merge pull request #303 from nickago/MM-1642Christopher Speller2015-07-311-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Updated error message for an incorrect passwordnickago2015-07-301-1/+1
* | | | | | | | | | | | | | | Merge pull request #306 from nickago/MM-1660Christopher Speller2015-07-311-91/+112
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Added singlequotes around 'Edit' and did cosmetic refactoringnickago2015-07-311-91/+112
| | |_|_|_|_|_|_|/ / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #307 from mattermost/revert-304-mm1706Joram Wilander2015-07-311-7/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|/ / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Revert "MM-1706 Changed mention highlighting code to split words on all non-w...Joram Wilander2015-07-311-7/+7
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #271 from hmhealey/mm1656Joram Wilander2015-07-3118-335/+473
|\ \ \ \ \ \ \ \ \ \ \ \ \
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-30 19:04:46 +0000