Commit Graph

430 Commits

Author SHA1 Message Date
bf723b522b start making ux changes 2015-04-23 23:46:58 -07:00
f2179c6be6 non-www now points to www 2015-04-22 14:53:58 -07:00
b2f18a790a Changed from post to put for since updating not creatings 2015-04-18 11:53:46 -04:00
349dbbc2af Added functuality to the edit button. Added router to /commets/:id/edit as well as commentEdit method in story js. 2015-04-18 02:40:48 -04:00
d2fae63310 fix a few minor issues post merge 2015-04-16 23:16:55 -07:00
04d9856d4f Remove vomit route. 2015-04-17 01:48:06 -04:00
b9372b9af6 Resolve merge conflicts using Webstorm's merge integration tool. v2 2015-04-17 00:39:48 -04:00
b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
9c67d4988f Add new currying challenge to bonfires and allow inspectlet through protective helmet 2015-04-14 23:04:54 -04:00
18bdefbfac Add in message about twitter authorization being down temporarily to error handler 2015-04-14 16:17:58 -04:00
a6d5721458 Switch from debug to console.log 2015-04-14 15:42:46 -04:00
4fb119ab68 Add debug to app.js to troubleshoot twitter signin in production, unable to repliate locally 2015-04-14 15:36:02 -04:00
9145e959de able to use the api upon button click 2015-04-08 22:42:40 -07:00
7da6f69cd8 start process of moving wiki over to field guide 2015-04-08 17:18:51 -07:00
c02fafa6a9 add status, turn hours into integer, create a directory view of all nonprofits 2015-04-08 14:36:05 -07:00
bd7c5310b1 improve the footer 2015-04-07 00:11:31 -07:00
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
60fee94574 create infrastructure for advancing through wiki 2015-04-05 16:44:07 -07:00
fbeff58477 build a functional challenge map and change navbar links 2015-04-03 20:05:53 -07:00
1248cde97f continue work on nonprofit show views 2015-04-01 22:31:08 -07:00
fa74a1b454 got show all nonprofits button working and improved nonprofit show view 2015-03-31 17:38:33 -07:00
ca404e66e8 close to getting all nonprofits to render 2015-03-30 20:08:29 -07:00
acea52dc1b make further improvements to wiki and start new show view for nonprofits 2015-03-30 18:02:50 -07:00
106a10edca add a modal that allows one to scroll through all wiki pages 2015-03-30 15:55:00 -07:00
23a3e235a7 Update routes for all static pages and leave redirects for existing routes to get to new wiki routes 2015-03-30 15:15:07 -07:00
660214f87e able to seed and view wiki content 2015-03-30 13:48:54 -07:00
5bb084120e create a styleguide from @brndbr's sample style guide 2015-03-29 17:28:25 -07:00
43810ccb0c Merge branch 'ux-improvements' of https://github.com/terakilobyte/freecodecamp into terakilobyte-ux-improvements
Conflicts:
	controllers/bonfire.js
	controllers/resources.js
	public/js/main.js
	views/bonfire/show.jade
2015-03-29 14:44:49 -07:00
f20743428a Merge branch 'jameskopacz-patch-259' of https://github.com/jameskopacz/freecodecamp into ux-improvements 2015-03-29 14:19:12 -07:00
70f812dc78 Merge branch 'master' into ux-improvements
Conflicts:
	controllers/bonfire.js
	controllers/resources.js
	views/bonfire/show.jade
2015-03-29 13:05:39 -07:00
1fc3cffdbf Add .editorconfig to enforce certain automatic behavior on all editors,
Add logic for ziplines and basejumps completion.
2015-03-29 20:49:56 +09:00
f6df15d5e0 merge master in ux-improvements 2015-03-29 19:19:19 +09:00
9e1a4a1348 Streak display in account/show.jade, refactor courseware.json for error handling and linting 2015-03-28 23:42:07 +09:00
a1ffc88b58 add trello and blogger apis back in 2015-03-27 23:30:06 -07:00
d3dee00df5 Stories reply and upvote redirect to signin when user isn't signed in.
Redirects user back to story after signing in.
2015-03-28 00:16:48 -05:00
947b034533 Resolve merge conflict (spacing issue in app.js) 2015-03-28 11:35:14 +09:00
efd7707ac8 Move to Mongoose 4.0, begin implementation of streak 2015-03-28 11:34:12 +09:00
94b6cae3ec apply Nathan's insights into multistep form' 2015-03-27 12:36:21 -07:00
29e29d5687 Merge remote-tracking branch 'upstream/master' into ux-improvements 2015-03-28 02:51:52 +09:00
c69d919d46 Merge branch 'master' into ux-improvements 2015-03-27 10:28:31 -07:00
e915e74b8d Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-27 00:21:00 -07:00
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
e78609171d continue work on the param-based funnel 2015-03-26 23:33:52 -07:00
d64b5c5718 add progress bar to nonprofit project proposal wizard 2015-03-25 15:25:19 -07:00
09b812688e Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
Conflicts:
	app.js
2015-03-25 14:20:34 -07:00
25ae3ec909 resolve merge conflict in app.js while merging in master, get rid of completed-challenge route 2015-03-26 02:32:07 +09:00
6e4067ee00 most views are now in place 2015-03-24 22:12:16 -07:00
d4935d44de add the routes, controller actions and views for the nonprofit wizard 2015-03-24 21:46:42 -07:00
bcec96e427 half way done with the initial views and controllers 2015-03-24 19:08:26 -07:00
2b0cc91754 Add production error handler 2015-03-24 08:03:59 -07:00