Commit Graph

1272 Commits (a3ab32f339614cae5b9e020e3dff216ff546215a)

Author SHA1 Message Date
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
Quincy Larson 7279559c41 Merge branch 'staging' into nonprofit-improvements
Conflicts:
	controllers/resources.js
	seed_data/bonfires.json
	views/partials/navbar.jade
2015-05-22 19:36:15 -07:00
Quincy Larson b9adbd5976 add jobs page 2015-05-22 19:30:56 -07:00
Quincy Larson 4ec1b53766 add comic challenge 2015-05-21 23:55:47 -07:00
Berkeley Martinez 4ad757ebd5 Merge pull request #466 from terakilobyte/challenge-restructure
Challenge restructure
2015-05-21 00:12:52 -07: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 5ed5d5cd63 Factor out more mentions of courseware and bonfire. Remove extraneous methos from resources.js. Refactor sitemap to use new structure. 2015-05-20 22:45:19 -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 27a14dbf0f Create helper methods in resources. Get map view working. 2015-05-20 13:07:41 -04:00
terakilobyte 81b2661e0e Rename all passedCoursewareHash variables to challengeName in relevant views. 2015-05-20 10:38:31 -04:00
LumenTeun 7b9faabd32 Github => GitHub 2015-05-20 16:29:05 +02: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 48a9bcbb52 Merge branch 'master' into courseware 2015-05-13 13:37:54 -07:00
Quincy Larson 06a92202be hotfix to fix #440 2015-05-11 23:46:38 -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 1033d74ccb hotfixes for field guide 2015-05-09 23:40:28 -07:00
terakilobyte 66914b9b51 Fix layout issue with validation on account page 2015-05-09 19:46:07 -04:00
Quincy Larson f3646b0aae give points for upvoting, add facebook profile attribute, improve social profile icons 2015-05-09 16:23:45 -07:00
Quincy Larson 70503528d2 give user a point for submitting to news, remove broken javascript path, remove unnecessary empty js lib 2015-05-09 15:53:01 -07:00
Quincy Larson b5747c7712 add facebook groups challenge, field guide and footer link 2015-05-09 10:52:02 -07:00
terakilobyte 72339f9183 Set correct mime type in jailed. Set correct types on script imports in bonfire/show. Open helmet up to potentially unsafe levels by allowing "* unsafe-inline" in scriptSrc. 2015-05-06 14:06:10 -04:00
terakilobyte adaa3cdece Remove template path, load correct javascript in universal header 2015-05-06 09:10:15 -04:00
terakilobyte 7b42757c9f Tilde bug 2015-05-05 20:00:14 -04:00
terakilobyte 0c4e6e2762 Linkify the bonfire names in profile view. 2015-05-05 19:53:54 -04:00
Quincy Larson 52f7dcc96b Merge remote-tracking branch 'upstream/staging'
Conflicts:
	views/account/show.jade
2015-05-05 16:41:28 -07:00
Quincy Larson e52c0a1578 Make bonfire sample code wrap properly within responsive div 2015-05-05 16:24:16 -07:00
terakilobyte 1df3b2671b Stylize bonfires in account view 2015-05-05 15:36:56 -04:00
Nathan 770e298b65 Merge pull request #419 from QuincyLarson/point-fix
add campwide meeting and fix user show points
2015-05-05 12:48:32 -04:00
Quincy Larson 200fa53012 add campwide meeting and fix user show points 2015-05-05 09:22:38 -07:00
terakilobyte c170bef08c Hotfix fontawesome for site layout. Update package.json to lock to major version # 2015-05-04 17:37:29 -04:00
Quincy Larson 961096cf49 finish moving away from connectAssets 2015-05-03 16:45:34 -07:00
Quincy Larson 14b99b7b67 finish making cdns gracefully fallback to bower 2015-05-03 16:31:45 -07:00
Quincy Larson a0b7b0b653 heatmap looks better 2015-05-03 14:45:46 -07:00
Quincy Larson 8867fe42d7 get angular working in bower 2015-05-03 14:28:03 -07:00
Quincy Larson c7c11cf7f6 get closer to all bower static assets 2015-05-03 01:37:22 -07:00
Quincy Larson 451e3c75f2 improvements to portfolios and heatmaps 2015-05-03 00:34:46 -07:00
Quincy Larson 6d015212e4 add tips to all bonfire views 2015-05-02 18:56:42 -07:00
Quincy Larson ca189c5d71 remove Saturday Summit announcement modal 2015-05-02 18:52:15 -07:00
Quincy Larson b269ca08a0 fix mobile news-nav 2015-05-02 17:08:07 -07:00
Quincy Larson d65f66e03f fix mobile camper news headlines 2015-05-02 17:06:31 -07:00
Quincy Larson ef48efe8a8 improve sitemap 2015-05-02 16:50:59 -07:00
Quincy Larson 80d8fe7e81 add some alt tags to landing page 2015-05-02 16:11:37 -07:00
Quincy Larson 7cbcf46377 Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
Conflicts:
	app.js
	views/challengeMap/show.jade
2015-05-01 23:12:56 -07:00
Quincy Larson 0f0adac85c stylize search results 2015-05-01 23:05:37 -07:00