Commit Graph

110 Commits (aa44bb2e3fc3f611bc564f74edc8d1c961e1e3ca)

Author SHA1 Message Date
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 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 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 0bade642a9 fix some aspects of zipline/basejump submission 2015-05-26 13:09:07 -07:00
Quincy Larson 4109485887 fixes #528 2015-05-26 09:46:23 -07: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 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 78f813bf18 make remaining directions in all challenge views wrap long strings 2015-05-25 20:28:57 -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 95ab51986e challenges are working when authenticated 2015-05-25 17:52:00 -07:00
terakilobyte f7252be9da Minor view cleanup. Closes #478 2015-05-25 17:30: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 a6cd73d2f1 manually merge improvements to bonfires to challenges/bonfires.json 2015-05-24 15:43:16 -07:00
Quincy Larson 7d1c47b399 remove the tip copy and move it into each bonfire, zipline and basejump 2015-05-24 01:38:39 -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 27a35e65a7 make a ton of small improvements related to github issues 2015-05-23 16:48:55 -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 16f9478c3e Move bonfire view into courseware view folder. Update seed file to exit when finished. 2015-05-21 00:34:51 -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
terakilobyte a174a1c630 Work on challenge flow from block to block, start refactoring the name courseware to challenges in main.js 2015-05-19 22:31:01 -04:00
Quincy Larson 1c6edd6fee improve zipline tips, add additional coursewares. 2015-05-17 23:16:47 -07:00
Quincy Larson 8077d37f11 add coursewares and note to zipline basejump views 2015-05-17 16:57:16 -07: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
Quincy Larson fb3a116fff Merge branch 'master' into mobile-news
Conflicts:
	controllers/story.js
	seed_data/field-guides.json
	views/coursewares/showVideo.jade
2015-04-30 19:10:10 -07:00
Quincy Larson 026f210b6e fix the button hotkeys in the showZiplineOrBasejump view 2015-04-29 22:32:52 -07:00
terakilobyte 9e8a618491 Twitter fixes. 2015-04-28 20:40:02 -04:00
terakilobyte 2487f0421b Fix tweeting in challenges 2015-04-28 19:35:12 -04:00
Quincy Larson 45490f75c4 make checkboxes larger and remove text clicking for completion 2015-04-27 00:10:14 -07:00
terakilobyte 4b2c04dd59 Improve functionality and allow rebinding if user doesn't hit control-enter 2015-04-23 20:14:20 -04:00
terakilobyte 98785184ef Improve functionality and allow rebinding if user doesn't hit control-enter 2015-04-23 19:55:33 -04:00
terakilobyte a4164276de Remove unnecessary unbinds. 2015-04-23 19:39:20 -04:00
terakilobyte 2a00a79ffc Fixes issue #353, add control-enter functionality to display modal as well as submit completion. Added bonus is to remove event listener. 2015-04-23 19:30:24 -04:00