Commit Graph

1646 Commits

Author SHA1 Message Date
ebc33ccef1 attempt to fix twitter_card 2014-12-26 13:46:14 -08:00
16ec131799 make tweet action open in new tab and add image for twitter card 2014-12-26 12:33:27 -08:00
99ebcdd2be fix the pair program with team viewer view 2014-12-26 12:15:24 -08:00
eb29b6e5f4 fix bad link on stats page 2014-12-26 00:13:58 -08:00
af60955a88 Merge branch 'master' into resources 2014-12-26 00:05:42 -08:00
8f6332262e Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2014-12-26 00:05:30 -08:00
a5fa27466c Clean up views, remove API controller views, add the gmail-shortcuts, control-shortcuts and deploy-a-website static views. Move all resource controller views to a resources view folder and update routes 2014-12-26 00:05:00 -08:00
fffc4ec949 update package.json information and add node-rest-client 2014-12-26 00:03:40 -08:00
986d6020fa add CTA buttons to anonymous challenge completion modal and selectively hide and show elements on the show view 2014-12-24 14:34:52 -08:00
b26ff474fd fix profile delete account button 2014-12-24 13:40:42 -08:00
4e24b90688 Update README.md 2014-12-24 10:57:40 -08:00
fc2031062b add back in generic secrets.js file 2014-12-24 09:46:51 -08:00
d39804053c finished with profile page for now 2014-12-24 00:07:20 -08:00
6906de7146 update jquery exercises 2014-12-23 23:23:37 -08:00
fcd457b958 email validations work, now on to username validations 2014-12-23 18:20:53 -08:00
20475ffcc4 reduce delay on gulp 2014-12-23 14:05:23 -08:00
a5df9697e9 Remote route end point in auth that are not called 2014-12-23 13:50:14 -08:00
b4be1f859f minor random post-merge fixes 2014-12-23 13:30:20 -08:00
ef2eba7b14 Merge branch 'master' into refactor
Conflicts:
	app.js
	controllers/api.js
	controllers/challenges.js
	gulpfile.js
2014-12-23 12:34:09 -08:00
3ac4ecdd08 add twitter social functionality 2014-12-23 12:16:23 -08:00
a032be6a0b fix finished challenges button 2014-12-23 11:20:31 -08:00
86fcfe8296 Major refactor. Add error handlers everywhere. 2014-12-23 08:48:28 -08:00
ca6652a791 refactor views to remove hardcoded challenge data 2014-12-23 08:22:50 -08:00
3eb09ab637 start reworking challenge views 2014-12-22 21:07:50 -08:00
7a5224b876 reverse change to challenge checkoff 2014-12-22 16:56:09 -08:00
33324fdf01 attempt to fix raffle 2014-12-22 16:47:02 -08:00
aebb9b3efd may have fixed websockets whitelisting issue 2014-12-22 16:16:10 -08:00
ae9c61fc64 another attempt at fixing 2014-12-22 15:54:43 -08:00
d8158041de another fix for rafflecopter 2014-12-22 15:46:12 -08:00
b18020518b another attempt at fixing rafflecopter 2014-12-22 15:45:03 -08:00
dafae0b06c make show views work without authenticated user 2014-12-22 15:42:39 -08:00
ebf85277be another attempt by whitelisting FCC websockets itself 2014-12-22 15:37:46 -08:00
4c9dcfdae6 yet another attempt at fixing websockets 2014-12-22 15:35:38 -08:00
f658dca068 third attempt at fixing web sockets for rafflecopter 2014-12-22 15:33:33 -08:00
bf0c6fa4d6 second attempt at fixing rafflecopter 2014-12-22 15:30:38 -08:00
4066872b8d add rafflecopter to whitelist 2014-12-22 15:07:32 -08:00
2d9c0d9900 add link to photo 2014-12-22 15:02:41 -08:00
b7ec61c4c3 probably fix crashing sites 2014-12-22 14:57:07 -08:00
2245aa6818 update the api controller 2014-12-22 14:33:25 -08:00
d3b56989c4 comment new relic 2014-12-22 14:26:02 -08:00
e921b637cc Add jshinrc file. 2014-12-22 14:08:46 -08:00
3122c6a61c Move keys into .env and remove from repo
Use keys in local .env during dev.
2014-12-22 14:06:24 -08:00
6ed5c5e8e0 add git gulp and browser-sync which still is not working properly 2014-12-22 13:38:48 -08:00
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
c06b8683c9 remove github auth again until I can figure out the issue 2014-12-22 10:22:04 -08:00
14174ee453 conditional logic showing links to forum and chatroom 2014-12-21 17:52:17 -08:00
46f217f548 update navigation to include links to chatroom and forum. 2014-12-21 15:43:07 -08:00
860171d5a5 update meta files and make landing page look better with Retina 2014-12-20 22:15:50 -08:00
fd0250884b fix landing page images 2014-12-18 00:45:31 -08:00