c9e7b30867
fix privacy policy link and remove redundant field guide entry
2015-05-05 18:31:03 -07:00
52f7dcc96b
Merge remote-tracking branch 'upstream/staging'
...
Conflicts:
views/account/show.jade
2015-05-05 16:41:28 -07:00
f5a7195e42
add deploy a website without code field guide
2015-05-05 16:23:51 -07:00
c305f1f5cd
Fix typo and add tests for Arguments Optional
...
Add tests for the second argument and fix a typo.
2015-05-05 11:49:18 +02:00
714ff14ea8
fix typo in field guide
2015-05-03 22:43:23 -07:00
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
8fbfae9554
further updates to basejumps
2015-04-17 19:05:18 -07:00
b1e92ddcd8
comment out non-twitter auth options and add pintrest clone to basejumps
2015-04-17 19:04:46 -07:00
fe31271ee5
add ziplines, basejumps and node school challenges to coursewares.json
2015-04-17 17:38:30 -07:00
820fbb99c7
finalize the way zipline and basejump challenges will look, fix twitch view
2015-04-17 15:01:08 -07:00
d10011acc3
Pull some useful changes from aborted branch
2015-04-16 23:54:26 -07:00
dbc99eafb6
Update chat link and copy.
2015-04-17 01:41:01 -04:00
b49d2fd343
Resolve merge conflicts using Webstorm's merge integration tool.
2015-04-17 00:11:13 -04:00
56e45ba9dd
resolve merge conflict
2015-04-15 18:35:06 -04:00
d20aa1cf3c
Merge pull request #288 from FreeCodeCamp/resources
...
Create Wiki controller to replace our static pages
2015-04-15 01:03:19 -07:00
d968524c69
attempt to fix wording on seek and destroy bonfire issue #293
2015-04-15 00:59:12 -07:00
993db11189
Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show
2015-04-15 00:12:27 -07:00
22be5b90ba
more improvements to the basejump challenges
2015-04-15 00:12:16 -07:00
255a6b48be
Merge pull request #298 from aldraco/coursewaresErr
...
Issue #277 Fix- coursewares chai-jquery test issue
2015-04-14 23:43:38 -07:00
3748356079
Update user migration script to ensure user model validity.
2015-04-15 00:53:36 -04:00
ddb88643e0
Nathan's updates to the userMigration script'
2015-04-14 21:19:05 -07:00
e033f224bc
fix challenge map to redirect to nonprofits
2015-04-14 20:20:38 -07:00
e0aa084c7a
finish getting field-guide working and improve zipline show view
2015-04-14 20:12:47 -07:00
9c67d4988f
Add new currying challenge to bonfires and allow inspectlet through protective helmet
2015-04-14 23:04:54 -04:00
6b671f7d1c
Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show
2015-04-14 19:39:51 -07:00
d1e4175624
additional work on basejumps
2015-04-14 13:43:10 -07:00
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
77b5265fde
start creating the basejump instructions
2015-04-13 21:56:51 -05:00
324e7fcbd3
Merge remote-tracking branch 'upstream/nonprofit-show' into nonprofit-show
2015-04-13 21:31:02 -04:00
96ac90274d
Update User model to make migration easier and complete user migration script
2015-04-13 21:30:08 -04:00
11548bfcf9
add checkbox cross off effect to challenges and reword pairwise bonfire
2015-04-13 02:41:42 -04:00
83c14cccc4
continue work on user migration
2015-04-13 01:03:26 -04:00
e98f445444
update the challenge sequencing
2015-04-13 00:02:21 -04:00
f85804f270
start writing user migration for challenge completion
2015-04-12 02:07:01 -04:00
332d4f1875
refactor story.js mailer and remove some cruft
2015-04-09 17:50:10 -07:00
62cabd56ff
update camper news and chat challenges to have new videos and updated copy
2015-04-09 12:58:30 -07:00
3b7ea3d9a4
start work on challenge-migraiton
2015-04-08 18:03:06 -07:00
7da6f69cd8
start process of moving wiki over to field guide
2015-04-08 17:18:51 -07:00
29b4e3b970
get seed data seeding and improve application submitted button
2015-04-08 14:57:08 -07:00
c02fafa6a9
add status, turn hours into integer, create a directory view of all nonprofits
2015-04-08 14:36:05 -07:00
751d25219e
improve the wiki seed file and add strikethrough to read wikis
2015-04-07 22:33:49 -07:00
df4c698177
improve the challenge map
2015-04-07 12:45:31 -07:00
bd7c5310b1
improve the footer
2015-04-07 00:11:31 -07:00
407bc99061
Fixed chai-jquery tests for coursewares that were not catching correct entries for color attrs.
2015-04-06 09:54:49 -04:00
9d746f7d49
add zipline and basejump to portfolio view, and bonfires with solutions(not yet writing name to bonfireCompletion record on user
2015-04-05 00:01:51 -07:00
e6272d4c7e
Forgot comma on the end of the new entry to bonfireMDNlinks.js
2015-04-04 12:22:29 -04:00
543c79b67a
Updated from upstream
2015-04-04 12:16:00 -04:00
fa74a1b454
got show all nonprofits button working and improved nonprofit show view
2015-03-31 17:38:33 -07:00
003f6c6c0a
Updated language and added more test cases
2015-03-31 19:07:22 -04:00
f72774d412
minor wording improvement to a zipline.
2015-03-31 13:32:39 -07:00
46d185a503
added 5 new bonfires
2015-03-30 23:27:09 -04:00
ca404e66e8
close to getting all nonprofits to render
2015-03-30 20:08:29 -07:00
acea52dc1b
make further improvements to wiki and start new show view for nonprofits
2015-03-30 18:02:50 -07:00
18a9818200
Merge branch 'master' into nonprofit-show
...
Conflicts:
controllers/challenges.js
controllers/courseware.js
2015-03-30 16:17:04 -07:00
106a10edca
add a modal that allows one to scroll through all wiki pages
2015-03-30 15:55:00 -07:00
23a3e235a7
Update routes for all static pages and leave redirects for existing routes to get to new wiki routes
2015-03-30 15:15:07 -07:00
660214f87e
able to seed and view wiki content
2015-03-30 13:48:54 -07:00
97c978dc7c
Make Basejumps show up properly and get their github routes persisting in the database.
2015-03-29 18:13:04 -07:00
44ffc715de
add nonprofit.json seed data from scrapped nonprofit branch
2015-03-29 15:29:14 -07:00
81ce249dfc
tiny fix for a bonfire
2015-03-29 14:56:13 -07:00
b0099efe6e
updates to javascript waypoints
2015-03-29 14:19:04 -07:00
70f812dc78
Merge branch 'master' into ux-improvements
...
Conflicts:
controllers/bonfire.js
controllers/resources.js
views/bonfire/show.jade
2015-03-29 13:05:39 -07:00
4a805729cf
add javascript waypoints
2015-03-29 12:51:23 -07:00
672df775a2
add a zipline and a base jump to the seed file
2015-03-28 07:47:47 -07:00
4d3337df32
Merge branch 'ziplines' into ux-improvements
...
Conflicts:
views/coursewares/showJS.jade
2015-03-28 00:24:41 -07:00
e4eb5052c7
intermediary work on ziplines
2015-03-27 23:15:39 -07:00
85c996ad2e
Added bonfire links for level 3.
2015-03-26 10:45:33 -04:00
c053069f23
Added bonfire links for level 2.
2015-03-26 10:34:59 -04:00
4cad7c1aee
fixed comma error for merge.
2015-03-26 09:53:22 -04:00
09b812688e
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
...
Conflicts:
app.js
2015-03-25 14:20:34 -07:00
482cc3fa7b
fixed typo for issue #266
2015-03-24 15:58:17 -04:00
c4624b7f20
links added, basic functionality working across pages.
2015-03-24 01:17:21 -04:00
dbc57dd0cb
links iterated through on the page. TODO formatting and adding more data.
2015-03-23 23:55:24 -04:00
0bf68fea5f
Links from database are being passed to the view. TODO create links
2015-03-23 23:20:19 -04:00
f2f8d93f9f
further work on ziplines
2015-03-21 22:49:31 -07:00
91edf73965
start building zipline views and controller
2015-03-21 17:23:13 -07:00
88e261ccf6
Merge branch 'master' into ux-improvements
...
Conflicts:
controllers/resources.js
controllers/user.js
seed_data/challenges.json
views/account/show.jade
views/coursewares/showHTML.jade
views/coursewares/showJS.jade
views/partials/bonfires.jade
2015-03-21 16:25:39 -07:00
2f240655a2
update announcements and move announcement modal back into learn-to-code view
2015-03-19 23:24:44 -07:00
9adc444a31
fix a courseware test
2015-03-10 17:52:48 -07:00
a2aec8d20d
initial commit
2015-03-08 23:20:23 -04:00
bc06c69a7b
update user pictures on page fetch for learn-to-code
2015-03-09 07:59:18 +09:00
8608f48d8c
Delete seed tasks, email signup now defaults a picture
2015-03-09 06:51:47 +09:00
3bd979ad08
Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-08 12:16:35 -07:00
bd81c678f9
Add story limiting for hotStories, not working on recentStories
2015-03-08 20:36:13 +09:00
95f938efdf
Merge pull request #149 from jonboiser/master
...
Fixed expected answer for third test on Pairwise bonfire.
2015-03-07 21:05:51 +09:00
a6cd9876d9
Rewrite description of Pairwise bonfire. Added second test illustrating the no-reuse rule.
2015-03-06 23:39:45 -08:00
89dd38cbac
Fix minor bugs
2015-03-07 03:55:59 +09:00
6910ed0aea
Nesting of comments in view, disabling comment form display button on button click
2015-03-07 01:57:09 +09:00
7e14990698
Merge branch 'news' of https://github.com/FreeCodeCamp/freecodecamp into news
2015-03-05 10:56:31 -08:00
4971d06db2
Merge branch 'master' into news
2015-03-05 10:56:20 -08:00
4c0ff3b5ed
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into news
...
Conflicts:
views/partials/navbar.jade
2015-03-05 10:56:06 -08:00
41442a540f
Need to work on story redirect after submission, fix url link in stories/show
2015-03-05 19:21:26 +09:00
3d9c49b76e
refactor the first challenge to make use of the array atribute we gave it
2015-03-04 22:04:58 -08:00
d8b8373b70
do some refactoring of the camper news views
2015-03-03 19:55:04 -08:00
6ac780e836
Rewire upvote to use post and req.body instead of req.params, add logic on click handler to reject upvotes if the user has already upvoted, coment display now works
2015-03-04 07:15:00 +09:00
3416353baf
remove mention of forum from fcc
2015-03-03 11:31:16 -08:00
52e494407b
Get initial view working, sort out mongo mess with seed file
2015-03-03 19:23:56 +09:00
b7a95ee56f
passing off hacker news clone to Nathan and his pair
2015-03-03 01:41:32 -08:00
130f743dfc
wrap some json notation that Nathan left unwrapped in code tags
2015-03-03 00:22:39 -08:00
e85b91de36
Fixup of bonfires for clarity, thanks to our users
2015-03-03 17:10:33 +09:00
ea9691de1c
Added new bonfire "No repeats please"
2015-03-01 08:58:05 +09:00
43f9a9c30b
Clean up bonfire descriptions
2015-02-28 17:57:58 +09:00
d70fd24583
clean up pairwise
2015-02-28 17:51:23 +09:00
2c27d6d965
Added pairwise bonfire
2015-02-28 17:46:17 +09:00
2d40779a96
Adding missing letters bonfire
2015-02-28 17:33:45 +09:00
df2ba2e486
Rename anagrams to mutations
2015-02-28 17:14:04 +09:00
d896857fd3
Added new anagram bonfire
2015-02-28 17:03:36 +09:00
8acf44ed86
Updated bonfires, added new challenge binary agents
2015-02-26 19:42:47 +09:00
bd6b9b2887
Merge pull request #118 from aldraco/master
...
update description on Union Sort bonfire challenge for clarity
2015-02-26 16:42:47 +09:00
216eae90c6
Updating local branch.
...
merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-02-24 13:11:39 -05:00
d446dbbd53
Updated description for Sorted Union bonfire for clarity.
2015-02-24 13:10:34 -05:00
9ce991b9df
Update bonfire challenge description
...
Clarified the description on the Return Largest Numbers in Arrays challenge.
2015-02-23 21:37:57 -06:00
f4fcb565f4
Merge branch 'master' into ux-improvements
...
Conflicts:
seed_data/coursewares.json
2015-02-22 18:17:47 -08:00
19e8795055
some minor ux improvements and use nice ghost-style buttons for more information and less information on challenges and bonfires
2015-02-22 17:32:30 -08:00
5a68ac5411
Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
2015-02-22 01:27:52 -08:00
36cf4196f5
fix some messed up json
2015-02-22 01:27:27 -08:00
3e65298e35
All coursewares list now displays properly, coursewares properly direct to the follow on, courseware controller now properly finds the next courseware
2015-02-22 18:23:50 +09:00
150226f4cf
add all old challenges to our coursewares.json file after normalization
2015-02-21 22:50:46 -08:00
a087068022
Fix drop it like its hot challenge
2015-02-22 13:55:27 +09:00
ff4fbefc0a
Cleaned up where do I belong challenge
2015-02-22 13:24:26 +09:00
f077a0f333
New bonfire challenge
2015-02-22 06:18:38 +09:00
b700b1dd87
Merge pull request #106 from letalumil/letalumil-bonfires-fixes
...
Fix 'Inventory Update' bonfire. Closes #105
2015-02-17 12:36:15 -08:00
8e209d6bca
start refactoring the learn-to-code view to use ajax
2015-02-16 23:35:02 -08:00
1742be2efa
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-02-16 17:56:13 -08:00
5628b44899
Fix 'Inventory Update' bonfire. Closes #105
2015-02-16 19:36:18 +03:00
9dd1558f1c
update the about page and make it the root
2015-02-15 23:59:03 -08:00
cf941c3666
Fix 'Cash Register' bonfire bug. Closes #103
2015-02-16 10:02:35 +03:00
9774f4fd5d
Merge branch 'master' of https://github.com/freecodecamp/freecodecamp
2015-02-16 00:04:14 -05:00
d0c2f6ccca
Fixing up more bonfires
2015-02-16 00:03:35 -05:00
0df8fd394d
Remove duplicate initialization of bob variable in the 'Make a Person' bonfire
2015-02-16 07:44:06 +03:00
a277305e90
Merge branch 'master' of https://github.com/freecodecamp/freecodecamp
2015-02-15 22:29:32 -05:00
d12e25f250
Update sorted union bonfire description
...
A camper requested more clarification on this challenge. Re-reading it, it was convoluted as to how the returned array should have been ordered.
2015-02-15 20:46:36 -06:00
6b6ffe0ae4
Fix naming of spinal tap case so bonfire can return it
2015-02-15 19:25:57 -05:00
c1115cbc7c
more fixes for boo who
2015-02-15 18:08:11 -05:00
ef6ad60778
Updated infinite redirect on boo who challenge
2015-02-15 17:54:46 -05:00
b93b2af97c
Cleaning up challengeSeed for where-art-though and adding it back into pool of available challenges
2015-02-15 11:57:48 -05:00
0e377c5728
Fix 'Where art thou' bonfire. Fixes #96
2015-02-15 04:54:56 +03:00
a2d66b4b96
Fix 'Slasher Flick' bonfire seed function signature
2015-02-15 04:51:52 +03:00
f0f4e85cb0
Fix 'Chunky Monkey' bonfire EntryPoint typo
2015-02-15 04:50:47 +03:00
3509e8c285
hide javascript and video courseware for now. add link to new screen hero video.
2015-02-14 16:53:54 -08:00
c7b1668dcd
missed a conflict during a merge
2015-02-14 16:30:15 -08:00
5cc5623648
Merge branch 'master' into coderbye
...
Conflicts:
seed_data/bonfires.json
2015-02-14 16:29:34 -08:00
20b37ac470
Clean up meet bonfire
2015-02-14 19:16:18 -05:00
2a32f5f087
minor updates to coursewares.json
2015-02-14 15:50:47 -08:00
fb971ab080
start adding test output to coursewares
2015-02-14 14:09:26 -08:00
31aafd300c
Removing a very buggy challenge
2015-02-14 15:54:51 -05:00
8210cb927e
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp into coderbye
...
Conflicts:
seed_data/challenges.json
2015-02-14 12:32:50 -08:00
5846a61955
Typos
2015-02-13 21:40:02 -08:00
a22e472fb2
update the showVideo view
2015-02-13 18:40:39 -08:00
b5c0ad9942
Building out new challenge framework to allow controller to determine view type for challenge
2015-02-13 20:55:49 -05:00
0eededde36
merge master into coderbye
2015-02-13 16:56:09 -05:00
Quincy Larson
Victor Påhlsson
terakilobyte
Alex Dixon
benmcmahon100
chilltrain
brndnb
Ashley Drake
Geoff Storbeck
piecedigital
Jonathan Boiser
Free Code Camp
letalumil