ce84f3eeb1
Fully remove remnant of errant debug statement
2015-04-25 14:36:34 -04:00
a9feb269f6
Remove some debug/console.log statements.
...
Fix allFieldGuideIds method in resources.js to return an array of _ids, not an array of objects.
Field guide controller now correctly completes field guides. Closes #367 .
2015-04-25 12:28:14 -04:00
1539708613
Fix Camper News email notification logic
2015-04-25 16:05:36 +02:00
15ea7f3473
Merge pull request #363 from FreeCodeCamp/root
...
Root
2015-04-24 19:16:43 -04:00
f79834bec9
Greatly increase the speed of sitemap by a factor of at least 10 (Nathan, Quincy, and Berkeley pairing).
2015-04-24 18:57:55 -04:00
096edd553b
Factor out $('title') to a re-usable variable to make the linter happy and remove old database lookup based on old challenge architecture.
2015-04-24 15:53:22 -04:00
79ff3631df
minor eslint cleanup
2015-04-24 13:50:48 -04:00
62df37072d
prevent global "fieldGuide" variable
2015-04-24 13:50:13 -04:00
b3929f693b
Clean up privacy policy routing. Adopt same pattern from courseware/bonfire mongo lookup to fieldguides.
2015-04-24 13:49:32 -04:00
5f6177378f
Clean up more linting errors and split out returns from Mongo.
2015-04-24 13:15:15 -04:00
a8689fec4a
Refactor sitemap function to use async for for easier reasoning. Factor out the user fetch as this was causing a huge blocking operation and eating a massive amount of memory.
2015-04-24 13:13:50 -04:00
bea77c580e
redirect user to bonfires if has completed waypoints but not bonfires gulp
2015-04-24 02:02:02 -07:00
e5e47136ea
make all navbar layouts wide style, redirect logo to challenge map, improve navbar collapse
2015-04-24 01:31:59 -07:00
bf723b522b
start making ux changes
2015-04-23 23:46:58 -07:00
d75a1b5973
Fix for issue #342 : "You can contribute to our field guide here" Page Not Found
2015-04-23 16:29:18 -05:00
92db9e5aba
fix the sitemap
2015-04-23 11:56:37 -07:00
2af8e4bf5c
Merge remote-tracking branch 'upstream/master'
2015-04-22 21:13:21 -04:00
26d84a21e0
fix issues with unauthenticated field guide browsing
2015-04-22 15:50:11 -07:00
36a99d84c0
Fix courseware update points on completion
2015-04-22 18:41:04 -04:00
7cbd8e1c04
merge pr for unique story slugs
2015-04-20 00:28:55 -04:00
8781bc3e63
Accept comment edit pr
2015-04-19 22:22:11 -04:00
f396dad029
Fix upvote button on initial story submission.
2015-04-19 20:28:56 -04:00
08bf658897
Harden camper news and don't expose user object. Upvoting still needs to be looked at.
2015-04-19 03:36:54 -04:00
b2f18a790a
Changed from post to put for since updating not creatings
2015-04-18 11:53:46 -04:00
790a4f941d
Removed alert and added server side check for 10minutes
2015-04-18 02:46:16 -04:00
349dbbc2af
Added functuality to the edit button. Added router to /commets/:id/edit as well as commentEdit method in story js.
2015-04-18 02:40:48 -04:00
7bc2232c01
remove api.js as it is a vestigial hackathon starter controller
2015-04-17 19:27:44 -07:00
d10011acc3
Pull some useful changes from aborted branch
2015-04-16 23:54:26 -07:00
d2fae63310
fix a few minor issues post merge
2015-04-16 23:16:55 -07:00
edefd90268
Fix bug where users could get points for completing the same challenge.
2015-04-17 01:40:32 -04:00
f1acc59f82
Fix bug where users could get points for completing the same challenge.
2015-04-17 01:39:55 -04:00
b9372b9af6
Resolve merge conflicts using Webstorm's merge integration tool. v2
2015-04-17 00:39:48 -04:00
b49d2fd343
Resolve merge conflicts using Webstorm's merge integration tool.
2015-04-17 00:11:13 -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
9fb048183c
finish up adding the slack functionality with a redirect on the chat navbar button
2015-04-08 22:52:14 -07:00
9145e959de
able to use the api upon button click
2015-04-08 22:42:40 -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
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
bd7c5310b1
improve the footer
2015-04-07 00:11:31 -07:00
ef57ec58c2
improve wikis with hotkey and update the flash to allow links
2015-04-05 17:35:08 -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
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
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
1248cde97f
continue work on nonprofit show views
2015-04-01 22:31:08 -07:00
fa74a1b454
got show all nonprofits button working and improved nonprofit show view
2015-03-31 17:38:33 -07:00
2328cc2927
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
...
Conflicts:
controllers/user.js
2015-03-31 15:11:06 -07:00
a60c5eb92c
refactor passport so that emails aren't fired if there are errors in save actions
2015-03-31 15:07:34 -07:00
2bc92924e2
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-31 13:46:49 -07:00
e04470872e
Merge branch 'jameskopacz-patch-261' of https://github.com/jameskopacz/freecodecamp into jameskopacz-jameskopacz-patch-261
...
Conflicts:
controllers/courseware.js
2015-03-31 13:43:58 -07:00
f5d6abdfef
On story submission create unique story URL if slug already exists
2015-03-30 23:14:39 -05: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
cdc5af4194
fix the challenges show all challenges button
2015-03-30 16:30:12 -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
b6da312547
Merge pull request #278 from FreeCodeCamp/accessability
...
Fix some bugs, improver perf of show all bonfires/challenges and add buttons to challenge views
2015-03-30 13:12:56 -07:00
83a9223dcc
respond to @BerkeleyTrue feedback
2015-03-30 13:09:24 -07:00
64c4bfd566
remove a leftover console.log
2015-03-30 12:55:31 -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
5bb084120e
create a styleguide from @brndbr's sample style guide
2015-03-29 17:28:25 -07:00
aa01a896a5
Add show all challenges button to all challenge views and refactor bonfire to use same modal and button ids
2015-03-29 17:09:12 -07:00
f0ae47dcf2
Fix show all bonfire bug where it wouldn't show while unauthenticated; add sr-only class to completed bonfires
2015-03-29 16:47:49 -07:00
43810ccb0c
Merge branch 'ux-improvements' of https://github.com/terakilobyte/freecodecamp into terakilobyte-ux-improvements
...
Conflicts:
controllers/bonfire.js
controllers/resources.js
public/js/main.js
views/bonfire/show.jade
2015-03-29 14:44:49 -07:00
4405defb0f
Merge pull request #275 from storbeck/master
...
Posts completed status when challenge 2 is opened for issue #274
2015-03-29 14:34:13 -07:00
7a27ded5bc
Merge pull request #273 from aldraco/coursewaresErr
...
Coursewares error handling (issue #261 )
2015-03-29 14:32:16 -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
75073e362a
Add errantly removed ramda include
2015-03-29 21:41:29 +09:00
aa2f0e8af8
Change completion event to remove duplicate entries if the user states they paired with themselves
2015-03-29 21:15:18 +09:00
1fc3cffdbf
Add .editorconfig to enforce certain automatic behavior on all editors,
...
Add logic for ziplines and basejumps completion.
2015-03-29 20:49:56 +09:00
f6df15d5e0
merge master in ux-improvements
2015-03-29 19:19:19 +09:00
47d0d8e0da
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-28 23:43:08 -07:00
1b247f97fc
Merge pull request #262 from aldraco/bonfirelinks
...
Bonfire MDN links - Issue #255
2015-03-28 20:34:34 -07:00
64ccae938a
Posts completed status when challenge 2 is opened for issue #274
2015-03-28 17:18:09 -04:00
3e839030ac
Fixed async function
2015-03-28 14:08:51 -04:00
69533424a3
Fixed user.save error callback handler
2015-03-28 14:01:31 -04:00
ca3d46a776
fixed obvious error handlers
2015-03-28 13:53:26 -04:00
ef27fda537
remove references to meeting from announcements and notification modal
2015-03-28 10:14:49 -07:00
65a4c923b2
resolve merge conflicts
2015-03-29 00:51:09 +09:00
6a19dc9bda
Zipline/Basejump view with controller logic to serve. Will have to change based upon json
2015-03-29 00:09:50 +09:00
672df775a2
add a zipline and a base jump to the seed file
2015-03-28 07:47:47 -07:00
9e1a4a1348
Streak display in account/show.jade, refactor courseware.json for error handling and linting
2015-03-28 23:42:07 +09:00
ff94d10aa8
resolve merge conflict, favoring upstream
2015-03-28 17:41:07 +09:00
0a07c1e397
Streaks!
2015-03-28 17:38:11 +09:00
4d3337df32
Merge branch 'ziplines' into ux-improvements
...
Conflicts:
views/coursewares/showJS.jade
2015-03-28 00:24:41 -07:00
a1ffc88b58
add trello and blogger apis back in
2015-03-27 23:30:06 -07:00
e4eb5052c7
intermediary work on ziplines
2015-03-27 23:15:39 -07:00
338d87424c
More work towards unifying timestamps
2015-03-28 12:22:08 +09:00
eb96d2cb02
Resolve merge conflict, using ziplines changes
2015-03-28 12:16:42 +09:00
947b034533
Resolve merge conflict (spacing issue in app.js)
2015-03-28 11:35:14 +09:00
efd7707ac8
Move to Mongoose 4.0, begin implementation of streak
2015-03-28 11:34:12 +09:00
f7f7fb39b9
start refactoring basejumps and ziplines to just be normal challenges, make all timestamps miliseconds
2015-03-27 14:36:17 -07:00
94b6cae3ec
apply Nathan's insights into multistep form'
2015-03-27 12:36:21 -07:00
29e29d5687
Merge remote-tracking branch 'upstream/master' into ux-improvements
2015-03-28 02:51:52 +09:00
c69d919d46
Merge branch 'master' into ux-improvements
2015-03-27 10:28:31 -07:00
683498e62a
remove calls to trello and blogger, camp counselor photos, and update the notice about Saturday's meeting
2015-03-27 00:20:50 -07:00
e78609171d
continue work on the param-based funnel
2015-03-26 23:33:52 -07:00
c17ff59aef
Handle callback errors for user, bonfire, challenges,
...
courseware, and resources controllers
2015-03-26 23:41:06 -05:00
4cad7c1aee
fixed comma error for merge.
2015-03-26 09:53:22 -04:00
d64b5c5718
add progress bar to nonprofit project proposal wizard
2015-03-25 15:25:19 -07:00
e9c6498cdf
Error handling
2015-03-26 02:28:04 +09:00
6e4067ee00
most views are now in place
2015-03-24 22:12:16 -07:00
d4935d44de
add the routes, controller actions and views for the nonprofit wizard
2015-03-24 21:46:42 -07:00
bcec96e427
half way done with the initial views and controllers
2015-03-24 19:08:26 -07:00
83d23ed2a4
Remove sending 500 response to user manually and rely on middleware instead
2015-03-24 18:28:02 +09:00
d0a00428d5
Refactor story.js to use sendStatus instead of status, ensure returning on next(err)
2015-03-24 18:26:02 +09: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
999ba14db7
Fix indenting to 2 spaces, remove most lint errors
2015-03-22 20:20:08 +09:00
fb5e8dc387
Remove debug statement, closes #156 , story decay to 32 hours
2015-03-22 20:11:37 +09:00
31ce7b686a
User will now get a point for posting a story as well as receiving an upvote on a posted story
2015-03-22 20:07:08 +09: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
2dbd59b7f1
Merge branch 'ux-improvements' of https://github.com/FreeCodeCamp/freecodecamp into ux-improvements
...
Conflicts:
controllers/resources.js
views/account/show.jade
views/coursewares/showHTML.jade
views/coursewares/showJS.jade
views/partials/bonfires.jade
2015-03-21 16:36:35 -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
ac511982a4
User facing challenge mentions now point to coursewares, remove completed view from account/show
2015-03-21 18:42:19 +09:00
9cdb2588b4
resolve merge conflict
2015-03-21 17:04:31 +09:00
9c5d9eea23
try shorter decay rate
2015-03-21 00:47:21 -07:00
ec5b3e4b84
Change from 1 billion seconds to 172 million.
2015-03-21 16:41:29 +09:00
bc69233226
Merge pull request #226 from FreeCodeCamp/email-validation
...
fix email validation issue #212
2015-03-21 16:40:03 +09:00
752f4125d4
Change decay rate of hot stories to 48 hours
2015-03-21 16:36:20 +09:00
6ad7c22313
Working on codemirror display issue in html coursewares
2015-03-21 16:34:06 +09:00
a2e2e6bfa2
Improve profile view on devices, store name in completedCoursewares for display in account/show
2015-03-21 15:44:18 +09:00
be91849d20
coursewares properly push timestamps to user object
2015-03-21 14:28:00 +09:00
5e095e8832
Merge remote-tracking branch 'upstream/master' into ux-improvements
2015-03-21 13:42:08 +09:00
b35f5ca59c
Working on unifying coursewares view and logic
2015-03-21 13:42:02 +09:00
d48da59aa7
resolve merge conflicts
2015-03-21 12:03:16 +09:00
2f240655a2
update announcements and move announcement modal back into learn-to-code view
2015-03-19 23:24:44 -07:00
56d7301d25
refactor announcement modal and add nodeschool-challenges
2015-03-19 22:34:36 -07:00
5a15da975f
fix email validation issue #212
2015-03-17 23:18:03 -07:00
3b913be893
handle async flow/errors of profile update
2015-03-17 21:09:54 -07:00
ab14b32d19
middleware using next should specify it in arguments
2015-03-17 20:42:09 -07:00
7b449e7a5b
Add returns to error handlers
...
add missing next to arguments for middleware
2015-03-17 20:39:27 -07:00
9e67ebf3c8
Merge pull request #204 from jameskopacz/jameskopacz-patch-199
...
Dev server crash fix
2015-03-17 20:10:29 -07:00
f1dcb4c373
start fixing the password in scope potential corner case security issue
2015-03-17 17:22:58 -07:00
f144e84310
Merge pull request #214 from MrRenter/upvoteFix
...
Upvote fix
2015-03-17 15:48:15 -07:00
terakilobyte
Maxim Orlov
Quincy Larson
chilltrain
MrRenter
Berkeley Martinez
jameskopacz
Geoff Storbeck
Ashley Drake