summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #239 from nickago/MM-1295Christopher Speller2015-07-284-0/+85
|\ | | | | MM-1295 Removal from a channel occurs in real time
| * Changed from Jquery style modal modification to using browserStorenickago2015-07-272-9/+26
| |
| * Added precautions to avoid incorrect data display to the user by clearing ↵nickago2015-07-271-2/+5
| | | | | | | | modal after every close
| * When user is removed, a modal appears, which on closing redirects thenickago2015-07-274-2/+59
| | | | | | | | user to town square.
| * When removed from a channel, user is sent back to town square and thatnickago2015-07-271-0/+8
| | | | | | | | channel is removed from their sidebar
* | Merge pull request #251 from asaadmahmoodspin/masterCorey Hulen2015-07-271-7/+5
|\ \ | | | | | | Ui Updates to signup flow
| * | Ui Updates to signup flowAsaad Mahmood2015-07-251-7/+5
| |/
* | Merge pull request #254 from hmhealey/mm1674Joram Wilander2015-07-271-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 ↵hmhealey2015-07-271-1/+1
| |/ | | | | | | browsers that support ES6
* | Merge pull request #246 from rgarmsen2295/mm-1657Joram Wilander2015-07-271-32/+5
|\ \ | | | | | | MM-1657 Removes tag highlighting for mentions
| * | Removed vestige textdiv code that is also no longer necessary due to ↵Reed Garmsen2015-07-241-21/+1
| | | | | | | | | | | | removing the mention tags
| * | Removes the blue tag highlighting from mentions that would appear after ↵Reed Garmsen2015-07-231-13/+6
| | | | | | | | | | | | typing a mention
* | | Merge pull request #245 from nickago/MM-1662Corey Hulen2015-07-271-3/+5
|\ \ \ | |_|/ |/| | MM-1662 Added support for png profile pictures
| * | Added support for png profile picturesnickago2015-07-231-3/+5
| | |
* | | Merge pull request #249 from asaadmahmoodspin/masterJoram Wilander2015-07-243-8/+69
|\ \ \ | | | | | | | | Complete signup page UI changes
| * | | Adding hint text for username back inAsaad Mahmood2015-07-241-0/+1
| | | |
| * | | Minor class changesAsaad Mahmood2015-07-242-5/+5
| | | |
| * | | Complete signup page UI changesAsaad Mahmood2015-07-243-8/+68
| | | |
* | | | Merge pull request #226 from nickago/MM-1546Joram Wilander2015-07-245-5/+64
|\ \ \ \ | |/ / / |/| | | MM-1546 Clear error messages on modal close and channel switch
| * | | Added a condition to close event listeners on modals when the componentnickago2015-07-234-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.nickago2015-07-235-5/+51
| |/ /
* | | Merge pull request #242 from asaadmahmoodspin/masterChristopher Speller2015-07-239-11/+24
|\ \ \ | | | | | | | | UI Fixes
| * | | UI changes for search bar in the RHS for Mobile WebAsaad Mahmood2015-07-231-3/+4
| | | |
| * | | Adjusting padding for LHS header infoAsaad Mahmood2015-07-231-1/+1
| | | |
| * | | Adding hover effect for LHS menu iconAsaad Mahmood2015-07-231-1/+5
| | | |
| * | | Placing SVGs into constants.jsxAsaad Mahmood2015-07-235-5/+11
| | | |
| * | | UI FixesAsaad Mahmood2015-07-234-4/+6
| |/ /
* | | Merge pull request #243 from hmhealey/mm1678Christopher Speller2015-07-231-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 ↵hmhealey2015-07-231-1/+1
| |/ / | | | | | | | | | from opening message threads containing non-image attachments
* | | Merge pull request #244 from rgarmsen2295/mm-1610Christopher Speller2015-07-233-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 Garmsen2015-07-233-3/+3
| |/ | | | | | | on OSX
* | Merge pull request #237 from mattermost/mm-1570Corey Hulen2015-07-2312-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 onJoramWilander2015-07-227-11/+32
| |
| * add changes from team reviewJoramWilander2015-07-221-3/+3
| |
| * added signup link verification to oauth signup flowJoramWilander2015-07-222-4/+54
| |
| * add error for trying to sign up with the same oauth account twiceJoramWilander2015-07-221-0/+5
| |
| * added error message when trying to sign up with gitlab using an email ↵JoramWilander2015-07-221-0/+5
| | | | | | | | already used in the system
| * merged with new team domain changes and added signup/login links for gitlabJoramWilander2015-07-227-28/+42
| |
| * made oauth architecture more generalizedJoramWilander2015-07-221-35/+73
| |
| * removed change password UI for oauth accountsJoramWilander2015-07-223-30/+49
| |
| * inital implementation of using GitLab OAuth2 provider for signup/loginJoramWilander2015-07-224-0/+208
| |
* | Merge pull request #194 from ralder/fix-command-box-cssCorey Hulen2015-07-2211-103/+101
|\ \ | | | | | | [webui] fix command-list css
| * | [webui] fix command-list cssralder2015-07-2211-103/+101
| | |
* | | Merge pull request #240 from asaadmahmoodspin/masterCorey Hulen2015-07-2212-22/+31
|\ \ \ | | | | | | | | Minor UI Improvements
| * | | Updating dropdown icon in LHS headerAsaad Mahmood2015-07-231-2/+2
| | | |
| * | | Minor UI ImprovementsAsaad Mahmood2015-07-2312-20/+29
| |/ /
* | | Merge pull request #241 from rgarmsen2295/mm-1556Joram Wilander2015-07-221-4/+14
|\ \ \ | | | | | | | | MM-1556 Better error handling of channel descriptions that are too large
| * | | Channel descriptions entered that are larger than the max number of bytes ↵Reed Garmsen2015-07-221-4/+14
| | | | | | | | | | | | | | | | now cause an error to be printed to the client without closing the modal and losing the user's draft of the description
* | | | Merge pull request #228 from nickago/MM-1547Joram Wilander2015-07-223-15/+86
|\ \ \ \ | |_|/ / |/| | | MM-1547 Added local cache storing of drafts for comments
| * | | Added message persistance on closing RHS/switching to another commentnickago2015-07-223-15/+86
| | | | | | | | | | | | | | | | | | | | thread. Similar to the center pane and channels, switching comment threads won't delete entered but unsent text/media in the RHS