summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
...
* | | | | | | | Merge pull request #352 from nickago/MM-1092Joram Wilander2015-08-182-6/+7
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Mm 1092 Renders scrolling in firefox every time for the more channels modal
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | MM-1299 Fixes problem of two notification sounds in firefox
| * | | | | | | | 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
|\ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|_|/ |/| | | | | | | | Mm 1894 Add state listening to the sidebar relative to the team store
| * | | | | | | | Cosmetic refactoringnickago2015-08-131-72/+74
| | | | | | | | |
| * | | | | | | | Added flux-style error protection on team store call in sidebarnickago2015-08-132-5/+11
| | |_|/ / / / / | |/| | | | | |
* | | | | | | | Merge pull request #388 from rgarmsen2295/mm-1785Corey Hulen2015-08-171-1/+1
|\ \ \ \ \ \ \ \ | |_|_|/ / / / / |/| | | | | | | MM-1785 Fixed issue with login redirects not working on safari
| * | | | | | | 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"
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Mm 1640 Fixed odd scrolling issues on channel refresh
| * | | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM 1703 Closing access history or activity log returns user to security menu
| * | | | | | | 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
|\ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ |/| | | | | | | mm-1858 - Truncating and adding tooltips to file names
| * | | | | | | 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"
| * | | | | | | 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…
| * | | | | | Revert "MM-375 Adds text formatting features using a modified version of the ↵Christopher Speller2015-08-1419-2065/+119
|/ / / / / / | | | | | | | | | | | | | | | | | | marked js library"
* | | | | | Merge pull request #360 from rgarmsen2295/mm-375dJoram Wilander2015-08-1419-119/+2065
|\ \ \ \ \ \ | | | | | | | | | | | | | | MM-375 Adds text formatting features using a modified version of the marked js library
| * | | | | | Cosmetic refactoring of the notifyMe function in utils.jsx and removed ↵Reed Garmsen2015-08-123-452/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | unnecessary files
| * | | | | | 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 ↵Reed Garmsen2015-08-1221-42/+2387
| | | | | | | | | | | | | | | | | | | | | | | | | | | | marked js library. Supports *bold*, _italics_, and `code`