Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 | ||||
| * | | added getChannelCounts service and refactored the client to more ↵ | JoramWilander | 2015-08-11 | 2 | -103/+167 |
| | | | | | | | | | | | | intelligently pull channel data | ||||
| * | | added getChannel api service and use that over getChannels where appropriate ↵ | JoramWilander | 2015-08-11 | 3 | -0/+40 |
| |/ | | | | | | | on client | ||||
* / | Added jpeg's to list of image types | nickago | 2015-08-11 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #359 from hmhealey/mm1770 | Christopher Speller | 2015-08-11 | 2 | -3/+28 |
|\ | | | | | MM-1770 Add the ability to cancel in-progress file uploads | ||||
| * | Changed post drafts to maintain a store a unique id for each file upload to ↵ | hmhealey | 2015-08-10 | 1 | -0/+21 |
| | | | | | | | | fix issues with duplicate file names | ||||
| * | Added the ability to cancel file uploads on posts | hmhealey | 2015-08-10 | 1 | -3/+7 |
| | | |||||
* | | Added keys to array-based elements and made getMe asynchronous | nickago | 2015-08-06 | 2 | -12/+4 |
|/ | |||||
* | Changed max number of displayed direct message channels to 20 | nickago | 2015-08-05 | 1 | -1/+1 |
| | |||||
* | Merge pull request #302 from hmhealey/mm1788 | Corey Hulen | 2015-08-02 | 1 | -1/+0 |
|\ | | | | | MM-1788 Removed ^replying in preparation for 0.6.0 | ||||
| * | Removed ^replying in preparation for 0.6.0 | hmhealey | 2015-07-30 | 1 | -1/+0 |
| | | |||||
* | | Merge pull request #276 from mattermost/mm-1688 | Corey Hulen | 2015-08-02 | 3 | -4/+11 |
|\ \ | | | | | | | MM-1688 reset number of posts to fetch on channel switch and fresh page load | ||||
| * | | removed ternary operator to make if statement clearer | JoramWilander | 2015-07-30 | 1 | -1/+4 |
| | | | |||||
| * | | reset number of posts to fetch on channel switch and fresh page load | JoramWilander | 2015-07-29 | 3 | -4/+8 |
| |/ | |||||
* | | Merge pull request #274 from mattermost/mm-1497 | Corey Hulen | 2015-08-02 | 1 | -0/+2 |
|\ \ | | | | | | | MM-1497 image thumbnails now scale appropriately so there is no whitespace | ||||
| * | | removed uneccessary utils loadThumbnails function | JoramWilander | 2015-07-31 | 1 | -44/+0 |
| | | | |||||
| * | | image thumbnails now scale appropriately so there is no whitespace, also ↵ | JoramWilander | 2015-07-31 | 2 | -0/+46 |
| | | | | | | | | | | | | generalized some thumbnail loading code | ||||
* | | | Revert "MM-1706 Changed mention highlighting code to split words on all ↵ | Joram Wilander | 2015-07-31 | 1 | -7/+7 |
|/ / | | | | | | | non-word characters" | ||||
* | | Merge pull request #271 from hmhealey/mm1656 | Joram Wilander | 2015-07-31 | 1 | -0/+65 |
|\ \ | | | | | | | MM-1656 Updated file UI | ||||
| * | | Updated ViewImage modal dialog to include details about non-image files | hmhealey | 2015-07-29 | 1 | -0/+6 |
| | | |