ce0731df5f
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
server/boot/randomAPIs.js
server/views/coursewares/showBonfire.jade
server/views/partials/navbar.jade
2015-06-21 15:53:16 -07:00
742a49b70d
fix mainjs resetEditor
2015-06-20 22:48:59 -07:00
03ea412b4a
major challenges refactor
...
commented out resetEditor in main
remove heatmap timout
2015-06-20 19:55:07 -07:00
e03d16e6a6
Merge pull request #1003 from Lemony-Andrew/patch-3
...
Auto Save, Removed Stamps +more, done
2015-06-20 18:43:31 -07:00
a0f4f91ec1
remove slack completely and update help and pair actions
2015-06-20 18:40:43 -07:00
883a561d73
finishing touches on calculator
2015-06-19 21:24:04 -07:00
437a564e34
Changed dependency on challenge_key to function
2015-06-19 18:22:57 -07:00
11305c152b
Update coursewaresJSFramework_0.0.6.js
2015-06-19 18:02:49 -07:00
60354d24e6
Auto Save, Removed Stamps +more
...
Removed stamps so code stays stored until code has been reset.
--> Added a feature which returns if the storage has been saved since last edit. *codeStorage.hasSaved()*
--> Changed "localBonfire" to *codeStorage*
2015-06-19 17:47:21 -07:00
ccc29b7fcb
improve upon @lemonyandrew pull request
2015-06-19 17:26:04 -07:00
6078b54393
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-19 16:18:56 -07:00
d5ea05e448
Merge branch 'Lemony-Andrew-master' into staging
...
Conflicts:
server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
0173804e21
updates helmet policies, makes new startup script
2015-06-18 17:08:21 -04:00
0621b8c62b
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-16 13:46:37 -07:00
2e1babb12d
finalize calculator for release
2015-06-16 13:46:24 -07:00
8735f164f8
Remove https from blob code
2015-06-16 16:28:09 -04:00
40b5b05ea4
factor JavaScript and JSON into separate files
2015-06-16 13:03:13 -07:00
810bf9a3f7
force https for blob url in _frame.js. Updates helmet to allow more inspectlet domains.
2015-06-16 15:59:22 -04:00
2cb0a3d717
futher improve calculator ux
2015-06-16 12:32:12 -07:00
308e539e1e
More protocol experimentation
2015-06-16 12:23:49 -04:00
97668120ad
More work to load google fonts
2015-06-16 12:04:26 -04:00
a53114e7b6
Update and rename coursewaresJSFramework_0.0.5.js to coursewaresJSFramework_0.0.6.js
...
Added auto save(to local storage) for any progress. It will set the IDE text to whatever the user last saw within 24 hours.
The auto save happens every 1.5 seconds _after_ someone lifts a key.
2015-06-15 22:47:17 -07:00
23eb74c762
improve ux on calculator clicking
2015-06-15 21:44:19 -07:00
6b909d8f59
start refactoring calculator logic
2015-06-15 18:00:13 -07:00
b6fc2551d9
Merge branch 'interview' into staging
...
Conflicts:
app.js
controllers/challenge.js
seed/future-jquery-ajax-json.json
2015-06-14 01:02:39 -07:00
147f1d1d37
fix user.exists returns an object with property exists
2015-06-10 17:21:57 -07:00
f3b1b5ca0d
remove misc console.logs
2015-06-10 17:14:48 -07:00
9f5ace03dc
fix acls access for user exists remote method
2015-06-10 17:11:32 -07:00
a8494b29da
add user signup through loopback
2015-06-09 16:45:14 -07:00
25e500a457
Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging
2015-06-09 16:49:10 -04:00
61486c2d7c
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
app.js
controllers/fieldGuide.js
controllers/story.js
seed/challenges/basic-html5-and-css.json
seed/challenges/bootstrap.json
seed/field-guides.json
server/views/partials/navbar.jade
views/resources/jobs-form.jade
views/resources/nonprofits-form.jade
views/resources/pmi-acp-agile-project-managers-form.jade
2015-06-09 13:48:29 -07:00
870c80d72d
Alter variable names in testing loop to avoid common collisions. Bump file version to force browser fetch.
2015-06-09 16:46:41 -04:00
0c799ec02f
make bonfire view look like html view
2015-06-07 21:49:14 -07:00
b84d41bcd6
write tests for first 5 jquery challenges
2015-06-07 18:29:00 -07:00
6953cb6347
make the view even more compact
2015-06-06 22:55:24 -07:00
feb0678a46
start shrinking down the views.
2015-06-06 22:51:39 -07:00
7cfca0b5f8
Bump a delay on test runs and show pattern for expect tests
2015-06-06 23:58:27 -04:00
5bcffa3ccb
Add necessary emmet js file
2015-06-06 20:17:35 -04:00
e5a8c27e07
Add emmet functionality to html views
2015-06-06 20:10:47 -04:00
aef35860dc
fix mobile view issue
2015-06-05 22:35:13 -07:00
6e1d5968bc
improve mobile menu
2015-06-05 22:11:30 -07:00
8b7bfb23ab
Update story api to use stories instead of news
2015-06-05 09:07:46 -04:00
53a31509e6
Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp
2015-06-04 22:36:08 -04:00
f002e7c3f7
Always output tests in the order ran ignoring success or failure. Bump version numbers of framework files to force fresh browser fetches.
2015-06-04 22:35:42 -04:00
cfb5f06cdf
Use strings for challengeMap
...
fixes switch when numbers are strings
2015-06-04 13:28:35 -07:00
3654bb7e6f
change _id to id everywhere that seems relevant to loopback
2015-06-04 13:20:42 -07:00
b2aafd89e7
flatten user object references throughout controllers and views
2015-06-04 12:54:41 -07:00
79e90c82a8
close issues by updating json files
2015-06-04 01:01:48 -07:00
ee1f336475
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
...
Conflicts:
public/css/main.less
2015-06-04 00:22:16 -07:00
d6f1565e19
changed z-index of iframe-croll class to 1
2015-06-03 23:04:43 -04:00
Quincy Larson
Berkeley Martinez
Andrew Cay
terakilobyte
Charles Treece