greasan
|
891aa09f04
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-16 19:20:27 +02: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 |
|
greasan
|
845c0ccc74
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-15 18:54:20 +02: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 |
|
greasan
|
f2ff5236eb
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-12 22:19:10 +02:00 |
|
Quincy Larson
|
5fb89cb091
|
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging
|
2015-06-11 11:16:31 -07:00 |
|
greasan
|
701241aac8
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-10 07:16:02 +02: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 |
|
greasan
|
8b8dab2970
|
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
|
2015-06-05 15:48:38 +02: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 |