Commit Graph

749 Commits (c0f4fecb6fc9137261c3388328b574864eb858b9)

Author SHA1 Message Date
Quincy Larson 66fda23dac Improve style on flash notification and make flyer conditional on logged in user with at least 6 points
Lower case model json file
2016-04-13 23:10:46 +01:00
Quincy Larson 79261f1793 Make the flash message look narrower (and much better) 2016-04-13 23:10:41 +01:00
Quincy Larson 4fa1e2f405 Make flyer show up in various views (but not in all, avoiding the map and wiki view problems) 2016-04-13 23:10:40 +01:00
benmcmahon100 2b2b359514 Bill board feature up and running 2016-04-13 22:58:58 +01:00
benmcmahon100 a27c5ccdd2 Ground work for the bill board announcement feature 2016-04-13 22:58:57 +01:00
Quincy Larson a40642b963 add completed challenge count back in and link to nonprofit playlist 2016-04-12 16:10:44 -07:00
BKinahan e56a7404ad Correct typo in How Nonprofit Projects Work 2016-04-11 18:32:42 +00:00
Justin Richardsson 5fdc961587 Night Mode + CSS Additions (#7929)
* Night Mode and More Hotkeys

* Nightmode CSS adjustments

* Removed Redundant Line

* Wrapped JSON.parse statements in a try catch block
2016-04-08 15:13:41 -07:00
Berkeley Martinez b2462e1b4c Fix sitemap
Add 24 hour cache
Add jobs to sitemap
Possible warning about to many eventemitter listeners
2016-04-07 13:31:58 -07:00
Berkeley Martinez 258597f053 Fix news jade pages
Remove unused pages
2016-04-07 10:12:29 -07:00
Berkeley Martinez 1308d312a4 Add methods to get challengeMap
Update boot/challenge.js to use new methods
Update boot/user.js to use new methods
2016-04-06 21:11:07 -07:00
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
Quincy Larson 46d5aa5718 Update navber 2016-02-11 20:47:03 -08:00
Quincy Larson aaaf327992 Merge pull request #6879 from FreeCodeCamp/feature/wiki-sidebar
Add Wiki Sidebar, Use Gatsby Generated Wiki
2016-02-11 20:01:01 -08:00
SaintPeter ba18520845 Add language detection 2016-02-11 18:14:47 -08:00
Quincy Larson d6fcbdaffc update font awesome and move about page to all font awesome icons 2016-02-11 15:56:15 -08:00
Quincy Larson 740be4ee24 add faq and update about page 2016-02-11 15:42:11 -08:00
Quincy Larson 93489c3fd9 Merge pull request #6854 from FreeCodeCamp/feature/reduce-query-load
Reduce query load/ add completed challenge validation
2016-02-11 09:44:07 -08:00
Hallaathrad b5fc216436 fix for Flash message not displaying in detached map 2016-02-10 17:47:35 -05:00
Berkeley Martinez 76cfbdf752 challenge/user router now works with challengeMap 2016-02-10 10:09:40 -08:00
Hallaathrad fe422d2300 adding wiki as detached and integrating into .less folder 2016-02-09 23:26:59 -05:00
JelenaBarinova 28df95b25c Green checkmarks added to Video and Zipline challenges view for completed challenges 2016-02-09 16:20:30 -08:00
Rex Schrader 02662e98e2 Add Wiki Sidebar 2016-02-09 12:44:08 -08:00
Quincy Larson 25a762f52c add link to euro tshirt campaign 2016-02-06 22:55:58 -08:00
Quincy Larson 43377e1d38 Merge pull request #6738 from hallaathrad/change/challenge-cockpit-overhaul
Minor aesthetic changes
2016-02-05 23:07:37 -08:00
Quincy Larson a55488e5eb create shop with link to tshirt 2016-02-05 21:06:30 -08:00
Hallaathrad a903db76e3 Minor aesthetic changes 2016-02-05 23:46:11 -05:00
Mrugesh Mohapatra ef3a93f6e6 Fix path for data visualization certification 2016-02-05 12:46:35 +00:00
Akira Laine a7bd7e3729 worked on video challenge superblock
fixed rebase merge errors

Fix videos route

Fix hikes broken true/false

fixed component name
2016-02-04 17:20:34 +11:00
Ka Lun Lee 65db39879f fixed spacing for Basejump and similar pages
there were very wide blank spaces between checklist and text when the page size was < 760px, also fixed misplaced titles in Basejump pages for Firefox when < 760px
closes #5347
2016-02-03 18:27:23 -08:00
Quincy Larson 696bbeaae9 fix map button size 2016-02-02 00:39:55 -08:00
Quincy Larson ebfda63f7d Merge pull request #6631 from SaintPeter/feature/map-live-filter
Map - Live Filter Search Feature
2016-01-31 22:25:23 -08:00
SaintPeter a6fc2f2fd4 Final effeciency pass, fix search bug 2016-01-31 22:12:41 -08:00
Quincy Larson 31194ee3c0 Merge pull request #6600 from raisedadead/fix/change-label-to-view-solution
Change the label text from "View my solution" to "View solution"
2016-01-31 22:12:26 -08:00
Hallaathrad d1993ea4b6 Filter functions almost ready.
Our pretty bar changes visual state of the filtered elements, clears with the X, restores hidden elements when deleting characters. Etc.

For the future: if a chapterBlock is collapsed but has results, expand it. No?
Also, hopefully getting fontawesome to the latest version... Regardless of that, this is a great opportunity for a legendary 404.

Expansion of containers achieved

Still working on collapsing them back when search terms change.
If users had just pressed "collapse all" before the search, they should remain thus afterwards.

The UX focus here is not to change the users' expected behaviour and final result.

Future: updating font awesome.
Working on a legendary "not found" image to make FCC join the internet hall of fame.
(btw, where would I keep that file in the server?)
2016-01-31 19:29:32 -08:00
Berkeley Martinez c7fc9dc99f Merge pull request #6601 from SaintPeter/feature/challenge-checksum
Add Checksum to Challenges for Google Analytics
2016-01-31 17:36:16 -08:00
SaintPeter fa18734a59 Add Live Filter to Map - partial 2016-01-31 14:42:35 -08:00
Rex Schrader d049d7b646 Merge pull request #6592 from SaintPeter/fix/remove-filter-adjust-spacing
Fix/Remove Filter and Adjust Map Spacing and Coloring
2016-01-31 14:34:47 -08:00
Quincy Larson 806b196d5e improve map spacing 2016-01-31 14:11:59 -08:00
Berkeley Martinez 76c75b8e48 Merge pull request #6333 from LenaBarinova/fix/streak-seems-broken-because-of-timezone
Fixed streak and completion dates to be showed using users timezone
2016-01-30 11:47:38 -08:00
SaintPeter f2e61ea0ac Add Checksum to Challenges for Google Analytics 2016-01-30 09:02:22 -08:00
Mrugesh Mohapatra 1b6ae0b462 Change the label text from "View my solution" to "View Solution"
This commit changes the text of the label from "View my solution" to
"View solution".

As disscussed in the issue, campers visiting profile pages of others,
saw "View my solution" and found this confusing.

Removing the "my" from the text makes it generic, to either user's own
page or other's pages.

Tested locally.
2016-01-30 13:13:22 +05:30
Hallaathrad 81f9b92bed Adjust spaces and sizes on sidebar
Addressing the changes discussed over skype to fix #6564, and an incoming issue with #6584 in which the absence of the button will create awkward empty spaces.
Took that chance to improve the spacing even further —vertical real state.

----

bonus: changed the colour for the navbar hover status (brown -> darkgreen)
2016-01-29 18:29:26 -08:00
Arsen Melikyan c62b7abf8f Remove the filter button and collapse completed blocks by default 2016-01-29 18:29:26 -08:00
Quincy Larson 93dfc42e04 Merge pull request #6403 from hallaathrad/change/center-map-layout
Centre map layout, colour enhancement for UX
2016-01-28 17:06:47 -08:00
Quincy Larson 64efbd36a2 Merge pull request #6548 from hallaathrad/change/about-page
Change space in population table
2016-01-28 17:04:59 -08:00
Rex Schrader 5ea9eb2d9e Merge pull request #6348 from bugron/feature/last-signin-method
Highlight last signin method's button
2016-01-28 13:47:27 -08:00
Arsen Melikyan 48755d0429 Highlight last signin method's button 2016-01-28 22:50:24 +04:00
Hallaathrad 49ccd81654 Change space in population table
From a <table> inside a single <h2> and spacing based on html encoded stuff, to an <ul> with light css styling.

-----
More cleanup changes for the rest of the page to come in next PR.
2016-01-28 12:51:23 -05:00
Hallaathrad 253b3a55bd Fix map's layout
Centering in screen, responsive and indented.

Adittional styling to enhance visual hyerarchies, and then some UX colour-loving care to ease use on the sidebar+menu.
2016-01-28 09:49:30 -05:00
Quincy Larson 88795410d0 fix landing page typo and simplify CTA button copy 2016-01-27 23:11:25 -08:00
Berkeley Martinez 446110fc17 Cleanup bad commit files 2016-01-27 12:29:49 -08:00
JelenaBarinova 57e5c98a48 LastUpdated updated to be displayed same as completeDate 2016-01-26 15:11:33 -08:00
JelenaBarinova 29f93df1bb Getting users timezone on client side and passing it to server side within POST (on challenge complete), showing users stats with users timezone
After CR
2016-01-26 15:09:47 -08:00
Berkeley Martinez 8a0341a7ac Fix zipline/basejump completed endpoint
This PR refactors and normalizes the endpoint and the ajax request.
Some weird bug keeps popping up on the server, but keymetrics has
decided to take a crap and not actually report back with the error
I don't know what exactly is causing it.

Normally I don't like fixing something I can't see, but I'm getting
a constant flood of emails because of some obscure bug here.

We removed the `completedWith` functionality a while back so that
was removed from this endpoint and the ajax call.

To test, verify that you can complete both a zipline/basejump.

Also show last updated date since it is possible a user might want
to update links
2016-01-23 20:34:49 -08:00
Hallaathrad 76bee1edec Fix Navbar elements
Noticed there was a div instead of li, and then repaired the css to make it fit the same way it was as a div.

(plus a bit of gridlike alignment to the right)
2016-01-21 18:20:42 -05:00
Arsen Melikyan d67566b3ab Add the filter button and fix superblock's position 2016-01-21 12:06:46 +04:00
Quincy Larson 18ac99f8f3 make map header fixed to top of page again 2016-01-21 10:28:28 +08:00
Quincy Larson c94609de04 make map carets clickable, add full stack and interview prep sections 2016-01-21 10:03:26 +08:00
Quincy Larson b971abcebf Merge pull request #6293 from SaintPeter/fix/new-challenge-color
Change New and Coming Soon to text-info (Blue)
2016-01-20 17:24:37 +08:00
Berkeley Martinez 51056fa4db Add last updated to profile algos/challenges 2016-01-19 00:02:21 -08:00
SaintPeter fdb2e6d20a Change New and Coming Soon to text-info 2016-01-18 17:52:51 -08:00
Rex Schrader a13178ad42 Merge pull request #6292 from FreeCodeCamp/fix/remove-old-terms
Fix show profile page challenge filtering to use challengeType
2016-01-18 17:42:56 -08:00
Berkeley Martinez e3ec56ef40 Fix show profile page challenge filtering to use challengeType 2016-01-18 17:33:06 -08:00
Arsen Melikyan 092db019e6 Revert recent feature and fix it 2016-01-19 03:21:00 +04:00
Derek Keith 494243786b Make map header area fixed with flex layout and overflow scroll.
This commit makes the map header with the collapse button fixed by using
flex and overflow. This commit implements the behavior on both the aside
and map (mobile) page.

closes #6276
2016-01-18 12:12:54 -07:00
Arsen Melikyan db57fd405f Add 'copy to clipboard' buttons for easy challenge link and code copying 2016-01-18 11:20:21 +04:00
Eric Leung 0979806d93 Remove preceding space to section headings in map 2016-01-17 21:21:01 -08:00
SaintPeter 333a45ed0f Fix HTML Display 2016-01-17 10:53:14 -08:00
Arsen Melikyan 647621cadd Restores changes overwritten by the redesign 2016-01-17 10:04:08 +04:00
Arsen Melikyan 2e5a1937f3 Fix map list icon not toggling and Expand all button issues 2016-01-16 18:32:06 +04:00
Quincy Larson 57f7e04f44 start working on accordion caret animation 2016-01-16 01:21:05 -08:00
Quincy Larson 1d23f855a2 make look of camper news submission flow more consistent 2016-01-16 01:10:06 -08:00
Quincy Larson cb972cacc8 Get the expand all / collapse all view working on the map 2016-01-16 01:03:22 -08:00
Quincy Larson 2f992e3df9 improve accordion. It is not done but way better than before 2016-01-15 20:05:34 -08:00
Quincy Larson 932a0a975b improve the challenge accordion 2016-01-15 18:00:13 -08:00
Quincy Larson e02000bddd start adding accordion map 2016-01-15 17:19:39 -08:00
Berkeley Martinez 12b2be9db8 Remove old terminology 2016-01-15 06:08:54 -08:00
Berkeley Martinez 48167fe6e9 Fix profiles not visible to others 2016-01-15 05:42:37 -08:00
Quincy Larson 35b460b00a fix jade error and spacing issue on step challenges 2016-01-15 05:21:39 -08:00
Berkeley Martinez d7cba7c449 Fix rebase bugs 2016-01-15 05:04:44 -08:00
Quincy Larson 564d8c620f fix style issues throughout app 2016-01-15 04:52:47 -08:00
Quincy Larson c0a87a8fcf implement @bugron's UI suggestions 2016-01-15 04:51:11 -08:00
Quincy Larson 9f67cb8736 improve onboarding challenges 2016-01-15 04:51:11 -08:00
Berkeley Martinez 47c930d7f4 Add new help rooms and logic 2016-01-15 04:51:11 -08:00
Berkeley Martinez 918ea56e33 Add stats to about page 2016-01-15 04:49:46 -08:00
Quincy Larson a6c4ed77a5 further improvements of challenge ssed for better looking views 2016-01-15 04:49:46 -08:00
Quincy Larson 1e5f3dc61c refactor map view and make buttons and text bigger 2016-01-15 04:49:46 -08:00
Berkeley Martinez 95dfd2304e Use specific layout for map aside
Links in aside change parent location
2016-01-15 04:46:20 -08:00
Berkeley Martinez 7e041dc169 Remove learn button. 2016-01-15 04:46:20 -08:00
Berkeley Martinez 98b54e9fc7 Load map aside as an iframe on every page 2016-01-15 04:46:20 -08:00
Berkeley Martinez a2fd213a86 Ad minimal map for iframe loading 2016-01-15 04:46:20 -08:00
Berkeley Martinez f960b3aa84 Normalize indenting on map/show 2016-01-15 04:46:20 -08:00
Quincy Larson 98626d3be7 delete old terms-and-privacy page 2016-01-15 04:46:20 -08:00
Quincy Larson 6d23e4931b update privacy, terms, code of conduct and add links to about page 2016-01-15 04:46:20 -08:00
Quincy Larson 97b614e467 improve look of buttons and layout on portfolio view 2016-01-15 04:46:20 -08:00
Quincy Larson dad1e1638e surface isRequired in view 2016-01-15 04:40:55 -08:00
Berkeley Martinez 56a7d03658 Add back map overview to map page 2016-01-15 04:40:55 -08:00
Berkeley Martinez 5798537bcb Abstract map and showChallenge logic
Rename some legacy naming conventions
Remove logic for waypoint,basejumps, etc...
2016-01-15 04:39:45 -08:00
Berkeley Martinez 57507d84f5 Re-add btn classes to account page 2016-01-15 04:36:15 -08:00
Quincy Larson bbf6d14ee7 start working on ghost-only buttons 2016-01-15 04:33:19 -08:00