d492afb4f5
Merge branch 'mobile-news'
...
Conflicts:
views/challengeMap/show.jade
2015-05-01 21:54:10 -07:00
ec5c542d07
potentially fix the too many redirects issue
2015-05-01 21:32:24 -07:00
18d9f06c14
make / path redirect to landing in case of old account issue
2015-05-01 10:18:24 -07:00
1ec3ef7433
remove errant console.log
2015-04-30 23:42:46 -07:00
19456f2e23
add unsubscribe path
2015-04-30 23:41:40 -07:00
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
222f9b9a64
fix some of the news functionality
2015-04-30 17:18:08 -07:00
cc13b325d6
fix some issues with @terakilobyte and beautify the camper news index view
2015-04-30 14:55:00 -07:00
35515c2da5
Merge branch 'videos' into pmi
2015-04-28 12:12:20 -07:00
a8e215c74e
Check everything for undefined in email reply logic for story.js
2015-04-27 20:03:37 -04:00
fd456ec9be
make new landing pages and forms for project managers and nonprofits
2015-04-27 16:17:29 -07:00
5be9dd2587
gracefully handle original story poster having been deleted in mailer
2015-04-26 23:19:03 -07:00
20c2b7a0ac
Merge branch 'maximization-352' of https://github.com/Maximization/freecodecamp into Maximization-maximization-352
2015-04-25 18:17:46 -07:00
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
Quincy Larson
terakilobyte
Maxim Orlov
chilltrain
MrRenter