Commit Graph

2688 Commits

Author SHA1 Message Date
4fa6c9c65d iFrame cleanup for courseware to get rid of domain error, rename both framework files to force browser fetches to most recent code 2015-02-08 01:12:40 -05:00
2b0428fe51 Fix old redirect in courseware.js 2015-02-08 00:57:37 -05:00
180699adb2 Wiring up analytics for courseware, unifying analytics between coursewares and bonfires, general housekeeping tasks for live push 2015-02-07 21:11:26 -08:00
07c5757538 Code cleanup 2015-02-07 20:43:39 -08:00
f136b22b10 Merge pull request #82 from FreeCodeCamp/courseware
Courseware
2015-02-07 20:30:59 -08:00
11459d3763 Adding floobits ignore information 2015-02-07 23:29:27 -05:00
e425df2b0b Regex matching example for lorem ipsum challenge 2015-02-06 20:25:21 -05:00
4f9474bc3a Add hotkey to go to next challenge/bonfire from completion modal, keep editor in focus on exiting completion modal, allow for courseware to theoretically work in production and development. 2015-02-06 16:55:48 -08:00
319b537e5b add a hotkey for advancing to the next challenge 2015-02-06 15:18:02 -08:00
a1c5d665e6 Merge branch 'courseware' of https://github.com/FreeCodeCamp/freecodecamp into courseware 2015-02-06 13:54:55 -08:00
57db67aa82 update the courseware.json to treat challengeSeed as an array, and update schema and write logic to strinify this array 2015-02-06 12:11:22 -08:00
e2ab4438f5 Merge branch 'master' into courseware
Conflicts:
	controllers/bonfire.js
	controllers/resources.json
	views/bonfire/show.jade
2015-02-06 14:39:16 -05:00
0313fd9751 Fixed routing for unfound coursewares 2015-02-06 14:28:28 -05:00
26417c5483 Merge branch 'courseware' of https://github.com/freecodecamp/freecodecamp into courseware 2015-02-06 12:37:19 -05:00
f627c156fc Tab now inserts two spaces, the path "coursewares/" is no longer broken 2015-02-06 12:36:55 -05:00
e98ff50282 Merge pull request #77 from FreeCodeCamp/brndnb-readme
Update README with mongo server instructions
2015-02-06 09:01:03 -08:00
a487e8c7dd Adding postinstall tasks 2015-02-06 02:01:38 -05:00
6b80460556 Changing forever script to correctly target app.js 2015-02-06 01:59:43 -05:00
ca26c38cc7 Adding forever 2015-02-06 01:54:23 -05:00
dcb057a175 Fixing routing issue for unfound bonfires 2015-02-06 01:51:54 -05:00
2d7f9dc4d0 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-05 22:31:23 -08:00
1c3bb66848 figure out a test for inline styles 2015-02-05 22:31:15 -08:00
ac778b1a5a Switch order of starting mongo server directions 2015-02-06 00:14:41 -06:00
480a8493fc add a bunch of raw material to the coursewares 2015-02-05 21:59:21 -08:00
3ef334ac6f New bonfire challenges added 2015-02-05 23:35:09 -05:00
44aa0f6eee Merge pull request #81 from FreeCodeCamp/brndnb-typo
Fix typo in Bonfire Challenge
2015-02-05 18:06:36 -08:00
471bd575e2 more work on courseware 2015-02-05 16:51:25 -08:00
ea0e3d54d2 Merge branch 'courseware' of https://github.com/FreeCodeCamp/freecodecamp into courseware 2015-02-05 15:34:08 -08:00
f35b1332da start creation of courseware challenges 2015-02-05 15:33:38 -08:00
fc3ae2a623 Fix typo in Bonfire Challenge
Challenge id:  a3566b1109230028080c9345
2015-02-05 16:22:42 -06:00
2314ab91c2 remove comma from resources that was haphazardly left there 2015-02-05 14:02:02 -08:00
6333f3fa7d Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-05 13:56:53 -08:00
bccc37f55d add more compliments and remove image validation from the profile image field 2015-02-05 13:56:44 -08:00
51e8cd410e Merge branch 'master' of https://github.com/freecodecamp/freecodecamp 2015-02-05 10:02:24 -05:00
995ba0b9ed Fixed accessibility issue whereby completion button for bonfires was set to be hidden to screenreaders 2015-02-05 10:01:55 -05:00
c22a38972b Cleaning up generator pages 2015-02-04 23:59:05 -05:00
27d1fde8d9 Update README with mongo server instructions 2015-02-04 22:45:58 -06:00
5898de7ab9 Changes to courseware and bonfire controller to handle direction to next challenge if the user has completed all offerings, also show a flash message letting them know why they are being redirected 2015-02-04 23:27:57 -05:00
adfe5588d6 wire in points for courseware and bonfire 2015-02-04 19:39:57 -08:00
98286e19d1 fix formatting of modals and make them less likely to accidentally wrap the compliment text 2015-02-04 19:00:40 -08:00
7344a74c01 Configuring the modal 2015-02-04 21:35:20 -05:00
d47482fdcc Merge branch 'master' into courseware 2015-02-04 21:28:41 -05:00
9246d7f663 Hooked courseware up to mongo correctly, persisting solutions and configured controller to correctly pass user to next course or return to first if all are completed 2015-02-04 21:28:10 -05:00
70d704d975 Correctly display modal on challenge completion 2015-02-04 20:41:02 -05:00
161582f6c9 courseware testing implemented 2015-02-04 19:59:51 -05:00
0d854de438 Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp 2015-02-04 16:43:11 -08:00
829ace0365 fix a strange edge case on public portfolio pages 2015-02-04 16:42:54 -08:00
1f36c26264 minor changes to landing page 2015-02-04 16:11:48 -08:00
62abc4b3ee update nonprofit project text and add footer back into landing page 2015-02-04 15:26:13 -08:00
f2ad94d7c6 add h1 text to bonfire, challenge and account views 2015-02-04 13:04:51 -08:00