Commit Graph

481 Commits (89c64fb37668fb5a8980bd91cd9c80839d8547f2)

Author SHA1 Message Date
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 559822485d update landing page 2015-11-03 17:37:58 -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
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 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
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
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
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 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
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
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 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 3ae7da38a3 Remove rev helper use in ssl redirect 2015-10-14 20:41:36 -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
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
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 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
Berkeley Martinez 155f9359a1 Fix default dollar amount incorrectly set 2015-10-07 14:37:48 -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
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
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
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 2864f607cc Add on certification, complete goal and stop pledge 2015-10-06 21:12:40 -07:00
Berkeley Martinez 49c06b266e Add complete commit endpoint 2015-10-06 19:51:19 -07:00
Berkeley Martinez 0b716c0057 Add stop commit functionality 2015-10-06 19:51:19 -07:00
Berkeley Martinez d132978df9 Add ability to edit commit 2015-10-06 19:51:19 -07:00
Berkeley Martinez 362efd4365 Add display on user profile when user commits 2015-10-06 19:51:19 -07:00
Berkeley Martinez c8da944caf Add logic to load nonprofit on query
Add logic to model update
2015-10-06 19:51:19 -07:00
Berkeley Martinez bc6a9c6db2 Add redirect to user page on submit 2015-10-06 19:51:19 -07:00
Berkeley Martinez d1c0276f4e fix spiffy up the commit form 2015-10-06 19:51:19 -07:00
Quincy Larson b1d8814aed remove angular from views 2015-10-06 16:43:46 -07:00
Berkeley Martinez 33e8f35bbf Fix replace script tags in URL
Replace script tags in URL with fcc tags.
This prevents some xss bugs blocking code from running
in the iFrame.
2015-10-06 16:39:15 -07:00
Quincy Larson 60d059f71e remove angular from bower file and scripts 2015-10-06 16:17:31 -07:00
Quincy Larson b8dc81214d Merge branch 'staging' into remove-angular
Conflicts:
	server/boot/user.js
	server/views/account/show.jade
2015-10-06 16:00:59 -07:00
Berkeley Martinez e6afda62c7 Add 5 dollar option to commit 2015-10-05 22:19:56 -07:00
Berkeley Martinez e16efc832c Move commit to separate router 2015-10-05 22:19:56 -07:00
Quincy Larson f02b3ffd4c update commit copy 2015-10-05 22:19:56 -07:00
Quincy Larson 68b12caf48 minor improvements to onboarding and create skeleton commit page 2015-10-05 22:19:55 -07:00
Quincy Larson c27e5bf6c4 start adding clementine challenge 2015-10-05 21:57:15 -07:00
Berkeley Martinez 8c48626f03 Add certification page 2015-10-05 15:55:50 -07:00
Berkeley Martinez a90fdf1e0c Fix check for existence 2015-10-01 23:58:56 -07:00
Berkeley Martinez ee35fe075c Feature show Waypoints on user profile page
This PR also fixes some bugs in lockedDown mode
2015-10-01 23:03:52 -07:00
Quincy Larson d8fd63fb87 Merge branch 'staging' into merge-account-page 2015-10-01 20:39:56 -07:00
Quincy Larson b197358056 make one page profile with bonfire solution urls 2015-09-30 21:04:16 -07:00
Berkeley Martinez 5de6837959 Merge pull request #3548 from FreeCodeCamp/converge-bonfires
refactor all Bonfire tests to use assert and have friendly messages
2015-09-30 19:47:20 -07:00
Quincy Larson dca179c2c5 Merge branch 'staging' into converge-bonfires
Conflicts:
	seed/challenges/basic-bonfires.json
	seed/challenges/intermediate-bonfires.json
2015-09-30 19:06:28 -07:00
Quincy Larson 416a866ec0 add step based challenge to framework 2015-09-30 13:26:06 -07:00
Quincy Larson 03675ef0a6 finish QAing basic and intermediate bonfires 2015-09-30 01:33:07 -07:00
Quincy Larson ab204c654e fix search results formatting for mobile and desktop camper news 2015-09-29 22:52:19 -07:00
Quincy Larson ee9827ea58 fix issues with get-started and remove pair button 2015-09-29 17:59:16 -07:00
Berkeley Martinez c7d68932ce Show share button from last completed 2015-09-28 19:47:45 -07:00
Berkeley Martinez 6a5bea67f7 set last completed block in map view 2015-09-28 19:20:29 -07:00
Quincy Larson 1ff55374db improve facebook sharing copy 2015-09-28 19:04:44 -07:00
Quincy Larson 91efd5940d add facebook sharing to map on completed challenges
remove twitter share from non-bonfire challenges
2015-09-28 17:35:25 -07:00
Quincy Larson 27f231e72f refactor tests to show same message when passing and failing 2015-09-27 23:22:06 -07:00
Quincy Larson 3e25b3a6bc improve button html 2015-09-27 21:52:13 -07:00
Quincy Larson e74533a727 add lockdown mode toggling 2015-09-27 17:08:56 -07:00
Quincy Larson 85a5766546 update the tshirt campaign text 2015-09-27 16:25:34 -07:00
Quincy Larson d08c3e5a88 Merge pull request #3514 from FreeCodeCamp/tshirt
Tshirt voting mechanism
2015-09-27 11:06:26 -07:00
Quincy Larson a64a46cff1 don't show tshirt voting to brand new users 2015-09-27 11:05:44 -07:00
Quincy Larson ccf5504537 add tshirt voting mechanism 2015-09-27 10:49:44 -07:00
Quincy Larson 0634926af0 add t-shirts to view 2015-09-27 01:44:09 -07:00
Quincy Larson de976c18ba remove email address from stories 2015-09-23 15:20:45 -07:00
Quincy Larson 04bdb9677e Merge pull request #3356 from leonfeng/fix/gooleapis
Replace Google-hosted scripts with cdnjs equivalents
2015-09-23 14:53:58 -07:00
Quincy Larson 51af4e4b0d Merge branch 'google-cdns' into remove-angular
Conflicts:
	server/boot/user.js
	server/views/account/show.jade
	server/views/account/signin.jade
	server/views/coursewares/showBonfire.jade
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
2015-09-23 09:56:01 -07:00
Quincy Larson 51e5c54f81 update CDNs to be non-google 2015-09-23 09:17:13 -07:00
Berkeley Martinez 39fdd637d5 fix load fonts through css
attempt to cache font files and load after dom init
resulted in a visible jitter when fonts transitioned.
2015-09-21 12:16:10 -07:00
Leon Feng a682009025 Replace Google-hosted scripts with cdnjs equivalents 2015-09-19 08:55:04 +08:00
Berkeley Martinez 2fee89b0e6 fix invisible div blocking run button
bootstrap classes stack on smaller screens if breakpoints are not
met. This fix removes the smaller screen classes that forced divs
that would otherwise stack to instead overlay each other. This is
the cause of the run button being blocks on smaller screens as a
col that should stack to the bottom was instead being pushed to
top.

closes #1466
2015-09-17 12:42:31 -07:00
Berkeley Martinez 723b490932 load lato font after dom ready 2015-09-17 09:57:27 -07:00
Berkeley Martinez 38d76ec3bb split fonts into two separate files 2015-09-17 00:06:01 -07:00
Berkeley Martinez 04727620e4 Merge branch 'leonfeng-enhancement-3311' of https://github.com/leonfeng/FreeCodeCamp into fix/fonts 2015-09-16 23:50:24 -07:00
Leon Feng 6e53b8701d Replace Google Fonts with locally served fonts 2015-09-17 04:53:33 +08:00
Anton Strömkvist 81cede35b4 Merge pull request #3325 from bugron/fix/news-no_results_found-padding
Fixes position of 'No Results Found' text
2015-09-16 22:21:09 +02:00
Arsen Melikyan d302e7e16c fixes position of 'No Results Found' text 2015-09-15 22:32:51 +04:00
Arsen Melikyan 829257194d removes the checkbox and improves a condition 2015-09-15 20:27:36 +04:00
Berkeley Martinez f659141746 Merge pull request #3292 from FreeCodeCamp/improve-map
adjust map font size and simplify Facebook share call to action
2015-09-14 14:15:50 -07:00
Quincy Larson 118c71e57e fix css issue and use bower instead of files 2015-09-14 14:05:43 -07:00
Quincy Larson e107b0e005 Merge branch 'feature/enlarge-images' of https://github.com/bugron/FreeCodeCamp into bugron-feature/enlarge-images 2015-09-14 13:43:34 -07:00
bugron c6e3c89b7c adds ability to 1-click expand images 2015-09-14 21:10:28 +04:00
Quincy Larson 953df6826b fix merge conflicts 2015-09-14 00:02:42 -07:00
Quincy Larson 957a5329e5 adjust map font size and simplify Facebook share call to action 2015-09-13 20:26:33 -07:00
Berkeley Martinez 9fd22e8264 remove unnecessary class 2015-09-12 18:51:44 -07:00
Berkeley Martinez 044571a8be Merge branch 'ahstro-3258' of https://github.com/ahstro/freecodecamp into ahstro-ahstro-3258 2015-09-12 18:27:25 -07:00
ahstro 7f6bcaa704 Include code in issue + issue body improvements
This creates an auto-checked checkbox next to the 'Create my GitHub
issue'-button that, when checked, includes the camper's code in the body
sent to GitHub when creating a new issue.
Also includes some general improvements to how the way the issue
creation is handled and how the output looks.
2015-09-13 01:54:26 +02:00
Berkeley Martinez ee92c923d7 Merge pull request #3254 from FreeCodeCamp/more-info
Reorient Search and Submit buttons on Camper News
2015-09-12 13:20:36 -07:00
Quincy Larson 4cd5168aac reorient search and submit buttons to look more conventional 2015-09-11 23:30:10 -07:00
Quincy Larson 0391faf5a2 fix meta tags for facebook 2015-09-09 23:05:58 -07:00
Berkeley Martinez 0791c99945 remove commit garbage 2015-09-09 20:47:46 -07:00
Berkeley Martinez ca50f8250f Merge pull request #3217 from QuincyLarson/signin-copy
improve signin page copy and move twitter to bottom of list
2015-09-09 20:41:59 -07:00
Quincy Larson d02ad70913 Merge pull request #3205 from FreeCodeCamp/feature/ctrl-enter-submit
add ctrl enter press to submit on modal
2015-09-09 20:40:02 -07:00
Berkeley Martinez 40f53fc7c8 Merge pull request #3216 from QuincyLarson/unauthenticated-buttons
Help, Pair and Bug buttons for unauthenticated campers
2015-09-09 20:38:36 -07:00
Berkeley Martinez 7ab36aa785 Merge pull request #3207 from QuincyLarson/fb-share
Fb share button on map
2015-09-09 20:28:05 -07:00
Berkeley Martinez 5490557592 Merge pull request #3041 from QuincyLarson/meta
Update meta tags and copy
2015-09-09 20:20:32 -07:00
Quincy Larson 08907b8ddb improve signin page copy and move twitter to bottom of list 2015-09-09 19:55:23 -07:00
Quincy Larson c70fe77952 Merge branch 'staging' into unauthenticated-buttons
Conflicts:
	server/views/coursewares/showVideo.jade
	server/views/coursewares/showZiplineOrBasejump.jade
2015-09-09 19:54:13 -07:00
Quincy Larson ee9a2d681f make help, pair, bug buttons accessible to unauthenticated campers 2015-09-09 19:51:24 -07:00
Berkeley Martinez d3e77f1282 add ctrl enter press to submit on modal
this adds the ability for a camper to press ctrl + enter to submit
a challenge while the challenge completion modal is open
2015-09-09 19:33:01 -07:00
Berkeley Martinez a5f30414ab Merge pull request #3206 from QuincyLarson/more-info
remove unnecessary elipses from more info buttons
2015-09-09 18:59:56 -07:00