Commit Graph

3044 Commits

Author SHA1 Message Date
bf0cf4cc7d add the bug, pair and help buttons to challenge views 2015-05-24 00:53:01 -07:00
1949005632 remove modal from field guide and create index view 2015-05-23 18:39:30 -07:00
50039184e9 Merge branch 'master' into staging 2015-05-23 17:46:08 -07:00
ef25bfdcb8 fix some typos and add new cities 2015-05-23 17:05:46 -07:00
27a35e65a7 make a ton of small improvements related to github issues 2015-05-23 16:48:55 -07:00
a3ab32f339 improve get help and add find a pair 2015-05-23 00:53:41 -07:00
f90b96e28c Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-05-22 23:37:01 -07:00
9da9b01607 update challenge map challenge 2015-05-22 23:36:42 -07:00
b626c811d0 Add initial I need help button and slack webhook integration 2015-05-23 02:26:29 -04:00
732f2104fd Merge pull request #476 from QuincyLarson/nonprofit-improvements
Nonprofit improvements
2015-05-22 22:59:52 -04:00
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
b9adbd5976 add jobs page 2015-05-22 19:30:56 -07:00
2e46777f8e add simply hired page 2015-05-22 12:57:43 -07:00
38f6d62abb fix typo on bonfire 2015-05-22 09:08:21 -07:00
42d48dbcec Fixes email signin from field-guide. Closes #429 2015-05-22 08:59:25 -04:00
8c2df61dea Merge pull request #473 from terakilobyte/staging
E-mail signin from camper news
2015-05-22 08:54:00 -04:00
d4da56fd96 Merge branch 'fix/use-find-one' into staging 2015-05-22 08:52:48 -04:00
a4be01aabb Merge #470 2015-05-22 08:52:03 -04:00
fd8a291ecd Fix import of constantStrings.json in resources controller 2015-05-22 08:39:03 -04:00
96556a4a87 Fix email-signin redirect when logging in from camper news 2015-05-22 08:34:28 -04:00
4ec1b53766 add comic challenge 2015-05-21 23:55:47 -07:00
ce76090367 fix typo 2015-05-21 21:42:45 -07:00
94850e8ca6 update bonfires and mdn links 2015-05-21 18:59:55 -07:00
0d2ac75b76 update cities 2015-05-21 17:21:00 -07:00
b58b725f9d Fix Lint all the controllers
Fix many undefined variables
Fix many unhandled error calls
2015-05-21 11:07:40 -07:00
c5d3aa4bff Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into staging 2015-05-21 09:56:06 -07:00
b848fcb719 Add eslint/babel-eslint/eslint-plugin-react 2015-05-21 09:52:18 -07:00
da19361c85 Merge pull request #468 from sageio/master
fix typo on line 97 of coursewwares.json
2015-05-21 09:33:48 -07:00
92f4c7a41a Use findone in controllers/story
also fixes some linting issues
closes #469
2015-05-21 09:15:16 -07:00
0bd4d350f4 Merge pull request #458 from phoenixstormcrow/phoenixstormcrow-374
Added MDN links to Bonfire 19: Diff Two Arrays
2015-05-21 08:20:13 -07:00
c63a77066d Merge pull request #460 from phoenixstormcrow/phoenixstormcrow-459
removed "white-space: pre-line" rule from pre.wrappable elements to p…
2015-05-21 08:19:04 -07:00
3f690629b0 Fix add missing return
add notes
2015-05-21 00:17:44 -07:00
4ad757ebd5 Merge pull request #466 from terakilobyte/challenge-restructure
Challenge restructure
2015-05-21 00:12:52 -07:00
ff4a239f1d update cities 2015-05-20 22:46:21 -07:00
16f9478c3e Move bonfire view into courseware view folder. Update seed file to exit when finished. 2015-05-21 00:34:51 -04:00
17829b4bd3 reduce user saves, provide callbacks. 2015-05-21 00:08:12 -04:00
ca36f636a8 Migration script written. 2015-05-20 23:35:32 -04:00
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
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
8783683e50 Add MDNlinks to Challenge scheme so they can display on bonfire views. 2015-05-20 22:15:28 -04:00
16ca72f716 Update views for new variable names. Get profile view working. Update challenge map. 2015-05-20 21:50:31 -04:00
76a49e2ec5 update cities 2015-05-20 11:21:42 -07:00
27a14dbf0f Create helper methods in resources. Get map view working. 2015-05-20 13:07:41 -04:00
77ddaa5b3a Add challenge type 5 to all bonfires 2015-05-20 11:13:55 -04:00
81b2661e0e Rename all passedCoursewareHash variables to challengeName in relevant views. 2015-05-20 10:38:31 -04:00
6ba2a7ee9b Rename passed variable coursewareHash to challengeId. 2015-05-20 10:35:09 -04:00
b27d2f0e2f Merge pull request #463 from LumenTeun/github-stylization
Github => GitHub
2015-05-20 10:33:41 -04:00
7b9faabd32 Github => GitHub 2015-05-20 16:29:05 +02:00
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
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