summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #331 from mattermost/060-readme-updatesChristopher Speller2015-08-051-48/+52
|\ | | | | Updates to the README for release.
| * Correcting minor typos, formatting, wordingit332015-08-041-31/+30
| |
| * Fixing typeoChristopher Speller2015-08-041-1/+1
| |
| * Updates to the README for release.it332015-08-041-23/+28
| |
* | Merge pull request #328 from asaadmahmoodspin/mm-1874Christopher Speller2015-08-053-4/+31
|\ \ | | | | | | mm-1874 - Improving team url screen and fixing file attachments in IE 10
| * | Updating css for url input add-on and removing display flexAsaad Mahmood2015-08-052-3/+6
| | |
| * | Fixing tooltip word-wrapAsaad Mahmood2015-08-051-0/+3
| | |
| * | mm-1874 - Improving team url screen and fixing file attachments in IE 10Asaad Mahmood2015-08-043-2/+23
| |/
* | Merge pull request #337 from mattermost/docker-config-updatesChristopher Speller2015-08-052-5/+13
|\ \ | | | | | | Updating docker configuration files for release
| * | Updating docker configuration files for releaseChristopher Speller2015-08-052-5/+13
|/ /
* | Merge pull request #320 from rgarmsen2295/mm-1873Christopher Speller2015-08-041-1/+1
|\ \ | | | | | | Fixed typo on landing page for sign-up
| * | Fixed typo on landing page for sign-upReed Garmsen2015-08-031-1/+1
| |/
* | Merge pull request #319 from mattermost/fix-distChristopher Speller2015-08-041-0/+12
|\ \ | |/ |/| Adding docs to build
| * Adding docs to build=Corey Hulen2015-08-031-0/+12
|/
* 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
|\ | | | | MM-1619 Updating dockerfiles.
| * 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
|\ \ | | | | | | MM-1702 Adding etag to channel extra_info api call.
| * | Moving the handing of extra_info etag before the extra info is retrieved ↵Christopher Speller2015-07-301-10/+14
| | | | | | | | | | | | from the database
| * | 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
|\ \ \ | | | | | | | | Fixes mm-1355 adds rate limiting apis
| * \ \ 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-1784 switching to a new PM channel now works in the more modal
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-1681 Fixed regression of static images not displaying in emails
| * | | | | | | Changed all templates to use site url instead of team url for finding the ↵nickago2015-07-3114-46/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 'static' directory
* | | | | | | | Merge pull request #302 from hmhealey/mm1788Corey Hulen2015-08-026-125/+5
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MM-1788 Removed ^replying in preparation for 0.6.0
| * | | | | | | | 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 text
| * | | | | | | | | 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 for Ubuntu
| * | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | MM-1758 partially fixed postgres search so that multiple search terms work
| * | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | MM-1688 reset number of posts to fetch on channel switch and fresh page load
| * | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | MM-1497 image thumbnails now scale appropriately so there is no whitespace
| * | | | | | | | | | | | 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 ↵JoramWilander2015-07-315-6/+64
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | generalized some thumbnail loading code
* | | | | | | | | | | | | Merge pull request #313 from mattermost/it33-patch-3Joram Wilander2015-08-011-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | Update to give credit to MongoDB on licensing
| * | | | | | | | | | | | 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
|\ \ \ \ \ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | MM-1789 update readme with basic config settings setup information