Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #374 from nickago/MM-1299 | Joram Wilander | 2015-08-18 | 3 | -9/+30 |
|\ | | | | | MM-1299 Fixes problem of two notification sounds in firefox | ||||
| * | Added hardcoded firefox function | nickago | 2015-08-17 | 2 | -4/+4 |
| | | |||||
| * | move browser check functionality into a method | nickago | 2015-08-14 | 2 | -2/+6 |
| | | |||||
| * | Cosmetic refactoring | nickago | 2015-08-13 | 1 | -5/+12 |
| | | |||||
| * | Refactored such that the menu doesn't open for firefox users | nickago | 2015-08-13 | 3 | -30/+23 |
| | | |||||
| * | Added extra uAgent check for weird browser implementations | nickago | 2015-08-12 | 1 | -1/+1 |
| | | |||||
| * | Handed control of notification sounds over to browser for firefox | nickago | 2015-08-12 | 2 | -18/+35 |
| | | |||||
* | | Merge pull request #377 from nickago/MM-1894 | Joram Wilander | 2015-08-18 | 2 | -73/+81 |
|\ \ | | | | | | | Mm 1894 Add state listening to the sidebar relative to the team store | ||||
| * | | Cosmetic refactoring | nickago | 2015-08-13 | 1 | -72/+74 |
| | | | |||||
| * | | Added flux-style error protection on team store call in sidebar | nickago | 2015-08-13 | 2 | -5/+11 |
| | | | |||||
* | | | Merge pull request #388 from rgarmsen2295/mm-1785 | Corey Hulen | 2015-08-17 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | MM-1785 Fixed issue with login redirects not working on safari | ||||
| * | | | Fixed issue with redirects not working on safari | Reed Garmsen | 2015-08-17 | 1 | -1/+1 |
|/ / / | |||||
* | | | Merge pull request #386 from mattermost/revert-372-MM-1640 | Joram Wilander | 2015-08-17 | 4 | -254/+223 |
|\ \ \ | | | | | | | | | Revert "Mm 1640 Fixed odd scrolling issues on channel refresh" | ||||
| * | | | Revert "Mm 1640 Fixed odd scrolling issues on channel refresh" | Joram Wilander | 2015-08-17 | 4 | -254/+223 |
|/ / / | |||||
* | | | Merge pull request #372 from nickago/MM-1640 | Christopher Speller | 2015-08-17 | 4 | -223/+254 |
|\ \ \ | | | | | | | | | Mm 1640 Fixed odd scrolling issues on channel refresh | ||||
| * | | | cosmetic refactoring | nickago | 2015-08-14 | 1 | -153/+198 |
| | | | | |||||
| * | | | Changed timeout code to event based | nickago | 2015-08-14 | 1 | -2/+5 |
| | | | | |||||
| * | | | Added non-default reliant behavior to initial scroll on mount | nickago | 2015-08-12 | 1 | -1/+5 |
| | | | | |||||
| * | | | Removed usused variable | nickago | 2015-08-12 | 1 | -1/+0 |
| | | | | |||||
| * | | | Changed the default for update to hold your position in the list | nickago | 2015-08-12 | 1 | -2/+2 |
| | | | | |||||
| * | | | Removed personal debugging code and notes | nickago | 2015-08-12 | 4 | -11/+4 |
| | | | | |||||
| * | | | Added case for window resize and cleaned up function | nickago | 2015-08-12 | 2 | -9/+23 |
| | | | | |||||
| * | | | Completely rehauled scrolling system, finished base implementation | nickago | 2015-08-12 | 5 | -94/+42 |
| | | | | |||||
| * | | | Filled out comments for post list | nickago | 2015-08-12 | 1 | -1/+1 |
| | | | | |||||
| * | | | Further added comments and split up if statments to make it more readable | nickago | 2015-08-12 | 1 | -6/+20 |
| | | | | |||||
| * | | | Added more comments and did cosmetic refactoring to understand code easier | nickago | 2015-08-12 | 1 | -10/+14 |
| | | | | |||||
| * | | | Added comments to confusing post list method | nickago | 2015-08-12 | 1 | -1/+8 |
| | |/ | |/| | |||||
* | | | Merge pull request #369 from nickago/MM-1703 | Joram Wilander | 2015-08-17 | 8 | -102/+115 |
|\ \ \ | | | | | | | | | MM 1703 Closing access history or activity log returns user to security menu | ||||
| * | | | Changed user_settings1 to user_settings and removed vestigial css | nickago | 2015-08-14 | 8 | -25/+15 |
| | | | | |||||
| * | | | cosmetic refactoring | nickago | 2015-08-14 | 2 | -64/+74 |
| | | | | |||||
| * | | | Fixed camelCase typos | nickago | 2015-08-11 | 1 | -2/+2 |
| | | | | |||||
| * | | | Cosmetic refactoring and removing no-op condition of set state | nickago | 2015-08-11 | 2 | -15/+20 |
| | | | | |||||
| * | | | access history and activity log closing re-opens user settings in correct state | nickago | 2015-08-11 | 3 | -5/+13 |
| | | | | |||||
* | | | | Merge pull request #379 from asaadmahmoodspin/mm-1854 | Joram Wilander | 2015-08-17 | 2 | -6/+13 |
|\ \ \ \ | | | | | | | | | | | mm-1858 - Truncating and adding tooltips to file names | ||||
| * | | | | Fixing style guide issues | Asaad Mahmood | 2015-08-15 | 1 | -3/+2 |
| | | | | | |||||
| * | | | | Using variables efficiently | Asaad Mahmood | 2015-08-15 | 1 | -3/+3 |
| | | | | | |||||
| * | | | | Initialising trimmedFilename variable | Asaad Mahmood | 2015-08-14 | 1 | -0/+1 |
| | | | | | |||||
| * | | | | mm-1858 - Truncating and adding tooltips to file names in thumbnail details | Asaad Mahmood | 2015-08-14 | 2 | -6/+13 |
| | | | | | |||||
* | | | | | Merge pull request #384 from mattermost/it33-patch-1 | Joram Wilander | 2015-08-17 | 1 | -1/+1 |
|\ \ \ \ \ | | | | | | | | | | | | | Added missing "is" | ||||
| * | | | | | Added missing "is" | it33 | 2015-08-15 | 1 | -1/+1 |
|/ / / / / | |||||
* | | | | | Merge pull request #382 from mattermost/revert-360-mm-375d | Christopher Speller | 2015-08-14 | 19 | -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 Speller | 2015-08-14 | 19 | -2065/+119 |
|/ / / / | | | | | | | | | | | | | marked js library" | ||||
* | | | | Merge pull request #360 from rgarmsen2295/mm-375d | Joram Wilander | 2015-08-14 | 19 | -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 Garmsen | 2015-08-12 | 3 | -452/+24 |
| | | | | | | | | | | | | | | | | | | | | unnecessary files | ||||
| * | | | | Minor change to bold and italic parsing to be more similar to code parsing | Reed Garmsen | 2015-08-12 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Cosmetic refactoring of post_body.jsx | Reed Garmsen | 2015-08-12 | 5 | -66/+46 |
| | | | | | |||||
| * | | | | Cosmetic refactoring of textToJsx function | Reed Garmsen | 2015-08-12 | 1 | -82/+131 |
| | | | | | |||||
| * | | | | Implemented basic text formatting package using a modfied version of the ↵ | Reed Garmsen | 2015-08-12 | 21 | -42/+2387 |
| | | | | | | | | | | | | | | | | | | | | marked js library. Supports *bold*, _italics_, and `code` | ||||
* | | | | | Merge pull request #370 from hmhealey/mm1812 | Christopher Speller | 2015-08-14 | 10 | -292/+546 |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1812 Provide warnings on team invite screens when email is disabled | ||||
| * | | | | | Removed isEmailEnabledSynchronous and switched the email disabled warnings ↵ | hmhealey | 2015-08-13 | 4 | -28/+4 |
| | | | | | | | | | | | | | | | | | | | | | | | | to use ConfigStore |