summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #359 from hmhealey/mm1770Christopher Speller2015-08-119-288/+405
|\ | | | | MM-1770 Add the ability to cancel in-progress file uploads
| * Changed PostStore.getDraft/getCommentDraft to return an empty draft instead ↵hmhealey2015-08-113-95/+15
| | | | | | | | of null when no draft is found
| * Formatted CreateComment, CreatePost, and FileUpload React components to ↵hmhealey2015-08-103-150/+208
| | | | | | | | match the style guide
| * 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 ↵hmhealey2015-08-107-58/+79
| | | | | | | | fix issues with duplicate file names
| * 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 ↵hmhealey2015-08-105-105/+131
| | | | | | | | instead of just a count
* | Merge pull request #354 from nickago/MM-1598Christopher Speller2015-08-111-99/+124
|\ \ | | | | | | MM-1598 Left and right arrow keys now scroll through pictures/files in preview mode
| * | 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
|\ \ \ | | | | | | | | MM-401 Add indicators to the sidebar for offscreen unread channels
| * | | Added handlers for the sidebar to update unread message indicators on page ↵hmhealey2015-08-071-0/+7
| | | | | | | | | | | | | | | | resize
| * | | 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 ↵hmhealey2015-08-061-2/+40
| | | | | | | | | | | | | | | | unread channels offscreen
| * | | 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
|\ \ \ | | | | | | | | MM-1684 Refactored code to remove errors on startup
| * | | 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
|\ \ \ | |_|/ |/| | Merge release back into master.
| * | 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
|\ \ \ | | | | | | | | Mm 1550 Mentions are no longer removed from auto complete once used
| * | | 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
|\ \ \ \ | | | | | | | | | | MM-1646 Fixed typo in channel/group naming
| * | | | Fixed typo in channel/group namingnickago2015-08-071-1/+1
| | |_|/ | |/| |
* | | | Merge pull request #351 from rgarmsen2295/mm-1759Christopher Speller2015-08-102-32/+45
|\ \ \ \ | | | | | | | | | | MM-1759 Fixes issue with team sign up link displaying incorrectly in ie10
| * | | | Cosmetic refactoringReed Garmsen2015-08-061-31/+43
| | | | |
| * | | | Correct sign up link now displays on ie10 in the 'Team Invite Link' modal; ↵Reed Garmsen2015-08-062-2/+3
| |/ / / | | | | | | | | | | | | replaces location.origin with utils function
* | | | Merge pull request #349 from mattermost/makefile-redis-removeHarrison Healey2015-08-071-20/+0
|\ \ \ \ | | | | | | | | | | Removing redis from makefile
| * | | | Removing redis from makefileChristopher Speller2015-08-061-20/+0
| |/ / /
* | | | Merge pull request #347 from mattermost/it33-patch-1Harrison Healey2015-08-071-5/+4
|\ \ \ \ | | | | | | | | | | MM-1898 Updates to Mac OSX instructions
| * | | | Removing note on creating new .bash_profileit332015-08-061-2/+1
| | | | |
| * | | | MM-1898 Updates to Mac OSX instructionsit332015-08-051-5/+5
| | | | |
* | | | | Merge pull request #341 from rgarmsen2295/mm-1643Harrison Healey2015-08-071-61/+72
|\ \ \ \ \ | |_|/ / / |/| | | | MM-1643 Errors displayed on the "change password" screen are now cleared when the user hits cancel
| * | | | Cosmetic refactoring of the Security Setting subsectionReed Garmsen2015-08-051-61/+72
| | | | |
| * | | | Fixed issue with password field not being cleared after canceling out of ↵Reed Garmsen2015-08-041-1/+1
| | | | | | | | | | | | | | | | | | | | changing your password
* | | | | Merge pull request #346 from hmhealey/mm1613Christopher Speller2015-08-062-75/+128
|\ \ \ \ \ | | | | | | | | | | | | MM-1613 Add option to hide Terms of Service disclaimer during signup
| * | | | | Added ShowTermsDuringSignup config option on the client which toggles the ↵hmhealey2015-08-052-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | Terms of Service disclaimer on signup
| * | | | | Reformat signup_user_complete to match style guidehmhealey2015-08-051-76/+121
| | |/ / / | |/| | |
* | | | | Merge pull request #344 from nickago/MM-1646Christopher Speller2015-08-062-5/+15
|\ \ \ \ \ | | | | | | | | | | | | MM-1646 Changes the word channel to group for priavte groups
| * | | | | Changes the word channel to group for priavte groupsnickago2015-08-052-5/+15
| | |_|/ / | |/| | |