Commit Graph

289 Commits

Author SHA1 Message Date
Quincy Larson
34ac36a64a Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-04-21 19:46:08 -07:00
Quincy Larson
3a54f3b5ad update the meta image files for our new curriculum 2015-04-21 19:38:13 -07:00
terakilobyte
e9c13124f1 Remove mention of ng-lodash from universal-head 2015-04-21 17:39:34 -04:00
terakilobyte
08bf658897 Harden camper news and don't expose user object. Upvoting still needs to be looked at. 2015-04-19 03:36:54 -04:00
Michael Q Larson
d078c6768a make the all field guides view conform to the challengeMap aesthetic 2015-04-18 17:19:06 -07:00
Michael Q Larson
d2fae63310 fix a few minor issues post merge 2015-04-16 23:16:55 -07:00
terakilobyte
dbc99eafb6 Update chat link and copy. 2015-04-17 01:41:01 -04:00
terakilobyte
b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
Michael Q Larson
ddb88643e0 Nathan's updates to the userMigration script' 2015-04-14 21:19:05 -07:00
Michael Q Larson
be00c7e402 Revert "remove inspectlet thinking this may be the malware twitter is finding"
This reverts commit 4b9be16b24.
2015-04-14 16:03:27 -07:00
Michael Q Larson
4b9be16b24 remove inspectlet thinking this may be the malware twitter is finding 2015-04-14 13:44:17 -07:00
Michael Q Larson
62cabd56ff update camper news and chat challenges to have new videos and updated copy 2015-04-09 12:58:30 -07:00
Michael Q Larson
9fb048183c finish up adding the slack functionality with a redirect on the chat navbar button 2015-04-08 22:52:14 -07:00
Michael Q Larson
7da6f69cd8 start process of moving wiki over to field guide 2015-04-08 17:18:51 -07:00
Michael Q Larson
29b4e3b970 get seed data seeding and improve application submitted button 2015-04-08 14:57:08 -07:00
Michael Q Larson
1c7d0b11b6 pass the original story URL to all comments for notification email 2015-04-07 23:39:52 -07:00
Michael Q Larson
751d25219e improve the wiki seed file and add strikethrough to read wikis 2015-04-07 22:33:49 -07:00
Michael Q Larson
df4c698177 improve the challenge map 2015-04-07 12:45:31 -07:00
Michael Q Larson
2c6a781890 add inspectlet javascript 2015-04-07 00:32:01 -07:00
Michael Q Larson
bd7c5310b1 improve the footer 2015-04-07 00:11:31 -07:00
Michael Q Larson
840930d967 get bonfire solutions showing up in the view; eliminate a lot of old views in favor of new challenge map 2015-04-05 18:37:58 -07:00
Michael Q Larson
ef57ec58c2 improve wikis with hotkey and update the flash to allow links 2015-04-05 17:35:08 -07:00
Michael Q Larson
c8b72499ab dynamically redirect chat link in navbar 2015-04-05 00:16:23 -07:00
Michael Q Larson
fbeff58477 build a functional challenge map and change navbar links 2015-04-03 20:05:53 -07:00
Michael Q Larson
3cff4e9879 add logic to add campers to nonprofit projects of interest to them 2015-04-02 17:23:45 -07:00
Michael Q Larson
4aea12abca make slight modifications to the d3 calendar heatmap on the portfolio page 2015-04-02 15:53:38 -07:00
Michael Q Larson
97e59d4568 add verified flag to challenges so we can tell which ziplines and basejumps have been verified 2015-04-02 14:07:00 -07:00
Michael Q Larson
36c43cc73a add jQuery to check for broken images and replace them with standard image. Remove gravatar logic. 2015-04-02 13:42:15 -07:00
Michael Q Larson
fa74a1b454 got show all nonprofits button working and improved nonprofit show view 2015-03-31 17:38:33 -07:00
Michael Q Larson
ca404e66e8 close to getting all nonprofits to render 2015-03-30 20:08:29 -07:00
Michael Q Larson
acea52dc1b make further improvements to wiki and start new show view for nonprofits 2015-03-30 18:02:50 -07:00
Michael Q Larson
106a10edca add a modal that allows one to scroll through all wiki pages 2015-03-30 15:55:00 -07:00
Michael Q Larson
83a9223dcc respond to @BerkeleyTrue feedback 2015-03-30 13:09:24 -07:00
Michael Q Larson
aa01a896a5 Add show all challenges button to all challenge views and refactor bonfire to use same modal and button ids 2015-03-29 17:09:12 -07:00
Michael Q Larson
f0ae47dcf2 Fix show all bonfire bug where it wouldn't show while unauthenticated; add sr-only class to completed bonfires 2015-03-29 16:47:49 -07:00
Nathan Leniz
b00c5be45c View improvement for users that are not logged in or happen to hit control enter 2015-03-29 21:41:59 +09:00
Michael Q Larson
94b6cae3ec apply Nathan's insights into multistep form' 2015-03-27 12:36:21 -07:00
Michael Q Larson
c69d919d46 Merge branch 'master' into ux-improvements 2015-03-27 10:28:31 -07:00
Michael Q Larson
683498e62a remove calls to trello and blogger, camp counselor photos, and update the notice about Saturday's meeting 2015-03-27 00:20:50 -07:00
Michael Q Larson
d64b5c5718 add progress bar to nonprofit project proposal wizard 2015-03-25 15:25:19 -07:00
Michael Q Larson
2dbd59b7f1 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
Conflicts:
	controllers/resources.js
	views/account/show.jade
	views/coursewares/showHTML.jade
	views/coursewares/showJS.jade
	views/partials/bonfires.jade
2015-03-21 16:36:35 -07:00
Michael Q Larson
88e261ccf6 Merge branch 'master' into ux-improvements
Conflicts:
	controllers/resources.js
	controllers/user.js
	seed_data/challenges.json
	views/account/show.jade
	views/coursewares/showHTML.jade
	views/coursewares/showJS.jade
	views/partials/bonfires.jade
2015-03-21 16:25:39 -07:00
Nathan Leniz
fa0462da4c point courseware reference in navbar to challenges 2015-03-21 18:58:14 +09:00
Nathan Leniz
cf44287d7a resolve merge conflict in navbar 2015-03-21 18:53:15 +09:00
Nathan Leniz
b35f5ca59c Working on unifying coursewares view and logic 2015-03-21 13:42:02 +09:00
Nathan Leniz
6aaebbf34e Clean up show all bonfires modal 2015-03-21 12:12:48 +09:00
Nathan Leniz
d48da59aa7 resolve merge conflicts 2015-03-21 12:03:16 +09:00
Michael Q Larson
2f240655a2 update announcements and move announcement modal back into learn-to-code view 2015-03-19 23:24:44 -07:00
Michael Q Larson
56d7301d25 refactor announcement modal and add nodeschool-challenges 2015-03-19 22:34:36 -07:00
Michael Q Larson
f99718daa0 update meta og:image 2015-03-14 01:51:28 -07:00