Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #328 from asaadmahmoodspin/mm-1874 | Christopher Speller | 2015-08-05 | 3 | -4/+31 |
|\ | |||||
| * | Updating css for url input add-on and removing display flex | Asaad Mahmood | 2015-08-05 | 2 | -3/+6 |
| * | Fixing tooltip word-wrap | Asaad Mahmood | 2015-08-05 | 1 | -0/+3 |
| * | mm-1874 - Improving team url screen and fixing file attachments in IE 10 | Asaad Mahmood | 2015-08-04 | 3 | -2/+23 |
* | | Merge pull request #337 from mattermost/docker-config-updates | Christopher Speller | 2015-08-05 | 2 | -5/+13 |
|\ \ | |||||
| * | | Updating docker configuration files for release | Christopher Speller | 2015-08-05 | 2 | -5/+13 |
|/ / | |||||
* | | Merge pull request #320 from rgarmsen2295/mm-1873 | Christopher Speller | 2015-08-04 | 1 | -1/+1 |
|\ \ | |||||
| * | | Fixed typo on landing page for sign-up | Reed Garmsen | 2015-08-03 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #319 from mattermost/fix-dist | Christopher Speller | 2015-08-04 | 1 | -0/+12 |
|\ \ | |/ |/| | |||||
| * | Adding docs to build | =Corey Hulen | 2015-08-03 | 1 | -0/+12 |
|/ | |||||
* | fixing docker file | =Corey Hulen | 2015-08-02 | 1 | -1/+1 |
* | incrementing to rc2 | =Corey Hulen | 2015-08-02 | 1 | -1/+1 |
* | Merge pull request #311 from mattermost/mm-1619 | Corey Hulen | 2015-08-02 | 14 | -8/+462 |
|\ | |||||
| * | Merge branch 'master' into mm-1619 | =Corey Hulen | 2015-08-02 | 210 | -24938/+8377 |
| |\ | |/ |/| | |||||
* | | Fixing upgrade | =Corey Hulen | 2015-08-02 | 1 | -1/+1 |
* | | Merge pull request #278 from mattermost/mm-1702 | Corey Hulen | 2015-08-02 | 7 | -28/+185 |
|\ \ | |||||
| * | | Moving the handing of extra_info etag before the extra info is retrieved from... | Christopher Speller | 2015-07-30 | 1 | -10/+14 |
| * | | Adding etag to channel extra_info api call. | Christopher Speller | 2015-07-29 | 7 | -23/+176 |
* | | | Merge pull request #273 from mattermost/mm-1355 | Corey Hulen | 2015-08-02 | 142 | -24159/+7277 |
|\ \ \ | |||||
| * \ \ | Merge branch 'master' into mm-1355 | =Corey Hulen | 2015-07-30 | 41 | -365/+1110 |
| |\ \ \ | |||||
| * | | | | Fixing code review feedback | =Corey Hulen | 2015-07-30 | 3 | -3/+8 |
| * | | | | Merge branch 'master' into mm-1355 | =Corey Hulen | 2015-07-29 | 40 | -118/+290 |
| |\ \ \ \ | |||||
| * | | | | | Fixes mm-1355 adds rate limiting apis | =Corey Hulen | 2015-07-29 | 142 | -24158/+7271 |
* | | | | | | Merge pull request #312 from mattermost/mm-1784 | Corey Hulen | 2015-08-02 | 1 | -1/+2 |
|\ \ \ \ \ \ | |||||
| * | | | | | | switching to a new PM channel now works in the more modal | JoramWilander | 2015-07-31 | 1 | -1/+2 |
* | | | | | | | Merge pull request #305 from nickago/MM-1681 | Corey Hulen | 2015-08-02 | 14 | -46/+47 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | Changed all templates to use site url instead of team url for finding the 'st... | nickago | 2015-07-31 | 14 | -46/+47 |
* | | | | | | | | Merge pull request #302 from hmhealey/mm1788 | Corey Hulen | 2015-08-02 | 6 | -125/+5 |
|\ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | Removed ^replying in preparation for 0.6.0 | hmhealey | 2015-07-30 | 6 | -125/+5 |
* | | | | | | | | | Merge pull request #301 from lfbrock/patch-1 | Corey Hulen | 2015-08-02 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | MM-1841 Corrected help text | lfbrock | 2015-07-30 | 1 | -1/+1 |
| |/ / / / / / / / | |||||
* | | | | | | | | | Merge pull request #300 from hmhealey/ubuntudev | Corey Hulen | 2015-08-02 | 1 | -33/+73 |
|\ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | Updated developer setup instructions to include Ubuntu setup | Harrison Healey | 2015-07-31 | 1 | -33/+73 |
* | | | | | | | | | | Merge pull request #291 from mattermost/mm-1758 | Corey Hulen | 2015-08-02 | 2 | -1/+6 |
|\ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | partially fixed postgres search so that multiple search terms work | JoramWilander | 2015-07-30 | 2 | -1/+6 |
* | | | | | | | | | | | Merge pull request #276 from mattermost/mm-1688 | Corey Hulen | 2015-08-02 | 4 | -5/+13 |
|\ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | removed ternary operator to make if statement clearer | JoramWilander | 2015-07-30 | 1 | -1/+4 |
| * | | | | | | | | | | | reset number of posts to fetch on channel switch and fresh page load | JoramWilander | 2015-07-29 | 4 | -5/+10 |
* | | | | | | | | | | | | Merge pull request #274 from mattermost/mm-1497 | Corey Hulen | 2015-08-02 | 6 | -8/+33 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | center small thumbnails and top left larger thumbnails | JoramWilander | 2015-07-31 | 1 | -0/+11 |
| * | | | | | | | | | | | | removed uneccessary utils loadThumbnails function | JoramWilander | 2015-07-31 | 1 | -44/+0 |
| * | | | | | | | | | | | | updated docker config thumbnail width/height | JoramWilander | 2015-07-31 | 1 | -2/+2 |
| * | | | | | | | | | | | | image thumbnails now scale appropriately so there is no whitespace, also gene... | JoramWilander | 2015-07-31 | 5 | -6/+64 |
* | | | | | | | | | | | | | Merge pull request #313 from mattermost/it33-patch-3 | Joram Wilander | 2015-08-01 | 1 | -1/+1 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / |/| | | | | | | | | | | | | |||||
| * | | | | | | | | | | | | Update to give credit to MongoDB on licensing | it33 | 2015-07-31 | 1 | -1/+1 |
|/ / / / / / / / / / / / | |||||
* | | | | | | | | | | | | Merge pull request #298 from mattermost/mm-1789 | Joram Wilander | 2015-07-31 | 1 | -9/+19 |
|\ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | replaced 'fiddle' with 'adjust' to be more clear | JoramWilander | 2015-07-31 | 1 | -1/+1 |
| * | | | | | | | | | | | | update readme with basic config settings setup information | JoramWilander | 2015-07-30 | 1 | -9/+19 |
* | | | | | | | | | | | | | Merge pull request #299 from nickago/MM-1734 | Christopher Speller | 2015-07-31 | 1 | -24/+22 |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | |||||
| * | | | | | | | | | | | | | Updated actual text of error message | nickago | 2015-07-31 | 1 | -1/+1 |