summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
* | | | Merge pull request #275 from asaadmahmoodspin/mm-1762Joram Wilander2015-07-297-46/+100
|\ \ \ \ | | | | | | | | | | MM-1762 - Search improvements with some other minor Ui changes
| * | | | 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 branch 'master' of https://github.com/mattermost/platform into mm-1762Asaad Mahmood2015-07-2926-176/+597
| |\ \ \ \ | | | |/ / | | |/| |
| * | | | Merge branch 'master' of https://github.com/mattermost/platform into mm-1762Asaad Mahmood2015-07-290-0/+0
| |\ \ \ \
| * \ \ \ \ Merge branch 'master' of https://github.com/mattermost/platform into mm-1762Asaad Mahmood2015-07-285-7/+10
| |\ \ \ \ \
* | \ \ \ \ \ Merge pull request #261 from mattermost/it33-freetype-license-additionJoram Wilander2015-07-292-67/+270
|\ \ \ \ \ \ \ | |_|_|_|/ / / |/| | | | | | Adding notice for golang-freetype
| * | | | | | Adding notice for golang-freetype it332015-07-272-67/+270
| | | | | | | | | | | | | | | | | | | | | Also changing from .md to .txt file, and adding formatting changes, because golang-freetype license doesn't format well in .md
* | | | | | | Merge pull request #268 from mattermost/mm-1358Joram Wilander2015-07-294-1/+318
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | MM-1358, MM-1203 Adding preview of style guide and ESLint Javascript + JSX static analyzer
| * | | | | | | Fixing spelling and clarifying a few parts of style guide.Christopher Speller2015-07-291-14/+16
| | | | | | | |
| * | | | | | | Minor tweaks to style guideChristopher Speller2015-07-281-2/+6
| | | | | | | |
| * | | | | | | Adding style guideChristopher Speller2015-07-281-0/+161
| | | | | | | |
| * | | | | | | Adding rest of directories to eslint listChristopher Speller2015-07-281-0/+4
| | | | | | | |
| * | | | | | | Adding check target to makefile to run eslint. Adding eslint to package.jsonChristopher Speller2015-07-282-1/+8
| | | | | | | |
| * | | | | | | 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-2914-159/+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-287-41/+16
| | | | | | | | |
| * | | | | | | | Signup Ui changesAsaad Mahmood2015-07-288-114/+227
| | |_|_|_|_|_|/ | |/| | | | | |
* | | | | | | | Merge pull request #264 from asaadmahmoodspin/mm-1732Corey Hulen2015-07-2811-18/+18
|\ \ \ \ \ \ \ \ | | |_|_|_|_|/ / | |/| | | | | / | |_|_|_|_|_|/ |/| | | | | | mm-1732 - Decreasing font size for footer in emails
| * | | | | | MM-1730 - Updating logo in emailsAsaad Mahmood2015-07-2811-9/+9
| | | | | | |
| * | | | | | mm-1732 - Decrease font size for footer in emailsAsaad Mahmood2015-07-289-9/+9
| | |/ / / / | |/| | | |
* | | | | | Merge pull request #270 from mattermost/mm-1763Joram Wilander2015-07-281-1/+1
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | MM-1763 update our postgresql index check to work with 9.2.4+ versions of postgresql
| * | | | | update our postgresql index check to work with 9.2+ versions of postgresqlJoramWilander2015-07-281-1/+1
|/ / / / /
* | | | | Merge pull request #255 from hmhealey/mm1682Christopher Speller2015-07-284-6/+9
|\ \ \ \ \ | |/ / / / |/| | | | MM-1682 Allow files without file extensions to be attached to messages
| * | | | Added non-capturing group to regex used for matching local file urlshmhealey2015-07-281-1/+1
| | | | |
| * | | | Display thumbnails for files without file extensionshmhealey2015-07-282-4/+7
| | | | |
| * | | | Allow users to download file attachments with names that don't include a ↵hmhealey2015-07-281-1/+1
| | | | | | | | | | | | | | | | | | | | file extension
| * | | | Allow files without extensions to be uploaded as attachments to postshmhealey2015-07-281-1/+1
|/ / / /
* | | | Merge pull request #253 from nickago/MM-1654Christopher Speller2015-07-282-0/+13
|\ \ \ \ | | | | | | | | | | MM-1654 Anti-clickjacking measures
| * | | | Limited the added headers to only non-api callsnickago2015-07-271-2/+6
| | | | |
| * | | | Centralized header additions and removed duplicate codenickago2015-07-272-32/+2
| | | | |
| * | | | Removed ability to place MM in an iframenickago2015-07-242-0/+39
| | | | |