9849acd49e
fixed helmet related errors
2014-12-22 12:36:45 -08:00
ffddd86022
Merge branch 'master' into helmet
...
Conflicts:
controllers/resources.js
package.json
views/partials/meta.jade
2014-12-22 11:49:51 -08:00
5497987506
Merge branch 'master' into challenges
...
Conflicts:
app.js
2014-12-16 10:45:59 -08:00
059fe5f39b
update to automatically redirect based on highest completed challenge hash value
2014-12-16 10:31:19 -08:00
91c829ac19
revise to have both screen hero and team viewer pair programming sections
2014-12-15 21:10:13 -08:00
666953d127
add the livecode and inbox.js routes and stand in text
2014-12-14 22:24:54 -08:00
c7a5a51c8d
Merge branch 'timestamp' into challenges
...
Conflicts:
config/passport.js
public/css/main.less
2014-12-13 21:09:11 -08:00
c72dfb32bd
add chromebook promo
2014-12-11 21:24:44 -08:00
21738654e9
start working on integrating helmet plugin
2014-12-10 20:44:33 -08:00
d5fa19779b
Revert "change font weight on landing page and buttons"
...
This reverts commit eba969af992288133fe898fbb26212474729273b.
2014-12-10 13:28:38 -08:00
38715b9dfc
change font weight on landing page and buttons
2014-12-10 13:11:16 -08:00
6b7ca4fe70
update landing page with we are Free Code Camp content including masonry for twitter embeds
2014-12-09 22:30:18 -08:00
719b4e6c5f
fix the FCC email login process
2014-12-07 16:25:43 -08:00
177dc900cf
made parallel 'points' infrastructure
2014-12-05 20:44:42 -08:00
704b4e52a3
Revert "update the landing page and add the firelane easter egg"
...
This reverts commit 06c4ec540cf77b5d7b693a0725c37a90ca4f0fb0.
2014-12-05 11:49:21 -08:00
4a0c724711
update the landing page and add the firelane easter egg
2014-12-05 10:31:04 -08:00
07ba7e4fcb
continue work on challengeshash
2014-12-04 12:06:17 -08:00
5c54fddaec
Merge branch 'master' into timestamp
...
Conflicts:
views/partials/challenges.jade
2014-12-03 23:31:36 -08:00
3fb11302d4
add privacy
2014-11-29 23:01:49 -08:00
21370b83a5
start adding omniauth functionality back in and debugging in production
2014-11-29 22:22:27 -08:00
00c92176cb
update the hackathon starter base app
2014-11-29 21:32:59 -08:00
79f060951a
add jquery exercises
2014-11-29 15:16:47 -08:00
456c845967
reached a stopping point, trying to fix a production bug
2014-11-26 22:00:28 -08:00
d973619f4a
writes completed challenges to database
2014-11-25 11:17:07 -08:00
06fe5390ba
seems to attempt to write timestamp
2014-11-24 18:07:03 -08:00
d9502856dc
SEO improvements suggested by Mark
2014-11-23 15:08:46 -06:00
0f3132a3f0
maybe fix the redirect issue
2014-11-19 15:50:57 -08:00
7c1ae2f450
Adds auth check to linked path. Removes unused routes.
2014-11-19 15:30:36 -08:00
e85cf837cd
add new relic require to app.js and fix challenges.js
2014-11-17 21:16:32 -08:00
fdff7d1691
add learn-to-code
2014-11-11 17:52:03 -08:00
24d57f0eaf
possibly prevent app from crashing
2014-11-10 10:29:16 -08:00
887462f734
removed helperContext property from connect assets
2014-11-08 20:54:55 -08:00
2dcea49f70
user model cleanup
2014-11-08 20:42:48 -08:00
ca0c71b77f
redirects to correct challenge upon authentication
2014-11-06 23:01:01 -08:00
e36a98cf2a
ajax seems to work and we now seem to track completion of challenges
2014-11-06 22:47:35 -08:00
86d433aaba
closer to getting ajax to work
2014-11-06 17:38:47 -08:00
944f4d6a1d
purge old views and now using simple numeric system
2014-11-06 16:27:18 -08:00
80fbe1dee4
fix nonprofit form and fix some mistakes in video links
2014-11-04 14:57:00 -08:00
97ddb9bc21
add a lot of content to challenges
2014-11-03 12:32:02 -08:00
5a2de8c47b
start grooming the challenges
2014-11-02 12:24:37 -08:00
de29af1e8a
update views and add routes to app.js
2014-11-02 09:07:40 -08:00
ff5f12cda8
update views and remove additional cruft
2014-11-01 18:07:59 -07:00
a5e8329769
app.js cleanup, cache defaults to 1 year for maxAge
2014-10-27 19:38:52 -07:00
029daa816f
rename non-profit to nonprofit
2014-10-26 09:32:57 -07:00
2387e00ca8
update non-profit route
2014-10-26 09:22:53 -07:00
942b154f70
fix minor problems and use s3
2014-10-20 16:25:24 -07:00
fa76554a5b
finish setting up layouts
2014-10-20 15:35:42 -07:00
972c52ca47
add named routes to courses
2014-10-20 13:28:23 -07:00
8f3c7b44c5
start creating partials and views
2014-10-20 12:37:48 -07:00
093bbfd679
pass session object directly into connect-mongo
2014-10-18 15:27:08 -07:00
5dbbb935a5
thrashing on the routes a bit
2014-10-18 00:46:30 -07:00
58761e7c2b
start adding challenge routes and controllers
2014-10-18 00:01:26 -07:00
d9e68463be
completely purge websockets
2014-10-17 19:23:53 -07:00
0ec7a052d1
rip out chat component
2014-10-17 19:10:53 -07:00
88bc8e14f8
got username in scope in variable
2014-10-16 18:04:32 -07:00
093bc73375
views are wired up
2014-10-16 17:04:28 -07:00
4a36e58756
allow access to both production and development databases
2014-10-15 15:57:51 -07:00
a380cf2564
add oauth strategies back in
2014-10-15 14:26:34 -07:00
254740c065
socket io is connecting
2014-10-13 18:00:37 -07:00
a5985cd73d
start building out views
2014-10-13 14:14:51 -07:00
05c31ba15d
firechat and firepad installed but not fully working
2014-10-12 01:51:55 -07:00
af616e0e21
Use __dirname for connect-assets paths configuration. Fixes #172
2014-07-28 02:15:24 -04:00
efc5980c26
Fixed express-session deprecation warning. Fixes #169
2014-07-12 00:23:43 -04:00
738713fe02
fixed body parser warning
2014-07-02 01:12:11 -04:00
04c5262bea
windows-cr line endings commit
2014-07-01 17:05:49 -04:00
1b3a6716e6
CSRF middleware refactoring
2014-06-06 15:57:04 -04:00
4c7b0d275b
Reverted back to express 3 style routes
2014-06-06 15:23:28 -04:00
1807e9edc7
Updated comments, added missing semicolons, moved compress() middleware up one level above connect-assets
2014-06-06 14:58:30 -04:00
bdc495782a
Use new Express 4 routes notation
2014-06-05 20:21:03 -04:00
f5e41d53d2
Fixed a returnTo bug
...
Bumped version to 2.1.4
2014-06-05 11:08:30 -04:00
0049a879cd
Minor updates, added comments for custom express middleware
2014-06-01 11:52:28 -04:00
0f3eb15d72
Added "Compose New Tweet" form on Twitter API demo
2014-05-29 18:29:16 -04:00
754789e085
Added yahoo api example
2014-05-13 01:35:46 -04:00
4381743358
Removed underscore "require" from app.js. No longer used.
2014-05-06 01:21:48 -04:00
9e90ccb3e6
CSRF refactoring
2014-05-06 00:44:30 -04:00
5ce1cb4444
Removed unused POST route for instagram api example
2014-04-30 00:02:05 -04:00
fc55e385e4
Added Instagram authentication
2014-04-22 15:00:27 -04:00
0440635fb0
Code refactoring
2014-04-21 16:51:43 -04:00
4621ecd56c
Removed connect-favicon middleware
2014-04-21 16:42:22 -04:00
347b757782
Removed 404 error handler and 404 page
2014-04-21 16:41:26 -04:00
429fc5a8ac
Code cleanup, updated README packages table
2014-04-18 14:37:06 -04:00
d5f5bd185d
Swapped connect-csrf for lusca and added conditional csrf
2014-04-18 14:29:30 -04:00
05f825d3c8
Removed PayPal API
2014-04-14 17:58:49 -04:00
2dae0ee0ab
Only two Stripe routes: GET and POST /api/stripe
2014-04-14 16:58:08 -04:00
b9fee1cb35
Merge branch 'master' of https://github.com/tmcpro/hackathon-starter
...
# By Tyler McIntyre
# Via Tyler McIntyre
* 'master' of https://github.com/tmcpro/hackathon-starter :
Added to Readme file
Stripe API finished
stripe API added
Conflicts:
package.json
views/api/index.jade
2014-04-14 16:15:46 -04:00
8fc3899def
Updated caching time variables
2014-04-12 14:17:37 -04:00
2103163428
Upgraded Hackathon Starter to Express 4
2014-04-12 12:43:07 -04:00
5c51aab076
Stripe API finished
2014-03-31 17:14:15 -04:00
dfc5a2c435
stripe API added
2014-03-31 16:00:51 -04:00
0151ff130f
Removed favicon middleware
...
For reference: https://github.com/visionmedia/express/issues/1979
2014-03-30 15:43:53 -04:00
963c07e999
Merge pull request #115 from ammit/patch-1
...
Minor Updates
2014-03-28 19:08:01 -04:00
05f7191c19
Change token to _csrf
2014-03-28 10:37:16 -04:00
b6f3dc9620
use app.get('env')
2014-03-28 03:12:57 +05:30
e659018576
Update returnTo middleware
...
by default express doesn't do case sensitive routing, so `/login` & '/LogIn' are treated same.
2014-03-28 03:03:04 +05:30
727983e1ae
Added environment variables. Fixes #100
2014-03-13 16:33:56 -04:00
b82cef30b7
Redirect back to original destination after a successful sign-in via OAuth
2014-03-08 14:58:27 -05:00
c2cda88433
Merged forgot/reset controllers into user controller
2014-03-07 14:08:56 -05:00
007d561d88
Merge branch 'master' of https://github.com/mediaburst/hackathon-starter into mediaburst-master
...
* 'master' of https://github.com/mediaburst/hackathon-starter :
Update README.md
Using the newest clockwork npm package
Removed commentted out lines from clockwork.jade
Tweak to the clockwork view
Adding clockwork SMS to the API mix
Conflicts:
controllers/api.js
package.json
2014-02-27 19:27:11 -05:00
933c79e15b
Added isAuthenticated and isAuthorized on LinkedIn
2014-02-27 17:56:46 -05:00
f80546bf84
Add LinkedIn API example route and controller
2014-02-27 14:48:09 -05:00
Michael Q Larson
Berkeley Martinez
Sahat Yalkabov
Tyler McIntyre
Brian Ridings
Ammit