Riley Davis a0c03605b9 Merge branch 'master' ...

Conflicts:
	client/coral-embed-stream/src/Embed.js
	client/coral-framework/constants/auth.js
	client/coral-framework/reducers/auth.js
	client/coral-sign-in/components/SignUpContent.js

2017-02-03 13:12:32 -07:00

..

admin

remove confirm and replace with verify

2017-02-02 14:59:45 -07:00

email

simplify email text

2017-01-31 12:08:59 -07:00

embed

Merge branch 'master' into email-confirm

2017-01-05 18:45:06 -07:00

admin.ejs

Community Section Ready

2017-01-13 17:11:46 -03:00

article.ejs

Add async attribute to coral-embed scripts

2017-02-04 02:03:31 +08:00

articles.ejs

Add useful links

2017-01-25 15:27:38 -05:00

auth-callback.ejs

Added facebook login support + redis cache

2016-11-11 12:53:51 -07:00

embed-stream.ejs

Loading history links in parent page.

2017-01-24 16:04:03 -05:00

error.ejs

Added error middleware

2016-11-08 15:53:26 -07:00