Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Correcting proper use of "set up" vs. "setup" | it33 | 2015-07-29 | 1 | -1/+1 |
| | |||||
* | Merge pull request #269 from rgarmsen2295/mm-1686 | Christopher Speller | 2015-07-29 | 2 | -5/+28 |
|\ | | | | | MM-1686 Access History and Active Sessions now load upon opening instead of at start | ||||
| * | Access History and Active Sessions are now lazy-loaded upon opening instead ↵ | Reed Garmsen | 2015-07-29 | 2 | -5/+28 |
| | | | | | | | | of loaded at start; added loading screens to Access History and Active Sessions | ||||
* | | Merge pull request #259 from nickago/MM-1683 | Christopher Speller | 2015-07-29 | 1 | -19/+17 |
|\ \ | | | | | | | MM-1683 Removed a vestigial wait condition from the signup process. | ||||
| * | | Added IE friendly window origin function in place of unwrapped call | nickago | 2015-07-29 | 1 | -1/+1 |
| | | | |||||
| * | | Removed timeout originally set on team creation | nickago | 2015-07-29 | 1 | -19/+17 |
| | | | |||||
* | | | Merge pull request #256 from nickago/MM-1183 | Joram Wilander | 2015-07-29 | 2 | -6/+11 |
|\ \ \ | | | | | | | | | MM-1183 Allow channel descriptions on 1-1 channels | ||||
| * | | | Added a 'set description' link for private channels | nickago | 2015-07-28 | 1 | -1/+4 |
| | | | | |||||
| * | | | Removed popover on channel name and added ability to set channel ↵ | nickago | 2015-07-27 | 1 | -5/+7 |
| | | | | | | | | | | | | | | | | descritption for 1-1 channels | ||||
* | | | | Removing unused id on LHS dropdown | Asaad Mahmood | 2015-07-29 | 1 | -3/+1 |
| | | | | |||||
* | | | | Fixing error markup in signup flow | Asaad Mahmood | 2015-07-29 | 1 | -2/+2 |
| | | | | |||||
* | | | | mm-1762 - Search improvements with some other minor Ui changes | Asaad Mahmood | 2015-07-29 | 2 | -5/+16 |
| |/ / |/| | | |||||
* | | | Merge pull request #252 from rgarmsen2295/ie10-image-regression-fix | Christopher Speller | 2015-07-29 | 6 | -12/+12 |
|\ \ \ | | | | | | | | | 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 | 2 | -4/+4 |
| | | | | |||||
| * | | | Fixes issue with images not displaying due to window.origin not being ↵ | Reed Garmsen | 2015-07-27 | 4 | -8/+8 |
| |/ / | | | | | | | | | | defined in IE10 | ||||
* | | | Merge pull request #267 from nickago/MM-1652 | Christopher Speller | 2015-07-29 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | MM-1652 Fixed typo in delete post modal | ||||
| * | | | Fixed typo in delete_post_modal | nickago | 2015-07-28 | 1 | -1/+1 |
| | | | | |||||
* | | | | added use of strings.Team to replace hardcoded mentions of 'team' | JoramWilander | 2015-07-29 | 1 | -3/+3 |
| | | | | |||||
* | | | | updated changing email in sign up flow to work properly | JoramWilander | 2015-07-28 | 1 | -4/+8 |
| | | | | |||||
* | | | | updated user sign up page and login page with new UI details | JoramWilander | 2015-07-28 | 2 | -4/+3 |
| | | | | |||||
* | | | | updates to sign-up flow, remove company name and marketing checkbox | JoramWilander | 2015-07-28 | 2 | -28/+11 |
| | | | | |||||
* | | | | Signup Ui changes | Asaad Mahmood | 2015-07-28 | 4 | -74/+104 |
| |_|/ |/| | | |||||
* | | | Display thumbnails for files without file extensions | hmhealey | 2015-07-28 | 1 | -1/+1 |
|/ / | |||||
* | | Merge pull request #260 from rgarmsen2295/mm-1724 | Joram Wilander | 2015-07-28 | 2 | -2/+3 |
|\ \ | | | | | | | MM-1724 Changed title of Active Devices to Active Sessions and added help text explaining Active Sessions | ||||
| * | | Changed title of Active Devices to Active Sessions; added help text ↵ | Reed Garmsen | 2015-07-27 | 2 | -2/+3 |
| | | | | | | | | | | | | explaining Active Sessions | ||||
* | | | Merge pull request #239 from nickago/MM-1295 | Christopher Speller | 2015-07-28 | 2 | -0/+78 |
|\ \ \ | |/ / |/| | | MM-1295 Removal from a channel occurs in real time | ||||
| * | | Changed from Jquery style modal modification to using browserStore | nickago | 2015-07-27 | 2 | -9/+26 |
| | | | |||||
| * | | Added precautions to avoid incorrect data display to the user by clearing ↵ | nickago | 2015-07-27 | 1 | -2/+5 |
| | | | | | | | | | | | | modal after every close | ||||
| * | | When user is removed, a modal appears, which on closing redirects the | nickago | 2015-07-27 | 2 | -2/+52 |
| | | | | | | | | | | | | user to town square. | ||||
| * | | When removed from a channel, user is sent back to town square and that | nickago | 2015-07-27 | 1 | -0/+8 |
| |/ | | | | | | | channel is removed from their sidebar | ||||
* | | Merge pull request #254 from hmhealey/mm1674 | Joram Wilander | 2015-07-27 | 1 | -1/+1 |
|\ \ | | | | | | | MM-1674 Replaced call to String.prototype.startsWith which only works in browsers that support ES6 | ||||
| * | | Replaced instance of String.prototype.startsWith which only works in ↵ | hmhealey | 2015-07-27 | 1 | -1/+1 |
| |/ | | | | | | | browsers that support ES6 | ||||
* | | Merge pull request #246 from rgarmsen2295/mm-1657 | Joram Wilander | 2015-07-27 | 1 | -32/+5 |
|\ \ | | | | | | | MM-1657 Removes tag highlighting for mentions | ||||
| * | | Removed vestige textdiv code that is also no longer necessary due to ↵ | Reed Garmsen | 2015-07-24 | 1 | -21/+1 |
| | | | | | | | | | | | | removing the mention tags | ||||
| * | | Removes the blue tag highlighting from mentions that would appear after ↵ | Reed Garmsen | 2015-07-23 | 1 | -13/+6 |
| | | | | | | | | | | | | typing a mention | ||||
* | | | Merge pull request #245 from nickago/MM-1662 | Corey Hulen | 2015-07-27 | 1 | -3/+5 |
|\ \ \ | |_|/ |/| | | MM-1662 Added support for png profile pictures | ||||
| * | | Added support for png profile pictures | nickago | 2015-07-23 | 1 | -3/+5 |
| | | | |||||
* | | | Merge pull request #249 from asaadmahmoodspin/master | Joram Wilander | 2015-07-24 | 1 | -6/+5 |
|\ \ \ | | | | | | | | | Complete signup page UI changes | ||||
| * | | | Adding hint text for username back in | Asaad Mahmood | 2015-07-24 | 1 | -0/+1 |
| | | | | |||||
| * | | | Minor class changes | Asaad Mahmood | 2015-07-24 | 1 | -2/+2 |
| | | | | |||||
| * | | | Complete signup page UI changes | Asaad Mahmood | 2015-07-24 | 1 | -6/+4 |
| | | | | |||||
* | | | | Merge pull request #226 from nickago/MM-1546 | Joram Wilander | 2015-07-24 | 5 | -5/+64 |
|\ \ \ \ | |/ / / |/| | | | MM-1546 Clear error messages on modal close and channel switch | ||||
| * | | | Added a condition to close event listeners on modals when the component | nickago | 2015-07-23 | 4 | -27/+40 |
| | | | | | | | | | | | | | | | | is unmounted, and set all unsaved data to be cleared from user settings | ||||
| * | | | When closing out of a modal, unsaved data and text inside of it is erased. | nickago | 2015-07-23 | 5 | -5/+51 |
| |/ / | |||||
* | | | Merge pull request #242 from asaadmahmoodspin/master | Christopher Speller | 2015-07-23 | 4 | -4/+8 |
|\ \ \ | | | | | | | | | UI Fixes | ||||
| * | | | Placing SVGs into constants.jsx | Asaad Mahmood | 2015-07-23 | 4 | -4/+8 |
| | | | | |||||
| * | | | UI Fixes | Asaad Mahmood | 2015-07-23 | 1 | -1/+1 |
| |/ / | |||||
* | | | Merge pull request #243 from hmhealey/mm1678 | Christopher Speller | 2015-07-23 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | MM-1678 Fixed sidebar so that it can open threads containing non-image attachments | ||||
| * | | | Fixed reference to non-existant local variable that prevented the sidebar ↵ | hmhealey | 2015-07-23 | 1 | -1/+1 |
| |/ / | | | | | | | | | | from opening message threads containing non-image attachments | ||||
* | | | Merge pull request #244 from rgarmsen2295/mm-1610 | Christopher Speller | 2015-07-23 | 3 | -3/+3 |
|\ \ \ | |_|/ |/| | | MM-1610 Fixed issue with error message for uploading more than 5 files not appearing on OSX |