0e9ab5017b
Merge branch 'Lemony-Andrew-master' into staging
...
Conflicts:
server/views/coursewares/showBonfire.jade
2015-06-19 16:17:59 -07:00
00d1f00b72
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
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
7a431bef5b
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
f248b3fb9f
fix name and dashed name switched
...
close #975
2015-06-18 20:02:32 -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
92656fcf2f
Added missing MDN Link
...
This bonfire "Missing letters"seems to be missing an important MDN link to "String.fromCharCode()", which is needed to get the missing character to return for the test. Since the missing character is obviously not in the string supplied, you cannot get the character code for it from the string.
2015-06-18 17:48:30 -07:00
07a54c9e0c
Fixed a word
2015-06-18 17:48:29 -07:00
14225ec4bd
Update field-guides.json
...
Fixed a typo in languages section of field guides.
2015-06-18 20:36:33 -04:00
cddc1b6c6a
More test cases for 'Seek and Destroy' #942
2015-06-18 11:56:13 +02:00
f04019a790
'No repeats please' test fix. #941
2015-06-17 23:30:08 +02:00
931a197a93
fix minor typo in html challenge
2015-06-16 18:00:17 -07:00
3ce51fecea
WP11 ES Translation
2015-06-16 18:27:58 -03:00
026e027f23
Translated basic HTML5 and CSS
2015-06-16 19:40:07 +02:00
e39764a739
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-16 19:20:27 +02:00
bec1460d82
Fix wikipedia viewer zipline naming
2015-06-16 08:36:54 -04:00
092f8254ed
Fix challenge map display for loopback updated models. Update loopback migration script to auto complete and catch all records.
2015-06-15 20:53:43 -04:00
93dd65176c
rename flattenUser to loopbackMigration
...
add stories migration to script
2015-06-15 16:47:50 -07:00
d87dcd6ada
Remove excess debug statements from flattenUser.js
2015-06-15 19:12:48 -04:00
643aa30cea
Fix json typo
2015-06-15 18:59:56 -04:00
faeff7b1ed
Ensure build process is part of npm install
2015-06-15 18:10:48 -04:00
e5a4c2f8f5
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-15 18:54:20 +02:00
4b349ff761
Check fix in 'Bootstrap Grid'. #907
2015-06-15 18:26:44 +02:00
667a37cac7
Test for almost palindromes. #911
2015-06-15 18:14:55 +02:00
8ae797d582
Improves check for catphotoapp.com. Fixes #914
2015-06-15 18:06:09 +02:00
466395eb74
Fixed Zipline jQuery.getJSON() links. Fixes #918 #919
2015-06-15 17:43:52 +02:00
2911562888
More 'Convert HTML Entities' test cases. Fixes #924
2015-06-15 17:26:37 +02:00
d5b5973326
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
9589b6abeb
add dashedName attributes to JSON
2015-06-14 00:55:27 -07:00
ef99b91951
first challenge json file updated with dashedname
2015-06-13 23:50:36 -07:00
3969dd2c6b
Take id property of username, remove wasteful save on profile lookup.
2015-06-12 19:16:10 -04:00
6670ac1db3
Comment out blacklist
2015-06-12 18:55:47 -04:00
2f43e0380b
add create identities on flatten users
2015-06-12 15:27:51 -07:00
4693518192
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-12 22:19:10 +02:00
d4fe751baa
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
seed/field-guides.json
2015-06-12 12:40:26 -07:00
dab805174e
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-12 14:08:44 +02:00
794c036fd3
Update field guides to display properly. Correct models on user object.
2015-06-11 16:19:44 -04:00
fc7ac3b3ca
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-11 11:16:31 -07:00
585bd40fc3
fix conflicting id
2015-06-11 10:36:47 -07:00
b12fcae985
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-10 07:16:02 +02:00
9e44deda0c
move get emails script to seed
2015-06-09 16:49:03 -07:00
3b861a5a7f
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
7957603dc5
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-08 07:25:05 +02:00
0e240ba630
save users into new user collection
2015-06-07 22:06:57 -07:00
38931dd23d
initial script to flatten user object
2015-06-07 17:15:53 -07:00
3c042cba30
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-05 15:48:38 +02:00
b2124d7878
fix nonprofit ids should be unique
2015-06-04 14:32:16 -07:00
323ec3d587
change _id to id everywhere that seems relevant to loopback
2015-06-04 13:20:42 -07:00
