Commit Graph

29599 Commits

Author SHA1 Message Date
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
202d0fa068 Fix add to completed challenges on cert verify 2015-10-05 19:58:44 -07:00
bf4ccab586 Merge pull request #3570 from FreeCodeCamp/feature/certificates
Add certification page
2015-10-05 17:19:17 -07:00
838171acdf update copy of certificate flows 2015-10-05 17:18:35 -07:00
34efc43f6a update copy of certificate flows 2015-10-05 17:18:35 -07:00
8f84596142 Fix 500 out of range bug when completing last challenge 2015-10-05 16:38:58 -07:00
e39120d454 Merge branch 'staging' into feature/certificates 2015-10-05 16:30:01 -07:00
fc17e266fb Merge branch 'staging' into feature/certificates 2015-10-05 16:30:01 -07:00
98c671df8a Add certification page 2015-10-05 15:55:50 -07:00
8c48626f03 Add certification page 2015-10-05 15:55:50 -07:00
b611793bdf Brought in line with staging and added spoofigator! 2015-10-05 23:42:30 +01:00
da09a7b650 Brought in line with staging and added spoofigator! 2015-10-05 23:42:30 +01:00
66c092066f resolve difference with the JSON and AJAX differing from staging 2015-10-05 23:40:33 +01:00
cbb78079f9 resolve difference with the JSON and AJAX differing from staging 2015-10-05 23:40:33 +01:00
fdefcae562 Merge pull request #1 from FreeCodeCamp/staging
update
2015-10-05 22:52:25 +01:00
d65042af54 Finished the geolocation waypoint. Ready for QA and copy fixes 2015-10-05 22:46:29 +01:00
5b771e18e6 Finished the geolocation waypoint. Ready for QA and copy fixes 2015-10-05 22:46:29 +01:00
bda4d33ee6 fix bootstrap fluid containers wording issue
Closes #2467.
2015-10-05 21:26:18 +02:00
c04832d618 fix bootstrap fluid containers wording issue
Closes #2467.
2015-10-05 21:26:18 +02:00
e079419367 Confirm the Ending: Add test case
Add a test case that makes sure the user can't just check the last
character or word.
2015-10-05 18:01:28 +02:00
c3aafafc16 Confirm the Ending: Add test case
Add a test case that makes sure the user can't just check the last
character or word.
2015-10-05 18:01:28 +02:00
4b05a6edc7 Merge pull request #3586 from josephbreihan/fix/typoissue-3585
Fix minor typo
2015-10-05 10:24:34 +02:00
620c828362 Fix typo described in issue #3585 2015-10-04 23:20:09 -04:00
dc4f5212c2 Fix typo described in issue #3585 2015-10-04 23:20:09 -04:00
fe3e94e69b Modify tests for Bonfire - Where do I belong
close FreeCodeCamp/FreeCodeCamp#3381
2015-10-04 11:46:08 +05:30
32cce26251 Modify tests for Bonfire - Where do I belong
close FreeCodeCamp/FreeCodeCamp#3381
2015-10-04 11:46:08 +05:30
47bd1cbb1a New for loop waypoints and verbiage improvements 2015-10-03 20:00:09 -07:00
89e1ebb952 New for loop waypoints and verbiage improvements 2015-10-03 20:00:09 -07:00
7ea6af00dd 90% complete without QA or refined descriptions/tests 2015-10-03 23:59:54 +01:00
4e33b355b0 90% complete without QA or refined descriptions/tests 2015-10-03 23:59:54 +01:00
1f38accd14 Truncate a string: Minor typo
The assert message said `1`, instead of the number `11` that was
actually being used in the assertion.
2015-10-03 11:23:41 +02:00
b2bf3ce391 Truncate a string: Minor typo
The assert message said `1`, instead of the number `11` that was
actually being used in the assertion.
2015-10-03 11:23:41 +02:00
d9332e7d03 Merge pull request #3559 from QuincyLarson/map-restructure
restructure challenges and add certificate challenge skeletons
2015-10-02 12:05:48 -07:00
fe2c78b3e8 add appropriate challenges to certificate challenges 2015-10-02 11:44:29 -07:00
c688082ee4 add appropriate challenges to certificate challenges 2015-10-02 11:44:29 -07:00
344a5b9103 Merge branch 'staging' into map-restructure
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/intermediate-ziplines.json
2015-10-02 11:23:54 -07:00
465835d6b1 Merge branch 'staging' into map-restructure
Conflicts:
	seed/challenges/basic-ziplines.json
	seed/challenges/intermediate-ziplines.json
2015-10-02 11:23:54 -07:00
08de1ac8bb Merge pull request #3568 from FreeCodeCamp/fix/travis
fix travis yaml and test challenges
2015-10-02 11:23:24 -07:00
86344d5c9e fix travis yaml and test challenges 2015-10-02 11:19:07 -07:00
7709438fa3 Merge pull request #3567 from FreeCodeCamp/fix/last-completed-regression
Fix last completed logic bug
2015-10-02 11:11:26 -07:00
c819fcc0cb Merge pull request #3561 from FreeCodeCamp/remove-difficulty
remove vestigial difficulty attribute from challenges
2015-10-02 11:00:11 -07:00
5c3973c365 Fix last completed logic bug
This PR fixes a regression introduced in an earlier patch
2015-10-02 10:50:35 -07:00
b78696463d remove vestigial difficulty attribute from challenges 2015-10-02 01:06:27 -07:00
ea33385fea remove vestigial difficulty attribute from challenges 2015-10-02 01:06:27 -07:00
42b77e92f8 Merge pull request #3560 from FreeCodeCamp/fix/common-is-undefined
Fix check for existence
2015-10-02 00:11:26 -07:00
a90fdf1e0c Fix check for existence 2015-10-01 23:58:56 -07:00
8dc908aa30 restructure challenges and add certificate challenge skeletons 2015-10-01 23:54:20 -07:00
69a3729025 restructure challenges and add certificate challenge skeletons 2015-10-01 23:54:20 -07:00
5f9022475c Merge pull request #3558 from FreeCodeCamp/feature/show-waypoints
Feature show Waypoints on user profile page
2015-10-01 23:09:03 -07:00
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