|
56e45ba9dd
|
resolve merge conflict
|
2015-04-15 18:35:06 -04:00 |
|
|
8119858a24
|
Merge remote-tracking branch 'upstream/nonprofit-show' into nonprofit-show
|
2015-04-15 18:20:40 -04:00 |
|
|
6341b1158b
|
add eslint task to gulp to let us know how we need to write better code
|
2015-04-15 18:20:20 -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 |
|
|
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 |
|
|
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 |
|
|
6b671f7d1c
|
Merge branch 'nonprofit-show' of https://github.com/FreeCodeCamp/freecodecamp into nonprofit-show
|
2015-04-14 19:39:51 -07:00 |
|
|
d7a698f629
|
fix the field guide
|
2015-04-14 19:39:25 -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 |
|
|
9a16ddad0a
|
Merge pull request #290 from storbeck/ux-improvements
added 5 new bonfires
|
2015-04-12 00:02:10 -04:00 |
|
|
332d4f1875
|
refactor story.js mailer and remove some cruft
|
2015-04-09 17:50:10 -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 |
|
|
73b536de95
|
update sitemap
|
2015-04-08 15:05:24 -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 |
|
|
61e07041a7
|
camper news reply emails go out to original story poster and poster of replied-to comment, works with old stories as well
|
2015-04-08 13:16:16 -07:00 |
|
|
889de9c875
|
build other solutions page of links for nonprofits
|
2015-04-08 00:42:33 -07:00 |
|
|
6242f322d7
|
still working on passing original author email all the way down the comment chain
|
2015-04-08 00:30:51 -07:00 |
|
|
1c7d0b11b6
|
pass the original story URL to all comments for notification email
|
2015-04-07 23:39:52 -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 |
|
|
840930d967
|
get bonfire solutions showing up in the view; eliminate a lot of old views in favor of new challenge map
|
2015-04-05 18:37:58 -07:00 |
|
|
ef57ec58c2
|
improve wikis with hotkey and update the flash to allow links
|
2015-04-05 17:35:08 -07:00 |
|
|
32f9a61d5d
|
add hotkey to wiki pages
|
2015-04-05 17:17:31 -07:00 |
|
|
60fee94574
|
create infrastructure for advancing through wiki
|
2015-04-05 16:44:07 -07:00 |
|
|
c8b72499ab
|
dynamically redirect chat link in navbar
|
2015-04-05 00:16:23 -07: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 |
|
|
c9b4a90f57
|
more improvements to look of challengeMap
|
2015-04-03 20:50:27 -07:00 |
|
|
fbeff58477
|
build a functional challenge map and change navbar links
|
2015-04-03 20:05:53 -07:00 |
|
|
3cff4e9879
|
add logic to add campers to nonprofit projects of interest to them
|
2015-04-02 17:23:45 -07:00 |
|
|
4aea12abca
|
make slight modifications to the d3 calendar heatmap on the portfolio page
|
2015-04-02 15:53:38 -07:00 |
|
|
44c5da8f72
|
improve the streak counter which previously wasn't defaulting to one day
|
2015-04-02 14:23:56 -07:00 |
|
|
97e59d4568
|
add verified flag to challenges so we can tell which ziplines and basejumps have been verified
|
2015-04-02 14:07:00 -07:00 |
|
|
36c43cc73a
|
add jQuery to check for broken images and replace them with standard image. Remove gravatar logic.
|
2015-04-02 13:42:15 -07:00 |
|