Commit Graph

320 Commits

Author SHA1 Message Date
Sahat Yalkabov
82bf9df29d Add login required label on Vemo link 2014-02-11 08:29:00 -05:00
Sahat Yalkabov
3b570cd9e0 Minor template cleanup 2014-02-11 08:26:05 -05:00
Sahat Yalkabov
6b7c68c1c6 Fixed a typo and added form placeholders 2014-02-11 08:24:04 -05:00
Sahat Yalkabov
c5a73443d6 Fixed typo and added payment.target.user to recentPayments table in case User ID was used instead of email or phone # to send a payment 2014-02-11 08:14:50 -05:00
Sahat Yalkabov
241baf179a Add venmo recent payments 2014-02-11 08:04:20 -05:00
Sahat Yalkabov
5275607bdb Add send a payment form, route and controller for Venmo API 2014-02-10 23:55:32 -05:00
Sahat Yalkabov
86801331a3 Added make payment form for Venmo API 2014-02-10 22:16:18 -05:00
Sahat Yalkabov
fa96ffde30 Update textfield type for Name 2014-02-10 22:12:19 -05:00
Sahat Yalkabov
2ccd46e69b Add Venmo template 2014-02-10 22:03:02 -05:00
Sahat Yalkabov
45613cda0e Add venmo authorize, callback and API urls, and a corresponding Venmo controller 2014-02-10 19:21:54 -05:00
Sahat Yalkabov
7c79609659 Merge branch 'seafoodbuffet-configurable_auth'
* seafoodbuffet-configurable_auth:
  Replaced tabs to spaces
  Converted tabs to spaces
  enable localAuth
  introduce configurable login providers to selectively show/hide different login methods
2014-02-10 11:27:18 -05:00
Sahat Yalkabov
414b0483ca Replaced tabs to spaces 2014-02-10 11:20:14 -05:00
Sahat Yalkabov
b85954b62f Converted tabs to spaces 2014-02-10 11:16:31 -05:00
Sahat Yalkabov
0d4f2ae8fd Merge branch 'master' of https://github.com/JahlomP/hackathon-starter into JahlomP-master
* 'master' of https://github.com/JahlomP/hackathon-starter:
  Replaced hardcoded success flash with express-flash
2014-02-10 10:58:31 -05:00
Cheng Zhou
9d9f9c926c merge from upstream 2014-02-07 23:08:11 -06:00
Sahat Yalkabov
517e2f13d2 Removed form-control and form-group classes from CSRF inputs. Placed them at the top right after form block for consistency 2014-02-07 23:45:24 -05:00
Sahat Yalkabov
1143ac4320 Add CSRF input to Account Delete form. 2014-02-07 23:41:15 -05:00
Sahat Yalkabov
fab3c1455d Pass size of 60px to gravatar function from navbar. Since it won't be larger than that, no point loading a larger 200px image and then shrinking it. 60px already takes into consideration retina displays. The actual size of avatar is 30px. 2014-02-07 09:53:48 -05:00
Precious Jahlom Agboado
de3d62b66b Replaced hardcoded success flash with express-flash 2014-02-07 08:04:22 +00:00
Cheng Zhou
ed70466c43 introduce configurable login providers to selectively show/hide different login methods 2014-02-06 21:52:49 -06:00
Sahat Yalkabov
aec3807d34 Updated docs button group on Twilio page.
Pass err.message instead of error object to the middleware.
2014-02-06 08:33:37 -05:00
Sahat Yalkabov
a34dabbc68 Added Twilio POST route and controller 2014-02-06 08:09:54 -05:00
Sahat Yalkabov
41cfc59cda Added Twilio API template, controller and route; + twilio library. 2014-02-06 07:46:47 -05:00
Sahat Yalkabov
2475825c9b Responsive forms on User profile page. Fixes #58. 2014-02-06 04:40:13 -05:00
Sahat Yalkabov
78b27a4841 Updated API index page 2014-02-06 04:07:12 -05:00
Sahat Yalkabov
f34e5d57dc Changed playerSummaries to playerSummary since i am only getting information a single Steam ID 2014-02-06 03:54:26 -05:00
Sahat Yalkabov
6fcdabb1b4 Added profile information, avatar, login status, and other nice improvements on Steam page 2014-02-06 03:51:06 -05:00
Sahat Yalkabov
888f4eb86a Include free games in getOwnedGames, added custom thumbnail hover effect 2014-02-06 02:51:16 -05:00
Sahat Yalkabov
0774772dcd Add owned games thumbnails 2014-02-05 23:27:13 -05:00
Sahat Yalkabov
73411a03b0 Merge branch 'KarlJakober-master'
* KarlJakober-master:
  Add profile information and owned games to Steam template
  Steam API template display achievements
  Steam API code refactoring, added ownedGames API call
  removes steam auth, sets up steam api requests in async
  Adds Steam auth and API

Conflicts:
	views/api/index.jade
#
# It looks like you may be committing a merge.
# If this is not correct, please remove the file
#	.git/MERGE_HEAD
# and try again.

# Please enter the commit message for your changes. Lines starting
# with '#' will be ignored, and an empty message aborts the commit.
# On branch master
# All conflicts fixed but you are still merging.
#   (use "git commit" to conclude merge)
#
# Changes to be committed:
#
#	modified:   README.md
#	modified:   app.js
#	modified:   config/passport.js
#	modified:   config/secrets.js
#	modified:   controllers/api.js
#	modified:   models/User.js
#	new file:   views/api/steam.jade
#
# Changes not staged for commit:
#   (use "git add <file>..." to update what will be committed)
#   (use "git checkout -- <file>..." to discard changes in working directory)
#
#	modified:   config/passport.js
#	modified:   config/secrets.js
#	modified:   models/User.js
#	modified:   views/api/index.jade
#
2014-02-05 19:45:05 -05:00
Sahat Yalkabov
38296e38b1 Merge branch 'KarlJakober-master'
* KarlJakober-master:
  Add profile information and owned games to Steam template
  Steam API template display achievements
  Steam API code refactoring, added ownedGames API call
  removes steam auth, sets up steam api requests in async
  Adds Steam auth and API

Conflicts:
	views/api/index.jade
2014-02-05 19:44:54 -05:00
Sahat Yalkabov
aa3e6e6a67 Add profile information and owned games to Steam template 2014-02-05 19:39:31 -05:00
Sahat Yalkabov
eedfb77ac6 Steam API template display achievements 2014-02-05 19:30:00 -05:00
Sahat Yalkabov
a2f4ffbf2b Merge branch 'master' of https://github.com/KarlJakober/hackathon-starter into KarlJakober-master
* 'master' of https://github.com/KarlJakober/hackathon-starter:
  removes steam auth, sets up steam api requests in async
2014-02-05 17:13:43 -05:00
Karl Jakober
1687440588 removes steam auth, sets up steam api requests in async 2014-02-05 21:04:02 +00:00
Sahat Yalkabov
a86326c40c Placed lock icon outside of URL 2014-02-05 12:53:30 -05:00
Sahat Yalkabov
20621d535d Merge branch 'master' of https://github.com/KarlJakober/hackathon-starter into KarlJakober-master
* 'master' of https://github.com/KarlJakober/hackathon-starter:
  Adds Steam auth and API
2014-02-05 12:26:23 -05:00
Sahat Yalkabov
e4d3fba68b Radio button text wrapped with span tag 2014-02-05 12:11:20 -05:00
Karl Jakober
aa36ad9fbb Adds Steam auth and API 2014-02-05 16:37:48 +00:00
Abimael Martell
adedc05b54 fix form inputs labels
some form inputs has a wrong "for" attribute
2014-02-04 09:24:04 -08:00
Sahat Yalkabov
61e95b582b Merge branch 'patch-1' of https://github.com/GeneralZero/hackathon-starter into GeneralZero-patch-1
* 'patch-1' of https://github.com/GeneralZero/hackathon-starter:
  Update profile.jade
  Readded newline
  Removed extra app.use(express.csrf());
  Removed dynamicHelpers comment
  Changed Views to accept CSRF token
  Added CSRF Protection to all form views
  Add CSRF Security measures on login forms

Conflicts:
	views/account/profile.jade
2014-02-04 00:37:32 -05:00
Sahat Yalkabov
0b89b41376 Display gravatar if no profile image is present 2014-02-03 19:12:21 -05:00
Sahat Yalkabov
cf4b87988b Add icons to buttons on account page 2014-02-03 18:54:43 -05:00
Sahat Yalkabov
09ef5201e5 Made gravatar consistent with the rest of the form in Profile Information section 2014-02-03 18:51:19 -05:00
Daniel Mills
8e804c5a1a retro default, better size for xs 2014-02-03 18:18:28 -05:00
Daniel Mills
f5ecfc507c add gravatar to profile 2014-02-03 17:50:47 -05:00
Brian Ridings
c5199929a5 Update profile.jade 2014-02-03 13:32:13 -05:00
Brian Ridings
1b6aa2e603 Readded newline 2014-02-03 13:31:53 -05:00
Brian Ridings
c99c8fe1f8 Changed Views to accept CSRF token 2014-02-03 13:08:34 -05:00
Brian Ridings
f9ec861151 Added CSRF Protection to all form views 2014-02-03 13:02:24 -05:00