Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | 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 #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 |
| | | | |||||
| * | | Added utility function to get a file attachment's url | hmhealey | 2015-07-29 | 1 | -0/+13 |
| | | | |||||
| * | | Added preview images for non-image files | hmhealey | 2015-07-29 | 1 | -0/+13 |
| | | | |||||
| * | | Add an info box next to image thumbnails which provides the name, type, and ↵ | hmhealey | 2015-07-29 | 1 | -0/+33 |
| |/ | | | | | | | size of a file. | ||||
* / | Changed mention highlighting code to split words on all non-word characters | hmhealey | 2015-07-30 | 1 | -7/+7 |
|/ | |||||
* | Merge pull request #252 from rgarmsen2295/ie10-image-regression-fix | Christopher Speller | 2015-07-29 | 1 | -2/+9 |
|\ | | | | | Fixes issue with images not displaying in IE10 due to window.location.origin not being defined in IE10 | ||||
| * | Removed usage of window.location.origin throughout the codebase | Reed Garmsen | 2015-07-27 | 1 | -3/+4 |
| | | |||||
| * | Fixes issue with images not displaying due to window.origin not being ↵ | Reed Garmsen | 2015-07-27 | 1 | -2/+8 |
| | | | | | | | | defined in IE10 | ||||
* | | updates to sign-up flow, remove company name and marketing checkbox | JoramWilander | 2015-07-28 | 1 | -2/+2 |
| | | |||||
* | | Display thumbnails for files without file extensions | hmhealey | 2015-07-28 | 1 | -3/+6 |
|/ | |||||
* | Placing SVGs into constants.jsx | Asaad Mahmood | 2015-07-23 | 1 | -1/+3 |
| | |||||
* | Merge pull request #201 from hmhealey/mm1539 | Corey Hulen | 2015-07-22 | 1 | -0/+1 |
|\ | | | | | MM-1539 Added the ability to reply to earlier message threads by starting a post with ^ | ||||
| * | Added events for when the active thread (ie the message thread that a user ↵ | hmhealey | 2015-07-21 | 1 | -0/+1 |
| | | | | | | | | is responding to) changes | ||||
* | | Changing the way we mattermost handles URLs. team.domain.com becomes ↵ | Christopher Speller | 2015-07-20 | 3 | -33/+28 |
|/ | | | | | | | domain.com/team. Renaming team.Name to team.DisplayName and team.Domain to team.Name. So: team.Name -> url safe name. team.DisplayName -> nice name for users | ||||
* | Use a user's full name as their display name if a nickname hasn't been specified | hmhealey | 2015-07-17 | 1 | -1/+19 |
| | |||||
* | Unify all locations where we determine a user's display named based off of ↵ | hmhealey | 2015-07-17 | 1 | -1/+7 |
| | | | | their nickname/username into a helper function | ||||
* | Merge pull request #198 from nickago/MM-1518 | Joram Wilander | 2015-07-17 | 1 | -1/+7 |
|\ | | | | | MM-1518 Fixed config on our link parser | ||||
| * | fixed formatting | nickago | 2015-07-16 | 1 | -1/+1 |
| | | |||||
| * | readded space | nickago | 2015-07-16 | 1 | -0/+1 |
| | | |||||
| * | Fixed config on our link parser | nickago | 2015-07-16 | 1 | -2/+7 |
| | | |||||
* | | Merge pull request #183 from nickago/MM-1073 | Joram Wilander | 2015-07-16 | 1 | -8/+15 |
|\ \ | |/ |/| | MM-1073 Enable youtube metadata with a google developer key | ||||
| * | Changed scope of 'metatdata' | nickago | 2015-07-15 | 1 | -1/+1 |
| | | |||||
| * | Need you GDev key for youtube stuff | nickago | 2015-07-14 | 1 | -8/+15 |
| | | |||||
* | | [webui] fix loading animation for ie | ralder | 2015-07-11 | 1 | -4/+35 |
|/ | |||||
* | Merge pull request #159 from rgarmsen2295/mm-1269b | Corey Hulen | 2015-07-10 | 1 | -2/+0 |
|\ | | | | | MM-1269b Added yellow tinge to post and comment textbox when connection is disrupted | ||||
| * | Added errorchange listener to textbox that detects if inet is not connected. ↵ | Reed Garmsen | 2015-07-09 | 1 | -7/+0 |
| | | | | | | | | Still do not have reliable way of checking if inet has reconnected | ||||
| * | Notes to myself | Reed Garmsen | 2015-07-09 | 1 | -1/+6 |
| | | |||||
* | | Merge pull request #157 from rgarmsen2295/mm-1265 | Corey Hulen | 2015-07-10 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1265 Button to change roles now shows "click" mouse ptr when hovered over & change with loading more channels | ||||
| * | | Final change to code affected by change to loading more channels logic | Reed Garmsen | 2015-07-10 | 1 | -1/+1 |
| |/ | |||||
* / | fix bugs for pr #150 MM-895 | ralder | 2015-07-10 | 1 | -1/+1 |
|/ | |||||
* | Merge branch 'master' of https://github.com/mattermost/platform | Asaad Mahmood | 2015-07-09 | 2 | -28/+29 |
|\ | |||||
| * | Merge pull request #150 from mattermost/mm-895 | Joram Wilander | 2015-07-08 | 2 | -15/+2 |
| |\ | | | | | | | MM-895 Reorganization of browser storage. | ||||
| | * | Finishing centralization of BrowserStore | Christopher Speller | 2015-07-08 | 1 | -14/+0 |
| | | |