summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #369 from nickago/MM-1703Joram Wilander2015-08-178-102/+115
|\
| * Changed user_settings1 to user_settings and removed vestigial cssnickago2015-08-148-25/+15
| * cosmetic refactoringnickago2015-08-142-64/+74
| * Fixed camelCase typosnickago2015-08-111-2/+2
| * Cosmetic refactoring and removing no-op condition of set statenickago2015-08-112-15/+20
| * access history and activity log closing re-opens user settings in correct statenickago2015-08-113-5/+13
* | Merge pull request #379 from asaadmahmoodspin/mm-1854Joram Wilander2015-08-172-6/+13
|\ \
| * | Fixing style guide issuesAsaad Mahmood2015-08-151-3/+2
| * | Using variables efficientlyAsaad Mahmood2015-08-151-3/+3
| * | Initialising trimmedFilename variableAsaad Mahmood2015-08-141-0/+1
| * | mm-1858 - Truncating and adding tooltips to file names in thumbnail detailsAsaad Mahmood2015-08-142-6/+13
* | | 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-148-292/+511
|\ \ \
| * | | Removed isEmailEnabledSynchronous and switched the email disabled warnings to...hmhealey2015-08-133-23/+4
| * | | Added ConfigStore that is populated from the serverhmhealey2015-08-136-3/+107
| * | | 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-111-0/+21
| | |/ | |/|
* | | Merge pull request #365 from mattermost/mm-1700Christopher Speller2015-08-1410-365/+549
|\ \ \
| * | | 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
| * | | incorporate channel updateAt into channel counts and pull channel data on cha...JoramWilander2015-08-113-4/+5
| * | | added getChannelCounts service and refactored the client to more intelligentl...JoramWilander2015-08-116-165/+243
| * | | added getChannel api service and use that over getChannels where appropriate ...JoramWilander2015-08-116-8/+83
| |/ /
* | | 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-122-17/+18
|\ \ \
| * | | Cosmetic refactoringnickago2015-08-111-10/+17
| * | | Added server side validation of jpegs as imagesnickago2015-08-111-6/+0
| * | | Added jpeg's to list of image typesnickago2015-08-111-1/+1
| |/ /
* | / Changed Image to File since we preview filesnickago2015-08-121-1/+1
| |/ |/|
* | Fixed typonickago2015-08-111-1/+1
|/
* Merge pull request #359 from hmhealey/mm1770Christopher Speller2015-08-117-287/+397
|\
| * 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-105-57/+71
| * Added the ability to cancel file uploads on commentshmhealey2015-08-101-5/+15