Commit Graph

6446 Commits

Author SHA1 Message Date
c23367f62b Merge pull request #5038 from bugron/fix/common-improvements
Some common code improvements
2015-12-07 06:48:47 -08:00
1aa470b184 Merge pull request #5024 from gasperno/fix/multiple-lines-img-tag-regex
Modified regex in test case for passing img tag spanning multiple lines
2015-12-07 06:40:33 -08:00
f585b846bf Merge pull request #5055 from QuincyLarson/fix/better-zipline-and-basejump-copy
improve introductory challenges for ziplines and bonfires
2015-12-06 20:41:53 -08:00
34ac4e2e71 improve introductory challenges for ziplines and bonfires 2015-12-06 22:06:26 -06:00
a051d8cc93 Modified regex in test case for passing img tag spanning multiple lines 2015-12-06 21:08:30 -05:00
6a7f7d9204 Merge pull request #5047 from bogadodiegoh/fix/jQuery-Funhouse-text
Updated text from "jQuery Funhouse" to "jQuery Playground"
2015-12-06 11:56:04 -08:00
cbd117c64d Updated text from "jQuery Funhouse" to "jQuery Playground"
This change fixes the issue #5032.
2015-12-06 16:49:18 -03:00
de302ae925 Merge pull request #5031 from gasperno/fix/multiple-lines-modify-regex
fix regex to test h1 tag spanning multiple lines
2015-12-06 10:55:36 -08:00
029cd52e80 Some common code improvements 2015-12-06 13:26:02 +04:00
99df268239 Merge pull request #5035 from FreeCodeCamp/fix/code-uri
Make code-uri more robust
2015-12-06 12:56:29 +04:00
415a39ea17 Make code-uri more robust 2015-12-05 14:53:33 -08:00
addcd4fa20 Merge pull request #5023 from regonn/fix/indent
fix indent in intermediate-bonfires.json
2015-12-05 13:50:21 -08:00
111ff7ed1c fix regex to test h1 tag spanning multiple lines 2015-12-05 15:54:43 -05:00
ad57364427 fix indent intermediate-bonfires.json 2015-12-05 15:15:44 +09:00
0e11374188 Merge pull request #5006 from vtamara/fix/translation-minor-spanish
Minor improvements to spanish translation
2015-12-05 00:02:30 -06:00
9525d135f8 Merge pull request #5022 from FreeCodeCamp/QuincyLarson-remove-angular
Remove angular
2015-12-04 21:47:55 -06:00
615f553fd2 fix editor height 2015-12-04 21:47:30 -06:00
3462ba791e Fix camper news submit 2015-12-04 19:23:06 -08:00
85510a2fd8 Remove directives from views 2015-12-04 18:24:09 -08:00
1014b5562e Merge branch 'remove-angular' of https://github.com/QuincyLarson/freecodecamp into QuincyLarson-remove-angular 2015-12-04 18:16:50 -08:00
676ef0e253 finish qa-ing removal of angular 2015-12-04 19:21:19 -06:00
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
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
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
f0c6388941 translation for gear up for success challenge 2015-12-04 01:31:10 -06:00
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
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
d68c356123 Fixed typo in test case and modified the testcase to pass test-challenges 2015-12-04 01:45:18 -05:00
5b30a521d2 Added test case to Bonfire Drop It Closes #4741 2015-12-03 22:44:59 -08:00
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
efb9eccb19 Merge pull request #4999 from xjlim/fix/fix-hexademical
fix typo in description
2015-12-04 09:26:04 +04:00
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
0b42712a1f Fix moving of query behind hash 2015-12-03 17:37:00 -08:00
d6508ac080 Increase loop protect timeout 2015-12-03 17:13:04 -08:00
ffb4d06d62 Minor improvements to spanish translation 2015-12-03 19:02:34 -05:00
b7530253aa Also disable output and tests 2015-12-03 15:09:52 -08:00
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
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
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
36e6343c56 fix typo 2015-12-03 13:33:10 -08:00
ebfee3ed0a Load jquery from a script tag in iframe 2015-12-03 12:13:25 -08:00
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
5469b03e0e change million to thousand in accordance to graph 2015-12-03 07:06:34 -05:00
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
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
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
e61b44d017 added test case to improve a waypoint 2015-12-03 02:44:50 -05:00
9c97f90f66 Add source map profiling to all files 2015-12-02 23:19:02 -08:00
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
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