summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | | Revert "MM-831 Time change ping riding on the status interupt for timestamp ↵Joram Wilander2015-07-142-31/+3
|/ / / / / / | | | | | | | | | | | | | | | | | | update"
* | | | | | Merge pull request #174 from nickago/MM-831-3Joram Wilander2015-07-142-3/+31
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-831 Time change ping riding on the status interupt for timestamp update
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-629 Empty messages with files attached now include text in the desktop notification describing the contents
| * | | | | | | If a message has no text but has an attached image or file the desktop ↵Reed Garmsen2015-07-132-1/+31
| | |_|_|_|/ / | |/| | | | | | | | | | | | | | | | | | | notification now says uploaded an image or uploaded a file respectively (if both, defaults to image)
* | | | | | | Merge pull request #168 from ralder/fix-loading-screen-for-ieJoram Wilander2015-07-148-139/+108
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | [webui] fix loading animation for ie
| * | | | | | | [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 Header
| * | | | | | | 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
| | |/ / / / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Please enter a commit message to explain why this merge is necessary, # especially if it merges an updated upstream into a topic branch. # # Lines starting with '#' will be ignored, and an empty message aborts # the commit.
* / | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-975 Added timestamps to pictures to stop caching
| * | | | | | 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
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-1526 Desktop notifications no longer render carriage returns
| * | | | | | 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
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | [webui] second bugfix for pr #150 and refactor BrowserStore
| * | | | | 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 and edit textbox
| * | | | [webui] fix incorrect height for mentions list for reply textboxralder2015-07-102-15/+23
| | | | |
| | | | * Fixes mm-1415 adding email bypass flag=Corey Hulen2015-07-127-28/+29
| |_|_|/ |/| | |
* | | | 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"
| * | | 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
|\ \ \ | | | | | | | | MM-1269b Added yellow tinge to post and comment textbox when connection is disrupted
| * | | Removed extraneous setStateReed Garmsen2015-07-101-2/+1
| | | |
| * | | Changed spacing model of connection flag & removed unnecessary duplication ↵Reed Garmsen2015-07-101-9/+6
| | | | | | | | | | | | | | | | of logic
| * | | 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 ↵Reed Garmsen2015-07-091-16/+27
| | | | | | | | | | | | | | | | does come back the yellow tinge goes away automatically not on user input
| * | | Added performance commentReed Garmsen2015-07-091-0/+2
| | | |
| * | | Use the AsyncClient call 'updateLastViewedAt' as a way of checking for inet ↵Reed Garmsen2015-07-092-10/+16
| | | | | | | | | | | | | | | | connectivity immediately after clearning yellow bar after user has typed 5 characters
| * | | Added errorchange listener to textbox that detects if inet is not connected. ↵Reed Garmsen2015-07-094-10/+38
| | | | | | | | | | | | | | | | Still do not have reliable way of checking if inet has reconnected
| * | | Notes to myselfReed Garmsen2015-07-091-1/+6
| | | |
* | | | Merge pull request #157 from rgarmsen2295/mm-1265Corey Hulen2015-07-104-10/+11
|\ \ \ \ | |_|/ / |/| | | MM-1265 Button to change roles now shows "click" mouse ptr when hovered over & change with loading more channels
| * | | Final change to code affected by change to loading more channels logicReed Garmsen2015-07-101-1/+1
| | | |
| * | | Removed test codeReed Garmsen2015-07-101-2/+0
| | | |
| * | | Better logic for checking if channel has loadedReed Garmsen2015-07-103-2/+9
| | | |
| * | | Removed extraneous console.log functionsReed Garmsen2015-07-091-5/+0
| | | |
| * | | Leave result of _getMoreChannels unitialized if it does not yet exist in ↵Reed Garmsen2015-07-092-4/+5
| | | | | | | | | | | | | | | | browser storage to know when list of more channels is loading vs when its empty
| * | | The options to change member roles are now links so that they have the ↵Reed Garmsen2015-07-091-4/+4
| |/ / | | | | | | | | | 'click' mouse hand when hovered over
* | | Merge pull request #162 from asaadmahmoodspin/masterJoram Wilander2015-07-103-8/+13
|\ \ \ | | | | | | | | UI Improvements for RHS
| * | | UI Improvements for RHSAsaad Mahmood2015-07-103-8/+13
|/ / /
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-07-08 10:26:57 +0000