Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Fixed issue with carriage returns being counted improperly in non-ie ↵ | Reed Garmsen | 2015-08-25 | 1 | -0/+28 |
| | | | | browsers and updated error messages to be appropriate to what is being typed (message vs. post vs. edit) | ||||
* | Prevents users from typing more than 4000 characters into any 'textbox' ↵ | Reed Garmsen | 2015-08-25 | 1 | -0/+1 |
| | | | | (posts, comments, and post/comment edits). Also adds new error message for when users hit exactly 4000 characters so they know the limit. | ||||
* | Merge pull request #458 from rgarmsen2295/mm-1983 | Christopher Speller | 2015-08-25 | 1 | -1/+1 |
|\ | | | | | MM-1983 Fixed issue with timestamp incorrectly displaying single digit minutes | ||||
| * | Fixed issue with timestamp incorrectly displaying single digit minutes | Reed Garmsen | 2015-08-24 | 1 | -1/+1 |
| | | |||||
* | | Merge pull request #449 from rgarmsen2295/mm-1933 | Corey Hulen | 2015-08-24 | 1 | -6/+11 |
|\ \ | |/ |/| | Multiple fixes for IE10 & Edge browsers primarily due to aggressive ajax call caching on the browser | ||||
| * | Fixes issue with profile pictures not updating w/o refresh and prevents more ↵ | Reed Garmsen | 2015-08-22 | 1 | -0/+5 |
| | | | | | | | | ie10 ajax caching issues | ||||
| * | Fixed issue with logout in active sessions not working in ie10 | Reed Garmsen | 2015-08-22 | 1 | -0/+2 |
| | | |||||
| * | Added cache: false to ajax calls that caused problems with ie10 | Reed Garmsen | 2015-08-22 | 1 | -6/+4 |
| | | |||||
* | | Added fullscreen capability to youtube embed | nickago | 2015-08-21 | 1 | -1/+2 |
|/ | |||||
* | Fixing AM-PM issue | Christopher Speller | 2015-08-20 | 1 | -1/+1 |
| | |||||
* | Fixing a few refactoring errors. | Christopher Speller | 2015-08-20 | 1 | -3/+3 |
| | |||||
* | Merge pull request #394 from mattermost/mm-1410 | Joram Wilander | 2015-08-19 | 2 | -635/+687 |
|\ | | | | | MM-1410 Initial implementaiton of import from Slack | ||||
| * | Requiring team admin to import and fixing a few style issues | Christopher Speller | 2015-08-19 | 1 | -2/+1 |
| | | |||||
| * | Cosmetic refactoring for ESLint | Christopher Speller | 2015-08-19 | 2 | -642/+670 |
| | | |||||
| * | Implemention of slack import feature. | Christopher Speller | 2015-08-19 | 2 | -0/+25 |
| | | |||||
* | | Added a message deleted indicator when a post is deleted to let the user ↵ | JoramWilander | 2015-08-19 | 1 | -2/+3 |
|/ | | | | know what's happening. | ||||
* | Merge pull request #383 from rgarmsen2295/mm-1584b | Corey Hulen | 2015-08-18 | 2 | -1/+31 |
|\ | | | | | MM-1584 Private message channels no longer do a page refresh on creation/first use | ||||
| * | Added feature to the 'More...' PM channel list and fixed small cosmetic issues | Reed Garmsen | 2015-08-18 | 2 | -3/+16 |
| | | |||||
| * | Private message channels no longer refresh on creation/first use | Reed Garmsen | 2015-08-18 | 1 | -0/+17 |
| | | |||||
* | | Formatted comments' time in RHS similar to root | nickago | 2015-08-18 | 1 | -0/+4 |
|/ | |||||
* | finalize implenetation of predictive client posts so that users get ↵ | JoramWilander | 2015-08-18 | 2 | -11/+21 |
| | | | | immediate feedback after posting | ||||
* | adds predictive posting on the client | JoramWilander | 2015-08-18 | 1 | -0/+2 |
| | |||||
* | Merge pull request #391 from asaadmahmoodspin/master | Christopher Speller | 2015-08-18 | 1 | -0/+14 |
|\ | | | | | Multiple UI changes | ||||
| * | Multiple UI changes | Asaad Mahmood | 2015-08-18 | 1 | -0/+14 |
| | | |||||
* | | Merge pull request #381 from mattermost/mm-1705 | Christopher Speller | 2015-08-18 | 3 | -4/+15 |
|\ \ | | | | | | | MM-1705 add google as an oauth single-sign-on service | ||||
| * | | merge async_client getMe changes | JoramWilander | 2015-08-14 | 1 | -6/+6 |
| | | | |||||
| * | | added google sign-in functionality to the client, with minor model modifications | JoramWilander | 2015-08-14 | 3 | -10/+21 |
| | | | |||||
* | | | Merge pull request #374 from nickago/MM-1299 | Joram Wilander | 2015-08-18 | 1 | -2/+8 |
|\ \ \ | |_|/ |/| | | MM-1299 Fixes problem of two notification sounds in firefox | ||||
| * | | Added hardcoded firefox function | nickago | 2015-08-17 | 1 | -3/+3 |
| | | | |||||
| * | | move browser check functionality into a method | nickago | 2015-08-14 | 1 | -1/+5 |
| | | | |||||
| * | | Refactored such that the menu doesn't open for firefox users | nickago | 2015-08-13 | 1 | -1/+1 |
| | | | |||||
| * | | Handed control of notification sounds over to browser for firefox | nickago | 2015-08-12 | 1 | -2/+4 |
| | | | |||||
* | | | Revert "Mm 1640 Fixed odd scrolling issues on channel refresh" | Joram Wilander | 2015-08-17 | 1 | -0/+2 |
| | | | |||||
* | | | Merge pull request #372 from nickago/MM-1640 | Christopher Speller | 2015-08-17 | 1 | -2/+0 |
|\ \ \ | | | | | | | | | Mm 1640 Fixed odd scrolling issues on channel refresh | ||||
| * | | | Added case for window resize and cleaned up function | nickago | 2015-08-12 | 1 | -1/+0 |
| | | | | |||||
| * | | | Completely rehauled scrolling system, finished base implementation | nickago | 2015-08-12 | 1 | -2/+1 |
| |/ / | |||||
* | / | Revert "MM-375 Adds text formatting features using a modified version of the ↵ | Christopher Speller | 2015-08-14 | 1 | -229/+79 |
| |/ |/| | | | | | marked js library" | ||||
* | | Merge pull request #360 from rgarmsen2295/mm-375d | Joram Wilander | 2015-08-14 | 1 | -79/+229 |
|\ \ | | | | | | | 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 | 1 | -24/+24 |
| | | | | | | | | | | | | unnecessary files | ||||
| * | | Cosmetic refactoring of post_body.jsx | Reed Garmsen | 2015-08-12 | 1 | -0/+2 |
| | | | |||||
| * | | 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 | 1 | -27/+126 |
| |/ | | | | | | | marked js library. Supports *bold*, _italics_, and `code` | ||||
* | | Merge pull request #370 from hmhealey/mm1812 | Christopher Speller | 2015-08-14 | 3 | -0/+43 |
|\ \ | | | | | | | MM-1812 Provide warnings on team invite screens when email is disabled | ||||
| * | | Removed isEmailEnabledSynchronous and switched the email disabled warnings ↵ | hmhealey | 2015-08-13 | 1 | -21/+0 |
| | | | | | | | | | | | | to use ConfigStore | ||||
| * | | Added ConfigStore that is populated from the server | hmhealey | 2015-08-13 | 3 | -0/+43 |
| | | | |||||
| * | | Reformatted code to match the style guide | hmhealey | 2015-08-11 | 1 | -2/+2 |
| | | | |||||
| * | | Added initial api to allow clientside code to query serverside configuration | hmhealey | 2015-08-11 | 1 | -0/+21 |
| |/ | |||||
* | | Merge pull request #365 from mattermost/mm-1700 | Christopher Speller | 2015-08-14 | 4 | -92/+209 |
|\ \ | | | | | | | MM-1700 don't pull all channel data all the time | ||||
| * | | update rename channel modal to not refresh page on channel name change | JoramWilander | 2015-08-11 | 1 | -6/+17 |
| | | | |||||
| * | | incorporate channel updateAt into channel counts and pull channel data on ↵ | JoramWilander | 2015-08-11 | 1 | -2/+4 |
| | | | | | | | | | | | | channel update |