Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
* | | | | | Merge pull request #265 from mattermost/mm-1711 | Joram Wilander | 2015-07-29 | 13 | -152/+250 | |
|\ \ \ \ \ | | | | | | | | | | | | | MM-1711 update sign-up and login UI | |||||
| * | | | | | 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 | 3 | -5/+4 | |
| | | | | | | ||||||
| * | | | | | updates to sign-up flow, remove company name and marketing checkbox | JoramWilander | 2015-07-28 | 6 | -34/+16 | |
| | | | | | | ||||||
| * | | | | | Signup Ui changes | Asaad Mahmood | 2015-07-28 | 8 | -114/+227 | |
| | |_|_|/ | |/| | | | ||||||
* | | | | | Merge pull request #264 from asaadmahmoodspin/mm-1732 | Corey Hulen | 2015-07-28 | 2 | -0/+0 | |
|\ \ \ \ \ | |/ / / / |/| | | | | mm-1732 - Decreasing font size for footer in emails | |||||
| * | | | | MM-1730 - Updating logo in emails | Asaad Mahmood | 2015-07-28 | 2 | -0/+0 | |
| |/ / / | ||||||
* / / / | Display thumbnails for files without file extensions | hmhealey | 2015-07-28 | 2 | -4/+7 | |
|/ / / | ||||||
* | | | Merge pull request #253 from nickago/MM-1654 | Christopher Speller | 2015-07-28 | 1 | -0/+7 | |
|\ \ \ | | | | | | | | | MM-1654 Anti-clickjacking measures | |||||
| * | | | Centralized header additions and removed duplicate code | nickago | 2015-07-27 | 1 | -32/+0 | |
| | | | | ||||||
| * | | | Removed ability to place MM in an iframe | nickago | 2015-07-24 | 2 | -0/+39 | |
| | | | | ||||||
* | | | | Merge pull request #260 from rgarmsen2295/mm-1724 | Joram Wilander | 2015-07-28 | 3 | -2/+6 | |
|\ \ \ \ | |_|_|/ |/| | | | 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 | 3 | -2/+6 | |
| | | | | | | | | | | | | | | | | explaining Active Sessions | |||||
* | | | | Merge pull request #239 from nickago/MM-1295 | Christopher Speller | 2015-07-28 | 4 | -0/+85 | |
|\ \ \ \ | |/ / / |/| | | | 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 | 4 | -2/+59 | |
| | | | | | | | | | | | | | | | | 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 #251 from asaadmahmoodspin/master | Corey Hulen | 2015-07-27 | 1 | -7/+5 | |
|\ \ \ | | | | | | | | | Ui Updates to signup flow | |||||
| * | | | Ui Updates to signup flow | Asaad Mahmood | 2015-07-25 | 1 | -7/+5 | |
| |/ / | ||||||
* | | | 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 | 3 | -8/+69 | |
|\ \ \ \ | | | | | | | | | | | 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 | 2 | -5/+5 | |
| | | | | | ||||||
| * | | | | Complete signup page UI changes | Asaad Mahmood | 2015-07-24 | 3 | -8/+68 | |
| | |_|/ | |/| | | ||||||
* | | | | 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 | 9 | -11/+24 | |
|\ \ \ | | | | | | | | | UI Fixes | |||||
| * | | | UI changes for search bar in the RHS for Mobile Web | Asaad Mahmood | 2015-07-23 | 1 | -3/+4 | |
| | | | | ||||||
| * | | | Adjusting padding for LHS header info | Asaad Mahmood | 2015-07-23 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Adding hover effect for LHS menu icon | Asaad Mahmood | 2015-07-23 | 1 | -1/+5 | |
| | | | | ||||||
| * | | | Placing SVGs into constants.jsx | Asaad Mahmood | 2015-07-23 | 5 | -5/+11 | |
| | | | | ||||||
| * | | | UI Fixes | Asaad Mahmood | 2015-07-23 | 4 | -4/+6 | |
| |/ / | ||||||
* | | | 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 | |||||
| * | | Fixed issue with error message for uploading more than 5 files not appearing ↵ | Reed Garmsen | 2015-07-23 | 3 | -3/+3 | |
| |/ | | | | | | | on OSX | |||||
* | | Merge pull request #237 from mattermost/mm-1570 | Corey Hulen | 2015-07-23 | 12 | -42/+402 | |
|\ \ | |/ |/| | fixes mm-1570 adds support for using mattermost as an OAuth client | |||||
| * | only show gitlab signup/login links if gitlab oauth is turned on | JoramWilander | 2015-07-22 | 7 | -11/+32 | |
| | | ||||||
| * | add changes from team review | JoramWilander | 2015-07-22 | 1 | -3/+3 | |
| | | ||||||
| * | added signup link verification to oauth signup flow | JoramWilander | 2015-07-22 | 2 | -4/+54 | |
| | | ||||||
| * | add error for trying to sign up with the same oauth account twice | JoramWilander | 2015-07-22 | 1 | -0/+5 | |
| | |