gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
4,737 Commits 9 Branches 0 Tags
1477f56f97e309ad78ef947a9690ed72d4e46652
Commit Graph

366 Commits

Author SHA1 Message Date
benmcmahon100
ede956e1d6 Merge of the frameworks: an unexpected merge 2015-08-23 21:59:29 +01:00
benmcmahon100
38397fa5f7 Fixed help modal part 3: the modal strikes back 2015-08-22 23:18:10 +01:00
benmcmahon100
c35fde061d Fixed help modal part 2 2015-08-22 22:51:48 +01:00
Quincy Larson
73eb6ec2d1 kind of got the modals working - Ben will finish this 2015-08-22 12:10:08 -07:00
Quincy Larson
cd4823de76 comment out a line that was causing JavaScript errors 2015-08-22 11:42:27 -07:00
Quincy Larson
e9050290eb remove now unnecessary jquery functions 2015-08-22 11:42:11 -07:00
benmcmahon100
d52a2d8da0 Attempt to sorta fix the scroll locker resetting 2015-08-20 16:48:46 +01:00
Quincy Larson
27cac3067a fix the code editor save and refresh actions 2015-08-19 18:30:01 -07:00
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