summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #388 from rgarmsen2295/mm-1785Corey Hulen2015-08-171-1/+1
|\
| * Fixed issue with redirects not working on safariReed Garmsen2015-08-171-1/+1
|/
* Merge pull request #386 from mattermost/revert-372-MM-1640Joram Wilander2015-08-174-254/+223
|\
| * 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-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
* | | | 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