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

..

bonfire.json

Add read access to all models

2015-06-24 08:23:49 -07:00

challenge.json

Add read access to all models

2015-06-24 08:23:49 -07:00

comment.json

fix comment model defaults

2015-06-24 08:24:13 -07:00

field-guide.json

Add read access to all models

2015-06-24 08:23:49 -07:00

job.json

Add read access to all models

2015-06-24 08:23:49 -07:00

nonprofit.json

Merge branch 'staging' of github.com:FreeCodeCamp/freecodecamp into staging

2015-06-26 01:08:40 -07:00

story.json

add read authority to all for stories and comments

2015-06-24 07:25:56 -07:00

User-Credential.json

Adding passport config stuff

2015-06-04 10:52:12 -07:00

User-Identity.js

fix grab user photo from profile

2015-06-11 21:12:47 -07:00

User-Identity.json

Add read access to all models

2015-06-24 08:23:49 -07:00

user.js

Handle invalid login

2015-06-16 00:29:32 -04:00

user.json

fix uncompletedBonfires should default to empty array

2015-06-22 19:18:15 -07:00