summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #395 from mattermost/merge-fixJoram Wilander2015-08-181-6/+0
|\ | | | | Fix a bad merge that had edited posts being handled sloppily.
| * Fix a bad merge that had edited posts being handled sloppily.JoramWilander2015-08-181-6/+0
| |
* | Merge pull request #375 from nickago/MM-1777Christopher Speller2015-08-182-2/+6
|\ \ | | | | | | MM-1777 Formatted comments' time in RHS similar to root
| * | Formatted comments' time in RHS similar to rootnickago2015-08-182-2/+6
| | |
* | | Merge pull request #390 from rgarmsen2295/mm-1802Corey Hulen2015-08-182-152/+169
|\ \ \ | | | | | | | | MM-1802 Clicking on a PM channel name in mobile view now opens the channel menu
| * | | Clicking on a PM channel name in mobile view now opens the channel menu ↵Reed Garmsen2015-08-171-16/+14
| | | | | | | | | | | | | | | | (like desktop mode)
| * | | Refactored the NotifyCounts component out of the navbar.jsx file into its ↵Reed Garmsen2015-08-172-44/+50
| | | | | | | | | | | | | | | | own file
| * | | Initial prepatory cosmetic reformatting of navbar.jsxReed Garmsen2015-08-171-116/+129
| | | |
* | | | Merge pull request #389 from nickago/MM-1799Joram Wilander2015-08-181-1/+5
|\ \ \ \ | |_|/ / |/| | | MM-1799 Changed wording of get link modal
| * | | Changed wording of get link modalnickago2015-08-171-1/+5
| |/ /
* | | Merge pull request #392 from hmhealey/typingfixJoram Wilander2015-08-181-1/+1
|\ \ \ | |_|/ |/| | Fixed 'X is typing...' messages being malformed when sent to the server
| * | Fixed 'X is typing...' messages being malformed when sent to the serverhmhealey2015-08-181-1/+1
|/ /
* | Merge pull request #380 from mattermost/mm-319Christopher Speller2015-08-1815-521/+941
|\ \ | | | | | | MM-319 adding pending post functionality to the client
| * | reformat post_list.jsx to match style guide more closelyJoramWilander2015-08-181-185/+227
| | |
| * | reformatted post_right to match style guide more closelyJoramWilander2015-08-181-55/+61
| | |
| * | reformat post_body.jsx to match style guide more closelyJoramWilander2015-08-181-18/+18
| | |
| * | fix minor issues caused by rebaseJoramWilander2015-08-181-7/+11
| | |
| * | reformatting and minor refactoring of post_*.jsx to match style guideJoramWilander2015-08-183-38/+62
| | |
| * | removed unused post store functionJoramWilander2015-08-181-14/+0
| | |
| * | MM-319 - Minor ui changesAsaad Mahmood2015-08-183-20/+17
| | |
| * | add received post action on successful post/comment retryJoramWilander2015-08-182-0/+10
| | |
| * | minor bug fixes to pending postsJoramWilander2015-08-182-1/+2
| | |
| * | finalize implenetation of predictive client posts so that users get ↵JoramWilander2015-08-1813-270/+374
| | | | | | | | | | | | immediate feedback after posting
| * | update formatting in post_storeJoramWilander2015-08-181-28/+40
| | |
| * | added client predictive commentingJoramWilander2015-08-184-17/+97
| | |
| * | adds predictive posting on the clientJoramWilander2015-08-188-36/+190
|/ /
* | Merge pull request #391 from asaadmahmoodspin/masterChristopher Speller2015-08-1810-14/+41
|\ \ | | | | | | Multiple UI changes
| * | Multiple UI changesAsaad Mahmood2015-08-1810-14/+41
| | |
* | | Merge pull request #385 from mattermost/mm-1623Christopher Speller2015-08-184-5/+57
|\ \ \ | | | | | | | | MM-1623 when user roles are updated, the relevant session roles are updated as well
| * | | when user roles are updated, the relevant session roles are updated as wellJoramWilander2015-08-174-5/+57
| | | |
* | | | Merge pull request #381 from mattermost/mm-1705Christopher Speller2015-08-1817-170/+335
|\ \ \ \ | | | | | | | | | | MM-1705 add google as an oauth single-sign-on service
| * | | | merge async_client getMe changesJoramWilander2015-08-141-6/+6
| | | | |
| * | | | reformat login.jsx to meet style guideJoramWilander2015-08-141-48/+54
| | | | |
| * | | | turn off google SSO by default and remove test google oauth credentialsJoramWilander2015-08-141-3/+3
| | | | |
| * | | | incorporate asaad's UI updates for google sign-upJoramWilander2015-08-143-1/+18
| | | | |
| * | | | added google sign-in functionality to the client, with minor model modificationsJoramWilander2015-08-1411-81/+136
| | | | |
| * | | | initial server implementation for using google as a single-sign-on oauth serviceJoramWilander2015-08-147-59/+146
| | | | |
* | | | | Merge pull request #378 from rgarmsen2295/mm-316cChristopher Speller2015-08-1816-31/+325
|\ \ \ \ \ | | | | | | | | | | | | MM-316 Allows users to drag and drop files from their computer to the center pane or RHS to upload them
| * | | | | Small changes to css to clean up codeReed Garmsen2015-08-145-21/+9
| | | | | |
| * | | | | Minor cosmetic refactoring of file_upload.jsxReed Garmsen2015-08-131-12/+14
| | | | | |
| * | | | | Minor refactoring for better maintainibilityReed Garmsen2015-08-133-8/+16
| | | | | |
| * | | | | Better error checking along with other fixesReed Garmsen2015-08-134-29/+36
| | | | | |
| * | | | | Changed location of file upload overlayReed Garmsen2015-08-134-13/+28
| | | | | |
| * | | | | Merge pull request #7 from asaadmahmoodspin/mm-316Reed Garmsen2015-08-1314-36/+327
| |\ \ \ \ \ | | | | | | | | | | | | | | MM-316
| | * | | | | Updating UI to cover RHS and the centre channel separatelyAsaad Mahmood2015-08-134-5/+6
| | | | | | |
| | * | | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-316Asaad Mahmood2015-08-131-19/+36
| | |\ \ \ \ \
| | * | | | | | UI Upgrades to file overlay for uploadsAsaad Mahmood2015-08-135-48/+45
| | | | | | | |
| | * | | | | | Merge pull request #5 from rgarmsen2295/mm-316asaadmahmoodspin2015-08-1312-17/+293
| |/| | | | | | | | | | | | | | | | | | | | | | MM-316 Allows users to drag and drop files from their computer to the center pane or RHS to upload them
| | * | | | | | Implements better markup for css changes to be made, including an overlay of ↵Reed Garmsen2015-08-127-43/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | the dropzones and help pic/text
| | * | | | | | Updated feature to work with new upload cancel logicReed Garmsen2015-08-121-7/+32
| | | | | | | |
generated by cgit v1.2.3-1-g7c22 (git 2.25.1) at 2024-10-31 14:35:45 +0000