Commit Graph

638 Commits (7737bfedc1671b7fce34ecd89386146fd624e3f1)

Author SHA1 Message Date
Berkeley Martinez 9cf4a9cc69 Merge pull request #7943 from QuincyLarson/feature/remove-camper-news
intercept /news with a notice
2016-04-06 14:21:13 -07:00
Quincy Larson fcebd37a01 intercept /news with a notice 2016-04-06 13:49:39 -07:00
Quincy Larson c1a6104618 update shop to have tshirts 2016-04-06 12:28:42 -07:00
Quincy Larson cf420753cc Merge pull request #7921 from FreeCodeCamp/feature/add-stats
Feature add stats to about page
2016-04-05 23:51:29 -07:00
Berkeley Martinez 1a15687327 Change 'campers' to 'earned' 2016-04-05 21:41:45 -07:00
Berkeley Martinez 06ea132257 Add timed cache to user count queries 2016-04-05 14:45:09 -07:00
Berkeley Martinez c57f1b6f9a Make cert bold 2016-04-05 11:21:08 -07:00
Berkeley Martinez a71daa07ce Add cert counts 2016-04-05 11:21:08 -07:00
Quincy Larson 2fb922be0f create pledge calculation logic 2016-04-05 11:21:08 -07:00
Quincy Larson b40f9b4880 Update home page to reflect 300,000+ campers 2016-04-04 22:21:57 -07:00
Quincy Larson e98fc9d9ff Remove Google and Facebook links from user profiles and settings page for privacy reasons 2016-04-04 22:21:34 -07:00
Quincy Larson a2466d77b3 fix button colors from issue #7903 2016-04-04 22:03:18 -07:00
Quincy Larson 8fb0516811 Merge pull request #7779 from FreeCodeCamp/fix/wiki-urls
Fix article loading on direct link to wiki
2016-04-04 21:09:21 -07:00
Berkeley Martinez 88edd2c64a Merge pull request #7878 from baguzzzaji/remove-jailed-and-all-references-to-it
Remove jailed and all references to it
2016-04-04 14:26:24 -07:00
Berkeley Martinez 5fcb6b999e Merge pull request #7895 from lipis/feature/update-bootstrap-social
Updated Bootstrap Social and remove plus from Google sign in icon
2016-04-04 14:19:11 -07:00
Panayiotis Lipiridis c17af58aee Renamed Github to GitHub 2016-04-04 22:50:07 +02:00
Panayiotis Lipiridis 7c27952ff6 Updated Bootstrap Social
..and remove plus from Google sign in icon
2016-04-04 22:36:35 +02:00
Bagus Aji Santoso 5bc2602bfd Remove jailed and all references to it 2016-04-04 13:13:06 +07:00
Nick b049d252ef FIX - Remove trailing spaces 2016-04-02 23:52:52 -04:00
Berkeley Martinez ee1c017b0d Sync wiki article urls with main site 2016-04-02 00:56:40 -07:00
Mrugesh Mohapatra cb6a594684 Update label text for projects on User portfolio page 2016-03-28 22:14:18 +05:30
Berkeley Martinez 94a9bcea5a Fix article loading on direct link to wiki 2016-03-25 13:48:42 -07:00
Mrugesh Mohapatra eda7b3e255 Move Sign out and Send Email to User Page
This commit moves the Sign out from Free Code Camp and the
Email us buttons to the User page as they are not related
to the accounts page.

Tested Locally.
2016-03-22 01:15:41 +05:30
benmcmahon100 a65742ad45 Fix wiki's SSL issue
fix wiki view

Fix to the same issue that was effecting the aside wiki
2016-03-17 18:14:26 +00:00
Jacob Bearden fcf866906b fix image protocol 2016-03-16 20:32:12 -06:00
Logan Tegman 97a0f71388 Merge pull request #7158 from QuincyLarson/feature/add-nonprofit-project-description
Add an explanation of how our nonprofit projects work
2016-03-16 12:57:23 -07:00
Quincy Larson 69ee345d5c incorporate feedback 2016-03-16 00:27:19 -07:00
Quincy Larson 2285d18260 refactor show view to have a settings button 2016-03-14 23:59:25 -07:00
Quincy Larson d47aed4850 factor out settings page with email settings 2016-03-14 23:59:24 -07:00
Rex Schrader 296536fd81 Merge pull request #7516 from FreeCodeCamp/fix/update-faq
Update Campsite challenge copy and labs
2016-03-14 21:15:11 -07:00
Quincy Larson 9e93d580f6 Update the FAQ 2016-03-11 23:16:06 -08:00
Quincy Larson 7f85f84e47 Update labs view and add a new project 2016-03-11 23:14:21 -08:00
Alister N. Mada eaa513dc56 Redirect /twitch to Twitch channel 2016-03-06 06:20:34 +07:00
Hallaathrad dabcebd91c scrolling issues be gone 2016-03-03 19:00:47 -05:00
Randy Tolentino a6f2373efd Escaped the `h4` in the `challenge-instructions sentence` block because the `h4` was causing the issue with inconsistent text. 2016-02-26 11:22:16 -06:00
afr114 604fbede86 fix bug 7171 2016-02-25 20:47:54 -08:00
Quincy Larson 2f613ec216 shorten nonprofit testimonials 2016-02-22 15:30:08 -08:00
Quincy Larson 389ea7529c add an explanation of how our nonprofit projects work 2016-02-19 17:36:03 -08:00
Quincy Larson f5260f7c21 add testimonial to nonprofit landing page 2016-02-19 17:09:35 -08:00
Hallaathrad a1de66648c fix-instructions-formatting
Another adjustment to the Regex (the word table in the paragraph made it not be wrapped in a p element)
2016-02-18 12:31:22 -05:00
Quincy Larson 6490d681ea add stickers to shop and related paypal functionality
add stickers to shop without unnecessary extra css
2016-02-17 15:11:21 -08:00
Rex Schrader 9c91a84854 Merge pull request #7076 from QuincyLarson/fix/camper-news-notice
add notice to camper news
2016-02-17 13:11:54 -08:00
Quincy Larson 6bb1b09020 add notice to camper news
post notice at the top of camper news
2016-02-16 19:51:28 -08:00
Hallaathrad 447b79cddf fix-odd-spacing
Addresses the JS challenge generator trying to wrap the `<ol>` element inside of a paragraph (and obviously failing)

Closes #6840
2016-02-16 11:06:19 -05:00
Quincy Larson fc94d7c201 Add link to code of conduct and nonprofit project figure 2016-02-13 16:37:29 -08:00
Quincy Larson e417a363ab Move academic honesty policy from wiki to main site 2016-02-13 16:32:14 -08:00
Hallaathrad 3086252d03 Fix for bouncing sidecar's gap 2016-02-12 22:41:58 -05:00
Berkeley Martinez bd506b127b Merge pull request #6921 from FreeCodeCamp/feature/faq
Add FAQ to About page and make About page look much better
2016-02-11 22:00:38 -08:00
Quincy Larson e210bebdd3 update sequence of about page content 2016-02-11 21:51:54 -08:00
Quincy Larson d1d4e368d5 make email address a mailto link 2016-02-11 21:22:22 -08:00