summaryrefslogtreecommitdiffstats
path: root/web
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #279 from asaadmahmoodspin/masterJoram Wilander2015-07-294-14/+15
|\ | | | | Fixing LHS Header css
| * Minor Ui updates regarding the search and the center channel header on mobile.Asaad Mahmood2015-07-293-12/+12
| |
| * Updating color of hover on LHS HeaderAsaad Mahmood2015-07-291-1/+1
| |
| * Fixing LHS Header cssAsaad Mahmood2015-07-291-1/+2
| |
* | Merge pull request #269 from rgarmsen2295/mm-1686Christopher Speller2015-07-293-7/+30
|\ \ | | | | | | 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 Garmsen2015-07-293-7/+30
| | | | | | | | | | | | of loaded at start; added loading screens to Access History and Active Sessions
* | | Merge pull request #259 from nickago/MM-1683Christopher Speller2015-07-291-19/+17
|\ \ \ | | | | | | | | MM-1683 Removed a vestigial wait condition from the signup process.
| * | | Added IE friendly window origin function in place of unwrapped callnickago2015-07-291-1/+1
| | | |
| * | | Removed timeout originally set on team creationnickago2015-07-291-19/+17
| | | |
* | | | Merge pull request #256 from nickago/MM-1183Joram Wilander2015-07-292-6/+11
|\ \ \ \ | |_|_|/ |/| | | MM-1183 Allow channel descriptions on 1-1 channels
| * | | Added a 'set description' link for private channelsnickago2015-07-281-1/+4
| | | |
| * | | Removed popover on channel name and added ability to set channel ↵nickago2015-07-271-5/+7
| | | | | | | | | | | | | | | | descritption for 1-1 channels
* | | | Removing unused id on LHS dropdownAsaad Mahmood2015-07-291-3/+1
| | | |
* | | | Improving css for form hints in signup flowAsaad Mahmood2015-07-291-1/+1
| | | |
* | | | Fixing error markup in signup flowAsaad Mahmood2015-07-291-2/+2
| | | |
* | | | mm-1762 - Search improvements with some other minor Ui changesAsaad Mahmood2015-07-295-44/+100
| |/ / |/| |
* | | Merge pull request #268 from mattermost/mm-1358Joram Wilander2015-07-292-1/+142
|\ \ \ | | | | | | | | MM-1358, MM-1203 Adding preview of style guide and ESLint Javascript + JSX static analyzer
| * | | Adding check target to makefile to run eslint. Adding eslint to package.jsonChristopher Speller2015-07-281-1/+3
| | | |
| * | | Configuration for eslintrcChristopher Speller2015-07-281-0/+139
| | | |
* | | | Merge pull request #252 from rgarmsen2295/ie10-image-regression-fixChristopher Speller2015-07-298-15/+28
|\ \ \ \ | | | | | | | | | | 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 codebaseReed Garmsen2015-07-274-8/+15
| | | | |
| * | | | Fixes issue with images not displaying due to window.origin not being ↵Reed Garmsen2015-07-275-10/+16
| | |/ / | |/| | | | | | | | | | defined in IE10
* | | | Merge pull request #267 from nickago/MM-1652Christopher Speller2015-07-291-1/+1
|\ \ \ \ | | | | | | | | | | MM-1652 Fixed typo in delete post modal
| * | | | Fixed typo in delete_post_modalnickago2015-07-281-1/+1
| | | | |
* | | | | Merge pull request #265 from mattermost/mm-1711Joram Wilander2015-07-2913-152/+250
|\ \ \ \ \ | | | | | | | | | | | | MM-1711 update sign-up and login UI
| * | | | | added use of strings.Team to replace hardcoded mentions of 'team'JoramWilander2015-07-291-3/+3
| | | | | |
| * | | | | updated changing email in sign up flow to work properlyJoramWilander2015-07-281-4/+8
| | | | | |
| * | | | | updated user sign up page and login page with new UI detailsJoramWilander2015-07-283-5/+4
| | | | | |
| * | | | | updates to sign-up flow, remove company name and marketing checkboxJoramWilander2015-07-286-34/+16
| | | | | |
| * | | | | Signup Ui changesAsaad Mahmood2015-07-288-114/+227
| | |_|_|/ | |/| | |
* | | | | Merge pull request #264 from asaadmahmoodspin/mm-1732Corey Hulen2015-07-282-0/+0
|\ \ \ \ \ | |/ / / / |/| | | | mm-1732 - Decreasing font size for footer in emails
| * | | | MM-1730 - Updating logo in emailsAsaad Mahmood2015-07-282-0/+0
| |/ / /
* / / / Display thumbnails for files without file extensionshmhealey2015-07-282-4/+7
|/ / /
* | | Merge pull request #253 from nickago/MM-1654Christopher Speller2015-07-281-0/+7
|\ \ \ | | | | | | | | MM-1654 Anti-clickjacking measures
| * | | Centralized header additions and removed duplicate codenickago2015-07-271-32/+0
| | | |
| * | | Removed ability to place MM in an iframenickago2015-07-242-0/+39
| | | |
* | | | Merge pull request #260 from rgarmsen2295/mm-1724Joram Wilander2015-07-283-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 Garmsen2015-07-273-2/+6
| | | | | | | | | | | | | | | | explaining Active Sessions
* | | | 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