From cc7faa5a4387c9a01ffeb066c8f7816ac0388c74 Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Sun, 19 Oct 2014 15:19:53 -0700 Subject: [PATCH 1/4] Fixed tracis-ci badge --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 0a2562796b..e9c6fe0d00 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![Alt](https://lh4.googleusercontent.com/-PVw-ZUM9vV8/UuWeH51os0I/AAAAAAAAD6M/0Ikg7viJftQ/w1286-h566-no/hackathon-starter-logo.jpg) -Hackathon Starter [![Dependency Status](https://david-dm.org/sahat/hackathon-starter/dev-status.svg?style=flat)](https://david-dm.org/sahat/hackathon-starter) [![Build Status](http://img.shields.io/sahat/hackathon-starter.svg?style=flat)](https://travis-ci.org/sahat/hackathon-starter) [![Analytics](https://ga-beacon.appspot.com/UA-47447818-2/hackathon-starter?pixel)](https://github.com/igrigorik/ga-beacon) +Hackathon Starter [![Dependency Status](https://david-dm.org/sahat/hackathon-starter/dev-status.svg?style=flat)](https://david-dm.org/sahat/hackathon-starter) [![Build Status](http://img.shields.io/travis/sahat/hackathon-starter.svg?style=flat)](https://travis-ci.org/sahat/hackathon-starter) [![Analytics](https://ga-beacon.appspot.com/UA-47447818-2/hackathon-starter?pixel)](https://github.com/igrigorik/ga-beacon) ======================= :octocat:  **Live Demo**: http://hackathonstarter.herokuapp.com From 37d0713d314bae92f5071fe2849b83c9e2da1069 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?=D0=94=D0=B6=D0=BE=D0=BD=2C=20=D0=BF=D1=80=D0=BE=D1=81?= =?UTF-8?q?=D1=82=D0=BE=20=D0=94=D0=B6=D0=BE=D0=BD?= Date: Tue, 21 Oct 2014 23:02:12 +0300 Subject: [PATCH 2/4] Update login.jade Be consistent with [signup view](https://github.com/sahat/hackathon-starter/blob/master/views/account/signup.jade#L11). --- views/account/login.jade | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/views/account/login.jade b/views/account/login.jade index 21a294d357..254292a395 100644 --- a/views/account/login.jade +++ b/views/account/login.jade @@ -8,7 +8,7 @@ block content .col-sm-8.col-sm-offset-2 .form-group label.control-label(for='email') Email - input.form-control(type='text', name='email', id='email', placeholder='Email', autofocus=true) + input.form-control(type='email', name='email', id='email', placeholder='Email', autofocus=true) .form-group label.control-label(for='password') Password input.form-control(type='password', name='password', id='password', placeholder='Password') @@ -35,4 +35,4 @@ block content | Sign in with LinkedIn a.btn.btn-block.btn-instagram.btn-social(href='/auth/instagram') i.fa.fa-instagram - | Sign in with Instagram \ No newline at end of file + | Sign in with Instagram From 968703b6d0f2a3f0ba1e0a344dee183773318f39 Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Fri, 24 Oct 2014 21:57:17 -0700 Subject: [PATCH 3/4] Update package.json --- package.json | 14 +++++++------- 1 file changed, 7 insertions(+), 7 deletions(-) diff --git a/package.json b/package.json index 57d775de4b..a6d8ceb3c5 100644 --- a/package.json +++ b/package.json @@ -12,7 +12,7 @@ "dependencies": { "async": "^0.9.0", "bcrypt-nodejs": "^0.0.3", - "body-parser": "^1.9.0", + "body-parser": "^1.9.1", "cheerio": "^0.17.0", "clockwork": "^0.1.1", "compression": "^1.2.0", @@ -21,9 +21,9 @@ "cookie-parser": "^1.3.3", "csso": "^1.3.11", "errorhandler": "^1.2.2", - "express": "^4.9.8", + "express": "^4.10.0", "express-flash": "^0.0.2", - "express-session": "^1.9.0", + "express-session": "^1.9.1", "express-validator": "^2.6.0", "fbgraph": "^0.3.0", "github-api": "^0.7.0", @@ -34,7 +34,7 @@ "lodash": "^2.4.1", "lusca": "^1.0.2", "method-override": "^2.3.0", - "mongoose": "^3.8.17", + "mongoose": "^3.8.18", "morgan": "^1.4.0", "node-foursquare": "^0.2.1", "node-linkedin": "^0.3.3", @@ -48,19 +48,19 @@ "passport-local": "^1.0.0", "passport-oauth": "^1.0.0", "passport-twitter": "^1.0.2", - "request": "^2.45.0", + "request": "^2.46.0", "stripe": "^2.8.0", "tumblr.js": "^0.0.4", "twilio": "^1.7.0", "twit": "^1.1.18", "uglify-js": "^2.4.15", "validator": "^3.22.0", - "yui": "^3.18.0" + "yui": "^3.18.1" }, "devDependencies": { "blessed": "^0.0.37", "chai": "^1.9.2", - "mocha": "^1.21.5", + "mocha": "^2.0.1", "multiline": "^1.0.1", "supertest": "^0.14.0" } From 5554cb3201812d96d8b84ad4cd79642c7243e39a Mon Sep 17 00:00:00 2001 From: Sahat Yalkabov Date: Fri, 24 Oct 2014 21:58:58 -0700 Subject: [PATCH 4/4] Update README.md --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index e9c6fe0d00..ae39b94e24 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,5 @@ ![Alt](https://lh4.googleusercontent.com/-PVw-ZUM9vV8/UuWeH51os0I/AAAAAAAAD6M/0Ikg7viJftQ/w1286-h566-no/hackathon-starter-logo.jpg) -Hackathon Starter [![Dependency Status](https://david-dm.org/sahat/hackathon-starter/dev-status.svg?style=flat)](https://david-dm.org/sahat/hackathon-starter) [![Build Status](http://img.shields.io/travis/sahat/hackathon-starter.svg?style=flat)](https://travis-ci.org/sahat/hackathon-starter) [![Analytics](https://ga-beacon.appspot.com/UA-47447818-2/hackathon-starter?pixel)](https://github.com/igrigorik/ga-beacon) +Hackathon Starter [![Dependency Status](https://david-dm.org/sahat/hackathon-starter/status.svg?style=flat)](https://david-dm.org/sahat/hackathon-starter) [![Build Status](http://img.shields.io/travis/sahat/hackathon-starter.svg?style=flat)](https://travis-ci.org/sahat/hackathon-starter) [![Analytics](https://ga-beacon.appspot.com/UA-47447818-2/hackathon-starter?pixel)](https://github.com/igrigorik/ga-beacon) ======================= :octocat:  **Live Demo**: http://hackathonstarter.herokuapp.com