Commit Graph

25375 Commits

Author SHA1 Message Date
Quincy Larson
0bade642a9 fix some aspects of zipline/basejump submission 2015-05-26 13:09:07 -07:00
Jay Hennessy
0365a6590a improved tests for chunky monkey bonfire 2015-05-26 12:47:13 -07:00
terakilobyte
33b98f4054 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-05-26 15:18:41 -04:00
terakilobyte
885dd7e5e6 temporary fix for firefox duplication causing false completion 2015-05-26 15:18:26 -04:00
Quincy Larson
697fff79d5 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	seed_data/challenges/basic-html5-and-css.json
2015-05-26 11:44:45 -07:00
Quincy Larson
7d9ffbaa65 closes #509 2015-05-26 11:44:00 -07:00
Quincy Larson
c078702da4 fixes #492 2015-05-26 11:25:33 -07:00
terakilobyte
40837abeaa Fix conflicts 2015-05-26 13:37:00 -04:00
terakilobyte
15817591d4 Closes #493 2015-05-26 13:33:50 -04:00
Quincy Larson
5c46c552d6 fixes #487 2015-05-26 10:33:29 -07:00
Nathan
30280b0645 Merge pull request #540 from benmcmahon100/patch-4
Quick fix to issue #509
2015-05-26 13:02:46 -04:00
benmcmahon100
01ad03b9d7 Quick fix to issue #509 2015-05-26 17:58:27 +01:00
Quincy Larson
4109485887 fixes #528 2015-05-26 09:46:23 -07:00
Quincy Larson
cb7f33ecea close #539 2015-05-26 09:41:49 -07:00
Quincy Larson
fb59e34419 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-26 09:38:22 -07:00
Quincy Larson
42dfca0f4b closes #533 2015-05-26 09:38:11 -07:00
terakilobyte
4a22da8e6e Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-05-26 12:32:59 -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
Quincy Larson
4115638c9b closes #531 2015-05-26 09:32:32 -07:00
Quincy Larson
2ace13c56d Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-26 09:08:43 -07:00
Quincy Larson
b87e013460 closes #535 2015-05-26 09:08:29 -07:00
terakilobyte
9a7a8bacfc Create user update script to run against db to normalize zipline and basejumps for display 2015-05-26 11:49:09 -04:00
terakilobyte
9b8a7cdd49 Fix display of zipline/basejump completion in account view for new solutions. 2015-05-26 11:30:06 -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
267897ca5a temporarily disable help button on bonfires 2015-05-26 10:25:20 -04:00
terakilobyte
751fff3408 Temporarily disabled help button in showHTML view as it is absolutely destroying slack #help chatroom 2015-05-26 10:05:37 -04:00
terakilobyte
24f4648760 improve regex matching in challenge controller 2015-05-26 10:01:52 -04:00
terakilobyte
3078fa8104 Update chat link, fix 404 for ziplines and basejumps 2015-05-26 09:57:40 -04:00
terakilobyte
081a76d0d6 Remove more unnecessary variables from map show view. 2015-05-26 09:16:25 -04:00
terakilobyte
186d320d01 version updates to force browser fetch so buttons works 2015-05-26 09:14:10 -04:00
terakilobyte
6b7ede6e1e Update tests for smallest common multiple, this closes #507 2015-05-26 08:44:01 -04:00
terakilobyte
8607a9b551 rename drop it like its hot bonfire, closes #507 2015-05-26 08:40:22 -04:00
terakilobyte
9e9e28dc57 Don't relative link to zipline and basejump solutions. 2015-05-26 08:34:38 -04:00
terakilobyte
f15d7daa2e Fix for old challenge names in account view so linking still works. 2015-05-26 08:32:17 -04:00
Quincy Larson
4e4031c5d4 hotfixes - hide help/pair/bug buttons unless has created slack account 2015-05-26 02:36:29 -07:00
Quincy Larson
4e76d3b8a0 add changelog video 2015-05-26 01:45:03 -07:00
Quincy Larson
3a41be9e55 revert breaking changes to field guide controller 2015-05-26 01:36:37 -07:00
Quincy Larson
cf6232192f Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-26 00:33:25 -07:00
Quincy Larson
7581ed9b30 quick challenge hot fixes 2015-05-26 00:33:13 -07:00
terakilobyte
6b9044febd Add migration middleware to map route 2015-05-26 03:17:50 -04:00
Quincy Larson
4991d2c07d Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp 2015-05-25 23:40:55 -07:00
Quincy Larson
c4e8c03cef hotfoot for missing challenge type, plus new cities 2015-05-25 23:40:15 -07: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
dc670055de Bug fix for headers 2015-05-26 02:17:24 -04:00
Quincy Larson
8ace7e4393 Merge branch 'master' into staging 2015-05-25 23:13:04 -07:00
Nathan
6b2abe6e0c Merge pull request #486 from FreeCodeCamp/staging
merge new curriculum, help/pair/bug functionality, jobs page
2015-05-26 02:00:38 -04:00
Quincy Larson
ea820a684d Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-05-25 22:47:00 -07:00
Quincy Larson
77d3b5be9f finish html, css and bootstrap challenges 2015-05-25 22:46:47 -07:00
terakilobyte
ac304bd59c Fix grammatical error in Mutations instructions 2015-05-26 00:07:10 -04:00