04ed00f4b7
fix #412
2015-05-02 18:55:27 -07:00
7cbcf46377
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
...
Conflicts:
app.js
views/challengeMap/show.jade
2015-05-01 23:12:56 -07:00
cbdba845df
Resolve merge conflicts
2015-05-02 00:41:38 -04:00
4729ef31b4
Get rid of duplicate field guide for mac keyboard shortcuts
2015-05-01 17:17:12 -04:00
2cb02176a4
more camper news improvements
2015-04-30 15:56:14 -07:00
cc13b325d6
fix some issues with @terakilobyte and beautify the camper news index view
2015-04-30 14:55:00 -07:00
164411e2c4
fix spelling of pinterest
2015-04-30 08:53:48 -07:00
0c1ba64a83
fix copy around git commits on basejumps
2015-04-29 22:13:03 -07:00
19a556af80
add videos to some challenges
2015-04-29 22:05:21 -07:00
a201633e09
improvements and fixes for our field guide. Add 20 day announcement modal
2015-04-29 15:31:49 -07:00
22f8cc2b65
improvements to field guide
2015-04-29 12:30:53 -07:00
ddb93897bc
Revert Mac keyboard shortcuts
2015-04-29 07:16:17 -07:00
7e7cdab867
field guide fixes for @zersiax
2015-04-28 22:54:55 -07:00
38525eb77a
make some minor improvements to the courseware.json file
2015-04-28 16:17:09 -07:00
0f4c13c234
improvements to basejump and zipline copy
2015-04-28 13:25:38 -07:00
5a6e2cc4bd
minor copy edits and improvements to seed files
2015-04-27 00:33:14 -07:00
dac45382e2
Merge branch 'master' into videos
...
Conflicts:
app.js
2015-04-26 22:52:06 -07:00
c50ce70749
minor updates to coursewares and field guides
2015-04-26 12:46:48 -07:00
941d261b7c
remove console.log statements, improve coursewares.json
2015-04-25 12:12:26 -07:00
7c8e5e60f4
Modification to script.
2015-04-25 12:44:34 -04:00
2fce595e89
Add story cleanup script to ensure all story links are proper.
2015-04-25 12:40:07 -04:00
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
252f955285
Merge pull request #360 from benmcmahon100/patch-1
...
slight tidy and example
2015-04-24 20:58:32 -07:00
15ea7f3473
Merge pull request #363 from FreeCodeCamp/root
...
Root
2015-04-24 19:16:43 -04:00
8c10f4efcc
make improvements to coursewares.json
2015-04-24 13:57:50 -07:00
eaf81fd3f7
Closes #333
2015-04-24 16:04:25 -04:00
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
bea77c580e
redirect user to bonfires if has completed waypoints but not bonfires gulp
2015-04-24 02:02:02 -07:00
f049ff8f27
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-04-23 16:18:28 -07:00
ac611d61fb
minor copy fix
2015-04-23 16:04:42 -07:00
c2a78b1278
Fix for issue #349 : Zipline Copy Typo
2015-04-23 16:10:08 -05:00
26d84a21e0
fix issues with unauthenticated field guide browsing
2015-04-22 15:50:11 -07:00
f321d7f22f
Merge branch 'master' of heroku.com:freecodecamp
2015-04-22 07:46:20 -04:00
97173ccca7
add new challenge videos and update copy
2015-04-22 04:25:44 -07:00
34ac36a64a
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-04-21 19:46:08 -07:00
2507b08768
archive future coursewares in seed_data file
2015-04-21 19:45:57 -07:00
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
95543ace12
update the try mongo challenge
2015-04-20 22:39:01 -07:00
50c404d9be
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-04-20 22:34:53 -07:00
e245b4d813
remove mongo course for now
2015-04-20 19:11:19 -07:00
c6b1bc79d3
make some improvements to our field guides
2015-04-20 18:51:24 -07:00
7cbd8e1c04
merge pr for unique story slugs
2015-04-20 00:28:55 -04:00
083cd7d710
Fix json for get 'started with ziplines' ziplines
2015-04-19 21:07:38 -04:00
d9ddda6cb9
record videos and add to courseware.json and field-guide.json
2015-04-19 16:28:11 -07:00
102550fd0b
update the symmetric difference challenge
2015-04-19 01:18:56 -07:00
07becee1c4
further improvements to courseware.json
2015-04-18 17:25:59 -07:00
d31031f92c
continue updating coursewares and field-guide
2015-04-18 17:10:18 -07:00
b671ab9817
move checkboxes to the left of the showVideo view
2015-04-18 15:00:31 -07:00
aacfb86e1f
improve challenge map look
2015-04-18 14:17:10 -07:00
11ece0fda1
fix courseware.json typo and make it easier to click checkboxes
2015-04-17 22:37:13 -07:00
Quincy Larson
terakilobyte
Alex Dixon
benmcmahon100
chilltrain