Commit Graph

120 Commits (5c1d5f4ea686245fdab9545902125106f88b760b)

Author SHA1 Message Date
Quincy Larson 416a866ec0 add step based challenge to framework 2015-09-30 13:26:06 -07:00
Quincy Larson 03675ef0a6 finish QAing basic and intermediate bonfires 2015-09-30 01:33:07 -07:00
Quincy Larson ee9827ea58 fix issues with get-started and remove pair button 2015-09-29 17:59:16 -07:00
Quincy Larson 91efd5940d add facebook sharing to map on completed challenges
remove twitter share from non-bonfire challenges
2015-09-28 17:35:25 -07:00
Quincy Larson 27f231e72f refactor tests to show same message when passing and failing 2015-09-27 23:22:06 -07:00
Quincy Larson 51af4e4b0d Merge branch 'google-cdns' into remove-angular
Conflicts:
	server/boot/user.js
	server/views/account/show.jade
	server/views/account/signin.jade
	server/views/coursewares/showBonfire.jade
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
2015-09-23 09:56:01 -07:00
Berkeley Martinez 2fee89b0e6 fix invisible div blocking run button
bootstrap classes stack on smaller screens if breakpoints are not
met. This fix removes the smaller screen classes that forced divs
that would otherwise stack to instead overlay each other. This is
the cause of the run button being blocks on smaller screens as a
col that should stack to the bottom was instead being pushed to
top.

closes #1466
2015-09-17 12:42:31 -07:00
Berkeley Martinez 38d76ec3bb split fonts into two separate files 2015-09-17 00:06:01 -07:00
Leon Feng 6e53b8701d Replace Google Fonts with locally served fonts 2015-09-17 04:53:33 +08:00
Quincy Larson 118c71e57e fix css issue and use bower instead of files 2015-09-14 14:05:43 -07:00
Quincy Larson e107b0e005 Merge branch 'feature/enlarge-images' of https://github.com/bugron/FreeCodeCamp into bugron-feature/enlarge-images 2015-09-14 13:43:34 -07:00
bugron c6e3c89b7c adds ability to 1-click expand images 2015-09-14 21:10:28 +04:00
Quincy Larson 953df6826b fix merge conflicts 2015-09-14 00:02:42 -07:00
Berkeley Martinez 0791c99945 remove commit garbage 2015-09-09 20:47:46 -07:00
Quincy Larson d02ad70913 Merge pull request #3205 from FreeCodeCamp/feature/ctrl-enter-submit
add ctrl enter press to submit on modal
2015-09-09 20:40:02 -07:00
Quincy Larson c70fe77952 Merge branch 'staging' into unauthenticated-buttons
Conflicts:
	server/views/coursewares/showVideo.jade
	server/views/coursewares/showZiplineOrBasejump.jade
2015-09-09 19:54:13 -07:00
Quincy Larson ee9a2d681f make help, pair, bug buttons accessible to unauthenticated campers 2015-09-09 19:51:24 -07:00
Berkeley Martinez d3e77f1282 add ctrl enter press to submit on modal
this adds the ability for a camper to press ctrl + enter to submit
a challenge while the challenge completion modal is open
2015-09-09 19:33:01 -07:00
Quincy Larson 4d427f8318 simplify modal animations and close #2792 2015-09-09 18:55:20 -07:00
Quincy Larson cfba4edb29 add further code to be QAd after sleeping 2015-09-08 23:48:11 -07:00
bugron 8fd99e3350 removes unnecessary class 2015-09-08 16:30:44 +04:00
Quincy Larson 73ef8b9d2b fix a view bug 2015-09-06 03:12:59 -07:00
Quincy Larson 79a396b9c8 Merge branch 'patch-1' of https://github.com/tcyrus/FreeCodeCamp into staging
Conflicts:
	server/views/coursewares/showHTML.jade
2015-09-04 14:26:56 -07:00
Timothy Cyrus f8a5d0d7ba Update showHTML.jade
Fix Styling issue with Submit Button based on showJS.jade and showBonfire.jade
2015-09-04 14:11:52 -04:00
jameskopacz 70b769cc6a Updated text to "Submit and go to next challenge" 2015-08-30 23:49:21 -05:00
jameskopacz c036e00f53 Updated challenge submit button text from "Submit" to "Go to my next challenge" 2015-08-30 23:17:22 -05:00
Berkeley Martinez 702dbeceab change Run code button to Run tests
Changes run button copy

closes #2846
2015-08-29 09:30:47 -07:00
Berkeley Martinez f0b953eb66 fix typo js challenges view 2015-08-29 01:05:07 -07:00
Berkeley Martinez 376b58cc15 combine sandbox into commonFramework
a @benmcmahon suggestion
2015-08-27 12:37:41 -07:00
Berkeley Martinez 306c441ae7 add revisioning to js/css files to break caching
This moves the location of javascript files, commonFramework,
iFrameScript, sandbox, plugin, and all the less files.
On gulp or gulp build these files are moved and revisioned.
Places where they are references in jade/html are now removed and
replaced with the use of a helper function `rev`. This function will
take the required file and return a string referencing the revisioned
file. This should alleviate the need for hard refreshing and will break
caches when files change, so fixes for firefox caching issue as well.

NOTE: @benmcmahon @quincylarson, This means files will need to be build
on the server in production before doing a server restart/reload
In production: 'npm run build' To build and revision js/css files

`gulp` and `gulp build` will used in development

npm install also needs to be run in production on initial deploy
2015-08-26 23:30:33 -07:00
Berkeley Martinez 39f636ae91 add loader to challenge submit 2015-08-26 15:17:38 -07:00
benmcmahon100 7c3f650521 Bump up cFW version number to ensure eveyone is on te latest version 2015-08-26 22:37:54 +01:00
Berkeley Martinez 2c9ed16b7a fix only submit on user click 2015-08-26 13:09:38 -07:00
benmcmahon100 306551848c Update cFW version no 2015-08-26 20:45:50 +01:00
benmcmahon100 a63d6bd00b Fixed my stupid mistake that almost killed the server again 2015-08-26 20:22:29 +01:00
benmcmahon100 695ad48778 Fixed version number 2015-08-26 12:26:01 +01:00
benmcmahon100 9f9f151a6f Re add init run 2015-08-26 12:24:44 +01:00
benmcmahon100 8cdd49e7f1 Fix caching issue with frameworks 2015-08-26 01:13:17 +01:00
Berkeley Martinez 14d1d1db02 fix left panel jitter jump 2015-08-25 14:49:19 -07:00
benmcmahon100 b1b07a5b9e Fixed major Fudge up with challenges without functions 2015-08-25 22:25:00 +01:00
benmcmahon100 14cc6a7cef Final touch up to the framework before merge 2015-08-25 19:28:13 +01:00
benmcmahon100 1477f56f97 Merge of the frameworks: the desolation of the views 2015-08-23 22:26:02 +01:00
benmcmahon100 ede956e1d6 Merge of the frameworks: an unexpected merge 2015-08-23 21:59:29 +01:00
benmcmahon100 38a73e392f Deactivated scroll locking 2015-08-22 00:59:21 +01:00
benmcmahon100 d52a2d8da0 Attempt to sorta fix the scroll locker resetting 2015-08-20 16:48:46 +01:00
Quincy Larson 538e48e237 start updating showZiplineOrBasejump view to function post-angular 2015-08-19 17:56:44 -07:00
Quincy Larson 23b7c4f20f remove difficulty from bonfires to make things look more consistent 2015-08-19 17:56:14 -07:00
benmcmahon100 fe102bdf51 fix #1840 2015-08-17 14:04:12 +01: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 0a34dcf6c3 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:25:49 +01:00
benmcmahon100 c075eb0116 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:24:16 +01:00
benmcmahon100 f60bfd5da1 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:22:02 +01:00
benmcmahon100 aef867cc69 Added extra regex moving on to fix scroller without those new images 2015-08-01 20:20:19 +01:00
benmcmahon100 abfab7389b Added the scrolling editor 2015-08-01 19:55:40 +01:00
Quincy Larson 2547868854 fix storage and reset functionality for js and html challenge views 2015-07-31 13:37:06 -07:00
Quincy Larson 8072a4b7f2 fix modal closing a on showJS view 2015-07-10 10:12:53 -07:00
Quincy Larson db324186da update showjs view 2015-07-05 17:15:54 -07:00
benmcmahon100 71ea26ab96 Implemented scroll-locker 2015-07-02 21:32:20 +01:00
benmcmahon100 8bed9fa7d7 Implemented scroll-locker 2015-07-02 21:31:59 +01:00
benmcmahon100 0a59bd5cfb Implemented scroll-locker 2015-07-02 21:31:28 +01:00
Quincy Larson 7e2d5c91e2 minor ui improvements 2015-06-26 01:28:02 -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
Quincy Larson a0f4f91ec1 remove slack completely and update help and pair actions 2015-06-20 18:40:43 -07:00
Quincy Larson ccc29b7fcb improve upon @lemonyandrew pull request 2015-06-19 17:26:04 -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 0a8356e50f Configure production to run in https 2015-06-16 14:30:16 -04: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
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 d9c3251f94 Begin shaping codebase for loopback migration. 2015-06-01 18:30:43 -04:00