Quincy Larson
dac45382e2
Merge branch 'master' into videos
...
Conflicts:
app.js
2015-04-26 22:52:06 -07:00
Quincy Larson
c50ce70749
minor updates to coursewares and field guides
2015-04-26 12:46:48 -07:00
Quincy Larson
941d261b7c
remove console.log statements, improve coursewares.json
2015-04-25 12:12:26 -07:00
terakilobyte
7c8e5e60f4
Modification to script.
2015-04-25 12:44:34 -04:00
terakilobyte
2fce595e89
Add story cleanup script to ensure all story links are proper.
2015-04-25 12:40:07 -04:00
Quincy Larson
e49c9ca87e
make some improvements to the field guide articles and move the bonfire styleguide into field guides
2015-04-24 21:30:22 -07:00
Quincy Larson
252f955285
Merge pull request #360 from benmcmahon100/patch-1
...
slight tidy and example
2015-04-24 20:58:32 -07:00
Nathan
15ea7f3473
Merge pull request #363 from FreeCodeCamp/root
...
Root
2015-04-24 19:16:43 -04:00
Quincy Larson
8c10f4efcc
make improvements to coursewares.json
2015-04-24 13:57:50 -07:00
terakilobyte
eaf81fd3f7
Closes #333
2015-04-24 16:04:25 -04:00
benmcmahon100
a6d5aa05d0
slight tidy and example
...
Replaced one occurrence of gitter with slack and added an example bit torrent client after someone pointed out in the help section that there was not guide to demonstrate how to do so.
2015-04-24 20:48:29 +01:00
Quincy Larson
bea77c580e
redirect user to bonfires if has completed waypoints but not bonfires gulp
2015-04-24 02:02:02 -07:00
Quincy Larson
f049ff8f27
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-04-23 16:18:28 -07:00
Quincy Larson
ac611d61fb
minor copy fix
2015-04-23 16:04:42 -07:00
chilltrain
c2a78b1278
Fix for issue #349 : Zipline Copy Typo
2015-04-23 16:10:08 -05:00
Quincy Larson
26d84a21e0
fix issues with unauthenticated field guide browsing
2015-04-22 15:50:11 -07:00
terakilobyte
f321d7f22f
Merge branch 'master' of heroku.com:freecodecamp
2015-04-22 07:46:20 -04:00
Quincy Larson
97173ccca7
add new challenge videos and update copy
2015-04-22 04:25:44 -07:00
Quincy Larson
34ac36a64a
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-04-21 19:46:08 -07:00
Quincy Larson
2507b08768
archive future coursewares in seed_data file
2015-04-21 19:45:57 -07:00
Nathan
92157ebdff
Merge pull request #311 from FreeCodeCamp/seek-and-destroy
...
Attempt to fix wording on seek and destroy bonfire issue #293
2015-04-21 22:28:14 -04:00
Quincy Larson
95543ace12
update the try mongo challenge
2015-04-20 22:39:01 -07:00
Quincy Larson
50c404d9be
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-04-20 22:34:53 -07:00
Quincy Larson
e245b4d813
remove mongo course for now
2015-04-20 19:11:19 -07:00
Quincy Larson
c6b1bc79d3
make some improvements to our field guides
2015-04-20 18:51:24 -07:00
terakilobyte
7cbd8e1c04
merge pr for unique story slugs
2015-04-20 00:28:55 -04:00
terakilobyte
083cd7d710
Fix json for get 'started with ziplines' ziplines
2015-04-19 21:07:38 -04:00
Quincy Larson
d9ddda6cb9
record videos and add to courseware.json and field-guide.json
2015-04-19 16:28:11 -07:00
Quincy Larson
102550fd0b
update the symmetric difference challenge
2015-04-19 01:18:56 -07:00
Quincy Larson
07becee1c4
further improvements to courseware.json
2015-04-18 17:25:59 -07:00
Michael Q Larson
d31031f92c
continue updating coursewares and field-guide
2015-04-18 17:10:18 -07:00
Michael Q Larson
b671ab9817
move checkboxes to the left of the showVideo view
2015-04-18 15:00:31 -07:00
Michael Q Larson
aacfb86e1f
improve challenge map look
2015-04-18 14:17:10 -07:00
Michael Q Larson
11ece0fda1
fix courseware.json typo and make it easier to click checkboxes
2015-04-17 22:37:13 -07:00
Michael Q Larson
8fbfae9554
further updates to basejumps
2015-04-17 19:05:18 -07:00
Michael Q Larson
b1e92ddcd8
comment out non-twitter auth options and add pintrest clone to basejumps
2015-04-17 19:04:46 -07:00
Michael Q Larson
fe31271ee5
add ziplines, basejumps and node school challenges to coursewares.json
2015-04-17 17:38:30 -07:00
Michael Q Larson
820fbb99c7
finalize the way zipline and basejump challenges will look, fix twitch view
2015-04-17 15:01:08 -07:00
Michael Q Larson
d10011acc3
Pull some useful changes from aborted branch
2015-04-16 23:54:26 -07:00
terakilobyte
dbc99eafb6
Update chat link and copy.
2015-04-17 01:41:01 -04:00
terakilobyte
b49d2fd343
Resolve merge conflicts using Webstorm's merge integration tool.
2015-04-17 00:11:13 -04:00
terakilobyte
56e45ba9dd
resolve merge conflict
2015-04-15 18:35:06 -04:00
Quincy Larson
d20aa1cf3c
Merge pull request #288 from FreeCodeCamp/resources
...
Create Wiki controller to replace our static pages
2015-04-15 01:03:19 -07:00
Michael Q Larson
d968524c69
attempt to fix wording on seek and destroy bonfire issue #293
2015-04-15 00:59:12 -07:00
Michael Q Larson
993db11189
Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show
2015-04-15 00:12:27 -07:00
Michael Q Larson
22be5b90ba
more improvements to the basejump challenges
2015-04-15 00:12:16 -07:00
Quincy Larson
255a6b48be
Merge pull request #298 from aldraco/coursewaresErr
...
Issue #277 Fix- coursewares chai-jquery test issue
2015-04-14 23:43:38 -07:00
terakilobyte
3748356079
Update user migration script to ensure user model validity.
2015-04-15 00:53:36 -04:00
Michael Q Larson
ddb88643e0
Nathan's updates to the userMigration script'
2015-04-14 21:19:05 -07:00
Michael Q Larson
e033f224bc
fix challenge map to redirect to nonprofits
2015-04-14 20:20:38 -07:00
