gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,555 Commits 9 Branches 0 Tags
543c79b67a7c60bfa3b32ef7c84367abd6da3fcc
Commit Graph

644 Commits

Author SHA1 Message Date
Berkeley Martinez
b6da312547 Merge pull request #278 from FreeCodeCamp/accessability 
Fix some bugs, improver perf of show all bonfires/challenges and add buttons to challenge views
 2015-03-30 13:12:56 -07:00
Michael Q Larson
83a9223dcc respond to @BerkeleyTrue feedback 2015-03-30 13:09:24 -07:00
Michael Q Larson
64c4bfd566 remove a leftover console.log 2015-03-30 12:55:31 -07:00
Michael Q Larson
97c978dc7c Make Basejumps show up properly and get their github routes persisting in the database. 2015-03-29 18:13:04 -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
Michael Q Larson
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
Michael Q Larson
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
Nathan Leniz
75073e362a Add errantly removed ramda include 2015-03-29 21:41:29 +09:00
Nathan Leniz
aa2f0e8af8 Change completion event to remove duplicate entries if the user states they paired with themselves 2015-03-29 21:15:18 +09:00
Nathan Leniz
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
Nathan Leniz
f6df15d5e0 merge master in ux-improvements 2015-03-29 19:19:19 +09:00
Michael Q Larson
47d0d8e0da Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-03-28 23:43:08 -07:00
Quincy Larson
1b247f97fc Merge pull request #262 from aldraco/bonfirelinks 
Bonfire MDN links - Issue #255
 2015-03-28 20:34:34 -07:00
Michael Q Larson
ef27fda537 remove references to meeting from announcements and notification modal 2015-03-28 10:14:49 -07:00
Nathan Leniz
65a4c923b2 resolve merge conflicts 2015-03-29 00:51:09 +09:00
Nathan Leniz
6a19dc9bda Zipline/Basejump view with controller logic to serve. Will have to change based upon json 2015-03-29 00:09:50 +09:00
Michael Q Larson
672df775a2 add a zipline and a base jump to the seed file 2015-03-28 07:47:47 -07:00
Nathan Leniz
9e1a4a1348 Streak display in account/show.jade, refactor courseware.json for error handling and linting 2015-03-28 23:42:07 +09:00
Nathan Leniz
ff94d10aa8 resolve merge conflict, favoring upstream 2015-03-28 17:41:07 +09:00
Nathan Leniz
0a07c1e397 Streaks! 2015-03-28 17:38:11 +09:00
Michael Q Larson
4d3337df32 Merge branch 'ziplines' into ux-improvements 
Conflicts:
	views/coursewares/showJS.jade
 2015-03-28 00:24:41 -07:00
Michael Q Larson
a1ffc88b58 add trello and blogger apis back in 2015-03-27 23:30:06 -07:00
Michael Q Larson
e4eb5052c7 intermediary work on ziplines 2015-03-27 23:15:39 -07:00
Nathan Leniz
338d87424c More work towards unifying timestamps 2015-03-28 12:22:08 +09:00
Nathan Leniz
eb96d2cb02 Resolve merge conflict, using ziplines changes 2015-03-28 12:16:42 +09:00
Nathan Leniz
947b034533 Resolve merge conflict (spacing issue in app.js) 2015-03-28 11:35:14 +09:00
Nathan Leniz
efd7707ac8 Move to Mongoose 4.0, begin implementation of streak 2015-03-28 11:34:12 +09:00
Michael Q Larson
f7f7fb39b9 start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds 2015-03-27 14:36:17 -07:00
Michael Q Larson
94b6cae3ec apply Nathan's insights into multistep form' 2015-03-27 12:36:21 -07:00
Nathan Leniz
29e29d5687 Merge remote-tracking branch 'upstream/master' into ux-improvements 2015-03-28 02:51:52 +09: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
e78609171d continue work on the param-based funnel 2015-03-26 23:33:52 -07:00
Ashley Drake
4cad7c1aee fixed comma error for merge. 2015-03-26 09:53:22 -04:00
Michael Q Larson
d64b5c5718 add progress bar to nonprofit project proposal wizard 2015-03-25 15:25:19 -07:00
Nathan Leniz
e9c6498cdf Error handling 2015-03-26 02:28:04 +09:00
Michael Q Larson
6e4067ee00 most views are now in place 2015-03-24 22:12:16 -07:00
Michael Q Larson
d4935d44de add the routes, controller actions and views for the nonprofit wizard 2015-03-24 21:46:42 -07:00
Michael Q Larson
bcec96e427 half way done with the initial views and controllers 2015-03-24 19:08:26 -07:00
Nathan Leniz
83d23ed2a4 Remove sending 500 response to user manually and rely on middleware instead 2015-03-24 18:28:02 +09:00
Nathan Leniz
d0a00428d5 Refactor story.js to use sendStatus instead of status, ensure returning on next(err) 2015-03-24 18:26:02 +09:00
A. Drake
dbc57dd0cb links iterated through on the page. TODO formatting and adding more data. 2015-03-23 23:55:24 -04:00
A. Drake
0bf68fea5f Links from database are being passed to the view. TODO create links 2015-03-23 23:20:19 -04:00
Nathan Leniz
999ba14db7 Fix indenting to 2 spaces, remove most lint errors 2015-03-22 20:20:08 +09:00
Nathan Leniz
fb5e8dc387 Remove debug statement, closes #156, story decay to 32 hours 2015-03-22 20:11:37 +09:00
Nathan Leniz
31ce7b686a User will now get a point for posting a story as well as receiving an upvote on a posted story 2015-03-22 20:07:08 +09:00
Michael Q Larson
f2f8d93f9f further work on ziplines 2015-03-21 22:49:31 -07:00
Michael Q Larson
91edf73965 start building zipline views and controller 2015-03-21 17:23:13 -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