Commit Graph

1129 Commits (7aeceaf97ec8fd8648eb2a036fbbedd74aecfe47)

Author SHA1 Message Date
Quincy Larson cb6f026fd0 more redesign work on challenge views 2016-01-15 04:31:18 -08:00
Quincy Larson bcba082efc start simplifying views 2016-01-15 04:25:27 -08:00
Berkeley Martinez de95f0e0f3 Add back map overview to map page 2016-01-15 04:14:38 -08:00
Berkeley Martinez 0c54adfb07 Add map aside to challenges 2016-01-15 04:14:38 -08:00
Berkeley Martinez b03e71e7c0 Abstract map and showChallenge logic
Rename some legacy naming conventions
Remove logic for waypoint,basejumps, etc...
2016-01-15 04:14:38 -08:00
Berkeley Martinez 5b681bfdfd Re-add btn classes to account page 2016-01-15 04:14:38 -08:00
Quincy Larson 8e71cdd4b8 start working on ghost-only buttons 2016-01-15 04:14:38 -08:00
Quincy Larson c36b8352d2 further build up challengemap 2016-01-15 04:14:38 -08:00
Quincy Larson f410a94b54 Update 2016-01-15 04:10:16 -08:00
Quincy Larson 7f0be44f98 additional cleanup of nonprofit directory 2016-01-15 04:10:16 -08:00
Quincy Larson bf06d0c6a0 Update commit views 2016-01-15 04:10:16 -08:00
Quincy Larson 09b4f1caa2 Update nonprofits structure and remove old directory 2016-01-15 04:10:16 -08:00
Quincy Larson 7eefcb0705 more redesign work on challenge views 2016-01-15 04:10:16 -08:00
Quincy Larson 4101a6c34a start simplifying views 2016-01-15 04:09:57 -08:00
Alister N. Mada 89c64fb376 fix a couple of meme-based compliments 2016-01-15 07:46:54 +07:00
Arsen Melikyan c34e8a7783 Remove unused code 2016-01-13 21:36:21 +04:00
Arsen Melikyan 29682f112b Fixes incorrect showing MDNlinks on challenges 2016-01-13 14:43:38 +04:00
Berkeley Martinez 52fd15284a Add banning to camper news 2016-01-12 22:07:19 -08:00
Quincy Larson 4c9026a354 Merge pull request #6071 from FreeCodeCamp/feature/add-data-science-cert
Add data vis certification
2016-01-11 18:24:39 -06:00
Berkeley Martinez ee0c5c90e0 Fix cert type switch 2016-01-11 16:23:24 -08:00
Berkeley Martinez a7f04cdc11 Add data vis certification 2016-01-11 15:58:37 -08:00
Logan Tegman 4341a3eee2 Update babel to 6.0 2016-01-10 20:21:15 -08:00
Berkeley Martinez 05d34c8e15 Merge pull request #5848 from FreeCodeCamp/fix/hiding-text
Update certificate error messages
2016-01-10 18:22:01 -08:00
Berkeley Martinez f8e06fb2bc Fix spacing issues in privacy page 2016-01-10 18:20:13 -08:00
Berkeley Martinez 7f60af8a3f Fix change links to about 2016-01-10 18:20:13 -08:00
Berkeley Martinez 17eaed7f99 Fix lint errors 2016-01-10 18:20:13 -08:00
Quincy Larson 93ebfd4515 update labs, update about page, create TOS and privacy view 2016-01-10 18:20:13 -08:00
Quincy Larson 6233f66411 update GitHub in use error message copy 2016-01-10 18:20:13 -08:00
Quincy Larson 649cfb72f8 make sync data from GitHub button's text more clear 2016-01-10 18:20:13 -08:00
Quincy Larson 9b4b6a241c fix typo 2016-01-10 19:41:50 -06:00
Logan Tegman 63ee1139da Merge pull request #5960 from FreeCodeCamp/feature/hikes
Add toasts to react app
2016-01-10 14:40:43 -08:00
Berkeley Martinez 2962ee52a0 Remove old debug 2016-01-09 23:23:04 -08:00
Berkeley Martinez e51127ffc7 feature completed challenge can also return json 2016-01-09 20:08:01 -08:00
Robert Richey 0166e9db8c Update news search field placeholder text
Changed placeholder text from 'Search our links' to 'search term or @username'. Tested locally.
2016-01-09 14:13:57 -07:00
Harsha 2b64a97125 fixes no url supplied on successful submission 2016-01-08 14:20:32 -05:00
Berkeley Martinez 9a9421e712 Fix for Vimeo API change 2016-01-07 22:40:51 -08:00
Berkeley Martinez ea574d721e Make document titles work 2016-01-04 14:27:22 -08:00
Berkeley Martinez 22cb610279 Make structure changes to hikes 2016-01-04 14:27:22 -08:00
Berkeley Martinez 3028c891d7 Fix hikes order 2016-01-04 14:27:22 -08:00
Berkeley Martinez cec243b032 [add] Upgrade ThunderCats react 2016-01-04 14:27:22 -08:00
Quincy Larson 3743b8ddf6 update certificate error messages 2016-01-04 02:01:38 -06:00
Dieter Daems dba9654a09 Fix linting errors 2016-01-03 05:48:23 +01:00
SaintPeter 9a18344dad Fix display of Checkpoints
Tested Locally\n\nFixes 5782
2016-01-02 17:43:48 -08:00
Waqas Ahmed abd0edf4b8 Show status on individual completed courseware 2016-01-03 01:07:51 +04:00
SaintPeter b32afaea1b Fix Merge Issue 2016-01-01 21:10:08 -08:00
Rex Schrader 425c027414 Merge pull request #5696 from FreeCodeCamp/fix/add-release-date-to-ziplines
make challenges new and extend to 60 days
2015-12-31 22:37:16 -08:00
Quincy Larson 035b6027de make challenges new and extend to 60 days 2016-01-01 00:34:05 -06:00
Quincy Larson d533e027a9 add hackclub 2015-12-31 16:11:10 -06:00
Logan Tegman 7c93b86321 Merge pull request #5573 from BKinahan/fix/guitar-solo-capitalization
Lowercase 'Solo' in 'Face-melting guitar Solo'
2015-12-30 11:48:53 -08:00
BKinahan c10a086bb6 Lowercase 'Solo' in 'Face-melting guitar Solo'
Changed the case of Solo in the message 'Face-melting guitar Solo' because, unless there's an extremely subtle Star Wars reference I'm missing, solo isn't a proper noun here.
2015-12-30 19:46:04 +00:00
Berkeley Martinez 0c42368cae Merge pull request #5545 from FreeCodeCamp/new/basic-javascript-revamp
Basic Javascript Revamp
2015-12-30 08:58:41 -08:00
Berkeley Martinez 6e7cadb2e7 Load random commit if none specified 2015-12-29 17:40:20 -08:00
Berkeley Martinez 84d4611209 Merge pull request #5419 from evaristoc/ga/show-completion-event-mod
ga completion event change
2015-12-29 12:38:32 -08:00
Quincy Larson 6403bd4e6a Merge pull request #5526 from FreeCodeCamp/fix/commit-signin-redirect
Fix commit redirect for non signed user.
2015-12-29 14:04:59 -06:00
Berkeley Martinez 2a48f42313 Fix user redirect on email account creation 2015-12-29 11:57:12 -08:00
Berkeley Martinez d745e3a254 Add ability to change message type in middleware util 2015-12-29 11:43:06 -08:00
Berkeley Martinez 445008665c Remove autoReconnect: it is true by default 2015-12-29 11:18:55 -08:00
Berkeley Martinez 8c3e14cd8e Fix commit redirect for non signed user.
Now users will be directed to sign in page and on sign in
will have pledge completed
2015-12-29 10:57:35 -08:00
Quincy Larson 80bb80b23a minor updates to copy 2015-12-28 16:28:53 -06:00
SaintPeter 758a22bb0d Add table tag to exception list 2015-12-28 09:39:04 -08:00
SaintPeter ec01155c0d Change display for blockquote and h4 lines 2015-12-28 09:38:46 -08:00
evaristoc c681c2e858 ga completion event modif 2015-12-23 23:31:48 +01:00
Mrugesh Mohapatra 7b36111f88 fix labs page button to centered 2015-12-20 00:49:22 +05:30
Berkeley Martinez 83e43dbbff Merge pull request #5134 from LenaBarinova/fix/streak-still-seems-to-be-broken
Current and Longest streak calculation fixed
2015-12-18 21:00:47 -08:00
Quincy Larson 8e485a893c fix minor style issue on challenge map 2015-12-17 13:36:34 -06:00
Quincy Larson 4ae944962c hotfix to make reddit ad not disrupt map 2015-12-17 13:19:40 -06:00
Quincy Larson 6e85de9efe improve copy on some buttons and fix challenge map css issues 2015-12-17 01:28:40 -06:00
JelenaBarinova 6c7d2685fd Current and Longest streak calculation fixed
Minor refactoring and unit tests added

After CR: user-stats file moved to util folder, export keywork added to exported functions, new line added at the end of gulp file

User-stats-test file moved to replicate user-stats path in test folder
2015-12-15 18:33:04 -05:00
Akira Laine 2d1192f362 fixed "greenfield" typo - closes #5296 2015-12-15 20:28:31 +11:00
Berkeley Martinez 0fca3bad7f Filter out coming soon from challenge blocks 2015-12-14 13:19:30 -08:00
Berkeley Martinez 355c8214e6 Filter out coming soon challenges from returnNextChallenge 2015-12-14 13:19:30 -08:00
Berkeley Martinez 2d559efdee Fix for block order 2015-12-14 13:19:30 -08:00
Berkeley Martinez 38d71abda6 Fix block stream not being set correctly 2015-12-14 13:19:30 -08:00
Berkeley Martinez 107f42e8f4 Change verify cert to back end 2015-12-14 13:19:30 -08:00
Quincy Larson c4064d4e99 minor fixes to challenge map 2015-12-14 13:19:30 -08:00
Quincy Larson 65b7edca0b hardcode the full stack and interview prep sections 2015-12-14 13:19:30 -08:00
Berkeley Martinez 6db0252ab1 Fix map indenting 2015-12-14 13:19:30 -08:00
Berkeley Martinez 2aa611047f Change full stack to back end 2015-12-14 13:19:30 -08:00
Quincy Larson a553cbbb2b add interviewing and nonprofit projects to map 2015-12-14 13:19:30 -08:00
Berkeley Martinez 0c4a780f54 Add logic to allow coming soon challenge to be seen and not used 2015-12-14 13:19:30 -08:00
Berkeley Martinez fe8fe0ff0d Fix lint error 2015-12-14 13:19:30 -08:00
Berkeley Martinez 5c2bdd974a Add isComingSoon flag 2015-12-14 13:19:30 -08:00
Berkeley Martinez 9848aa8eab Remove console.log 2015-12-14 13:19:30 -08:00
Berkeley Martinez f7f587194d Add superblock ordering 2015-12-14 13:19:30 -08:00
Berkeley Martinez c87737a0c5 Remove 800 hour thingy 2015-12-14 13:19:30 -08:00
Berkeley Martinez c736a5c00f Use regex to hide hikes
Capitalize super block
2015-12-14 13:19:30 -08:00
Berkeley Martinez 8175fbb297 Remove console.log 2015-12-14 13:19:30 -08:00
Berkeley Martinez 8037ff9038 Remove hikes from map view 2015-12-14 13:19:30 -08:00
Berkeley Martinez ab043d1c6d Change map logic and view 2015-12-14 13:19:30 -08:00
Berkeley Martinez 75821c4db3 Change hikes order 2015-12-14 13:19:30 -08:00
Quincy Larson 6d911a70cd Merge pull request #5119 from FreeCodeCamp/fix/commit-directory
Add new cert goals to commit
2015-12-11 18:46:48 -06:00
Berkeley Martinez a8a73abea0 More changes to commit copy 2015-12-11 16:44:14 -08:00
Logan Tegman 74d5c0bf00 Merge pull request #5127 from Zenith-One/fix/forgot-password-error-message
Fix/forgot password error message
2015-12-10 15:13:33 -08:00
Craig Burton 275e3ad9ea Fixed error message displayed when an error occurs while requesting a password reset 2015-12-10 09:21:21 -05:00
Quincy Larson 60789e0386 Merge branch 'fix/commit-directory' of https://github.com/freecodecamp/freecodecamp into fix/commit-directory
Conflicts:
	server/views/commit/index.jade
2015-12-10 00:02:22 -06:00
Quincy Larson 473a77e0a2 update copy and improve look of commit and its directory 2015-12-10 00:01:09 -06:00
Harsha a443c2bd37 Go to next step is enabled after user finishes step challenge 2015-12-09 20:25:43 -05:00
Logan Tegman 0dbf56e23a Merge pull request #5117 from FreeCodeCamp/landing-change
Update landing icons and copy to reflect React and D3
2015-12-09 14:38:50 -08:00
Logan Tegman 33b1ba08f1 Merge pull request #5090 from FreeCodeCamp/fix/bonfire-not-saving
Fix remove bonfire save endpoint
2015-12-09 14:20:10 -08:00
Berkeley Martinez 1464adc350 Add new cert goals to backend 2015-12-09 14:19:37 -08:00
Quincy Larson 3b320c8852 improve look of commit views 2015-12-09 15:39:36 -06:00
Quincy Larson 5d1ab89a1a Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-12-09 15:01:17 -06:00
Quincy Larson 8c06293df3 update json for commit 2015-12-09 14:59:56 -06:00
Quincy Larson 66431753b3 Merge branch 'add/commitnonprofit' of https://github.com/CodeNonprofit/FreeCodeCamp into CodeNonprofit-add/commitnonprofit 2015-12-09 14:14:21 -06:00
Quincy Larson 747dbfe750 update landing icons 2015-12-09 14:13:18 -06:00
Michael D. Johnson aea2eaf2e7 Added 3 new nonprofits to Commit 2015-12-09 14:27:02 -05:00
Berkeley Martinez 0f75aa3b88 Add freecatphotoapp to csp 2015-12-09 11:02:06 -08:00
Berkeley Martinez 9822cc67f9 Reduce header size
This is needed to move to cloudFlare
2015-12-09 10:56:40 -08:00
Berkeley Martinez f709ee30ee Fix for completedDate missing 2015-12-08 16:17:45 -08:00
Berkeley Martinez 579c569d15 Fix remove bonfire save endpoint
fix completedChallenge saving solution
remove unnecessary code.
2015-12-08 16:17:45 -08:00
Berkeley Martinez 9774638d43 Fix waypoints are not bonfires 2015-12-08 16:17:45 -08:00
Rex Schrader 6b7a314205 Merge pull request #5076 from FreeCodeCamp/update-ziplines
Update ZIpline and Basejump code review instructions, remove gist export
2015-12-08 16:13:58 -08:00
Rex Schrader da491ed374 Merge pull request #5088 from LenaBarinova/fix/free-code-camp-map
Challenge numbering in Map fixed to work properly on IE.
2015-12-08 15:47:42 -08:00
Harsha d3f1829931 step challenge button block in mobile version fixed 2015-12-08 17:45:30 -05:00
Quincy Larson 025a1269eb remove additional gist button 2015-12-08 14:34:05 -06:00
JelenaBarinova 96375bb643 Challenge numbering in Map fixed to work properly on IE. 2015-12-08 11:46:35 -08:00
Berkeley Martinez 5270f0e42e Make tag replacement more robust
Some challenges are incorrectly saved with no solutions
2015-12-08 11:30:47 -08:00
Quincy Larson 9409945ee7 Merge branch 'staging' into update-ziplines
Conflicts:
	client/commonFramework/bindings.js
2015-12-08 01:17:03 -06:00
Quincy Larson 92928b552b update user stories and sharing instructions for basejumps and ziplines 2015-12-07 00:51:37 -06:00
Arsen Melikyan 029cd52e80 Some common code improvements 2015-12-06 13:26:02 +04:00
Berkeley Martinez 3462ba791e Fix camper news submit 2015-12-04 19:23:06 -08:00
Berkeley Martinez 85510a2fd8 Remove directives from views 2015-12-04 18:24:09 -08:00
Quincy Larson 676ef0e253 finish qa-ing removal of angular 2015-12-04 19:21:19 -06:00
Quincy Larson 7e9d65675a Merge branch 'master' into remove-angular
Conflicts:
	bower.json
	client/main.js
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
2015-12-04 18:49:38 -06:00
Harsha 5b376e106c Fixes previous step issue in one-step-challenges 2015-11-30 23:29:07 -05:00
Berkeley Martinez 04db6744b9 Fix code output logic
Fix codemirror url paths
2015-11-29 16:28:32 -08:00
Berkeley Martinez 9532a80f26 Correct typos 2015-11-29 16:28:32 -08:00
Berkeley Martinez e8d9e31a47 Fix bad ctrl enter logic 2015-11-29 16:28:32 -08:00
Berkeley Martinez 4bdf1b2854 Add gulp build of commonFramework 2015-11-29 16:27:14 -08:00
Berkeley Martinez 29f90505b7 More refactoring 2015-11-29 16:27:14 -08:00
Berkeley Martinez 748f7ab93f Progress towards refactoring 2015-11-29 16:21:04 -08:00
Berkeley Martinez 87fa38182e bundle vendor files 2015-11-29 16:20:17 -08:00
Quincy Larson d4fde2a98a create the fastest site on the internet 2015-11-25 10:23:35 -06:00
roelver 44f581c13b Keep submitted url - closes #4319 2015-11-23 16:02:07 +01:00
Berkeley Martinez f8d68bcfa2 Hotfix revert heat-map offset 2015-11-20 11:24:02 -08:00
Berkeley Martinez 37f91d0bd7 Merge pull request #4581 from QuincyLarson/fix/links-view
Improve look of links page
2015-11-19 23:38:42 -08:00
Berkeley Martinez 022ed56af9 Merge pull request #4578 from FreeCodeCamp/feature/reddit-ad
Add reddit notice to map view
2015-11-19 23:36:53 -08:00
Quincy Larson 66d384c4c9 Improve look of links page 2015-11-20 01:25:49 -06:00
Quincy Larson f8b8580e8b add reddit ad to map 2015-11-20 00:55:37 -06:00
Berkeley Martinez 6f62868f44 Change order of links on links 2015-11-19 22:46:36 -08:00
Quincy Larson 9d08c1702e update navbar, remove footer, create links page 2015-11-19 22:46:36 -08:00
Berkeley Martinez 854e937a20 Merge pull request #4450 from bugron/fix/feed-content-type
Set RSS feed correct content-type
2015-11-19 19:52:29 -08:00
Berkeley Martinez 3b63e406ed Fix jobs order should be descend by post date 2015-11-19 17:31:00 -08:00
SaintPeter 86e4165c4c Step Challenge - Prev from end, x/y step display 2015-11-16 21:57:35 -08:00
Arsen Melikyan b88caa80be fix rss feed content type 2015-11-15 11:39:30 +04:00
Quincy Larson debfb07ab8 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-11-13 17:15:23 -08:00
Quincy Larson 0695860434 improve styling of completed challenges table 2015-11-13 17:08:51 -08:00
Berkeley Martinez ddd85d507b Merge pull request #4400 from FreeCodeCamp/fix/update-labs
Update labs and improve jobs
2015-11-13 13:02:09 -08:00
Rex Schrader 3b5b9dfcdc Merge pull request #4242 from bugron/feature/rss-feed-for-camper-news
Adds RSS feed for Camper News
2015-11-13 11:28:41 -08:00
Quincy Larson 61ffb55a3d Merge branch 'staging' into fix/update-labs
Conflicts:
	common/app/routes/Jobs/components/Jobs.jsx
2015-11-12 16:38:30 -08:00
Quincy Larson ffbac22511 update labs 2015-11-12 16:35:37 -08:00
Arsen Melikyan e2a4f5468d adds rss feed for camper news 2015-11-11 22:27:48 +04:00
Matthias Kern f14009833c add a mobile portfolio view. 2015-11-11 17:25:06 +02:00
Berkeley Martinez 1b512330af Merge pull request #4277 from ltegman/fix/unauthenticated-next-challenge-button-4262
Fix The Next Challenge link not working for unauthenticated users.
2015-11-10 17:39:15 -08:00
Logan Tegman c65be452b5 Fix The Next Challenge link not working for unauthenticated users.
Closes #4262
2015-11-10 16:42:05 -08:00
Rex Schrader 4751ea5e1e Merge pull request #4279 from FreeCodeCamp/feature/challenge-dev-mode
Feature in dev mode always pull from disk
2015-11-10 10:19:10 -08:00
Berkeley Martinez 42ab1d70fd Remove unnecessary unary operator 2015-11-10 09:59:49 -08:00
Berkeley Martinez 7d43ddab0b Merge branch 'fix-cal-heatmap' of https://github.com/terakilobyte/freecodecamp into terakilobyte-fix-cal-heatmap 2015-11-10 09:30:57 -08:00
Berkeley Martinez 1619a09da2 Add helpful error message if no filename 2015-11-09 22:37:16 -08:00
Berkeley Martinez d095fd5d90 Feature in dev mode always pull from disk 2015-11-09 17:27:56 -08:00
Berkeley Martinez 8fe3a075bf Hotfix fix basejump-zipline completion 2015-11-08 20:05:12 -08:00
terakilobyte 969204e2c8 Removes debugging statements 2015-11-07 16:40:36 -05:00
terakilobyte d6cea74447 Offsets user displayed time to server timezone(EST) for the heatmap 2015-11-07 13:26:58 -08:00
Logan Tegman 2667b574bf Fixes small bugs
+ With MDNLinks and bonfireExecute being run on step challenges.
+ Return when common isn't loaded in reBindModals instead of throwing.
2015-11-07 13:00:44 -08:00
Berkeley Martinez 328e75812a Fix lint issues with gist saving 2015-11-06 17:48:17 -08:00
Berkeley Martinez 5dbfbfcf57 Add head/tail to challenge spec.
Lint EVERYTHING!
2015-11-06 17:32:01 -08:00
Logan Tegman 5b4eafe751 Merge pull request #3995 from bugron/feature/save-bonfire-solution-as-github-gist
Save bonfire's solution as a GitHub gist
2015-11-06 17:21:01 -08:00
Aniruddh Agarwal 81c74f4209 Merge pull request #4136 from FreeCodeCamp/greenkeeper-update-all
Update all dependencies 🌴
2015-11-06 10:53:26 +08:00
Berkeley Martinez 00fcdc9bc1 Fix news username query should be case insensitive 2015-11-05 17:06:13 -08:00
Berkeley Martinez 325e121d4e Merge branch 'feature/find-posted-news-by-username' of https://github.com/bugron/FreeCodeCamp into bugron-feature/find-posted-news-by-username 2015-11-05 16:46:29 -08:00
Berkeley Martinez 085fc2fe72 Fix loopback explorer issue 2015-11-05 16:41:19 -08:00
Berkeley Martinez c7d6426728 Merge pull request #4200 from FreeCodeCamp/fix/update-landing
Fix landing and nonprofits page
2015-11-05 16:14:11 -08:00
Quincy Larson 5430ccc3be fix landing and nonprofit 2015-11-05 13:38:09 -08:00
Arsen Melikyan 8a5e12f6f3 find users news by typing their usernames in search box and fix FF CSS issue 2015-11-04 22:28:13 +04:00
Arsen Melikyan 59bd917a2c save bonfire solution as a gist and fix search issue button query string 2015-11-04 15:48:20 +04:00
Berkeley Martinez 1f16b0f79a Fix story search not closing connections
Now story search will use loopbacks mongo connection
to do search
2015-11-04 00:15:45 -08:00
Berkeley Martinez a8b61f566d Merge pull request #4156 from FreeCodeCamp/testimonial-update
Testimonial update and landing page improvement
2015-11-03 22:15:18 -08:00
Berkeley Martinez 692f577eb3 Fix linting issue 2015-11-03 21:54:42 -08:00
Logan Tegman 9bc6048a8d Merge pull request #4122 from junhaoyap/feature/command-key
The cmd and ctrl button now both trigger events
2015-11-03 21:26:09 -08:00
junhaoyap 64ab919613 Make cmd and ctrl both trigger events 2015-11-03 20:59:07 -08:00
Quincy Larson 9995a73e6d update testimonials 2015-11-03 17:58:47 -08:00
Quincy Larson 8931626bff update map ad to prevent default when clicked 2015-11-03 17:44:03 -08:00
Quincy Larson e064416dca Update testimonial views 2015-11-03 17:39:02 -08:00
Quincy Larson 672b529f31 update challenge completion rate 2015-11-03 17:38:27 -08:00
Quincy Larson 559822485d update landing page 2015-11-03 17:37:58 -08:00
Berkeley Martinez 406a821c34 Merge pull request #4094 from ltegman/fix/half-way-club-link-3934
Fix Half Way Club Gitter Link
2015-11-03 13:06:51 -08:00
Logan Tegman 0e4f85e8ea Merge pull request #4120 from terakilobyte/newFlags
Adds 'new' callouts to top level challenge blocks
2015-11-02 20:47:24 -08:00
Logan Tegman a028059aaf Fix Half Way Club Gitter Link
Closes #3934
2015-11-02 18:20:44 -08:00
Arsen Melikyan 10ca69391f fixes incorrect collection name in getStories function 2015-11-02 20:25:06 +04:00
Berkeley Martinez 41c8a97417 Merge pull request #4125 from FreeCodeCamp/update-ad
add medium ad to replace reddit one
2015-11-02 00:11:52 -08:00
Quincy Larson d77d78a3b2 Merge branch 'staging' into feature/jobs
Conflicts:
	seed/jobs.json
2015-11-02 00:07:16 -08:00
Quincy Larson 89b92c87cc add medium ad to replace reddit one 2015-11-01 23:43:24 -08:00
Berkeley Martinez 0546e34abf Merge pull request #4124 from FreeCodeCamp/update-titles
update page titles and sitemap
2015-11-01 23:35:07 -08:00
terakilobyte 502f7f83ba Adds 'new' callouts to top level challenge block links if all challenges
all challenges in that block are new.
2015-11-01 19:36:28 -08:00
terakilobyte c30f7f0795 Addresses lint errors 2015-11-01 17:45:01 -08:00
terakilobyte 16f97913be Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging 2015-11-01 17:28:28 -08:00
Berkeley Martinez 254e0cdbf3 Merge pull request #3984 from ltegman/fix/ctrl-enter-works-when-not-logged-in-3900
Fix Ctrl-Enter doesn't work when not logged in.
2015-11-01 17:27:55 -08:00
terakilobyte af30d4d56e Implements a 'releasedOn' flag and marks challenges less than 30 days old as NEW https://www.dropbox.com/s/43un2a908ldktpl/Screenshot%202015-11-01%2017.06.53.png 2015-11-01 17:26:26 -08:00
Berkeley Martinez f7530701ca Change step challenge button layout 2015-10-31 22:48:42 -07:00
Berkeley Martinez 7532094abc Merge branch 'feature/add-back-button-to-step-challenges' of https://github.com/bugron/FreeCodeCamp into bugron-feature/add-back-button-to-step-challenges 2015-10-31 22:22:39 -07:00
Berkeley Martinez e5449ee65f Fix linting errors 2015-10-31 22:13:18 -07:00
Arsen Melikyan ab83f6d5fa adds back button for step challenges 2015-10-31 17:24:05 +04:00
Quincy Larson 0fefac1090 update page titles and sitemap 2015-10-31 02:59:09 -07:00
Quincy Larson 03f189b260 add reddit add and update landing map stats 2015-10-30 23:39:11 -07:00
Berkeley Martinez a8f2bb1b50 Fix font 2015-10-30 12:55:13 -07:00
Berkeley Martinez c354ddf1ac Expose jobs board to production. 2015-10-29 17:55:42 -07:00
Berkeley Martinez 134a3a52e8 Fix lint issue 2015-10-29 17:10:31 -07:00
Berkeley Martinez e1a398597d Prevent binding attacks 2015-10-29 17:10:30 -07:00
Berkeley Martinez 568d1ef1d2 Add promo model 2015-10-29 17:10:29 -07:00
Berkeley Martinez 25464c4f9e Add jobs behind beta flag 2015-10-29 17:10:28 -07:00
Berkeley Martinez c6c1d7dac4 Add redirects 2015-10-29 17:10:28 -07:00
Berkeley Martinez ede8da38ba Filter unpaid, unapproved and filled jobs
Fix missing key in react array
2015-10-29 17:10:27 -07:00
Berkeley Martinez da26f19cde Adds paypal button and completes the number of views 2015-10-29 17:10:26 -07:00
Logan Tegman 7fd5174fe0 Fix Ctrl-Enter doesn't work when not logged in.
Closes #3900

First time contributing real code, so please let me know any critiques or style changes I should make.
2015-10-29 00:13:20 -07:00
Berkeley Martinez 6613ed95cf Merge pull request #3910 from FreeCodeCamp/clementine
Clementine waypoint is ready
2015-10-28 12:29:31 -07:00
Quincy Larson fd7451e233 Merge branch 'staging' into improve-early-challenges
Conflicts:
	seed/challenges/basic-javascript.json
	seed/challenges/bootstrap.json
	seed/challenges/html5-and-css.json
	seed/challenges/object-oriented-and-functional-programming.json
2015-10-28 02:20:09 -07:00
Quincy Larson 63f56c94b8 continue refining waypoints 2015-10-27 17:49:58 -07:00
Jonathan 5597d0efe3 Update README.md
Fixed small typo on the first line: changed "due" to "do."
2015-10-26 19:28:33 -04:00
Quincy Larson baaae041eb add the FCC leaderboard to the labs json 2015-10-26 11:39:45 -07:00
Quincy Larson dc26195395 finish clementine challenge for now 2015-10-25 23:28:53 -07:00
Quincy Larson ac4a71a229 fix signin button to use signin instead of login for path 2015-10-25 21:46:54 -07:00
Ben McMahon 0f7b9add2f Merge pull request #3868 from FreeCodeCamp/fix/javascript-linting
Fix linting in JavaScript editor
2015-10-24 00:05:53 +01:00
Berkeley Martinez 756efcd9fb Fix linting in JavaScript editor 2015-10-23 15:38:51 -07:00
Quincy Larson 2ac70458b0 remove unnecessary bullet point from Camper News view 2015-10-23 14:28:27 -07:00
Quincy Larson 4910118366 update flash message 2015-10-23 14:12:09 -07:00
Quincy Larson 1db84d1455 Merge branch 'staging' into feature/block-camper-news 2015-10-23 14:08:19 -07:00
Berkeley Martinez c13bdb65e5 Add camper must be auth with gitub to post to news 2015-10-21 22:05:27 -07:00
Berkeley Martinez 43155e85e8 Merge pull request #3848 from FreeCodeCamp/feature/nonprofit-ids
Feature/nonprofit ids
2015-10-21 21:41:48 -07:00
Quincy Larson cbeacbb50c Revert "further work to make challenges and news navigation consistent across mobile and desktop"
This reverts commit 286d0c06c4.
2015-10-21 21:32:30 -07:00
Quincy Larson 1dc0e868b9 update nonprofit files and delete old commented code 2015-10-21 21:30:47 -07:00
Quincy Larson 5077f74ca1 start updating HTML challenge styling 2015-10-21 17:42:01 -07:00
Quincy Larson 286d0c06c4 further work to make challenges and news navigation consistent across mobile and desktop 2015-10-21 12:33:35 -07:00
Berkeley Martinez 7f86c71cb2 Merge pull request #3800 from QuincyLarson/tshirt-improvement
update tshirt banner
2015-10-20 11:33:27 -07:00
Quincy Larson 7f2f3885f8 change blog links to lead to medium subdomain 2015-10-19 21:55:29 -07:00
Quincy Larson 3d63b8b020 update tshirt banner 2015-10-18 19:03:01 -07:00
noinkling b1a5f517a2 Move time text out of icon element on map page 2015-10-17 18:40:49 +13:00
Berkeley Martinez af654aebdc Hot fix for chat close button 2015-10-16 20:23:24 -07:00
Quincy Larson 4589b9ae39 add conditional buttons for mobile gitter 2015-10-16 16:45:38 -07:00
Berkeley Martinez 5b9c534bff Fix logic on zipline/basejumps 2015-10-16 16:30:44 -07:00
Berkeley Martinez 1b75d041c1 Fix logic on basejump/ziplines 2015-10-16 16:20:34 -07:00
Berkeley Martinez 12eeef2f41 Add chat room titles 2015-10-16 16:10:45 -07:00
Berkeley Martinez 35219cdce3 Add main chat window on nav bar chat click 2015-10-16 11:57:33 -07:00
Berkeley Martinez a0182957e7 Add chat to challenges! 2015-10-16 10:37:35 -07:00
Berkeley Martinez 745f059eeb hotfix prevent server from starting twice 2015-10-14 23:49:32 -07:00
Quincy Larson c552b6d05b Merge pull request #3748 from FreeCodeCamp/feature/add-ga-social-tracking
Add google analytics tracking
2015-10-14 21:57:44 -07:00
Quincy Larson 6955615690 Merge pull request #3746 from FreeCodeCamp/fix/morgan-reporting-order
Change order of information in morgan reporting
2015-10-14 21:49:03 -07:00
Quincy Larson e8b39648e2 Merge pull request #3745 from FreeCodeCamp/fix/ssl-redirect-rev
Remove rev helper use in ssl redirect
2015-10-14 21:48:51 -07:00
Quincy Larson cf45d2b01f update landing page and stories 2015-10-14 21:42:29 -07:00
Berkeley Martinez 7c0d801d63 Add google analytics tracking 2015-10-14 21:26:22 -07:00
Berkeley Martinez aceb1dd9e6 Change order of information in morgan reporting 2015-10-14 20:51:38 -07:00
Berkeley Martinez 3ae7da38a3 Remove rev helper use in ssl redirect 2015-10-14 20:41:36 -07:00
Quincy Larson 99db9eaf33 Merge branch 'staging' into success-stories 2015-10-14 20:00:11 -07:00
Berkeley Martinez 3e828ba266 Merge pull request #3727 from QuincyLarson/estimates
Time estimates for each block of challenge (by popular request)
2015-10-13 15:49:39 -07:00
Berkeley Martinez 7424d85f09 Merge pull request #3728 from FreeCodeCamp/update-step-challenges
Update step challenges
2015-10-13 15:05:03 -07:00
Quincy Larson 2bbb3e98db Merge pull request #3716 from FreeCodeCamp/feature/jobs
Update loopback, ThunderCats and RxJS.
2015-10-13 14:43:56 -07:00
Quincy Larson 407bd16aaf make additional improvements and fixes to step challenges 2015-10-13 10:04:44 -07:00
Quincy Larson 8da93ddea9 add spacing and nowrap to ensure time stays on single line 2015-10-12 23:02:24 -07:00
Quincy Larson f30239fb6c add time estimates to challenge blocks on map 2015-10-12 22:56:10 -07:00
Quincy Larson 3dee03d38b add more stories and clean up css 2015-10-12 01:22:11 -07:00
Berkeley Martinez 7b444b15dc Update loopback, ThunderCats and RxJS.
closes #2929
2015-10-11 17:35:46 -07:00
uwaseem 21c78f9f96 Removed an extra m from the word commit 2015-10-11 17:41:27 +08:00
Berkeley Martinez 749357933d Merge pull request #3669 from FreeCodeCamp/fix/challenge-sequence
Fix mis-sequence of challenges and fix some quick issues campers reported about challenges
2015-10-09 19:43:00 -07:00
Quincy Larson c2da02bf8a improve copy on button 2015-10-09 19:33:15 -07:00
Berkeley Martinez 91df8cba6f Merge pull request #3666 from FreeCodeCamp/fix/commit
update look of commit
2015-10-08 17:26:07 -07:00
Berkeley Martinez fcd7e096b2 Fix alt attribute 2015-10-08 17:25:47 -07:00
Quincy Larson da29152783 Merge branch 'fix/commit' of https://github.com/freecodecamp/freecodecamp into fix/commit
Conflicts:
	server/views/commit/index.jade
2015-10-08 17:21:30 -07:00
Quincy Larson 6fafbdf441 improve stories view 2015-10-08 17:05:42 -07:00
Berkeley Martinez e62375516b Add commit button functionality 2015-10-08 17:00:15 -07:00
Quincy Larson 66120a60b8 update look of commit 2015-10-08 16:29:43 -07:00
Quincy Larson 920d9ba403 Merge pull request #3655 from FreeCodeCamp/fix/remove-unused-endpoint
Remove unused jobs-form endpoint
2015-10-08 15:31:09 -07:00
Quincy Larson ce57a13a88 Merge pull request #3657 from FreeCodeCamp/fix/harded-certs
Harden showCert against errors
2015-10-08 15:30:13 -07:00
Berkeley Martinez 0dc35f2b0a Fix show certs to anon user
closes #3648
2015-10-08 09:02:35 -07:00
Berkeley Martinez ba88def035 Harden showCert against errors 2015-10-08 08:48:52 -07:00
Berkeley Martinez 76618efcd0 Remove unused jobs-form endpoint 2015-10-08 08:12:48 -07:00
Berkeley Martinez 1695a760ef Fix check for _id as well as id during certification 2015-10-07 16:30:51 -07:00
Berkeley Martinez 155f9359a1 Fix default dollar amount incorrectly set 2015-10-07 14:37:48 -07:00
Berkeley Martinez 0cb8c6c58b hot patch/ prevent dedube 2015-10-07 06:05:33 -07:00
Berkeley Martinez f9d616a4a6 Merge pull request #3626 from QuincyLarson/fix/learn-button
fix learn button
2015-10-07 02:40:00 -07:00
Quincy Larson 066b2ac7f9 fix learn button 2015-10-07 02:35:23 -07:00
Berkeley Martinez c6914fa205 Fix small typo on certification challenge 2015-10-07 02:22:04 -07:00
Berkeley Martinez f2679810a9 fix some typos in commit and getting started 2015-10-07 02:11:23 -07:00
Quincy Larson cdbd052b35 Merge branch 'staging' into clementine 2015-10-07 01:29:15 -07:00
Quincy Larson 1f7141c523 Merge branch 'staging' into clementine 2015-10-07 01:28:41 -07:00
Berkeley Martinez 0f6cdf8be1 Merge pull request #3615 from FreeCodeCamp/feature/commit
Add feature Commit
2015-10-07 01:23:24 -07:00
Berkeley Martinez a906b8f411 Fix firstChallenge var should point to new first challenge 2015-10-07 01:14:33 -07:00
Quincy Larson adfbdd7f9f more style improvements 2015-10-07 01:06:36 -07:00
Quincy Larson f7500c4bb0 improve style 2015-10-07 00:44:46 -07:00
Quincy Larson a1b574f768 update camper portfolio page 2015-10-07 00:41:43 -07:00
Quincy Larson cd964425f7 add t-shirt banner 2015-10-07 00:41:42 -07:00
Berkeley Martinez 241ca8097d Fix link errors in randomAPIs 2015-10-07 00:28:42 -07:00
Berkeley Martinez 7a4f5d752c Move labs/stories to server/resources
Rename stories to testimonials to reduce confusion
2015-10-07 00:26:17 -07:00
Quincy Larson ea827fda37 Remove unnecessary dangling class 2015-10-07 00:17:18 -07:00
Quincy Larson 4f26d82f65 add labs and stories 2015-10-07 00:17:18 -07:00
Quincy Larson 56673d429d add labs 2015-10-07 00:17:17 -07:00
Quincy Larson febdc5b0cc hide more info button 2015-10-07 00:17:17 -07:00
Berkeley Martinez 92b9f71532 Add commit directory page 2015-10-07 00:05:26 -07:00
Berkeley Martinez f5966c0959 Change redirect and text on commit 2015-10-06 23:33:17 -07:00
Berkeley Martinez 3273593b9c Change order of edit buttons on profile 2015-10-06 23:32:31 -07:00
Berkeley Martinez 364f79818f Fix dynamic commit link 2015-10-06 23:26:15 -07:00
Berkeley Martinez 44fd85dff8 Add ability to filter beta challenges from production
This PR adds the ability to test out challenges in beta
without fear that they will leak to production servers.

In development all challenges will display.

In production all challenges marked 'isBeta' will be filtered out
except in the case the environmental variable `BETA` is set ture,
in which case all challenges will display.
2015-10-06 22:37:08 -07:00