Commit Graph

6434 Commits (addcd4fa2059773670f986d86b3c323314894687)

Author SHA1 Message Date
Logan Tegman addcd4fa20 Merge pull request #5023 from regonn/fix/indent
fix indent in intermediate-bonfires.json
2015-12-05 13:50:21 -08:00
regonn ad57364427 fix indent intermediate-bonfires.json 2015-12-05 15:15:44 +09:00
Quincy Larson 0e11374188 Merge pull request #5006 from vtamara/fix/translation-minor-spanish
Minor improvements to spanish translation
2015-12-05 00:02:30 -06:00
Quincy Larson 9525d135f8 Merge pull request #5022 from FreeCodeCamp/QuincyLarson-remove-angular
Remove angular
2015-12-04 21:47:55 -06:00
Quincy Larson 615f553fd2 fix editor height 2015-12-04 21:47:30 -06:00
Berkeley Martinez 3462ba791e Fix camper news submit 2015-12-04 19:23:06 -08:00
Berkeley Martinez 85510a2fd8 Remove directives from views 2015-12-04 18:24:09 -08:00
Berkeley Martinez 1014b5562e Merge branch 'remove-angular' of https://github.com/QuincyLarson/freecodecamp into QuincyLarson-remove-angular 2015-12-04 18:16:50 -08:00
Quincy Larson 676ef0e253 finish qa-ing removal of angular 2015-12-04 19:21:19 -06:00
Quincy Larson 7e9d65675a Merge branch 'master' into remove-angular
Conflicts:
	bower.json
	client/main.js
	server/views/coursewares/showZiplineOrBasejump.jade
	server/views/partials/scripts.jade
2015-12-04 18:49:38 -06:00
Logan Tegman bde030001e Merge pull request #5011 from alan1001110/drop_it/add_test
Added test case to Bonfire Drop It
2015-12-04 09:05:18 -08:00
Arsen Melikyan 1d9ac13616 Merge pull request #5013 from MEXshredder/add/ES-translation-for-gear-up-for-success
translation for gear up for success challenge
2015-12-04 11:43:55 +04:00
David Ojeda f0c6388941 translation for gear up for success challenge 2015-12-04 01:31:10 -06:00
Rex Schrader 20b8761084 Merge pull request #5012 from gasperno/fix/test-case-modify
Fixed typo in test case and modified the test case
2015-12-03 23:03:51 -08:00
Arsen Melikyan b5df6ca110 Merge pull request #5007 from LenaBarinova/fix/incorrect-input-still-passes-the-test
Fix test to fail on incorrect input
2015-12-04 10:58:02 +04:00
Harsha d68c356123 Fixed typo in test case and modified the testcase to pass test-challenges 2015-12-04 01:45:18 -05:00
alan1001110 5b30a521d2 Added test case to Bonfire Drop It Closes #4741 2015-12-03 22:44:59 -08:00
JelenaBarinova 0b48d7e0bb Fix test to fail on incorrect input in Waypoint: Add Font Awesome Icons to our Buttons
Added more precise checking for not only class of the button but also text
2015-12-03 22:43:26 -08:00
Arsen Melikyan efb9eccb19 Merge pull request #4999 from xjlim/fix/fix-hexademical
fix typo in description
2015-12-04 09:26:04 +04:00
Rex Schrader 887578abb8 Merge pull request #5001 from FreeCodeCamp/feature/disable-javascript
Add ability to disable user code on page load
2015-12-03 17:51:14 -08:00
Berkeley Martinez 0b42712a1f Fix moving of query behind hash 2015-12-03 17:37:00 -08:00
Berkeley Martinez d6508ac080 Increase loop protect timeout 2015-12-03 17:13:04 -08:00
Vladimir Támara Patiño ffb4d06d62 Minor improvements to spanish translation 2015-12-03 19:02:34 -05:00
Berkeley Martinez b7530253aa Also disable output and tests 2015-12-03 15:09:52 -08:00
Berkeley Martinez 81028fceac Add ability to disable user code on page load
Adding `run=disabled` to the uri will disable the
page from running user code.

This is useful for pages that have frozen to to infinite loops
or untrusted links that may be malicious
2015-12-03 14:57:19 -08:00
Logan Tegman 09e8be03e3 Merge pull request #4995 from FreeCodeCamp/fix/remove-jquery-proxy
Load jquery from a script tag in iframe
2015-12-03 14:32:27 -08:00
Logan Tegman 0950335645 Merge pull request #4971 from FreeCodeCamp/feature/source-maps
Add source map profiling to all files
2015-12-03 14:26:03 -08:00
Terra Incognita 36e6343c56 fix typo 2015-12-03 13:33:10 -08:00
Berkeley Martinez ebfee3ed0a Load jquery from a script tag in iframe 2015-12-03 12:13:25 -08:00
Logan Tegman 6efb6783cb Merge pull request #4979 from vtamara/fix/400-millions
Change million to thousand in accordance to graph
2015-12-03 10:33:14 -08:00
Vladimir Támara Patiño 5469b03e0e change million to thousand in accordance to graph 2015-12-03 07:06:34 -05:00
Arsen Melikyan 72454354d7 Merge pull request #4903 from DDaems/Fix/waypoint-style-the-html-body-element
Fix second test to only test for brackets.
2015-12-03 12:25:50 +04:00
Dieter Daems d9aa7bf712 Fix second test to only test for brackets
- properly detect curly brackets without countradicting the first test
result.
2015-12-03 09:18:36 +01:00
Rex Schrader ae6317bd7e Merge pull request #4974 from gasperno/fix/add-test-case
Test Case to verify h3 element is nested in div
2015-12-03 00:00:07 -08:00
Harsha e61b44d017 added test case to improve a waypoint 2015-12-03 02:44:50 -05:00
Berkeley Martinez 9c97f90f66 Add source map profiling to all files 2015-12-02 23:19:02 -08:00
Rex Schrader 08da5befb8 Merge pull request #4968 from DDaems/Fix/waypoint-change-the-font-size-of-an-element
Fix: Check if both P tags have a font-size of 16px
2015-12-02 21:12:39 -08:00
Dieter Daems 3cf399a73f Fix: Check if both P tags have a font-size of 16px
currently the test would pass, when you add font-size 16px to the red-text class.
Even tho the second p tag didn't have the class.
2015-12-03 05:41:24 +01:00
Logan Tegman 3972f94b2b Merge pull request #4963 from SaintPeter/fix/uncomment-html-degenerate-test
Fix Uncomment HTML bad 4th test
2015-12-02 20:16:37 -08:00
Berkeley Martinez a41dbc84bf Merge pull request #4960 from SaintPeter/fix/fix-test-variable-collision
Fix 'test' variable name collision for Regular Expression Waypoints
2015-12-02 19:09:03 -08:00
SaintPeter a21348bec9 Fix Uncomment HTML bad 4th test 2015-12-02 19:07:21 -08:00
Rex Schrader 98a28781e8 Merge pull request #4962 from ADude2/fix/basic-bootstrap-custom-heading-fix
Solves text accuracy issue in Bootstrap Waypoint: Create a Custom Heading
2015-12-02 18:50:55 -08:00
Alex Di Domenico 912e5a66ee Solves text accuracy issue in Bootstrap Waypoint: Create a Custom Heading 2015-12-02 21:39:44 -05:00
SaintPeter 6d1961b319 Fix 'test' variable name collision 2015-12-02 18:26:42 -08:00
Arsen Melikyan 7a4868c554 Merge pull request #4772 from vtamara/add/ES-translation-json-apis-and-ajax
Indenting and translating to spanish json-apis-and-ajax.
2015-12-03 06:09:26 +04:00
Arsen Melikyan 0044d669db Merge pull request #4768 from vtamara/add/ES-translation-object-oriente-and-functional-programming
Indenting and adding spanish translation of Object Oriented and Functional Programming.
2015-12-03 06:03:34 +04:00
Vladimir Támara Patiño df23dd1614 Indenting and translating to spanish. Closes #4545
Thanks for corrections to @justinian336
2015-12-02 20:54:48 -05:00
Logan Tegman 4a7c35b951 Merge pull request #4957 from FreeCodeCamp/fix/mangled-test
Fix broken tests
2015-12-02 17:51:11 -08:00
Vladimir Támara Patiño ccdab5a777 Indenting and adding spanish translation. Closes #4543. Thanks for corrections to @justinian336 2015-12-02 20:41:56 -05:00
Berkeley Martinez 4778540072 Fix broken tests
Should use editor.getValue() or `code` when you need code
as a string.
2015-12-02 17:02:37 -08:00