summaryrefslogtreecommitdiffstats
path: root/web/react
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #352 from nickago/MM-1092Joram Wilander2015-08-182-6/+7
|\
| * Moved controlling CSS into post list so it always shows upnickago2015-08-172-6/+7
* | Merge pull request #374 from nickago/MM-1299Joram Wilander2015-08-183-9/+30
|\ \
| * | Added hardcoded firefox functionnickago2015-08-172-4/+4
| * | move browser check functionality into a methodnickago2015-08-142-2/+6
| * | Cosmetic refactoringnickago2015-08-131-5/+12
| * | Refactored such that the menu doesn't open for firefox usersnickago2015-08-133-30/+23
| * | Added extra uAgent check for weird browser implementationsnickago2015-08-121-1/+1
| * | Handed control of notification sounds over to browser for firefoxnickago2015-08-122-18/+35
* | | Merge pull request #377 from nickago/MM-1894Joram Wilander2015-08-182-73/+81
|\ \ \
| * | | Cosmetic refactoringnickago2015-08-131-72/+74
| * | | Added flux-style error protection on team store call in sidebarnickago2015-08-132-5/+11
* | | | Fixed issue with redirects not working on safariReed Garmsen2015-08-171-1/+1
| |_|/ |/| |
* | | Revert "Mm 1640 Fixed odd scrolling issues on channel refresh"Joram Wilander2015-08-174-254/+223
* | | Merge pull request #372 from nickago/MM-1640Christopher Speller2015-08-174-223/+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-122-9/+23
| * | | Completely rehauled scrolling system, finished base implementationnickago2015-08-125-94/+42
| * | | 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-149-342/+119
|/ / / /
* | | | Merge pull request #360 from rgarmsen2295/mm-375dJoram Wilander2015-08-149-119/+342
|\ \ \ \
| * | | | Cosmetic refactoring of the notifyMe function in utils.jsx and removed unnece...Reed Garmsen2015-08-121-24/+24
| * | | | Cosmetic refactoring of post_body.jsxReed Garmsen2015-08-124-36/+44
| * | | | 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-129-42/+208
| | |/ / | |/| |
* | | | 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