gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
10,548 Commits 9 Branches 0 Tags
56c81c86f18ccbe4c635fca129cd6104590dcb51
Commit Graph

212 Commits

Author SHA1 Message Date
Quincy Larson
68962d4d82 further improvements to coursewares and bonfires 2015-05-10 22:33:04 -07:00
Quincy Larson
d63b8f01be improve bonfires and js coursewares 2015-05-10 21:59:55 -07:00
Quincy Larson
70503528d2 give user a point for submitting to news, remove broken javascript path, remove unnecessary empty js lib 2015-05-09 15:53:01 -07:00
terakilobyte
72339f9183 Set correct mime type in jailed. Set correct types on script imports in bonfire/show. Open helmet up to potentially unsafe levels by allowing "* unsafe-inline" in scriptSrc. 2015-05-06 14:06:10 -04:00
Quincy Larson
961096cf49 finish moving away from connectAssets 2015-05-03 16:45:34 -07:00
Quincy Larson
7b61e9daa2 More view beautification for mobile. 2015-04-30 15:19:38 -07:00
terakilobyte
b49d2fd343 Resolve merge conflicts using Webstorm's merge integration tool. 2015-04-17 00:11:13 -04:00
terakilobyte
9c67d4988f Add new currying challenge to bonfires and allow inspectlet through protective helmet 2015-04-14 23:04:54 -04: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
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
09b812688e Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements 
Conflicts:
	app.js
 2015-03-25 14:20:34 -07:00
Berkeley Martinez
f246ef618c Close web worker after completion 
closes #257
 2015-03-22 16:57:10 -07:00
Michael Q Larson
6e0da758e0 finish wiring in buttons and hotkeys 2015-03-22 01:38:04 -07:00
Nathan Leniz
ac511982a4 User facing challenge mentions now point to coursewares, remove completed view from account/show 2015-03-21 18:42:19 +09:00
Nathan Leniz
6ad7c22313 Working on codemirror display issue in html coursewares 2015-03-21 16:34:06 +09:00
Nathan Leniz
bf7d38e080 resolve conflict 2015-03-15 17:08:34 +09:00
Nathan Leniz
c609294e1f force merge conflict for stream viewers 2015-03-15 17:06:05 +09:00
Michael Q Larson
191e38472e make selected indenting and outdenting work on courseware HTML, JS and Bonfires 2015-03-14 15:07:05 -07:00
Michael Q Larson
6a9bfc5ebf remove together.js and add a non-functioning submit form to the index view of news 2015-03-04 23:44:30 -08:00
Nathan Leniz
50b29eb2ba Refactor error message from bonfire 2015-03-01 09:54:03 +09:00
Michael Q Larson
e0c82156a7 refactor layout.jade to have universal head, and customize together.js 2015-02-21 14:49:24 -08:00
Michael Q Larson
e5cfa147fa attempt to use togetherjs 2015-02-21 14:22:46 -08:00
Nathan Leniz
b32f6133db Update bonfire plugin version number to force fresh import on browsers 2015-02-22 06:23:44 +09:00
Nathan Leniz
c852aef1be Ramda upgrade 2015-02-21 11:38:03 +09:00
Nathan Leniz
8a70678a0b Merge branch 'master' into ramda-fire 2015-02-16 00:51:11 -05:00
Nathan Leniz
e3c9e42fce showJS view now shows errors in a pretty format (kinda) 2015-02-14 18:43:45 -05:00
Nathan Leniz
9ac19023d9 Show tests on html view 2015-02-14 18:31:32 -05:00
Nathan Leniz
693b8fbb33 Forward progress, need to resolve script loading timing 2015-02-14 17:28:07 -05:00
Michael Q Larson
fb971ab080 start adding test output to coursewares 2015-02-14 14:09:26 -08: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
a0427b3e18 Fix for bonfire to allow people to prototype objects properly but lose default insertion point injection (i.e. they will get an error if they forget to call their function 2015-02-13 12:14:12 -05:00
Jason Rueckert
54b5870fc9 Merge pull request #91 from phlacin/automaticDating-livepair 
Added Moment.js library and time logic to next Live session
 2015-02-12 20:44:27 -08:00
phlacin
2d447f0bb0 added automatic time logic to live-pair-programming page 2015-02-12 20:31:11 -08:00
Michael Q Larson
f8f0c3454a subtle completed challenge button for courseware and add completionMessage to coursewares 2015-02-12 16:48:35 -08:00
phlacin
6455d80a6e Added Moment.js library and added logic to the time for the next Live session. 2015-02-11 23:08:10 -08:00
Michael Q Larson
a1507a969b Add should and assert to coursewares and write code to test multiple instances of an element for a condition 2015-02-10 22:22:40 -08:00
Nathan Leniz
e7b0cd53ed Adding ramda to bonfire 2015-02-09 14:20:27 -05:00
Nathan Leniz
4fa6c9c65d iFrame cleanup for courseware to get rid of domain error, rename both framework files to force browser fetches to most recent code 2015-02-08 01:12:40 -05:00
Michael Q Larson
180699adb2 Wiring up analytics for courseware, unifying analytics between coursewares and bonfires, general housekeeping tasks for live push 2015-02-07 21:11:26 -08:00
Michael Q Larson
07c5757538 Code cleanup 2015-02-07 20:43:39 -08:00
Michael Q Larson
4f9474bc3a Add hotkey to go to next challenge/bonfire from completion modal, keep editor in focus on exiting completion modal, allow for courseware to theoretically work in production and development. 2015-02-06 16:55:48 -08:00
Michael Q Larson
a1c5d665e6 Merge branch 'courseware' of https://github.com/FreeCodeCamp/freecodecamp into courseware 2015-02-06 13:54:55 -08:00
Michael Q Larson
57db67aa82 update the courseware.json to treat challengeSeed as an array, and update schema and write logic to strinify this array 2015-02-06 12:11:22 -08:00
Nathan Leniz
f627c156fc Tab now inserts two spaces, the path "coursewares/" is no longer broken 2015-02-06 12:36:55 -05:00
Nathan Leniz
d47482fdcc Merge branch 'master' into courseware 2015-02-04 21:28:41 -05:00
Nathan Leniz
9246d7f663 Hooked courseware up to mongo correctly, persisting solutions and configured controller to correctly pass user to next course or return to first if all are completed 2015-02-04 21:28:10 -05:00
Nathan Leniz
70d704d975 Correctly display modal on challenge completion 2015-02-04 20:41:02 -05:00
Nathan Leniz
161582f6c9 courseware testing implemented 2015-02-04 19:59:51 -05:00
Nathan Leniz
e55a85a18c Media queries everywhere to size iframe correctly 2015-02-04 02:29:38 -05:00
Nathan Leniz
d5231fc43f Add default padding to iframe iphone view 2015-02-04 01:57:00 -05:00