Commit Graph

864 Commits (89c64fb37668fb5a8980bd91cd9c80839d8547f2)

Author SHA1 Message Date
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
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
Berkeley Martinez 3f96490aff Add pledge model 2015-10-06 19:51:19 -07:00
Quincy Larson 914f2ef0b8 Merge pull request #3611 from FreeCodeCamp/fix/replace-script-tag-in-url
Fix replace script tags in URL
2015-10-06 16:48:37 -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
Quincy Larson ebe0165fba Merge pull request #3601 from FreeCodeCamp/fix/user-certs-edge-cases
Fix/user certs edge cases
2015-10-05 22:43:39 -07:00
Quincy Larson d78d7a3fa1 Merge branch 'staging' of https://github.com/freecodecamp/freecodecamp into staging 2015-10-05 22:43:17 -07:00
Quincy Larson 9a0505f782 add github linking enforcement 2015-10-05 22:42:42 -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 84eb5ac810 Merge pull request #3596 from FreeCodeCamp/fix/500-out-of-range-bug
Fix 500 out of range bug when completing last challenge
2015-10-05 22:15:26 -07:00
Quincy Larson c27e5bf6c4 start adding clementine challenge 2015-10-05 21:57:15 -07:00
Berkeley Martinez 85f2c005cd fix shareable challenges solution undefined
During challenges when a user tries to navigate to a challenge
and hits the name redirect, the solution is filled with
undefined starting the user with an empty box.
This PR fixes the issue by ignoring the solution param
if it is empty
2015-10-05 20:18:52 -07:00
Berkeley Martinez 188da02ffc Fix disable cert
Disable certificate when user is locked to the public
or when they haven't signed academic honesty
2015-10-05 20:00:25 -07:00
Berkeley Martinez 202d0fa068 Fix add to completed challenges on cert verify 2015-10-05 19:58:44 -07:00
Quincy Larson 34efc43f6a update copy of certificate flows 2015-10-05 17:18:35 -07:00
Berkeley Martinez 8f84596142 Fix 500 out of range bug when completing last challenge 2015-10-05 16:38:58 -07:00
Berkeley Martinez 8c48626f03 Add certification page 2015-10-05 15:55:50 -07:00
Berkeley Martinez 5c3973c365 Fix last completed logic bug
This PR fixes a regression introduced in an earlier patch
2015-10-02 10:50:35 -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
Berkeley Martinez 6c305dbc67 feature make completedChallenges uniq
now when users complete a challenge, it will instead update the
last save if it exists.
2015-10-01 22:19:26 -07:00
Berkeley Martinez d0528ec768 fix re-encode uri during redirect 2015-10-01 21:11:15 -07:00
Berkeley Martinez 8a1a7f238d fix undefined username and remove old function
fix many bugs and undefined
fix linting errors
2015-10-01 21:03:28 -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 242351e0e4 Merge pull request #3541 from FreeCodeCamp/fix/last-challenge-name
fix check for existance when getting last challenge
2015-09-29 22:37:57 -07:00
Berkeley Martinez cdf8c6a54c fix check for existance when getting last challenge 2015-09-29 22:12:02 -07:00
Quincy Larson ee9827ea58 fix issues with get-started and remove pair button 2015-09-29 17:59:16 -07:00
Quincy Larson 31f9b7d707 Merge pull request #3530 from FreeCodeCamp/map-share
add facebook sharing to map on completed challenges
2015-09-28 20:08:06 -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 7900628d2a Merge pull request #3525 from FreeCodeCamp/feature/jobs
intermediate pull
2015-09-28 17:35:13 -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 5b5b37adff fix tshirt version 2 not submitting properly bug 2015-09-27 14:00:55 -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
Berkeley Martinez c985a0f16e Merge pull request #3478 from FreeCodeCamp/remove-emails
remove email address from stories
2015-09-23 18:11:13 -07:00
Quincy Larson de976c18ba remove email address from stories 2015-09-23 15:20:45 -07:00
Berkeley Martinez bf95314830 fix prevent redirect to /news/hot 2015-09-23 15:05:27 -07:00
Quincy Larson 29dab96b9b Merge pull request #3475 from FreeCodeCamp/fix/redirect-whitelist
fix only allow redirects on whitelist
2015-09-23 14:55:10 -07:00
Berkeley Martinez baab92e3a0 fix only allow redirects on whitelist 2015-09-23 14:54:08 -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 e579cbd778 update to react-router 1.0.0-rc1 2015-09-21 12:54:33 -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
Berkeley Martinez dfed1538c7 render individual job on request and window transition 2015-09-10 16:27:10 -07:00
Berkeley Martinez e3ac50a0d5 remove old manifest file on request in dev 2015-09-10 16:27:09 -07:00
Berkeley Martinez cd4ee10838 add job subroutes 2015-09-10 16:27:08 -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
Quincy Larson 4d427f8318 simplify modal animations and close #2792 2015-09-09 18:55:20 -07:00
Quincy Larson 0eeb6891f7 Merge branch 'staging' into fb-share 2015-09-09 13:47:54 -07:00
Quincy Larson 501bd51e8b remove unnecessary elipses from more info buttons 2015-09-09 13:38:18 -07:00
Quincy Larson 2896cee8f5 simplify fb-share call to action and minimize sizze 2015-09-09 00:10:36 -07:00
Quincy Larson cfba4edb29 add further code to be QAd after sleeping 2015-09-08 23:48:11 -07:00
Quincy Larson c4c9068950 start refactoring account view into show view 2015-09-08 22:52:32 -07:00
Berkeley Martinez b2d04ec7c5 remove save to user on return individual user 2015-09-08 22:41:03 -07:00
Berkeley Martinez 9cc862e9a6 add learn button functionality
learn button looks for current challenge in localStorage
if not present sends user to map
2015-09-08 22:31:20 -07:00
Berkeley Martinez 184ba1fa37 add challengeId to localStorage
remove unneeded current challenge route
2015-09-08 22:18:25 -07:00
Quincy Larson f0a4924671 start refactoring next challenge logic 2015-09-08 21:45:53 -07:00
Quincy Larson 1e82165ed2 add learn button back in and fix redirect loop associated with it 2015-09-08 21:15:18 -07:00
Berkeley Martinez f42b671e17 Merge pull request #3119 from bugron/bugron-bring_br_back
Removes unnecessary 'negative-15' class
2015-09-08 07:25:17 -07:00
bugron 8fd99e3350 removes unnecessary class 2015-09-08 16:30:44 +04:00
Quincy Larson 5502aba817 further revisions to simplify bug modal 2015-09-07 08:18:44 -07:00
Quincy Larson e7e6bbb174 Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging 2015-09-07 07:56:25 -07:00
Quincy Larson e49bcece7d Merge branch 'bugron-bug_btn_enhancement_merged' of https://github.com/bugron/FreeCodeCamp into bugron-bugron-bug_btn_enhancement_merged 2015-09-07 07:25:14 -07:00
Quincy Larson 73ef8b9d2b fix a view bug 2015-09-06 03:12:59 -07:00
bugron 46a83b42a1 removes the checkbox at all 2015-09-06 11:40:06 +04:00
Quincy Larson 4c22d061df start working on fb-share 2015-09-04 18:36:28 -07:00
Quincy Larson 79a396b9c8 Merge branch 'patch-1' of https://github.com/tcyrus/FreeCodeCamp into staging
Conflicts:
	server/views/coursewares/showHTML.jade
2015-09-04 14:26:56 -07:00
Timothy Cyrus f8a5d0d7ba Update showHTML.jade
Fix Styling issue with Submit Button based on showJS.jade and showBonfire.jade
2015-09-04 14:11:52 -04:00
Quincy Larson 57e1fbf781 update copy in views 2015-09-03 18:35:42 -07:00
Quincy Larson 30aafd4185 update meta and other references to new short tagline 2015-09-02 17:42:18 -07:00
Quincy Larson 4b6cb490b7 update meta tags 2015-09-02 17:37:23 -07:00
Ammar Dodin fcaf10ca9d Updated README.md
The author of this file typed "this files" where I believe he meant to type "these".
2015-09-02 00:38:15 -07:00
bugron 887722d5c8 checkbox is now checked by default 2015-09-01 17:13:16 +04:00
bugron 8fdacb7e34 This commit extends 'Bug' button's functionality 2015-09-01 07:18:44 +04:00
jameskopacz 70b769cc6a Updated text to "Submit and go to next challenge" 2015-08-30 23:49:21 -05:00
jameskopacz c036e00f53 Updated challenge submit button text from "Submit" to "Go to my next challenge" 2015-08-30 23:17:22 -05:00
Berkeley Martinez 150676fa6e Merge pull request #2870 from QuincyLarson/add-quotes
Add quotes
2015-08-30 19:37:10 -07:00
Florian Beijers a3b54e3e63 added a space in the sr-only span for challenge map so it doesn't run together and fixed a typo on the getting started page 2015-08-30 12:43:27 +02:00
Quincy Larson 8392dcf156 Merge branch 'staging' into add-quotes 2015-08-29 22:32:44 -07:00
Quincy Larson 23c1e71823 update quotes 2015-08-29 22:31:46 -07:00
benmcmahon100 71b6e21e77 Added the accessibility fix and added the hack to fix the challenge complete modal 2015-08-30 00:31:07 +01:00
Berkeley Martinez 702dbeceab change Run code button to Run tests
Changes run button copy

closes #2846
2015-08-29 09:30:47 -07:00
Berkeley Martinez 16b33ee90a fix some linting issues 2015-08-29 01:48:01 -07:00
Berkeley Martinez f0b953eb66 fix typo js challenges view 2015-08-29 01:05:07 -07:00
Berkeley Martinez 0dfa11ca99 remove all manifest files from tracking
add readme explaining empty directory
2015-08-28 16:39:14 -07:00
Berkeley Martinez 6c48395868 separate main manifest generation from sub manifests
in dev mode always pull manifest on each request
add manifest build to gulp build task
add react bundle to manifest generation
2015-08-28 15:56:58 -07:00
Berkeley Martinez 376b58cc15 combine sandbox into commonFramework
a @benmcmahon suggestion
2015-08-27 12:37:41 -07:00
Berkeley Martinez 306c441ae7 add revisioning to js/css files to break caching
This moves the location of javascript files, commonFramework,
iFrameScript, sandbox, plugin, and all the less files.
On gulp or gulp build these files are moved and revisioned.
Places where they are references in jade/html are now removed and
replaced with the use of a helper function `rev`. This function will
take the required file and return a string referencing the revisioned
file. This should alleviate the need for hard refreshing and will break
caches when files change, so fixes for firefox caching issue as well.

NOTE: @benmcmahon @quincylarson, This means files will need to be build
on the server in production before doing a server restart/reload
In production: 'npm run build' To build and revision js/css files

`gulp` and `gulp build` will used in development

npm install also needs to be run in production on initial deploy
2015-08-26 23:30:33 -07:00
Berkeley Martinez 39f636ae91 add loader to challenge submit 2015-08-26 15:17:38 -07:00
benmcmahon100 7c3f650521 Bump up cFW version number to ensure eveyone is on te latest version 2015-08-26 22:37:54 +01:00
Berkeley Martinez 2c9ed16b7a fix only submit on user click 2015-08-26 13:09:38 -07:00
benmcmahon100 306551848c Update cFW version no 2015-08-26 20:45:50 +01:00
benmcmahon100 a63d6bd00b Fixed my stupid mistake that almost killed the server again 2015-08-26 20:22:29 +01:00
benmcmahon100 695ad48778 Fixed version number 2015-08-26 12:26:01 +01:00
benmcmahon100 9f9f151a6f Re add init run 2015-08-26 12:24:44 +01:00
Berkeley Martinez cb2bc3c0bd Merge pull request #2705 from QuincyLarson/alt-text
Alt text
2015-08-25 22:30:44 -07:00
benmcmahon100 8cdd49e7f1 Fix caching issue with frameworks 2015-08-26 01:13:17 +01:00
Quincy Larson 07f66b61f4 update the completed all challenges message 2015-08-25 15:51:47 -07:00
Berkeley Martinez 851af506b5 Merge pull request #2691 from QuincyLarson/alt-text
Add more alt text to onboarding page.
2015-08-25 15:21:44 -07:00
Berkeley Martinez 14d1d1db02 fix left panel jitter jump 2015-08-25 14:49:19 -07:00
benmcmahon100 b1b07a5b9e Fixed major Fudge up with challenges without functions 2015-08-25 22:25:00 +01:00
Quincy Larson 56b18f313b update get-started alt text 2015-08-25 14:23:47 -07:00
Ben McMahon c913e9bbf7 Merge pull request #2679 from FreeCodeCamp/staging
update framework to remove merge conflicts
2015-08-25 19:41:29 +01:00
benmcmahon100 14cc6a7cef Final touch up to the framework before merge 2015-08-25 19:28:13 +01:00
Quincy Larson 50f1705cbc start updating alt text 2015-08-25 08:59:42 -07:00
Quincy Larson bc1393edac Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into calculator 2015-08-24 19:19:58 -07:00
Quincy Larson a94c919374 update cost calculator 2015-08-24 19:19:47 -07:00