benmcmahon100
d588263658
Extra comma was breaking node seed
2015-07-30 21:54:33 +01:00
Quincy Larson
448daf1fa4
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-30 13:01:57 -07:00
Quincy Larson
35761f6316
fix some minor issues with bootstrap challenges
2015-07-30 13:01:46 -07:00
benmcmahon100
1e412b1498
Ready JavaScript Curriculum
2015-07-30 20:58:02 +01:00
Quincy Larson
14368f6471
add container-fluid divs to all bootstrap waypoints
2015-07-30 12:20:34 -07:00
Quincy Larson
fc7af46e0c
finish color tutorial
2015-07-29 23:21:44 -07:00
Quincy Larson
549ab1bd0e
start work on RGB section
2015-07-29 00:33:17 -07:00
Quincy Larson
5fd95c584c
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
seed/challenges/basic-javascript.json
2015-07-28 23:11:00 -07:00
Quincy Larson
2d009777b3
add ID related challenges
2015-07-28 18:51:39 -07:00
Quincy Larson
fd3374fca7
about to start priority and !important waypoints
2015-07-28 17:11:51 -07:00
TCYRUS
e67d843f48
Fix Issue #1015
...
Fix two of the tests in "Waypoint: Create an Ordered List"
2015-07-28 13:17:05 -04:00
biellls
19c2408348
Change order of subarrays to cover all cases
...
Since in all tests each subarray has a larger max than the previous subarray, if the user does not reset max for each subarray, the tests still pass.
2015-07-27 20:37:39 +02:00
Berkeley Martinez
9bc14d24a4
Display contact information for job and size thumbnail
2015-07-26 07:57:14 -07:00
Berkeley Martinez
f547ce32f7
update jobs model and jobs seed
2015-07-25 21:59:52 -07:00
Berkeley Martinez
4792485ac4
show jobs route up
2015-07-25 21:32:18 -07:00
Berkeley Martinez
fe51774814
Fix dup id's in basic javascript
2015-07-25 20:22:13 -07:00
Quincy Larson
37d5efed4e
Merge branch 'staging' into js-curriculum
...
Conflicts:
seed/challenges/basic-javascript.json
2015-07-24 16:08:45 -07:00
Quincy Larson
ea26455c4c
Merge branch 'js-curriculum' of https://github.com/benmcmahon100/freecodecamp into benmcmahon100-js-curriculum
...
Conflicts:
seed/challenges/basic-javascript.json
2015-07-24 15:59:37 -07:00
Quincy Larson
890bd8cd9c
additional refactor of HTML challenges
2015-07-23 22:24:51 -07:00
Quincy Larson
efa5d769c2
QA first dozen html challenges
2015-07-23 18:44:16 -07:00
benmcmahon100
a24ef288b4
Ready Js Curriculum
...
Added Regex, Random Numbers and If else Challenges
2015-07-24 00:38:13 +01:00
Berkeley Martinez
01c72656c8
fix 'id' not _id.
...
fix spacing after semi colon
2015-07-23 16:14:45 -07:00
Quincy Larson
3dfeaadba0
update zipline copy with CodePen override warning
2015-07-23 16:03:51 -07:00
Berkeley Martinez
47901a9b0a
add missing false in hikes challenge
2015-07-23 16:03:49 -07:00
Quincy Larson
ac5e31596d
add transcript for missing hike
2015-07-23 16:03:49 -07:00
Berkeley Martinez
a4c4eb1493
fix type hike not hikes
2015-07-23 16:03:47 -07:00
Berkeley Martinez
3df60136e8
add title field to challenges
2015-07-23 16:03:46 -07:00
Quincy Larson
8f738fb1d0
add videos to new challenges
2015-07-23 16:03:46 -07:00
Quincy Larson
83654fb86a
finish adding the nodeschool challenges
2015-07-23 16:03:46 -07:00
Quincy Larson
8b78d6e9ca
update basejump demo urls
2015-07-23 16:03:46 -07:00
Quincy Larson
99b99dc1a7
finish scripts and overall structure for new curriculum
2015-07-23 16:03:46 -07:00
Quincy Larson
60f2bdc685
more minor updates
2015-07-23 15:50:47 -07:00
Quincy Larson
fab672f8c6
all field guides operational
2015-07-23 15:50:47 -07:00
Quincy Larson
03a225e640
update hikes.json
2015-07-23 15:50:47 -07:00
Berkeley Martinez
8b0b5dd6ce
split field guides into separate categories
2015-07-23 15:50:47 -07:00
Quincy Larson
bfd51b66b6
add hikes.json
2015-07-23 15:49:04 -07:00
Quincy Larson
e04c11c2e7
mid-task commit for Berkeley to take over
2015-07-23 15:49:04 -07:00
Quincy Larson
158baca3d3
fix typo in nonprofit field guide
2015-07-23 15:49:03 -07:00
Quincy Larson
c98afee926
continue building the jQuery Playground
2015-07-23 15:49:03 -07:00
Quincy Larson
c492576181
start building the jquery playground bootstrap.json flow
2015-07-23 15:49:03 -07:00
Quincy Larson
fe03ee557d
restructure entire curriculum sequence and json files
2015-07-23 15:49:03 -07:00
Quincy Larson
c8f8ab7af2
continue adding rgb challenges to basic-html5
2015-07-23 15:49:02 -07:00
Berkeley Martinez
e17b838c80
add babel-node to seed
2015-07-23 15:49:01 -07:00
Quincy Larson
cc9af1c67b
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-20 22:56:23 -07:00
Quincy Larson
d9d9c67ae0
update field guides
2015-07-20 22:56:12 -07:00
benmcmahon100
003805d834
Added start of the random number challenges
2015-07-16 11:06:04 +01:00
benmcmahon100
7af3c1c67d
Full JS Stuff
...
There is a bit more RegEx and if else stuff. Other challenges can be added later but this is the base working set without @QuincyLarson 's fixes to the copy
2015-07-13 21:55:36 +01:00
Sean Nguyen
5d8d7a8f0f
Add <p> element to label the new ordered list.
...
- Improve consistency of challenge seeds
- Clarify challenge objective for "Waypoint: Created an ordered list"
2015-07-13 13:20:28 -07:00
benmcmahon100
ffd0d7e905
almost complete js challenges
2015-07-13 00:48:58 +01:00
Michael Pope
3d51e7776d
Clarify text for 'Waypoint: Add a Negative Margin to an Element'
...
- the user was asked to change text to a negative number
- this was confusing, as the test only passes if the value ia -15px
2015-07-11 10:52:58 -04:00
benmcmahon100
a39c398b8c
Update to 30!
2015-07-10 17:22:58 +01:00
benmcmahon100
46066e5be1
Third commit to the new curriculum
2015-07-10 00:56:30 +01:00
benmcmahon100
27df132367
Update 2 of the new js curriculum!
...
7 more challenges added!
2015-07-09 00:26:16 +01:00
LumenTeun
d6b9093be9
Improved consitency in 'Friendly Date Ranges' test cases. #410
2015-07-08 21:19:34 +02:00
benmcmahon100
91d6520817
Final wording tweak to line 1803
2015-07-08 19:51:19 +01:00
benmcmahon100
dd249197cb
Updated to reflect original wording a bit better
...
Another slight tweak to line 1803 to make it more true to the original wording of the challenge
2015-07-08 19:45:27 +01:00
benmcmahon100
3066bdc335
Fix for #1218
2015-07-06 23:46:26 +01:00
Quincy Larson
3098a6dc60
add basic javascript.json
2015-07-05 17:12:52 -07:00
Quincy Larson
655c7eef52
clear basic-javascript.json
2015-07-05 17:03:41 -07:00
Stephen Wanhella
3842c0b9c8
Fixed typos in Bonfire: Friendly Date Ranges #1156
2015-07-04 16:04:12 -07:00
Quincy Larson
c66b501837
start purging the br challenges
2015-07-03 01:08:11 -07:00
Quincy Larson
c2a9a1ca62
add an ajax challenge
2015-07-02 17:31:08 -07:00
Quincy Larson
0301d3bc61
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-07-02 13:59:22 -07:00
Quincy Larson
4fb3b3e7cc
add more cities and move the bootcamp calculator to field guide entries (still untested).
2015-07-02 13:59:13 -07:00
Quincy Larson
21a4dc1808
Merge pull request #1159 from LumenTeun/lumenteun-1151
...
'Font degrade'-test now check order of font-familiy.
2015-07-02 13:57:41 -07:00
Quincy Larson
d3a6ff1ba1
Merge pull request #1160 from LumenTeun/lumenteun-1158
...
Slightly clarifies 'Uncomment HTML'.
2015-07-02 13:56:48 -07:00
Quincy Larson
10f53bdd49
Merge pull request #1161 from LumenTeun/grammar
...
Quite a few spelling and grammar fixes
@LumenTeun Thanks for spotting these!
2015-07-02 13:56:11 -07:00
Quincy Larson
552ffb40d9
Merge pull request #1163 from kmiasko/staging
...
Waypoint: Get Set for Basejumps changed deprecated heroku command
@kmiasko Thanks for fixing this!
2015-07-02 13:51:23 -07:00
Quincy Larson
d96dde8d68
Merge pull request #1172 from LumenTeun/lumenteun-1168
...
Reword parts of 'how-to-npm'-waypoint.
2015-07-02 13:50:22 -07:00
benmcmahon100
9120edc67c
Update basic-html5-and-css.json
2015-07-01 15:28:29 +01:00
benmcmahon100
3955767c79
solution to issue #1173
...
this solution may also be needed for some of the other css-based challenges
2015-07-01 15:16:44 +01:00
LumenTeun
85c628dc00
Reword parts of 'how-to-npm'-waypoint. #1168
2015-07-01 13:46:36 +02:00
Quincy Larson
c434342f15
update official LA FCC chat room
2015-07-01 01:31:51 -07:00
Quincy Larson
ad69a923ce
add official fcc chat room list
2015-07-01 01:26:56 -07:00
Quincy Larson
154f8c894e
add more cities
2015-07-01 00:57:15 -07:00
Quincy Larson
3a1b5e79b5
add gitter rooms to cities
2015-07-01 00:45:19 -07:00
Quincy Larson
b27832f0d0
more improvements to html.json
2015-06-30 23:21:34 -07:00
Quincy Larson
7035f1fcf0
finish the color section of the basic html section
2015-06-30 20:10:00 -07:00
Quincy Larson
bc8a677be5
finish the color priority section of basic-html
2015-06-30 18:17:20 -07:00
Krzysztof Miąsko
2bbdf75ab9
Waypoint: Get Set for Basejumps changed deprecated heroku command
2015-06-30 12:25:51 +02:00
LumenTeun
75948c4bc1
Quite a few spelling and grammar fixes
2015-06-30 04:28:43 +02:00
Quincy Larson
f6602fe680
half way done creating css priority challenges
2015-06-29 19:17:06 -07:00
LumenTeun
ca9d951ce3
Slightly clarifies 'Uncomment HTML'. Regarding #1158
2015-06-30 03:17:12 +02:00
LumenTeun
33fa2d1939
'Font degrade'-test now check order of font-familiy. Fixes #1151
2015-06-30 02:52:21 +02:00
Quincy Larson
d9fe6dcef1
fix broken challenges and attempt to make streak more lenient.
2015-06-29 16:32:49 -07:00
Quincy Larson
cf167b3c11
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-28 18:03:21 -07:00
Quincy Larson
c4c1a44c48
make the Mobile Responsive Images challenge more robust fixes #998
2015-06-28 18:03:11 -07:00
Quincy Larson
2284a9fcd7
Merge pull request #1115 from NatashaHaggard/923
...
Issue 923 - Grammatical error
2015-06-28 15:24:52 -07:00
Quincy Larson
1fabe07bcd
Merge pull request #1124 from greasan/greasan-translateDE
...
First two sections translated into German
2015-06-28 15:22:58 -07:00
Quincy Larson
bdb2c2989f
Merge pull request #1114 from NatashaHaggard/1059
...
Issue 1059 - Wording issue on instructions
2015-06-28 15:22:10 -07:00
Quincy Larson
d857bbcc0b
Merge pull request #1149 from JonSonesen/jonathonsonesen-1148
...
fixes issue #1148
2015-06-28 15:21:11 -07:00
Quincy Larson
68dfa51719
Merge pull request #1074 from SaintPeter/staging
...
Add video link to Symmetric Differences Bonfire
2015-06-28 15:20:06 -07:00
JonSonesen
bdb170b0df
fixes issue #1148
2015-06-28 15:03:52 -07:00
Quincy Larson
0350980c3a
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-27 19:43:13 -07:00
Quincy Larson
05cfe86cd0
add some additional jquery challenges
2015-06-27 19:42:25 -07:00
Quincy Larson
7ee4b22a57
update the cities on the field guide
2015-06-27 15:28:37 -07:00
Quincy Larson
75c77cdb6f
clean up future jquery challenges
2015-06-27 11:56:31 -07:00
greasan
20fde8a8ab
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-26 19:22:13 +02:00
Berkeley Martinez
66e4138b36
fix buffer return from database query
2015-06-26 01:51:27 -07:00
Berkeley Martinez
e53419bb59
fix should be bufferWithCount
2015-06-26 01:48:21 -07:00
Quincy Larson
378f6da221
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
public/js/main_0.0.3.js
seed/challenges/get-set-for-free-code-camp.json
seed/field-guides.json
2015-06-26 01:08:40 -07:00
Quincy Larson
6700729658
update emails and refine sponsor view
2015-06-25 23:35:48 -07:00
Berkeley Martinez
2422663f34
add comments migration to loopback script
2015-06-25 21:47:25 -07:00
Natasha Haggard
6c9cb28fdc
Issue 923 - Grammatical error
...
"Your pair will have their own cursor, and will be able to type text on his or her and keyboard."
Removed the "and" after "his or her".
This closes #923
2015-06-24 22:40:10 -05:00
Natasha Haggard
42eba3becc
Issue 1059 - Wording issue on instructions
...
Second issue to solve states "Each of your Bootstrap buttons should be wrapped within its own a div element with the class "col-xs-4". Removed the word "a" to read "wrapped within its own div".
This closes #1059
2015-06-24 21:52:10 -05:00
Berkeley Martinez
95b0884df5
Merge pull request #1073 from NatashaHaggard/NatashaHaggard-1036
...
Issue 1036 - Fixed minor grammatical mistake
2015-06-24 10:43:12 -07:00
Berkeley Martinez
c3d9598d18
Merge pull request #1102 from NatashaHaggard/patch-2
...
Issue 1080
2015-06-24 10:32:58 -07:00
LumenTeun
c8c03aae10
'Slack' to 'Gitter or Slack'
2015-06-24 10:29:52 -07:00
LumenTeun
95f47de9f0
'Slack' to 'Gitter'
2015-06-24 10:29:52 -07:00
Quincy Larson
1df962bb07
Merge branch 'master' into staging
...
Conflicts:
controllers/resources.js
public/js/main_0.0.2.js
seed/challenges/advanced-bonfires.json
seed/challenges/basic-bonfires.json
seed/challenges/get-set-for-free-code-camp.json
server/views/partials/navbar.jade
2015-06-24 07:19:54 -07:00
Natasha Haggard
bd0a517144
Issue 1080
...
Changed "Twitter Bootstrap" to "Bootstrap". It used to be it's name but it's not any more. It's in their brand guidelines to not refer to it as Twitter Bootstrap any more: http://getbootstrap.com/about/#name
2015-06-23 22:55:52 -05:00
Natasha Haggard
1e84751a0f
Issue 1094 - Field Guide Error
...
"Contact Jason Ruekert - he's @jsonify in Slack."
Since freecodecamp is now using Gitter again, changed it to say "Contact Jason Ruekert - he's @jsonify in Gitter."
2015-06-23 22:46:28 -05:00
Rex Schrader
99459feb5e
Add Symmetric Difference link to bonfire
2015-06-22 21:49:44 -07:00
Rex Schrader
1cdd0eee6d
Add video link for Symmetric Difference
2015-06-22 21:46:09 -07:00
Natasha Haggard
e3aee8f421
Issue 1036 - Fixed minor grammatical mistake
...
Fixed minor grammatical mistake - changed "Your app should have an text field input element" to "Your app should have a text field input element"
2015-06-22 22:13:21 -05:00
Matias Cao
d0477bfb2b
WP 12-13 ES Translation
2015-06-22 20:22:09 -03:00
terakilobyte
7aff6dd285
Merge branch 'staging' of http://github.com/FreeCodeCamp/freecodecamp into staging
2015-06-22 10:31:24 -04:00
terakilobyte
7004e81b4a
Fixes #1053
...
This changes the link to point to Free Code Camp's "Lets Pair" room on gitter and opens the link in a new tab/window depending on user browser preference.
2015-06-22 10:30:26 -04:00
greasan
6950ebc346
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-21 12:25:45 +02:00
brandenbyers
5db883346e
Change eqls to equal
2015-06-21 00:56:20 -05:00
Quincy Larson
5212173c61
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-20 18:12:24 -07:00
Quincy Larson
dd3d445054
add new chat challenge
2015-06-20 18:12:12 -07:00
greasan
817f27bd5b
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-20 10:46:50 +02: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
5a0d38eb5e
Merge pull request #984 from rcw271828/staging
...
Fixed typo in field-guides.json
2015-06-19 17:36:19 -07:00
Quincy Larson
93ed1cfb1f
Merge pull request #961 from LumenTeun/lumenteun-942
...
More test cases for 'Seek and Destroy'
2015-06-19 17:32:31 -07:00
Quincy Larson
5f7443c91e
Merge pull request #960 from 1hella/1hella-959
...
1hella 959
2015-06-19 17:31:14 -07:00
Quincy Larson
25f4d4c30e
Merge pull request #958 from LumenTeun/lumenteun-941
...
'No repeats please' test fix.
2015-06-19 17:29:25 -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
Stephen Wanhella
9342503873
Added new test with different max number to Bonfire: Truncate a String
...
Issue 959
2015-06-18 17:48:30 -07:00
Brett Guillory
d6db51355e
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
Brett Guillory
8ade99b5d7
Fixed a word
2015-06-18 17:48:29 -07:00
rcw271828
7735f19fcc
Update field-guides.json
...
Fixed a typo in languages section of field guides.
2015-06-18 20:36:33 -04:00
LumenTeun
842a2efe64
More test cases for 'Seek and Destroy' #942
2015-06-18 11:56:13 +02:00
LumenTeun
d1a12fc894
'No repeats please' test fix. #941
2015-06-17 23:30:08 +02:00
Quincy Larson
d615e94c29
fix minor typo in html challenge
2015-06-16 18:00:17 -07:00
Matias Cao
13c3d213ce
WP11 ES Translation
2015-06-16 18:27:58 -03:00
greasan
07c2e6b1c3
Translated basic HTML5 and CSS
2015-06-16 19:40:07 +02:00
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
4fa1f25cc2
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
Berkeley Martinez
3d8b8e4c73
rename flattenUser to loopbackMigration
...
add stories migration to script
2015-06-15 16:47:50 -07:00
terakilobyte
d6ddd632d0
Remove excess debug statements from flattenUser.js
2015-06-15 19:12:48 -04:00
terakilobyte
76811b9215
Fix json typo
2015-06-15 18:59:56 -04:00
terakilobyte
988242df03
Ensure build process is part of npm install
2015-06-15 18:10:48 -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
terakilobyte
5b2b7e23ae
Take id property of username, remove wasteful save on profile lookup.
2015-06-12 19:16:10 -04:00
terakilobyte
d07e5351ea
Comment out blacklist
2015-06-12 18:55:47 -04:00
Berkeley Martinez
90b2f99a70
add create identities on flatten users
2015-06-12 15:27:51 -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
173d46ae01
Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging
...
Conflicts:
seed/field-guides.json
2015-06-12 12:40:26 -07:00
greasan
d9e64f842f
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-12 14:08:44 +02:00
terakilobyte
f7bb14803e
Update field guides to display properly. Correct models on user object.
2015-06-11 16:19:44 -04:00
Quincy Larson
5fb89cb091
Merge branch 'master' of github.com:FreeCodeCamp/freecodecamp into staging
2015-06-11 11:16:31 -07:00
Quincy Larson
4d8ab0a915
fix conflicting id
2015-06-11 10:36:47 -07:00
greasan
701241aac8
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-10 07:16:02 +02:00
Berkeley Martinez
c5d3b4a041
move get emails script to seed
2015-06-09 16:49:03 -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
greasan
ab9fcc6f29
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-08 07:25:05 +02:00
Berkeley Martinez
28f273e7ee
save users into new `user` collection
2015-06-07 22:06:57 -07:00
Berkeley Martinez
0c6c170754
initial script to flatten user object
2015-06-07 17:15:53 -07:00
greasan
8b8dab2970
Merge branch 'staging' of https://github.com/FreeCodeCamp/freecodecamp into greasan-translateDE
2015-06-05 15:48:38 +02:00
Berkeley Martinez
b6a0edc964
fix nonprofit ids should be unique
2015-06-04 14:32:16 -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