benmcmahon100
79a0dc8259
This should fix web storage script tag issues
2015-08-20 02:18:11 +01:00
benmcmahon100
9541377a08
Update coursewaresHCJQFramework_0.1.9.js
2015-08-20 02:12:24 +01:00
benmcmahon100
72d7881597
attempt to fix challenge submit part two
2015-08-20 00:04:55 +01:00
benmcmahon100
bdb4c55954
Fixed the stupid modals that i broke
2015-08-19 23:51:02 +01:00
benmcmahon100
d42afc8f10
Fixed local storage for HCJQ framework challenges
2015-08-19 22:31:18 +01:00
benmcmahon100
6de1f49a1f
Temp fix for buttons on modals and bonfires exec on load
2015-08-18 19:21:34 +01:00
benmcmahon100
1bdb40bcaf
The FCC editor will now catch un-closed comments! This can be extended to catch quotes as well if needed. Fix #1839
2015-08-17 15:43:36 +01:00
benmcmahon100
3d42b09bca
Added a helper function to main.js for challenge making
2015-08-14 23:57:43 +01:00
benmcmahon100
6377cc124e
Moved a permanent set css prop from jquery to CSS
2015-08-14 21:48:17 +01:00
benmcmahon100
d784cfcd76
Fix editor height locking features where it was displaying overflow instead of autoing
2015-08-14 21:46:13 +01:00
benmcmahon100
f07f74f523
Fixed a weird error involving RegEx and single quotes
2015-08-14 21:45:25 +01:00
Quincy Larson
0a8855fb11
Merge branch 'OOPF' of github.com:FreeCodeCamp/freecodecamp into staging
2015-08-13 14:36:41 -07:00
Berkeley Martinez
e76b5c8e7f
remove codemirror docs from tracking
2015-08-12 21:01:07 -07:00
Berkeley Martinez
3196824b61
remove unnecessary codemirror modes
2015-08-12 20:49:44 -07:00
Berkeley Martinez
ac5f8b9d9a
remove unneccassry demo dir from codemirror
...
closes #1730
2015-08-12 20:42:37 -07:00
benmcmahon100
7910f0ae2c
Revised scroll-locker layout. iPhone preview causing some styling issues that will require th dynamic resizing of the preview to fix which may impact the quality of the display
2015-08-13 01:20:12 +01:00
benmcmahon100
9df99eb635
Removed new incomplete JS Challenges and moved to OOPF branch.
2015-08-11 15:39:07 +01:00
benmcmahon100
4be714aa97
Generalised RegEx for waypoint-make-it-functional fix https://github.com/FreeCodeCamp/freecodecamp/issues/1476 added comment to show where to block exploits in jsframework
2015-08-03 18:02:26 +01:00
benmcmahon100
2f5b7a7db2
Fix https://github.com/FreeCodeCamp/freecodecamp/issues/1433 blocked tests passing when exploit used
2015-08-03 17:12:48 +01:00
benmcmahon100
dc0f72292a
Remove the backslash escaping from JavaScript challenge output (e.g. \")
2015-08-01 20:45:07 +01:00
benmcmahon100
abfab7389b
Added the scrolling editor
2015-08-01 19:55:40 +01:00
Quincy Larson
feab8b508e
remove field guide cruft and update all field guide links to wiki
2015-07-31 21:55:49 -07:00
Berkeley Martinez
ee8776feb3
removes comments
...
moves upvote to main page
add more info page
closes #955
2015-07-31 19:54:57 -07:00
Quincy Larson
ae38aab8cc
fix issue with codemirror framework and script tag rendering
2015-07-31 16:38:12 -07:00
Quincy Larson
2ccd6e3ee3
fix html view instruction column
2015-07-31 14:36:00 -07:00
Quincy Larson
a0230609f5
fix resultant javascript error on certain pages
2015-07-31 13:38:04 -07:00
Quincy Larson
2547868854
fix storage and reset functionality for js and html challenge views
2015-07-31 13:37:06 -07:00
benmcmahon100
e6694023c6
Emergency check fix for the scroll locker
...
Fix to stop main.js from completely bugging out on any page that isn't challengeType: 0
2015-07-30 20:45:51 +01:00
Berkeley Martinez
c664796165
fix check if scrollOffset exist
2015-07-23 15:49:02 -07:00
Quincy Larson
0301d3bc61
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-02 13:59:22 -07:00
Quincy Larson
4fb3b3e7cc
add more cities and move the bootcamp calculator to field guide entries (still untested).
2015-07-02 13:59:13 -07:00
Quincy Larson
10f53bdd49
Merge pull request #1161 from LumenTeun/grammar
...
Quite a few spelling and grammar fixes
@LumenTeun Thanks for spotting these!
2015-07-02 13:56:11 -07:00
benmcmahon100
5cedb09703
Combined UI Fixes
...
phone overlap bug fix + scroll-locker feature added
2015-07-02 21:27:16 +01:00
LumenTeun
75948c4bc1
Quite a few spelling and grammar fixes
2015-06-30 04:28:43 +02:00
Quincy Larson
378f6da221
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
public/js/main_0.0.3.js
seed/challenges/get-set-for-free-code-camp.json
seed/field-guides.json
2015-06-26 01:08:40 -07:00
Berkeley Martinez
82c96ec0ba
bump main.js version
2015-06-25 23:20:16 -07:00
Berkeley Martinez
13590a1331
refactor rxify stories
...
fixes many bugs
2015-06-25 15:03:46 -07:00
Quincy Larson
1df962bb07
Merge branch 'master' into staging
...
Conflicts:
controllers/resources.js
public/js/main_0.0.2.js
seed/challenges/advanced-bonfires.json
seed/challenges/basic-bonfires.json
seed/challenges/get-set-for-free-code-camp.json
server/views/partials/navbar.jade
2015-06-24 07:19:54 -07:00
Quincy Larson
135047027a
add new field guides and challenges
2015-06-23 11:42:27 -07:00
Quincy Larson
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
Berkeley Martinez
742a49b70d
fix mainjs resetEditor
2015-06-20 22:48:59 -07:00
Berkeley Martinez
03ea412b4a
major challenges refactor
...
commented out resetEditor in main
remove heatmap timout
2015-06-20 19:55:07 -07:00
Quincy Larson
e03d16e6a6
Merge pull request #1003 from Lemony-Andrew/patch-3
...
Auto Save, Removed Stamps +more, done
2015-06-20 18:43:31 -07:00
Quincy Larson
a0f4f91ec1
remove slack completely and update help and pair actions
2015-06-20 18:40:43 -07:00
Quincy Larson
883a561d73
finishing touches on calculator
2015-06-19 21:24:04 -07:00
Andrew Cay
437a564e34
Changed dependency on challenge_key to function
2015-06-19 18:22:57 -07:00
Andrew Cay
11305c152b
Update coursewaresJSFramework_0.0.6.js
2015-06-19 18:02:49 -07:00
Andrew Cay
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
Quincy Larson
ccc29b7fcb
improve upon @lemonyandrew pull request
2015-06-19 17:26:04 -07:00
Quincy Larson
6078b54393
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-19 16:18:56 -07:00
Quincy Larson
d5ea05e448
Merge branch 'Lemony-Andrew-master' into staging
...
Conflicts:
server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
terakilobyte
0173804e21
updates helmet policies, makes new startup script
2015-06-18 17:08:21 -04:00
Quincy Larson
0621b8c62b
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-16 13:46:37 -07:00
Quincy Larson
2e1babb12d
finalize calculator for release
2015-06-16 13:46:24 -07:00
terakilobyte
8735f164f8
Remove https from blob code
2015-06-16 16:28:09 -04:00
Quincy Larson
40b5b05ea4
factor JavaScript and JSON into separate files
2015-06-16 13:03:13 -07:00
terakilobyte
810bf9a3f7
force https for blob url in _frame.js. Updates helmet to allow more inspectlet domains.
2015-06-16 15:59:22 -04:00
terakilobyte
308e539e1e
More protocol experimentation
2015-06-16 12:23:49 -04:00
Andrew Cay
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
Quincy Larson
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
Berkeley Martinez
147f1d1d37
fix user.exists returns an object with property exists
2015-06-10 17:21:57 -07:00
Berkeley Martinez
f3b1b5ca0d
remove misc console.logs
2015-06-10 17:14:48 -07:00
Berkeley Martinez
9f5ace03dc
fix acls access for user exists remote method
2015-06-10 17:11:32 -07:00
Berkeley Martinez
a8494b29da
add user signup through loopback
2015-06-09 16:45:14 -07:00
terakilobyte
25e500a457
Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging
2015-06-09 16:49:10 -04:00
Quincy Larson
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
terakilobyte
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
Quincy Larson
b84d41bcd6
write tests for first 5 jquery challenges
2015-06-07 18:29:00 -07:00
Quincy Larson
6953cb6347
make the view even more compact
2015-06-06 22:55:24 -07:00
terakilobyte
7cfca0b5f8
Bump a delay on test runs and show pattern for expect tests
2015-06-06 23:58:27 -04:00
terakilobyte
5bcffa3ccb
Add necessary emmet js file
2015-06-06 20:17:35 -04:00
terakilobyte
e5a8c27e07
Add emmet functionality to html views
2015-06-06 20:10:47 -04:00
terakilobyte
8b7bfb23ab
Update story api to use stories instead of news
2015-06-05 09:07:46 -04:00
terakilobyte
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
Berkeley Martinez
cfb5f06cdf
Use strings for challengeMap
...
fixes switch when numbers are strings
2015-06-04 13:28:35 -07:00
Quincy Larson
3654bb7e6f
change _id to id everywhere that seems relevant to loopback
2015-06-04 13:20:42 -07:00
Quincy Larson
b2aafd89e7
flatten user object references throughout controllers and views
2015-06-04 12:54:41 -07:00
Quincy Larson
4f45867b6e
move to freecodecamp.slack.com
2015-06-01 16:17:06 -07:00
Quincy Larson
e322b3b7d6
Merge branch 'master' into modals
...
Conflicts:
seed_data/field-guides.json
views/coursewares/showHTML.jade
2015-05-28 17:25:34 -07:00
terakilobyte
193f9d16db
Set a refresh on codemirror instance rather than setting the cursor position. Closes #640
2015-05-28 19:51:42 -04:00
Quincy Larson
8501de396f
finish fixing modals
2015-05-28 16:18:04 -07:00
Quincy Larson
673a617151
create pair, help, bug modals
2015-05-28 14:29:45 -07:00
terakilobyte
131b9ad1b7
bump version numbers to force fresh browser fetch and suppress "editor is not defined". closes #
2015-05-28 14:13:31 -04:00
terakilobyte
718ae04f2f
Add ability to test editor contents. Ensures classes are implemented, closes # 684
2015-05-28 08:26:25 -04:00
terakilobyte
57fad7d923
proper fix for uncomment html challenge, improved codemirror performance
2015-05-27 15:29:31 -04:00
terakilobyte
6a2d365b9a
Update framework version, set cursor to line 15 on load to force full display. Closes #653
2015-05-27 14:40:06 -04:00
terakilobyte
cad39e1b5e
Fixes duplication bug in Firefox
2015-05-27 13:39:37 -04:00
terakilobyte
fa43dd1051
Unbind click handler on next-courseware-button to prevent repeated presses from advancing more than one challenge
2015-05-26 12:32:50 -04:00
terakilobyte
e7c855d72f
Fully disable all help buttons for now, remove post to slack functionality for aventerous campers who enable the buttons through their console
2015-05-26 11:10:10 -04:00
terakilobyte
ff6e11433c
Update bonfire framework to know how to use chai.should()
2015-05-26 10:41:50 -04:00
terakilobyte
186d320d01
version updates to force browser fetch so buttons works
2015-05-26 09:14:10 -04:00
terakilobyte
6ce5ccf449
Rename framework file to force new browser fetching. Update view to remove unused vars
2015-05-26 02:31:10 -04:00
terakilobyte
1c4b40c8e6
Update to bonfires. Successfully completing triggers a save. "Paired with" form field moved to bonfire view. Controller hardened for checking pair as button is no longer disabled for unfound username
2015-05-25 17:27:27 -04:00
Quincy Larson
bf0cf4cc7d
add the bug, pair and help buttons to challenge views
2015-05-24 00:53:01 -07:00
Quincy Larson
1949005632
remove modal from field guide and create index view
2015-05-23 18:39:30 -07:00
Quincy Larson
a3ab32f339
improve get help and add find a pair
2015-05-23 00:53:41 -07:00
terakilobyte
b626c811d0
Add initial I need help button and slack webhook integration
2015-05-23 02:26:29 -04:00
Berkeley Martinez
4ad757ebd5
Merge pull request #466 from terakilobyte/challenge-restructure
...
Challenge restructure
2015-05-21 00:12:52 -07:00
terakilobyte
5e918bdd7c
Remove bonfire and courseware controller, relying on all challenge related logic in challenge.js. Remove bonfire folder. Move necessary JS to coursewares folder and rename.
2015-05-20 22:31:20 -04:00
terakilobyte
16ca72f716
Update views for new variable names. Get profile view working. Update challenge map.
2015-05-20 21:50:31 -04:00