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 |
|
Michael Q Larson
|
e0aa084c7a
|
finish getting field-guide working and improve zipline show view
|
2015-04-14 20:12:47 -07:00 |
|
terakilobyte
|
9c67d4988f
|
Add new currying challenge to bonfires and allow inspectlet through protective helmet
|
2015-04-14 23:04:54 -04:00 |
|
Michael Q Larson
|
6b671f7d1c
|
Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show
|
2015-04-14 19:39:51 -07:00 |
|
Michael Q Larson
|
d1e4175624
|
additional work on basejumps
|
2015-04-14 13:43:10 -07:00 |
brndnb
|
7912dc722d
|
Update bonfire challenge in courseware to encourage people not to try to complete all bonfires back to back, and not to worry if new bonfires are added.
|
2015-04-14 11:15:06 -04:00 |
|
Michael Q Larson
|
77b5265fde
|
start creating the basejump instructions
|
2015-04-13 21:56:51 -05:00 |
|
brndnb
|
324e7fcbd3
|
Merge remote-tracking branch 'upstream/nonprofit-show' into nonprofit-show
|
2015-04-13 21:31:02 -04:00 |
|
brndnb
|
96ac90274d
|
Update User model to make migration easier and complete user migration script
|
2015-04-13 21:30:08 -04:00 |
|
Michael Q Larson
|
11548bfcf9
|
add checkbox cross off effect to challenges and reword pairwise bonfire
|
2015-04-13 02:41:42 -04:00 |
|
Michael Q Larson
|
83c14cccc4
|
continue work on user migration
|
2015-04-13 01:03:26 -04:00 |
|
Michael Q Larson
|
e98f445444
|
update the challenge sequencing
|
2015-04-13 00:02:21 -04:00 |