gaspersic/freeCodeCamp
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
21,085 Commits 9 Branches 0 Tags
9341aadb5b2421c3c0526ab93c657590218ce20c
Commit Graph

21085 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Quincy Larson
9409945ee7 Merge branch 'staging' into update-ziplines 
Conflicts:
	client/commonFramework/bindings.js
 2015-12-08 01:17:03 -06:00
Berkeley Martinez
e12e49e25e Fix run first time 
Now called `only-once`
but will not throw if run more than once
also, uses node to create file
 2015-12-07 23:16:33 -08:00
Logan Tegman
c23367f62b Merge pull request #5038 from bugron/fix/common-improvements 
Some common code improvements
 2015-12-07 06:48:47 -08:00
Logan Tegman
d95d96fe7d 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
Logan Tegman
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
Quincy Larson
dab704aee0 update user stories and sharing instructions for basejumps and ziplines 2015-12-07 00:51:37 -06:00
Quincy Larson
92928b552b update user stories and sharing instructions for basejumps and ziplines 2015-12-07 00:51:37 -06:00
Berkeley Martinez
13223a3f06 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
Berkeley Martinez
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
Quincy Larson
f7ce5c2b2c improve introductory challenges for ziplines and bonfires 2015-12-06 22:06:26 -06:00
Quincy Larson
34ac4e2e71 improve introductory challenges for ziplines and bonfires 2015-12-06 22:06:26 -06:00
Harsha
e28fa86708 Modified regex in test case for passing img tag spanning multiple lines 2015-12-06 21:08:30 -05:00
Harsha
a051d8cc93 Modified regex in test case for passing img tag spanning multiple lines 2015-12-06 21:08:30 -05:00
Logan Tegman
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
Diego Bogado
2e60cb30e5 Updated text from "jQuery Funhouse" to "jQuery Playground" 
This change fixes the issue #5032.
 2015-12-06 16:49:18 -03:00
Diego Bogado
cbd117c64d Updated text from "jQuery Funhouse" to "jQuery Playground" 
This change fixes the issue #5032.
 2015-12-06 16:49:18 -03:00
Logan Tegman
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
Logan Tegman
9e8b396665 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
Arsen Melikyan
029cd52e80 Some common code improvements 2015-12-06 13:26:02 +04:00
Arsen Melikyan
99df268239 Merge pull request #5035 from FreeCodeCamp/fix/code-uri 
Make code-uri more robust
 2015-12-06 12:56:29 +04:00
Berkeley Martinez
415a39ea17 Make code-uri more robust 2015-12-05 14:53:33 -08:00
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
Harsha
111ff7ed1c fix regex to test h1 tag spanning multiple lines 2015-12-05 15:54:43 -05:00
Harsha
0d9d489bbb fix regex to test h1 tag spanning multiple lines 2015-12-05 15:54:43 -05:00
regonn
db5b0e5568 fix indent intermediate-bonfires.json 2015-12-05 15:15:44 +09:00
regonn
ad57364427 fix indent intermediate-bonfires.json 2015-12-05 15:15:44 +09:00
Quincy Larson
4ecc9925fa 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
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
783d43a9eb 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
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
1797807d92 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
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
270d3c497a translation for gear up for success challenge 2015-12-04 01:31:10 -06:00
David Ojeda
f0c6388941 translation for gear up for success challenge 2015-12-04 01:31:10 -06:00
Rex Schrader
53c76c6f7c 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
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
456b1367b8 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
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
61250081be Fixed typo in test case and modified the testcase to pass test-challenges 2015-12-04 01:45:18 -05: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
7a3a3b779a Added test case to Bonfire Drop It Closes #4741 2015-12-03 22:44:59 -08:00
alan1001110
5b30a521d2 Added test case to Bonfire Drop It Closes #4741 2015-12-03 22:44:59 -08:00
JelenaBarinova
b6e8e5d1a7 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