summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #176 from nickago/MM-1400Corey Hulen2015-07-151-2/+13
|\
| * Fixed minor typonickago2015-07-141-1/+1
| * Add processing for messageless image posts w/ pluralizationnickago2015-07-131-2/+13
* | Merge pull request #153 from nickago/MM-1460Corey Hulen2015-07-152-2/+15
|\ \
| * | Updated database schema for full utf8 compatibilitynickago2015-07-092-2/+15
* | | Merge pull request #189 from nickago/MM-1591Christopher Speller2015-07-151-1/+1
|\ \ \
| * | | Fixed typo, returned password flow to standard modelnickago2015-07-151-1/+1
|/ / /
* | | Merge pull request #182 from mattermost/revert-174-MM-831-3Joram Wilander2015-07-142-31/+3
|\ \ \
| * | | Revert "MM-831 Time change ping riding on the status interupt for timestamp u...Joram Wilander2015-07-142-31/+3
|/ / /
* | | Merge pull request #174 from nickago/MM-831-3Joram Wilander2015-07-142-3/+31
|\ \ \
| * | | Added semicolonsnickago2015-07-142-2/+2
| * | | Fixed 'this' typo and added semicolonnickago2015-07-131-1/+1
| * | | Added timestamp updates to right side and cleaned codenickago2015-07-133-14/+28
| * | | merge conflictsnickago2015-07-132-2/+16
| |\ \ \ | | |_|/ | |/| |
| | * | should fix scrolling on forceupdateJoramWilander2015-07-132-2/+13
* | | | Merge pull request #167 from rgarmsen2295/mm-629Joram Wilander2015-07-142-1/+31
|\ \ \ \
| * | | | If a message has no text but has an attached image or file the desktop notifi...Reed Garmsen2015-07-132-1/+31
* | | | | Merge pull request #168 from ralder/fix-loading-screen-for-ieJoram Wilander2015-07-148-139/+108
|\ \ \ \ \
| * | | | | [webui] fix loading animation for ieralder2015-07-118-139/+108
* | | | | | Merge pull request #178 from asaadmahmoodspin/masterJoram Wilander2015-07-142-7/+29
|\ \ \ \ \ \
| * | | | | | mm-1302 - Adding profile pick in LHS HeaderAsaad Mahmood2015-07-142-9/+28
| * | | | | | Merge branch 'MM-1302' of https://github.com/nickago/platform into mm-1302Asaad Mahmood2015-07-141-0/+3
| | |/ / / / | |/| | | |
* / | | | | Updating README_DEV.md with corrected forum linksit332015-07-131-2/+2
|/ / / / /
* | | | | Merge pull request #158 from nickago/MM-975Christopher Speller2015-07-1311-10/+41
|\ \ \ \ \
| * | | | | removed testing statenickago2015-07-131-2/+0
| * | | | | Added update function to image update and fixed corner casesnickago2015-07-136-7/+12
| * | | | | Added async get to channel swapnickago2015-07-131-0/+1
| * | | | | Added User update functionnickago2015-07-131-0/+4
| * | | | | Added timestamps to pictures to stop cachingnickago2015-07-136-4/+27
| | |/ / / | |/| | |
* | | | | Merge pull request #166 from rgarmsen2295/mm-1526Corey Hulen2015-07-131-1/+1
|\ \ \ \ \
| * | | | | Changed parser for desktop notifications to replace returns with a single space.Reed Garmsen2015-07-101-1/+1
| * | | | | Changes to notifcation carriage return parsingReed Garmsen2015-07-101-1/+1
| | |/ / / | |/| | |
* | | | | Merge pull request #163 from ralder/fix-and-refactor-browser-storeChristopher Speller2015-07-1311-310/+150
|\ \ \ \ \ | |_|/ / / |/| | | |
| * | | | fix BrowserStore bug in actionOnItemsWithPrefix and refactor BrowserStoreralder2015-07-1011-310/+150
| | |/ / | |/| |
* | | | Merge pull request #164 from ralder/fix-mentions-list-height-in-right-sidebarJoram Wilander2015-07-132-15/+23
|\ \ \ \ | |_|/ / |/| | |
| * | | [webui] fix incorrect height for mentions list for reply textboxralder2015-07-102-15/+23
* | | | Merge pull request #165 from mattermost/revert-154-MM-831Joram Wilander2015-07-102-11/+0
|\ \ \ \ | |_|/ / |/| | |
| * | | Revert "MM-831 Post timestamp now updates in real time"Joram Wilander2015-07-102-11/+0
|/ / /
* | | Merge pull request #159 from rgarmsen2295/mm-1269bCorey Hulen2015-07-105-6/+54
|\ \ \
| * | | Removed extraneous setStateReed Garmsen2015-07-101-2/+1
| * | | Changed spacing model of connection flag & removed unnecessary duplication of...Reed Garmsen2015-07-101-9/+6
| * | | Moved check for existing timer interrupt outside of if-else block for sanityReed Garmsen2015-07-091-4/+5
| * | | Removed newlineReed Garmsen2015-07-091-1/+0
| * | | Changed method again this time to a timer based system so that when inet does...Reed Garmsen2015-07-091-16/+27
| * | | Added performance commentReed Garmsen2015-07-091-0/+2
| * | | Use the AsyncClient call 'updateLastViewedAt' as a way of checking for inet c...Reed Garmsen2015-07-092-10/+16
| * | | Added errorchange listener to textbox that detects if inet is not connected. ...Reed Garmsen2015-07-094-10/+38
| * | | Notes to myselfReed Garmsen2015-07-091-1/+6
* | | | Merge pull request #157 from rgarmsen2295/mm-1265Corey Hulen2015-07-104-10/+11
|\ \ \ \ | |_|/ / |/| | |
| * | | Final change to code affected by change to loading more channels logicReed Garmsen2015-07-101-1/+1
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-03 05:20:38 +0000