Quincy Larson
|
dd3d445054
|
add new chat challenge
|
2015-06-20 18:12:12 -07:00 |
|
Quincy Larson
|
883a561d73
|
finishing touches on calculator
|
2015-06-19 21:24:04 -07:00 |
|
Quincy Larson
|
88286d366f
|
fix a bunch of github issues regarding waypoints
|
2015-06-19 18:31:21 -07:00 |
|
Quincy Larson
|
fe1b3f4d2a
|
fix broken test from recent pull request
|
2015-06-19 17:53:59 -07:00 |
|
Quincy Larson
|
cd63977687
|
Merge branch 'master' into staging
Conflicts:
seed/challenges/basic-bonfires.json
|
2015-06-19 17:39:11 -07:00 |
|
Quincy Larson
|
6078b54393
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-19 16:18:56 -07:00 |
|
Quincy Larson
|
d5ea05e448
|
Merge branch 'Lemony-Andrew-master' into staging
Conflicts:
server/views/coursewares/showBonfire.jade
|
2015-06-19 16:17:59 -07:00 |
|
Quincy Larson
|
93e96643fb
|
Merge pull request #940 from LumenTeun/lumenteun-907
Check fix in 'Bootstrap Grid'.
|
2015-06-19 16:07:48 -07:00 |
|
Quincy Larson
|
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 |
|
Quincy Larson
|
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 |
|
Quincy Larson
|
c2c64b153a
|
Merge pull request #937 from LumenTeun/lumenteun-918
Fixed Zipline jQuery.getJSON() links.
|
2015-06-19 16:03:17 -07:00 |
|
Quincy Larson
|
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 |
|
Berkeley Martinez
|
adbbbf3743
|
fix name and dashed name switched
close #975
|
2015-06-18 20:02:32 -07:00 |
|
Quincy Larson
|
d615e94c29
|
fix minor typo in html challenge
|
2015-06-16 18:00:17 -07:00 |
|
terakilobyte
|
e319652373
|
Fix wikipedia viewer zipline naming
|
2015-06-16 08:36:54 -04:00 |
|
terakilobyte
|
76811b9215
|
Fix json typo
|
2015-06-15 18:59:56 -04:00 |
|
LumenTeun
|
663492c582
|
Check fix in 'Bootstrap Grid'. #907
|
2015-06-15 18:26:44 +02:00 |
|
LumenTeun
|
480c5dec0a
|
Test for almost palindromes. #911
|
2015-06-15 18:14:55 +02:00 |
|
LumenTeun
|
0038c48875
|
Improves check for catphotoapp.com. Fixes #914
|
2015-06-15 18:06:09 +02:00 |
|
LumenTeun
|
00c1cdef5b
|
Fixed Zipline jQuery.getJSON() links. Fixes #918 #919
|
2015-06-15 17:43:52 +02:00 |
|
LumenTeun
|
f50cee119c
|
More 'Convert HTML Entities' test cases. Fixes #924
|
2015-06-15 17:26:37 +02:00 |
|
Quincy Larson
|
b6fc2551d9
|
Merge branch 'interview' into staging
Conflicts:
app.js
controllers/challenge.js
seed/future-jquery-ajax-json.json
|
2015-06-14 01:02:39 -07:00 |
|
Quincy Larson
|
2b7177e856
|
add dashedName attributes to JSON
|
2015-06-14 00:55:27 -07:00 |
|
Quincy Larson
|
2c8a134e80
|
first challenge json file updated with dashedname
|
2015-06-13 23:50:36 -07:00 |
|
Quincy Larson
|
5fb89cb091
|
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-11 11:16:31 -07:00 |
|
Quincy Larson
|
61486c2d7c
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
Conflicts:
app.js
controllers/fieldGuide.js
controllers/story.js
seed/challenges/basic-html5-and-css.json
seed/challenges/bootstrap.json
seed/field-guides.json
server/views/partials/navbar.jade
views/resources/jobs-form.jade
views/resources/nonprofits-form.jade
views/resources/pmi-acp-agile-project-managers-form.jade
|
2015-06-09 13:48:29 -07:00 |
|
Quincy Larson
|
3654bb7e6f
|
change _id to id everywhere that seems relevant to loopback
|
2015-06-04 13:20:42 -07:00 |
|
Berkeley Martinez
|
02b195511e
|
fix challengeSeeds should be arrays
|
2015-06-04 12:31:33 -07:00 |
|
Quincy Larson
|
618cedddb0
|
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-04 12:24:30 -07:00 |
|
Berkeley Martinez
|
272d9b4ad5
|
Update seed directory to use loopback
|
2015-06-02 20:32:10 -07:00 |
|