Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed config on our link parser | nickago | 2015-07-16 | 1 | -2/+7 |
* | Clarifying license in README.md | it33 | 2015-07-16 | 1 | -4/+1 |
* | Merge pull request #175 from ralder/fix-dispatchError | Joram Wilander | 2015-07-16 | 7 | -132/+103 |
|\ | |||||
| * | fix incorrect call for AsyncClient.dispatchError | ralder | 2015-07-13 | 7 | -132/+103 |
* | | Merge pull request #195 from mattermost/revert-181-mm1494 | Joram Wilander | 2015-07-16 | 1 | -3/+3 |
|\ \ | |||||
| * | | Revert "MM-1494 Change image resizing for preview and thumbnail to use Lanczo... | Joram Wilander | 2015-07-16 | 1 | -3/+3 |
|/ / | |||||
* | | Merge pull request #171 from mattermost/mm-1415 | Corey Hulen | 2015-07-15 | 7 | -28/+29 |
|\ \ | |||||
| * \ | fixing merge | =Corey Hulen | 2015-07-15 | 40 | -493/+417 |
| |\ \ | |/ / |/| | | |||||
* | | | Merge pull request #191 from asaadmahmoodspin/master | Corey Hulen | 2015-07-15 | 2 | -4/+4 |
|\ \ \ | |||||
| * | | | Minor UI changes | Asaad Mahmood | 2015-07-15 | 2 | -4/+4 |
* | | | | Merge pull request #181 from hmhealey/mm1494 | Corey Hulen | 2015-07-15 | 1 | -3/+3 |
|\ \ \ \ | |||||
| * | | | | Changed image resizing for both the preview and thumbnail to use Lanczos inte... | hmhealey | 2015-07-14 | 1 | -3/+3 |
* | | | | | Merge pull request #176 from nickago/MM-1400 | Corey Hulen | 2015-07-15 | 1 | -2/+13 |
|\ \ \ \ \ | |||||
| * | | | | | Fixed minor typo | nickago | 2015-07-14 | 1 | -1/+1 |
| * | | | | | Add processing for messageless image posts w/ pluralization | nickago | 2015-07-13 | 1 | -2/+13 |
* | | | | | | Merge pull request #153 from nickago/MM-1460 | Corey Hulen | 2015-07-15 | 2 | -2/+15 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Updated database schema for full utf8 compatibility | nickago | 2015-07-09 | 2 | -2/+15 |
* | | | | | | Merge pull request #189 from nickago/MM-1591 | Christopher Speller | 2015-07-15 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Fixed typo, returned password flow to standard model | nickago | 2015-07-15 | 1 | -1/+1 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #182 from mattermost/revert-174-MM-831-3 | Joram Wilander | 2015-07-14 | 2 | -31/+3 |
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | | |||||
| * | | | | | Revert "MM-831 Time change ping riding on the status interupt for timestamp u... | Joram Wilander | 2015-07-14 | 2 | -31/+3 |
|/ / / / / | |||||
* | | | | | Merge pull request #174 from nickago/MM-831-3 | Joram Wilander | 2015-07-14 | 2 | -3/+31 |
|\ \ \ \ \ | |||||
| * | | | | | Added semicolons | nickago | 2015-07-14 | 2 | -2/+2 |
| * | | | | | Fixed 'this' typo and added semicolon | nickago | 2015-07-13 | 1 | -1/+1 |
| * | | | | | Added timestamp updates to right side and cleaned code | nickago | 2015-07-13 | 3 | -14/+28 |
| * | | | | | merge conflicts | nickago | 2015-07-13 | 2 | -2/+16 |
| |\ \ \ \ \ | | |_|/ / / | |/| | | | | |||||
| | * | | | | should fix scrolling on forceupdate | JoramWilander | 2015-07-13 | 2 | -2/+13 |
* | | | | | | Merge pull request #167 from rgarmsen2295/mm-629 | Joram Wilander | 2015-07-14 | 2 | -1/+31 |
|\ \ \ \ \ \ | |||||
| * | | | | | | If a message has no text but has an attached image or file the desktop notifi... | Reed Garmsen | 2015-07-13 | 2 | -1/+31 |
| | |_|_|_|/ | |/| | | | | |||||
* | | | | | | Merge pull request #168 from ralder/fix-loading-screen-for-ie | Joram Wilander | 2015-07-14 | 8 | -139/+108 |
|\ \ \ \ \ \ | |||||
| * | | | | | | [webui] fix loading animation for ie | ralder | 2015-07-11 | 8 | -139/+108 |
* | | | | | | | Merge pull request #178 from asaadmahmoodspin/master | Joram Wilander | 2015-07-14 | 2 | -7/+29 |
|\ \ \ \ \ \ \ | |||||
| * | | | | | | | mm-1302 - Adding profile pick in LHS Header | Asaad Mahmood | 2015-07-14 | 2 | -9/+28 |
| * | | | | | | | Merge branch 'MM-1302' of https://github.com/nickago/platform into mm-1302 | Asaad Mahmood | 2015-07-14 | 1 | -0/+3 |
| | |/ / / / / | |/| | | | | | |||||
* / | | | | | | Updating README_DEV.md with corrected forum links | it33 | 2015-07-13 | 1 | -2/+2 |
|/ / / / / / | |||||
* | | | | | | Merge pull request #158 from nickago/MM-975 | Christopher Speller | 2015-07-13 | 11 | -10/+41 |
|\ \ \ \ \ \ | |||||
| * | | | | | | removed testing state | nickago | 2015-07-13 | 1 | -2/+0 |
| * | | | | | | Added update function to image update and fixed corner cases | nickago | 2015-07-13 | 6 | -7/+12 |
| * | | | | | | Added async get to channel swap | nickago | 2015-07-13 | 1 | -0/+1 |
| * | | | | | | Added User update function | nickago | 2015-07-13 | 1 | -0/+4 |
| * | | | | | | Added timestamps to pictures to stop caching | nickago | 2015-07-13 | 6 | -4/+27 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #166 from rgarmsen2295/mm-1526 | Corey Hulen | 2015-07-13 | 1 | -1/+1 |
|\ \ \ \ \ \ | |||||
| * | | | | | | Changed parser for desktop notifications to replace returns with a single space. | Reed Garmsen | 2015-07-10 | 1 | -1/+1 |
| * | | | | | | Changes to notifcation carriage return parsing | Reed Garmsen | 2015-07-10 | 1 | -1/+1 |
| | |/ / / / | |/| | | | | |||||
* | | | | | | Merge pull request #163 from ralder/fix-and-refactor-browser-store | Christopher Speller | 2015-07-13 | 11 | -310/+150 |
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | | |||||
| * | | | | | fix BrowserStore bug in actionOnItemsWithPrefix and refactor BrowserStore | ralder | 2015-07-10 | 11 | -310/+150 |
| | |/ / / | |/| | | | |||||
* | | | | | Merge pull request #164 from ralder/fix-mentions-list-height-in-right-sidebar | Joram Wilander | 2015-07-13 | 2 | -15/+23 |
|\ \ \ \ \ | |_|/ / / |/| | | | | |||||
| * | | | | [webui] fix incorrect height for mentions list for reply textbox | ralder | 2015-07-10 | 2 | -15/+23 |
| | | | * | Fixes mm-1415 adding email bypass flag | =Corey Hulen | 2015-07-12 | 7 | -28/+29 |
| |_|_|/ |/| | | | |||||
* | | | | Merge pull request #165 from mattermost/revert-154-MM-831 | Joram Wilander | 2015-07-10 | 2 | -11/+0 |
|\ \ \ \ | |_|/ / |/| | | |