summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Cosmetic refactoring of the notifyMe function in utils.jsx and removed unnece...Reed Garmsen2015-08-123-452/+24
* Minor change to bold and italic parsing to be more similar to code parsingReed Garmsen2015-08-121-2/+2
* Cosmetic refactoring of post_body.jsxReed Garmsen2015-08-125-66/+46
* Cosmetic refactoring of textToJsx functionReed Garmsen2015-08-121-82/+131
* Implemented basic text formatting package using a modfied version of the mark...Reed Garmsen2015-08-1221-42/+2387
* Merge pull request #367 from mattermost/mm-1884Joram Wilander2015-08-127-9/+317
|\
| * Updating dockerfiles to allow for previewing of latest master and fixing loca...Christopher Speller2015-08-117-9/+317
* | Merge pull request #363 from mattermost/travis-s3-deployJoram Wilander2015-08-121-7/+22
|\ \
| * | Adding S3 deployment to travis ciChristopher Speller2015-08-101-7/+22
* | | Merge pull request #366 from nickago/MM-1914Joram Wilander2015-08-121-1/+1
|\ \ \
| * | | Fixed typonickago2015-08-111-1/+1
|/ / /
* | | Merge pull request #359 from hmhealey/mm1770Christopher Speller2015-08-119-288/+405
|\ \ \
| * | | Changed PostStore.getDraft/getCommentDraft to return an empty draft instead o...hmhealey2015-08-113-95/+15
| * | | Formatted CreateComment, CreatePost, and FileUpload React components to match...hmhealey2015-08-103-150/+208
| * | | Changed file upload components to properly remove previews for failed uploadshmhealey2015-08-103-6/+36
| * | | Changed post drafts to maintain a store a unique id for each file upload to f...hmhealey2015-08-107-58/+79
| * | | Added the ability to cancel file uploads on commentshmhealey2015-08-101-5/+15
| * | | Added the ability to cancel file uploads on postshmhealey2015-08-104-10/+62
| * | | Changed post drafts to maintain a list of the names of uploading files instea...hmhealey2015-08-105-105/+131
* | | | Merge pull request #354 from nickago/MM-1598Christopher Speller2015-08-111-99/+124
|\ \ \ \
| * | | | Added event to window scope so react can autobindnickago2015-08-101-10/+11
| * | | | Added cosmetic refactoringnickago2015-08-061-100/+113
| * | | | Left and right arrows now scroll through filesnickago2015-08-061-0/+11
* | | | | Merge pull request #353 from hmhealey/mm401Christopher Speller2015-08-112-80/+159
|\ \ \ \ \
| * | | | | Added handlers for the sidebar to update unread message indicators on page re...hmhealey2015-08-071-0/+7
| * | | | | Changed sidebar scroll handler to use React's onScrollhmhealey2015-08-071-5/+1
| * | | | | Removed ternary statements from sidebarhmhealey2015-08-061-7/+26
| * | | | | Added indicators for when a channel with unread posts is offscreenhmhealey2015-08-062-4/+34
| * | | | | Added the ability for the sidebar to determine whether or not there's any unr...hmhealey2015-08-061-2/+40
| * | | | | Refactored sidebar in preparation for adding unread indicatorshmhealey2015-08-061-78/+67
| |/ / / /
* | | | | Merge pull request #350 from nickago/MM-1684Christopher Speller2015-08-116-238/+234
|\ \ \ \ \ | |_|_|_|/ |/| | | |
| * | | | Removed unnecessary keysnickago2015-08-101-7/+7
| * | | | Removed vestigial arguements from refactored codenickago2015-08-071-2/+2
| * | | | Cosmetic refactors, including variable name changes and splitting if statementsnickago2015-08-062-39/+53
| * | | | fixed the spacing on UserStorenickago2015-08-061-220/+220
| * | | | Added keys to array-based elements and made getMe asynchronousnickago2015-08-066-34/+16
| |/ / /
* | | | Merge pull request #364 from mattermost/release-0.6.0Christopher Speller2015-08-112-2/+2
|\ \ \ \ | |_|/ / |/| | |
| * | | Updating Dockerfile and Dockerrun.aws.json to point at releaseChristopher Speller2015-08-052-2/+2
* | | | Merge pull request #348 from nickago/MM-1550Christopher Speller2015-08-103-299/+233
|\ \ \ \ | |_|_|/ |/| | |
| * | | further cosmetic refactoringnickago2015-08-101-67/+65
| * | | Removed vetigial argument and properly aligned post_storenickago2015-08-101-176/+176
| * | | Added cosmetic refactoringnickago2015-08-051-46/+49
| * | | Removed all functionality required for removing used mentions from auto-completenickago2015-08-053-76/+9
* | | | Merge pull request #356 from nickago/MM-1646Christopher Speller2015-08-101-1/+1
|\ \ \ \
| * | | | Fixed typo in channel/group namingnickago2015-08-071-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #351 from rgarmsen2295/mm-1759Christopher Speller2015-08-102-32/+45
|\ \ \ \
| * | | | Cosmetic refactoringReed Garmsen2015-08-061-31/+43
| * | | | Correct sign up link now displays on ie10 in the 'Team Invite Link' modal; re...Reed Garmsen2015-08-062-2/+3
| |/ / /
* | | | Merge pull request #349 from mattermost/makefile-redis-removeHarrison Healey2015-08-071-20/+0
|\ \ \ \
| * | | | Removing redis from makefileChristopher Speller2015-08-061-20/+0
| |/ / /