43ae70465b
refactor returnIndividualBonfires
2015-06-20 11:43:12 -07:00
3a5574c805
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-20 10:46:50 +02:00
817f27bd5b
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-20 10:46:50 +02:00
50a0ad3595
fix use gt not $gt
...
closes #1022
2015-06-20 00:36:28 -07:00
a6ca40d6f3
finishing touches on calculator
2015-06-19 21:24:04 -07:00
883a561d73
finishing touches on calculator
2015-06-19 21:24:04 -07:00
c01a0ad9d7
fix a bunch of github issues regarding waypoints
2015-06-19 18:31:21 -07:00
88286d366f
fix a bunch of github issues regarding waypoints
2015-06-19 18:31:21 -07:00
437a564e34
Changed dependency on challenge_key to function
2015-06-19 18:22:57 -07:00
11305c152b
Update coursewaresJSFramework_0.0.6.js
2015-06-19 18:02:49 -07:00
fe9d1e97bb
fix broken test from recent pull request
2015-06-19 17:53:59 -07:00
fe1b3f4d2a
fix broken test from recent pull request
2015-06-19 17:53:59 -07:00
60354d24e6
Auto Save, Removed Stamps +more
...
Removed stamps so code stays stored until code has been reset.
--> Added a feature which returns if the storage has been saved since last edit. *codeStorage.hasSaved()*
--> Changed "localBonfire" to *codeStorage*
2015-06-19 17:47:21 -07:00
1bb9951d04
Merge branch 'master' into staging
...
Conflicts:
seed/challenges/basic-bonfires.json
2015-06-19 17:39:11 -07:00
cd63977687
Merge branch 'master' into staging
...
Conflicts:
seed/challenges/basic-bonfires.json
2015-06-19 17:39:11 -07:00
9509c5eb2f
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp
2015-06-19 17:37:03 -07:00
e8c472ee91
Merge pull request #984 from rcw271828/staging
...
Fixed typo in field-guides.json
2015-06-19 17:36:19 -07:00
5a0d38eb5e
Merge pull request #984 from rcw271828/staging
...
Fixed typo in field-guides.json
2015-06-19 17:36:19 -07:00
65d283ed13
Merge pull request #970 from SaintPeter/SaintPeter-patch-1
...
Improve 'Convert HTML Entities' Bonfire
2015-06-19 17:35:14 -07:00
21de53de04
Merge pull request #961 from LumenTeun/lumenteun-942
...
More test cases for 'Seek and Destroy'
2015-06-19 17:32:31 -07:00
93ed1cfb1f
Merge pull request #961 from LumenTeun/lumenteun-942
...
More test cases for 'Seek and Destroy'
2015-06-19 17:32:31 -07:00
d23ad5c121
Merge pull request #960 from 1hella/1hella-959
...
1hella 959
2015-06-19 17:31:14 -07:00
5f7443c91e
Merge pull request #960 from 1hella/1hella-959
...
1hella 959
2015-06-19 17:31:14 -07:00
b857d19e2c
Merge pull request #958 from LumenTeun/lumenteun-941
...
'No repeats please' test fix.
2015-06-19 17:29:25 -07:00
25f4d4c30e
Merge pull request #958 from LumenTeun/lumenteun-941
...
'No repeats please' test fix.
2015-06-19 17:29:25 -07:00
ccc29b7fcb
improve upon @lemonyandrew pull request
2015-06-19 17:26:04 -07:00
db1233c7d4
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-19 16:18:56 -07:00
6078b54393
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-19 16:18:56 -07:00
0e9ab5017b
Merge branch 'Lemony-Andrew-master' into staging
...
Conflicts:
server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
d5ea05e448
Merge branch 'Lemony-Andrew-master' into staging
...
Conflicts:
server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
6fed8d1c24
Merge branch 'master' of https://github.com/Lemony-Andrew/freecodecamp into Lemony-Andrew-master
2015-06-19 16:09:42 -07:00
00d1f00b72
Merge pull request #940 from LumenTeun/lumenteun-907
...
Check fix in 'Bootstrap Grid'.
2015-06-19 16:07:48 -07:00
93e96643fb
Merge pull request #940 from LumenTeun/lumenteun-907
...
Check fix in 'Bootstrap Grid'.
2015-06-19 16:07:48 -07:00
a516a49e15
Merge pull request #939 from LumenTeun/lumenteun-911
...
Test for almost palindromes in 'Check for Palindromes'
2015-06-19 16:06:56 -07:00
40a1ff835c
Merge pull request #939 from LumenTeun/lumenteun-911
...
Test for almost palindromes in 'Check for Palindromes'
2015-06-19 16:06:56 -07:00
37341a2ad3
Merge pull request #938 from LumenTeun/lumenteun-914
...
Improves check for catphotoapp.com in 'Link to External Pages with Anchor Elements'
2015-06-19 16:05:23 -07:00
a339c1b60b
Merge pull request #938 from LumenTeun/lumenteun-914
...
Improves check for catphotoapp.com in 'Link to External Pages with Anchor Elements'
2015-06-19 16:05:23 -07:00
7a431bef5b
Merge pull request #937 from LumenTeun/lumenteun-918
...
Fixed Zipline jQuery.getJSON() links.
2015-06-19 16:03:17 -07:00
c2c64b153a
Merge pull request #937 from LumenTeun/lumenteun-918
...
Fixed Zipline jQuery.getJSON() links.
2015-06-19 16:03:17 -07:00
2cb57d5fcc
Merge pull request #936 from LumenTeun/lumenteun-924
...
More 'Convert HTML Entities' test cases. Fixes #924
2015-06-19 16:00:45 -07:00
f200a6f8a3
Merge pull request #936 from LumenTeun/lumenteun-924
...
More 'Convert HTML Entities' test cases. Fixes #924
2015-06-19 16:00:45 -07:00
12b055353e
remove challangeMap
...
move to challenges router
2015-06-19 14:49:10 -07:00
938568454e
move getMDNLinks func to utils
2015-06-19 14:32:17 -07:00
f248b3fb9f
fix name and dashed name switched
...
close #975
2015-06-18 20:02:32 -07:00
adbbbf3743
fix name and dashed name switched
...
close #975
2015-06-18 20:02:32 -07:00
f84ac9ad12
remove forceDomain
2015-06-18 19:56:21 -07:00
28f346e830
fix should be connectionTimeout not timeout
2015-06-18 19:08:39 -07:00
81b77ff8ad
increase database timeout
2015-06-18 17:52:23 -07:00
78fa5449b4
Added new test with different max number to Bonfire: Truncate a String
...
Issue 959
2015-06-18 17:48:30 -07:00
9342503873
Added new test with different max number to Bonfire: Truncate a String
...
Issue 959
2015-06-18 17:48:30 -07:00