summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #399 from mattermost/update-dependenciesJoram Wilander2015-08-194-188/+296
|\
| * Refacting post_info.jsx to be an example for ES6 class syntaxChristopher Speller2015-08-182-41/+129
| * Updating dependencies and blacklisting strict from babelify for now.Christopher Speller2015-08-182-147/+167
* | Merge pull request #387 from rgarmsen2295/mm-1733Corey Hulen2015-08-189-723/+811
|\ \
| * | Renamed new component files for easier identificationReed Garmsen2015-08-189-16/+16
| * | Refactors the signup_team_complete.jsx file into multiple files for each comp...Reed Garmsen2015-08-179-759/+805
| * | Initial cosmetic reformatting of signup_team_complete.jsx fileReed Garmsen2015-08-171-41/+83
| * | Team URLs no longer accept a number as the first character; updated error mes...Reed Garmsen2015-08-171-2/+2
* | | Merge pull request #383 from rgarmsen2295/mm-1584bCorey Hulen2015-08-185-52/+152
|\ \ \ | |_|/ |/| |
| * | Added feature to the 'More...' PM channel list and fixed small cosmetic issuesReed Garmsen2015-08-185-40/+72
| * | Prepatory cosmetic refactoring of more_direct_channels.jsxReed Garmsen2015-08-181-28/+38
| * | Cosmetic reformatting of sidebar.jsxReed Garmsen2015-08-181-20/+22
| * | Private message channels no longer refresh on creation/first useReed Garmsen2015-08-183-6/+62
* | | Merge pull request #395 from mattermost/merge-fixJoram Wilander2015-08-181-6/+0
|\ \ \
| * | | 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
|\ \ \ \
| * | | | 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
|\ \ \ \ \ | |_|_|/ / |/| | | |
| * | | | Clicking on a PM channel name in mobile view now opens the channel menu (like...Reed Garmsen2015-08-171-16/+14
| * | | | Refactored the NotifyCounts component out of the navbar.jsx file into its own...Reed Garmsen2015-08-172-44/+50
| * | | | 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
|\ \ \ \ | |_|/ / |/| | |
| * | | Changed wording of get link modalnickago2015-08-171-1/+5
| |/ /
* | / Fixed 'X is typing...' messages being malformed when sent to the serverhmhealey2015-08-181-1/+1
| |/ |/|
* | 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 immediate...JoramWilander2015-08-1813-270/+374
* | update formatting in post_storeJoramWilander2015-08-181-28/+40
* | added client predictive commentingJoramWilander2015-08-184-17/+97
* | adds predictive posting on the clientJoramWilander2015-08-187-21/+174
* | Merge pull request #391 from asaadmahmoodspin/masterChristopher Speller2015-08-1810-14/+41
|\ \
| * | Multiple UI changesAsaad Mahmood2015-08-1810-14/+41
* | | Merge pull request #381 from mattermost/mm-1705Christopher Speller2015-08-1811-101/+149
|\ \ \
| * | | merge async_client getMe changesJoramWilander2015-08-141-6/+6
| * | | reformat login.jsx to meet style guideJoramWilander2015-08-141-48/+54
| * | | 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-149-63/+85
| * | | initial server implementation for using google as a single-sign-on oauth serviceJoramWilander2015-08-141-3/+6
* | | | Merge pull request #378 from rgarmsen2295/mm-316cChristopher Speller2015-08-1816-31/+325
|\ \ \ \
| * | | | 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