Commit Graph

378 Commits (325e121d4e83dbfb3adfb05cb79847127518dc34)

Author SHA1 Message Date
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 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
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
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 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