Commit Graph

48 Commits

Author SHA1 Message Date
terakilobyte
e5a8c27e07 Add emmet functionality to html views 2015-06-06 20:10:47 -04:00
terakilobyte
53a31509e6 Merge branch 'master' of http://github.com/FreeCodeCamp/freecodecamp 2015-06-04 22:36:08 -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
Quincy Larson
d6e09ad1e5 fix the html mobile view to have taller iframe 2015-06-03 15:50:28 -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
Quincy Larson
a9d8992b88 fix if else syntax in Jade and add cities 2015-05-28 16:59:25 -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
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
57fad7d923 proper fix for uncomment html challenge, improved codemirror performance 2015-05-27 15:29:31 -04:00
terakilobyte
79b20d9798 Update copy for uncomment html. Fix iframe view covering up button in narrow width. Make iframe fixed so it's viewable as code editor expands and people scroll down. closes #596, closes #655 2015-05-27 15:15:28 -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
Quincy Larson
4109485887 fixes #528 2015-05-26 09:46:23 -07: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
186d320d01 version updates to force browser fetch so buttons works 2015-05-26 09:14:10 -04:00
Quincy Larson
4e4031c5d4 hotfixes - hide help/pair/bug buttons unless has created slack account 2015-05-26 02:36:29 -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
Quincy Larson
77d3b5be9f finish html, css and bootstrap challenges 2015-05-25 22:46:47 -07:00
Quincy Larson
c121bbe3bb make all directions in all challenge views wrap long stringsgs 2015-05-25 20:28:34 -07:00
Quincy Larson
08837304fd fix unauthenticated challenge bug and hide pair, bug and help buttons when unauthenticated 2015-05-25 18:00:45 -07:00
Quincy Larson
bf0cf4cc7d add the bug, pair and help buttons to challenge views 2015-05-24 00:53:01 -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
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
terakilobyte
81b2661e0e Rename all passedCoursewareHash variables to challengeName in relevant views. 2015-05-20 10:38:31 -04:00
terakilobyte
56bae0ca98 Users can now jump around and continue a linear progression through challenges. Added getstuff for easy debugging 2015-05-20 00:38:25 -04:00
Quincy Larson
4d0017a4d4 bower install jshint and build more coursewares 2015-05-11 23:40:04 -07:00
Quincy Larson
d63b8f01be improve bonfires and js coursewares 2015-05-10 21:59:55 -07:00
Michael Q Larson
840930d967 get bonfire solutions showing up in the view; eliminate a lot of old views in favor of new challenge map 2015-04-05 18:37:58 -07:00
Michael Q Larson
aa01a896a5 Add show all challenges button to all challenge views and refactor bonfire to use same modal and button ids 2015-03-29 17:09:12 -07:00
Nathan Leniz
1fc3cffdbf Add .editorconfig to enforce certain automatic behavior on all editors,
Add logic for ziplines and basejumps completion.
2015-03-29 20:49:56 +09:00
Michael Q Larson
4d3337df32 Merge branch 'ziplines' into ux-improvements
Conflicts:
	views/coursewares/showJS.jade
2015-03-28 00:24:41 -07:00
Michael Q Larson
f7f7fb39b9 start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds 2015-03-27 14:36:17 -07:00
Michael Q Larson
6e0da758e0 finish wiring in buttons and hotkeys 2015-03-22 01:38:04 -07:00
Michael Q Larson
2dbd59b7f1 Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
Conflicts:
	controllers/resources.js
	views/account/show.jade
	views/coursewares/showHTML.jade
	views/coursewares/showJS.jade
	views/partials/bonfires.jade
2015-03-21 16:36:35 -07:00
Nathan Leniz
ac511982a4 User facing challenge mentions now point to coursewares, remove completed view from account/show 2015-03-21 18:42:19 +09:00
Nathan Leniz
d48da59aa7 resolve merge conflicts 2015-03-21 12:03:16 +09:00
Michael Q Larson
f93fe396db hide all codemirror textareas until codemirror can replace them on load 2015-03-09 23:03:17 -07:00
Michael Q Larson
f4fcb565f4 Merge branch 'master' into ux-improvements
Conflicts:
	seed_data/coursewares.json
2015-02-22 18:17:47 -08:00
Michael Q Larson
19e8795055 some minor ux improvements and use nice ghost-style buttons for more information and less information on challenges and bonfires 2015-02-22 17:32:30 -08:00
Nathan Leniz
dc4aa40a32 Add bitly url shortening example to showHTML view 2015-02-23 07:47:43 +09:00
Nathan Leniz
ddf96c2ef2 Add modal popups to all courseware views 2015-02-22 19:35:55 +09:00
Nathan Leniz
3e65298e35 All coursewares list now displays properly, coursewares properly direct to the follow on, courseware controller now properly finds the next courseware 2015-02-22 18:23:50 +09:00
Nathan Leniz
9ac19023d9 Show tests on html view 2015-02-14 18:31:32 -05:00
Nathan Leniz
693b8fbb33 Forward progress, need to resolve script loading timing 2015-02-14 17:28:07 -05:00
Michael Q Larson
fb971ab080 start adding test output to coursewares 2015-02-14 14:09:26 -08:00
Michael Q Larson
a22e472fb2 update the showVideo view 2015-02-13 18:40:39 -08:00