Quincy Larson
8981be2dca
add more courseware and a working submit route
2015-05-15 18:43:07 -07:00
Quincy Larson
b574bed0a1
start integrating html css coursewares
2015-05-11 13:43:12 -07:00
Quincy Larson
1033d74ccb
hotfixes for field guide
2015-05-09 23:40:28 -07:00
Quincy Larson
f3646b0aae
give points for upvoting, add facebook profile attribute, improve social profile icons
2015-05-09 16:23:45 -07:00
Quincy Larson
70503528d2
give user a point for submitting to news, remove broken javascript path, remove unnecessary empty js lib
2015-05-09 15:53:01 -07:00
Quincy Larson
c2f0072801
minor tweeks to improve field guide flow
2015-05-09 11:20:17 -07:00
terakilobyte
adaa3cdece
Remove template path, load correct javascript in universal header
2015-05-06 09:10:15 -04:00
terakilobyte
ba78710c82
Go with calculating streaks with fresh data as cached mongo can"t be relied upon
2015-05-05 21:21:13 -04:00
terakilobyte
517c37f633
More fixes to streak calculation
2015-05-05 21:13:46 -04:00
terakilobyte
30c4085d21
Quick fix for longest streak logic
2015-05-05 20:03:27 -04:00
terakilobyte
b73c7eac62
Ensure all bonfires have names in account profile view. Add more aptly names state flag for future user data massaging.
2015-05-05 16:12:53 -04:00
terakilobyte
1b393bb685
Closed #348 .
2015-05-05 15:35:55 -04:00
terakilobyte
d3aaa5a11e
Ensure twit exists in package.json and remove unecessary console statement
2015-05-05 14:24:07 -04:00
terakilobyte
82a1680943
Resolve merge conflicts
2015-05-05 14:18:28 -04:00
Nathan
770e298b65
Merge pull request #419 from QuincyLarson/point-fix
...
add campwide meeting and fix user show points
2015-05-05 12:48:32 -04:00
Quincy Larson
200fa53012
add campwide meeting and fix user show points
2015-05-05 09:22:38 -07:00
Quincy Larson
f53b8fafcb
Merge pull request #413 from terakilobyte/news-mailer-fix
...
News mailer fix
2015-05-04 13:53:03 -07:00
terakilobyte
749ff0cc74
Fix mailer to point to new news route instead of stories
2015-05-03 20:41:35 -04:00
Quincy Larson
289a757401
fix moment and update .gitignore
2015-05-03 16:55:25 -07:00
Quincy Larson
d492afb4f5
Merge branch 'mobile-news'
...
Conflicts:
views/challengeMap/show.jade
2015-05-01 21:54:10 -07:00
Quincy Larson
ec5c542d07
potentially fix the too many redirects issue
2015-05-01 21:32:24 -07:00
Quincy Larson
18d9f06c14
make / path redirect to landing in case of old account issue
2015-05-01 10:18:24 -07:00
Quincy Larson
1ec3ef7433
remove errant console.log
2015-04-30 23:42:46 -07:00
Quincy Larson
19456f2e23
add unsubscribe path
2015-04-30 23:41:40 -07:00
Quincy Larson
fb3a116fff
Merge branch 'master' into mobile-news
...
Conflicts:
controllers/story.js
seed_data/field-guides.json
views/coursewares/showVideo.jade
2015-04-30 19:10:10 -07:00
Quincy Larson
222f9b9a64
fix some of the news functionality
2015-04-30 17:18:08 -07:00
Quincy Larson
cc13b325d6
fix some issues with @terakilobyte and beautify the camper news index view
2015-04-30 14:55:00 -07:00
A. Drake
e77eae2643
Edited per instructions in codepen to let users specify additional screen names
2015-04-29 20:07:38 -04:00
A. Drake
ffa2404993
Added API endpoint for twitter calls to use in codepen. NOTE added tokens to env file
2015-04-29 08:00:57 -04:00
Quincy Larson
35515c2da5
Merge branch 'videos' into pmi
2015-04-28 12:12:20 -07:00
terakilobyte
a8e215c74e
Check everything for undefined in email reply logic for story.js
2015-04-27 20:03:37 -04:00
Quincy Larson
fd456ec9be
make new landing pages and forms for project managers and nonprofits
2015-04-27 16:17:29 -07:00
Quincy Larson
5be9dd2587
gracefully handle original story poster having been deleted in mailer
2015-04-26 23:19:03 -07:00
Quincy Larson
20c2b7a0ac
Merge branch 'maximization-352' of https://github.com/Maximization/freecodecamp into Maximization-maximization-352
2015-04-25 18:17:46 -07:00
terakilobyte
ce84f3eeb1
Fully remove remnant of errant debug statement
2015-04-25 14:36:34 -04:00
terakilobyte
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
Maxim Orlov
1539708613
Fix Camper News email notification logic
2015-04-25 16:05:36 +02:00
Nathan
15ea7f3473
Merge pull request #363 from FreeCodeCamp/root
...
Root
2015-04-24 19:16:43 -04:00
terakilobyte
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
terakilobyte
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
terakilobyte
79ff3631df
minor eslint cleanup
2015-04-24 13:50:48 -04:00
terakilobyte
62df37072d
prevent global "fieldGuide" variable
2015-04-24 13:50:13 -04:00
terakilobyte
b3929f693b
Clean up privacy policy routing. Adopt same pattern from courseware/bonfire mongo lookup to fieldguides.
2015-04-24 13:49:32 -04:00
terakilobyte
5f6177378f
Clean up more linting errors and split out returns from Mongo.
2015-04-24 13:15:15 -04:00
terakilobyte
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
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
e5e47136ea
make all navbar layouts wide style, redirect logo to challenge map, improve navbar collapse
2015-04-24 01:31:59 -07:00
Quincy Larson
bf723b522b
start making ux changes
2015-04-23 23:46:58 -07:00
chilltrain
d75a1b5973
Fix for issue #342 : "You can contribute to our field guide here" Page Not Found
2015-04-23 16:29:18 -05:00
Quincy Larson
92db9e5aba
fix the sitemap
2015-04-23 11:56:37 -07:00
terakilobyte
2af8e4bf5c
Merge remote-tracking branch 'upstream/master'
2015-04-22 21:13:21 -04:00
Quincy Larson
26d84a21e0
fix issues with unauthenticated field guide browsing
2015-04-22 15:50:11 -07:00
terakilobyte
36a99d84c0
Fix courseware update points on completion
2015-04-22 18:41:04 -04:00
terakilobyte
7cbd8e1c04
merge pr for unique story slugs
2015-04-20 00:28:55 -04:00
terakilobyte
8781bc3e63
Accept comment edit pr
2015-04-19 22:22:11 -04:00
terakilobyte
f396dad029
Fix upvote button on initial story submission.
2015-04-19 20:28:56 -04:00
terakilobyte
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
MrRenter
b2f18a790a
Changed from post to put for since updating not creatings
2015-04-18 11:53:46 -04:00
MrRenter
790a4f941d
Removed alert and added server side check for 10minutes
2015-04-18 02:46:16 -04:00
MrRenter
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
Michael Q Larson
7bc2232c01
remove api.js as it is a vestigial hackathon starter controller
2015-04-17 19:27:44 -07:00
Michael Q Larson
d10011acc3
Pull some useful changes from aborted branch
2015-04-16 23:54:26 -07:00
Michael Q Larson
d2fae63310
fix a few minor issues post merge
2015-04-16 23:16:55 -07:00
terakilobyte
edefd90268
Fix bug where users could get points for completing the same challenge.
2015-04-17 01:40:32 -04:00
terakilobyte
f1acc59f82
Fix bug where users could get points for completing the same challenge.
2015-04-17 01:39:55 -04:00
terakilobyte
b9372b9af6
Resolve merge conflicts using Webstorm's merge integration tool. v2
2015-04-17 00:39:48 -04:00
terakilobyte
b49d2fd343
Resolve merge conflicts using Webstorm's merge integration tool.
2015-04-17 00:11:13 -04:00
Michael Q Larson
332d4f1875
refactor story.js mailer and remove some cruft
2015-04-09 17:50:10 -07:00
Michael Q Larson
62cabd56ff
update camper news and chat challenges to have new videos and updated copy
2015-04-09 12:58:30 -07:00
Michael Q Larson
9fb048183c
finish up adding the slack functionality with a redirect on the chat navbar button
2015-04-08 22:52:14 -07:00
Michael Q Larson
9145e959de
able to use the api upon button click
2015-04-08 22:42:40 -07:00
Michael Q Larson
7da6f69cd8
start process of moving wiki over to field guide
2015-04-08 17:18:51 -07:00
Michael Q Larson
73b536de95
update sitemap
2015-04-08 15:05:24 -07:00
Michael Q Larson
29b4e3b970
get seed data seeding and improve application submitted button
2015-04-08 14:57:08 -07:00
Michael Q Larson
c02fafa6a9
add status, turn hours into integer, create a directory view of all nonprofits
2015-04-08 14:36:05 -07:00
Michael Q Larson
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
Michael Q Larson
6242f322d7
still working on passing original author email all the way down the comment chain
2015-04-08 00:30:51 -07:00
Michael Q Larson
1c7d0b11b6
pass the original story URL to all comments for notification email
2015-04-07 23:39:52 -07:00
Michael Q Larson
751d25219e
improve the wiki seed file and add strikethrough to read wikis
2015-04-07 22:33:49 -07:00
Michael Q Larson
bd7c5310b1
improve the footer
2015-04-07 00:11:31 -07:00
Michael Q Larson
ef57ec58c2
improve wikis with hotkey and update the flash to allow links
2015-04-05 17:35:08 -07:00
Michael Q Larson
60fee94574
create infrastructure for advancing through wiki
2015-04-05 16:44:07 -07:00
Michael Q Larson
c8b72499ab
dynamically redirect chat link in navbar
2015-04-05 00:16:23 -07:00
Michael Q Larson
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
Michael Q Larson
c9b4a90f57
more improvements to look of challengeMap
2015-04-03 20:50:27 -07:00
Michael Q Larson
fbeff58477
build a functional challenge map and change navbar links
2015-04-03 20:05:53 -07:00
Michael Q Larson
3cff4e9879
add logic to add campers to nonprofit projects of interest to them
2015-04-02 17:23:45 -07:00
Michael Q Larson
44c5da8f72
improve the streak counter which previously wasn't defaulting to one day
2015-04-02 14:23:56 -07:00
Michael Q Larson
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
Michael Q Larson
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
Michael Q Larson
1248cde97f
continue work on nonprofit show views
2015-04-01 22:31:08 -07:00
Michael Q Larson
fa74a1b454
got show all nonprofits button working and improved nonprofit show view
2015-03-31 17:38:33 -07:00
Michael Q Larson
2328cc2927
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
...
Conflicts:
controllers/user.js
2015-03-31 15:11:06 -07:00
Michael Q Larson
a60c5eb92c
refactor passport so that emails aren't fired if there are errors in save actions
2015-03-31 15:07:34 -07:00
Berkeley Martinez
2bc92924e2
Merge branch 'master' of https://github.com/FreeCodeCamp/freecodecamp
2015-03-31 13:46:49 -07:00
Berkeley Martinez
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
jameskopacz
f5d6abdfef
On story submission create unique story URL if slug already exists
2015-03-30 23:14:39 -05:00
Michael Q Larson
ca404e66e8
close to getting all nonprofits to render
2015-03-30 20:08:29 -07:00
Michael Q Larson
acea52dc1b
make further improvements to wiki and start new show view for nonprofits
2015-03-30 18:02:50 -07:00
Michael Q Larson
cdc5af4194
fix the challenges show all challenges button
2015-03-30 16:30:12 -07:00