summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #384 from mattermost/it33-patch-1Joram Wilander2015-08-171-1/+1
|\
| * Added missing "is"it332015-08-151-1/+1
|/
* Merge pull request #382 from mattermost/revert-360-mm-375dChristopher Speller2015-08-1419-2065/+119
|\
| * Revert "MM-375 Adds text formatting features using a modified version of the ...Christopher Speller2015-08-1419-2065/+119
|/
* Merge pull request #360 from rgarmsen2295/mm-375dJoram Wilander2015-08-1419-119/+2065
|\
| * 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 #370 from hmhealey/mm1812Christopher Speller2015-08-1410-292/+546
|\ \
| * | Removed isEmailEnabledSynchronous and switched the email disabled warnings to...hmhealey2015-08-134-28/+4
| * | 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 on...hmhealey2015-08-111-23/+47
| * | 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
|\ \ \
| * | | 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 c...JoramWilander2015-08-112-226/+230
| * | | don't refresh page on channel creation and ignore case when sorting channels ...JoramWilander2015-08-112-7/+8
| * | | 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 cha...JoramWilander2015-08-115-11/+22
| * | | added getChannelCounts service and refactored the client to more intelligentl...JoramWilander2015-08-1110-165/+340
| * | | added getChannel api service and use that over getChannels where appropriate ...JoramWilander2015-08-1110-10/+190
| |/ /
* | | Merge pull request #371 from nickago/MM-1229Joram Wilander2015-08-131-19/+36
|\ \ \
| * | | 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
| |/ /
* | | Merge pull request #368 from nickago/MM-1911Harrison Healey2015-08-123-19/+20
|\ \ \
| * | | 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
|\ \ \ | |_|/ |/| |
| * | 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
|\ \ \
| * | | 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
|\ \ \