Commit Graph

94 Commits

Author SHA1 Message Date
Riley Davis ca04db80dc Merge branch 'master' into optional-google-fonts 2017-04-07 10:42:20 -06:00
Belén Curcio 10836f7918 Merge branch 'master' into plugin 2017-04-06 17:04:38 -03:00
Riley Davis 9cab34da73 Merge branch 'master' into optional-google-fonts 2017-04-06 10:40:04 -06:00
Riley Davis b24ee81e34 remove Lato from google fonts 2017-04-05 12:14:51 -06:00
Wyatt Johnson 52948a4165 Added support for a plugin which disables lazy assets 2017-04-03 16:51:14 -06:00
Belen Curcio 1ee49f76f6 Styles, utils and state 2017-03-30 20:08:53 -03:00
Chi Vinh Le 00a74f05cb Use standard mdl theme 2017-03-30 00:44:26 +07:00
Riley Davis 375ff08584 Merge branch 'master' into reset-password-redirect 2017-03-22 18:45:40 -06:00
Riley Davis fb2f8ef074 redirect to the parent url when resetting your password 2017-03-22 16:49:34 -06:00
Riley Davis 7af16471cd if the asset_url is not present, attempt to find the canonical link tag. if not, warn the user and strip the query params. 2017-03-22 15:41:06 -06:00
Riley Davis 555b4517d8 move email templates into services/mailer. remove express app dep to render files 2017-03-22 12:00:30 -06:00
Wyatt Johnson 681bdb1d92 bug fix 2017-03-16 11:11:24 -06:00
Wyatt Johnson 598fcc4cb0 Added new pageData action/reducer 2017-03-16 11:07:38 -06:00
Riley Davis 7bbf8abd3d try to just add recaptcha manually
use react-recaptcha

remove recaptcha file
2017-03-14 15:32:16 -06:00
Belen Curcio d0e67592c0 Adding favicon :) 2017-03-06 16:05:56 -05:00
Riley Davis e2273f5810 change PermissionRequired to LoginView and create a login form. delete old login page 2017-02-28 14:32:01 -07:00
David Jay 4cc3426af4 Adding bolding, adding translations to settings page. 2017-02-23 16:07:41 -05:00
gaba 06d426b72b Adds back the timeout to close window. 2017-02-16 12:17:20 -08:00
Riley Davis 183d2e1ea0 Merged branch master into external-css-file 2017-02-13 16:04:00 -07:00
Riley Davis 0234112ad0 enable configuration for linking override stylesheets 2017-02-13 16:03:49 -07:00
Wyatt Johnson de54433c5c Merge branch 'master' into username-displayname 2017-02-10 16:19:27 -07:00
Riley Davis 27ea409e31 html things 2017-02-10 10:52:55 -07:00
David Jay b4ee765437 Merge branch 'master' into actions 2017-02-09 17:14:53 -08:00
Wyatt Johnson 3cd2b28bc2 Inital rename of displayName -> username 2017-02-09 16:48:59 -07:00
David Erwin cd7d683fe2 Fixing for default url case 2017-02-09 15:16:02 -05:00
David Erwin 81e050214d fix js error 2017-02-09 15:03:29 -05:00
Wyatt Johnson 25103630b5 Added graphql docs endpoint. 2017-02-08 17:41:28 -07:00
David Jay 586537084b Merge branch 'master' into bugfix-tiny-mobile-fonts 2017-02-06 18:29:34 -08:00
David Jay ecb72b036d Fixing mobile viewport width. 2017-02-06 16:49:31 -08:00
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
Benjamin Goering 160fb6e4d4 Add async attribute to coral-embed scripts 2017-02-04 02:03:31 +08:00
Benjamin Goering 841d6add45 Rename /Coral.js to /embed.js 2017-02-04 01:48:57 +08:00
Benjamin Goering f7cddad659 Futureproof Embed Code
* Add client/coral-embed-api module. It's meant to be included in an HTML page and define window.Coral
* Serve coral-embed-api at /Coral.js
* Update / handler (article view) to use new embed format
* Update Talk Admin embed code section to use new embed format
2017-02-04 00:47:32 +08:00
Riley Davis a0cf467f1b remove confirm and replace with verify 2017-02-02 14:59:45 -07:00
Belén Curcio b4a03a5133 Merge branch 'master' into design-pass-tweaks 2017-02-02 07:55:41 -03:00
David Jay 17eefeea15 Merge branch 'master' into mobile-width-fix 2017-02-01 12:16:57 -05:00
David Jay bc6c77176e Fixing error in styling. 2017-02-01 12:11:12 -05:00
David Jay 3ca263bcfb Updating mock article template to support mobile widths. 2017-01-31 14:23:15 -05:00
Riley Davis 3d83c246f7 simplify email text 2017-01-31 12:08:59 -07:00
Riley Davis e63e1f3428 Merge branch 'master'
Conflicts:
	errors.js
	test/routes/api/auth/index.js
2017-01-31 12:05:16 -07:00
Belen Curcio 7a227dff91 Notification in the CommentStream Working 2017-01-30 15:11:16 -03:00
Riley Davis 5e521b832c add a confirm-email landing page 2017-01-27 15:04:42 -07:00
David Jay f06edec6a2 Merge branch 'master' of github.com:coralproject/talk into moderate-bio 2017-01-26 16:38:43 -05:00
David Erwin c4256fd27b Ditch console logs 2017-01-25 17:44:21 -05:00
David Jay 31abe57cb2 Merge branch 'master' of github.com:coralproject/talk into moderate-bio
Integrating graphql, updating tests, and preserving transition to ModerationList from CommentList.
2017-01-25 17:15:12 -05:00
David Erwin 1f1b1d43ae Add useful links 2017-01-25 15:27:38 -05:00
David Erwin 29e69a66bb Add basic index page for assets 2017-01-25 15:23:02 -05:00
David Erwin ad9684acd9 Create load stream by id route 2017-01-25 14:08:19 -05:00
David Jay 7c3f566202 Handling links inside of iframe in via Pym. 2017-01-24 16:21:49 -05:00
David Jay ce73118f53 Loading history links in parent page. 2017-01-24 16:04:03 -05:00