gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
2,549 Commits 9 Branches 0 Tags
83a9223dcc95c81fe3ec6ce2cf061522f3f4fbb2
Commit Graph

69 Commits

Author SHA1 Message Date
Michael Q Larson
83a9223dcc respond to @BerkeleyTrue feedback 2015-03-30 13:09:24 -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
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
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
338d87424c More work towards unifying timestamps 2015-03-28 12:22:08 +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
Ashley Drake
4cad7c1aee fixed comma error for merge. 2015-03-26 09:53:22 -04: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
Michael Q Larson
fc1d560a89 start refactoring points into progressTimestamps which is essentially points with timestamps 2015-02-22 18:16:26 -08:00
Nathan Leniz
b5a449cb1c Cross off completed bonfires in list of all bonfires in modal 2015-02-22 17:36:43 +09:00
Nathan Leniz
a197e99b1e Starting bonfires view partial, ajax call works, need to work into view 2015-02-22 16:27:38 +09:00
Michael Q Larson
174ed6122b fix an issue of bonfire not lowercasing input from the user when accepting a pairedWith username 2015-02-20 00:13:07 -08:00
Nathan Leniz
d0c2f6ccca Fixing up more bonfires 2015-02-16 00:03:35 -05:00
Nathan Leniz
b5c0ad9942 Building out new challenge framework to allow controller to determine view type for challenge 2015-02-13 20:55:49 -05:00
Nathan Leniz
e2ab4438f5 Merge branch 'master' into courseware 
Conflicts:
	controllers/bonfire.js
	controllers/resources.json
	views/bonfire/show.jade
 2015-02-06 14:39:16 -05:00
Nathan Leniz
dcb057a175 Fixing routing issue for unfound bonfires 2015-02-06 01:51:54 -05:00
Nathan Leniz
5898de7ab9 Changes to courseware and bonfire controller to handle direction to next challenge if the user has completed all offerings, also show a flash message letting them know why they are being redirected 2015-02-04 23:27:57 -05:00
Michael Q Larson
adfe5588d6 wire in points for courseware and bonfire 2015-02-04 19:39:57 -08:00
Nathan Leniz
d47482fdcc Merge branch 'master' into courseware 2015-02-04 21:28:41 -05:00
Nathan Leniz
26ee23ddf9 Fix for fibonacci challenge, fix routing issue for bonfire lookup 2015-02-04 15:32:31 -05:00
Nathan Leniz
c487ddf18e Cleaning up bonfire.js 2015-02-04 14:59:45 -05:00
Nathan Leniz
9193ba04e0 Fix pathing bug for users who are not logged in and type /bonfires/ 2015-02-04 00:41:25 -05:00
Michael Q Larson
f1000c3189 Merge branch 'master' into courseware 
Conflicts:
	controllers/bonfire.js
	views/layout.jade
 2015-02-02 23:32:46 -08:00
Michael Q Larson
f059bc33d8 add courseware controller and routes 2015-02-01 23:35:27 -08:00
Michael Q Larson
0ee291878a remove term code campers from codebase - replace with camper. Move bulky function from app.js to bonfire.js 2015-02-01 22:39:59 -08:00
Michael Q Larson
afab456ad9 start adding Courseware controllers, routes etc. 2015-02-01 14:22:34 -08:00
Michael Q Larson
68df7b218e update URL on regex match if incomplete url 2015-01-30 17:27:24 -08:00
Michael Q Larson
d7d4727c0f first commit with working iframe pulling data from code editor 2015-01-29 17:01:50 -08:00
Michael Q Larson
2f59dd5e5b improve the tweet button functionality for both bonfire and challenges 2015-01-28 21:00:14 -08:00
Nathan Leniz
9fa0323049 Sequence request for new bonfire to wait until save operation, making bonfire fetch unsolved bonfires at a much faster rate to ensure data sync 2015-01-28 17:17:45 -05:00
Nathan Leniz
7ea08f3074 Add callback to and settimeout functions to prevent race conditions with write 2015-01-28 02:22:12 -05:00
Nathan Leniz
40d52a5a3b BONFIRE READY TO SHIP 2015-01-28 00:59:30 -05:00
Nathan Leniz
4fcca641b6 Adding name to passed variables for generated bonfires 2015-01-27 22:46:18 -05:00
Nathan Leniz
5294462e4c Resolving issue with saving to "paired with" user profile 2015-01-27 22:25:48 -05:00
Nathan Leniz
01bdbd8f4d Finishing up pathing issues, writing user object if they haven't visited in a day 2015-01-27 17:39:53 -05:00
Nathan Leniz
be0cf978f5 Correctly sorting unsolved bonfires 2015-01-27 02:51:59 -05:00
Nathan Leniz
227c938445 massive redesign of user model and the way it interacts with bonfires, successfully returning next bonfire for the user, showing meet bonfire to unauthenticated users 2015-01-27 01:22:02 -05:00
Nathan Leniz
2e5dd6ea73 Strange user behavior, model not updating correctly 2015-01-26 18:28:14 -05:00
Michael Q Larson
f8343d4c13 full layout now works. refactor files and routes to have more conventional names and redirects where necessary 2015-01-26 11:38:19 -08:00
Nathan Leniz
ead9fe56d1 Fixed bonfire to allow users to enter contractions 2015-01-26 12:30:04 -05:00
Michael Q Larson
c20aa1697c generator now publishes directly to a view where you can interact with your new bonfire 2015-01-25 23:10:05 -08:00
Nathan Leniz
26c041826b Fixed bonfire to not overwrite user entry point but still allow user error by not defining entry point, create web form to give challenge json back, improved layout of bonfire even more 2015-01-25 23:56:04 -05:00
Nathan Leniz
d886a77858 Refactor random verbs, phrases, and compliments so that only the resources controller is concerned with how to fetch them and how to make them randomly. Remove debug statement from bonfire/show.jade 2015-01-25 10:02:41 -05:00
Michael Q Larson
0e63521ee0 refactor verbs, compliments and phrases into resources controller and require them where necessary. Create tutorial bonfire. Clean up existing bonfires. Fix minor ui issues. 2015-01-24 23:03:25 -08:00
Nathan Leniz
3c3dc803c5 Show long/short form instructions based on user input 2015-01-24 20:49:59 -05:00