summaryrefslogtreecommitdiffstats
path: root/web/react/components
Commit message (Expand)AuthorAgeFilesLines
* Revert "Mm 1640 Fixed odd scrolling issues on channel refresh"Joram Wilander2015-08-173-254/+221
* Merge pull request #372 from nickago/MM-1640Christopher Speller2015-08-173-221/+254
|\
| * cosmetic refactoringnickago2015-08-141-153/+198
| * Changed timeout code to event basednickago2015-08-141-2/+5
| * Added non-default reliant behavior to initial scroll on mountnickago2015-08-121-1/+5
| * Removed usused variablenickago2015-08-121-1/+0
| * Changed the default for update to hold your position in the listnickago2015-08-121-2/+2
| * Removed personal debugging code and notesnickago2015-08-124-11/+4
| * Added case for window resize and cleaned up functionnickago2015-08-121-8/+23
| * Completely rehauled scrolling system, finished base implementationnickago2015-08-124-92/+41
| * Filled out comments for post listnickago2015-08-121-1/+1
| * Further added comments and split up if statments to make it more readablenickago2015-08-121-6/+20
| * Added more comments and did cosmetic refactoring to understand code easiernickago2015-08-121-10/+14
| * Added comments to confusing post list methodnickago2015-08-121-1/+8
* | Merge pull request #369 from nickago/MM-1703Joram Wilander2015-08-176-93/+115
|\ \
| * | Changed user_settings1 to user_settings and removed vestigial cssnickago2015-08-146-16/+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-171-1/+9
|\ \ \
| * | | 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-141-1/+9
* | | | Revert "MM-375 Adds text formatting features using a modified version of the ...Christopher Speller2015-08-148-113/+40
|/ / /
* | | Merge pull request #360 from rgarmsen2295/mm-375dJoram Wilander2015-08-148-40/+113
|\ \ \
| * | | Cosmetic refactoring of post_body.jsxReed Garmsen2015-08-123-36/+42
| * | | Implemented basic text formatting package using a modfied version of the mark...Reed Garmsen2015-08-128-15/+82
| | |/ | |/|
* | | Merge pull request #370 from hmhealey/mm1812Christopher Speller2015-08-142-280/+395
|\ \ \
| * | | Removed isEmailEnabledSynchronous and switched the email disabled warnings to...hmhealey2015-08-132-2/+4
| * | | Reformatted code to match the style guidehmhealey2015-08-111-252/+296
| * | | Disabled the invite members dialog when email is disabled on the serverhmhealey2015-08-111-10/+55
| * | | Disabled the invite email portion of the team setup when email is disabled on...hmhealey2015-08-111-23/+47
| | |/ | |/|
* | | Merge pull request #365 from mattermost/mm-1700Christopher Speller2015-08-145-76/+91
|\ \ \
| * | | 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-111-14/+1
| * | | 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-112-7/+22
| * | | incorporate channel updateAt into channel counts and pull channel data on cha...JoramWilander2015-08-112-2/+1
| * | | added getChannelCounts service and refactored the client to more intelligentl...JoramWilander2015-08-114-62/+76
| * | | added getChannel api service and use that over getChannels where appropriate ...JoramWilander2015-08-112-7/+7
| |/ /
* | | 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-121-16/+17
|\ \ \
| * | | Cosmetic refactoringnickago2015-08-111-10/+17
| * | | Added server side validation of jpegs as imagesnickago2015-08-111-6/+0
| |/ /
* | / Changed Image to File since we preview filesnickago2015-08-121-1/+1
| |/ |/|