summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | Merge pull request #370 from hmhealey/mm1812Christopher Speller2015-08-1410-292/+546
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-1812 Provide warnings on team invite screens when email is disabled
| * | | | | | | Removed isEmailEnabledSynchronous and switched the email disabled warnings ↵hmhealey2015-08-134-28/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | to use ConfigStore
| * | | | | | | Added ConfigStore that is populated from the serverhmhealey2015-08-137-3/+123
| | | | | | | |
| * | | | | | | Reformatted code to match the style guidehmhealey2015-08-113-262/+306
| | | | | | | |
| * | | | | | | Disabled the invite members dialog when email is disabled on the serverhmhealey2015-08-112-11/+56
| | | | | | | |
| * | | | | | | Disabled the invite email portion of the team setup when email is disabled ↵hmhealey2015-08-111-23/+47
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | on the server
| * | | | | | | Added initial api to allow clientside code to query serverside configurationhmhealey2015-08-113-0/+45
| | |/ / / / / | |/| | | | |
* | | | | | | Merge pull request #365 from mattermost/mm-1700Christopher Speller2015-08-1418-367/+869
|\ \ \ \ \ \ \ | |_|_|_|_|_|/ |/| | | | | | MM-1700 don't pull all channel data all the time
| * | | | | | removed underscores from function names in channel_storeJoramWilander2015-08-131-34/+34
| | | | | | |
| * | | | | | merge fixJoramWilander2015-08-111-2/+2
| | | | | | |
| * | | | | | switch to channel after creationJoramWilander2015-08-111-2/+1
| | | | | | |
| * | | | | | format channel_store to more closely match style guide and sort channels in ↵JoramWilander2015-08-112-226/+230
| | | | | | | | | | | | | | | | | | | | | | | | | | | | channel store over sidebar
| * | | | | | don't refresh page on channel creation and ignore case when sorting channels ↵JoramWilander2015-08-112-7/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | in sidebar
| * | | | | | update rename channel modal to not refresh page on channel name changeJoramWilander2015-08-113-13/+39
| | | | | | |
| * | | | | | fixed channel counts etag to only update when appropriateJoramWilander2015-08-112-4/+13
| | | | | | |
| * | | | | | fix channelIdWithCountAndUpdateAt naming to be proper camel caseJoramWilander2015-08-111-2/+2
| | | | | | |
| * | | | | | change getChannel api service to not register as user activityJoramWilander2015-08-111-1/+1
| | | | | | |
| * | | | | | add etag cache testing to api GetChannelCounts unit testJoramWilander2015-08-111-0/+7
| | | | | | |
| * | | | | | added api unit test for GetChannelCountsJoramWilander2015-08-112-0/+43
| | | | | | |
| * | | | | | added store unit test for GetChannelCountsJoramWilander2015-08-111-0/+47
| | | | | | |
| * | | | | | incorporate channel updateAt into channel counts and pull channel data on ↵JoramWilander2015-08-115-11/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | channel update
| * | | | | | added getChannelCounts service and refactored the client to more ↵JoramWilander2015-08-1110-165/+340
| | | | | | | | | | | | | | | | | | | | | | | | | | | | intelligently pull channel data
| * | | | | | added getChannel api service and use that over getChannels where appropriate ↵JoramWilander2015-08-1110-10/+190
| |/ / / / / | | | | | | | | | | | | | | | | | | on client
* | | | | | Merge pull request #371 from nickago/MM-1229Joram Wilander2015-08-131-19/+36
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | MM-1229 Mobile client display public link in same tab instead of new tab
| * | | | | Added cosmetic refactoringnickago2015-08-131-17/+23
| | | | | |
| * | | | | get public link now displays in the same window pane on mobile, but in a new ↵nickago2015-08-111-3/+14
| |/ / / / | | | | | | | | | | | | | | | tab on desktop. Also added proptypes
* | | | | Merge pull request #368 from nickago/MM-1911Harrison Healey2015-08-123-19/+20
|\ \ \ \ \ | |_|_|_|/ |/| | | | MM 1911 Added support for .jpeg in addition to .jpg
| * | | | Fixed typonickago2015-08-121-1/+1
| | | | |
| * | | | Cosmetic refactoringnickago2015-08-111-10/+17
| | | | |
| * | | | Added server side validation of jpegs as imagesnickago2015-08-112-8/+2
| | | | |
| * | | | Added jpeg's to list of image typesnickago2015-08-111-1/+1
| |/ / /
* | | | Merge pull request #373 from nickago/MM-1868Joram Wilander2015-08-121-1/+1
|\ \ \ \ | |_|/ / |/| | | MM-1868 Changed wording for broader definition of what is previewed
| * | | Changed Image to File since we preview filesnickago2015-08-121-1/+1
| | |/ | |/|
* | | Merge pull request #367 from mattermost/mm-1884Joram Wilander2015-08-127-9/+317
|\ \ \ | | | | | | | | MM-1184 Updating dockerfiles for latest master and osx
| * | | Updating dockerfiles to allow for previewing of latest master and fixing ↵Christopher Speller2015-08-117-9/+317
| | | | | | | | | | | | | | | | local docker build so it works on osx
* | | | Merge pull request #363 from mattermost/travis-s3-deployJoram Wilander2015-08-121-7/+22
|\ \ \ \ | |_|/ / |/| | | Adding S3 deployment to travis ci
| * | | Adding S3 deployment to travis ciChristopher Speller2015-08-101-7/+22
| | | |
* | | | Merge pull request #366 from nickago/MM-1914Joram Wilander2015-08-121-1/+1
|\ \ \ \ | |_|_|/ |/| | | MM-1914 Fixed typo
| * | | Fixed typonickago2015-08-111-1/+1
|/ / /
* | | 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
| | | | |