Commit Graph

43 Commits

Author SHA1 Message Date
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
Wyatt Johnson 9e22c100f0 Added admin login form (naive approach) 2017-01-23 16:31:37 -07:00
Belen Curcio e69262c665 Community Section Ready 2017-01-13 17:11:46 -03:00
Belen Curcio 4a4affad70 More Design Tweaks 2017-01-12 09:16:23 -03:00
Belen Curcio 226af72ac9 Adding Roboto 2017-01-09 12:54:28 -03:00
Wyatt Johnson 4eb7c72ae2 Merge branch 'master' into email-confirm 2017-01-05 18:45:06 -07:00
Wyatt Johnson cabe546ecf Added email send on new user if enabled for confirming 2017-01-05 17:19:38 -07:00
Wyatt Johnson a7680ae5d9 Initial pass at email confirmation 2017-01-03 17:35:58 -07:00
gaba ec3e9d1cd4 Merge branch 'master' into csrf 2016-12-22 14:23:01 -08:00
Riley Davis 652a41971b Merge branch 'master'
Conflicts:
	client/coral-admin/src/containers/ModerationQueue/ModerationQueue.js
2016-12-20 14:51:36 -07:00
gaba 16a4daaeb3 Merge branch 'master' into csrf 2016-12-20 13:46:08 -08:00
Riley Davis 706cefad9e simplify wordlist ui further 2016-12-19 16:49:05 -07:00
Riley Davis 123ba07b63 add tag package to simplify wordlist ui 2016-12-19 16:43:00 -07:00
Belen Curcio 67aeb223d6 Login tests 2016-12-18 13:07:16 -03:00
gaba d8d30e512b Only on POST check for CSRF. 2016-12-16 16:02:45 -08:00
David Jay d229d5a96f Updating route to davidjay. 2016-12-09 19:28:19 -05:00
David Jay b2b9b0ec42 Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e 2016-11-30 17:55:39 -05:00
Riley Davis ef172cabfc Scroll to comment (#92)
* host pym locally

* host pym. fix some permalink styles

* get url from parent document

* reset copy dialog timeout

* use pym.parentUrl instead of depending on the parent document

* use a simpler method to find the url

* add some horrible setInterval code

* add some awesome polling

* merge master

* bail out of comment look up after 10 seconds

* re-update permalink attrs

* re-add my listeners to article.ejs

* allow for overriding the talk db name in an environment var
2016-11-29 17:19:56 -05:00
Wyatt Johnson 3c903ddd6d Merge branch 'master' into stream-e2e 2016-11-29 10:41:50 -07:00
Wyatt Johnson b0f01cf00f Initial commit of asset queuing (#97)
* Initial commit of asset queuing

* Addresssing comments
2016-11-28 13:29:39 -05:00
David Erwin a022ef8a52 Restore embed/stream.ejs 2016-11-25 10:50:30 -05:00
David Erwin 93cd4ea74c Remove non-standard stream embed template 2016-11-25 10:43:32 -05:00
David Jay 3030bf4f22 Merge branch 'master' of https://github.com/coralproject/talk into stream-e2e 2016-11-22 15:04:36 -05:00
David Jay dd060c5fd1 Signing in via e2e and posting comment. 2016-11-21 21:23:48 -05:00
Riley Davis ae1002fbbf update to root url 2016-11-21 16:36:07 -07:00
Riley Davis a0469301bb add password reset form 2016-11-21 16:32:07 -07:00
Belen Curcio b1824cdc01 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-18 06:08:23 -03:00
Belen Curcio c967587b95 Pym and Iframe support embed 2016-11-17 11:40:11 -03:00
Belen Curcio f1320c7f04 Merge branch 'master' of github.com:coralproject/talk into passport 2016-11-17 10:54:16 -03:00
Riley Davis 6e932b840e merge master. load reset password template from a view 2016-11-16 15:32:44 -07:00
David Erwin 9a2eacabb3 Adding faux multi-article functionality 2016-11-16 12:25:33 -05:00
David Erwin a5b8856905 Add moderation link to sample page 2016-11-16 12:00:46 -05:00
David Jay 4fd41704c0 Moving preview to embed code. 2016-11-15 12:31:30 -05:00
Wyatt Johnson f6184fddb0 Added facebook login support + redis cache 2016-11-11 12:53:51 -07:00
Wyatt Johnson 6867760099 Initial pass at adding middleware for users 2016-11-10 17:14:33 -07:00
David Erwin 6f7fe6ace7 Add embedding routes and homepage 2016-11-10 17:12:32 -05:00
Belen Curcio 0df83a2d95 Merge branch 'master' of github.com:coralproject/talk into community 2016-11-08 21:32:32 -03:00
Wyatt Johnson 7d5eae2e2f Added embed stream preview 2016-11-08 16:21:50 -07:00
Wyatt Johnson a1fd4d32ba Added error middleware 2016-11-08 15:53:26 -07:00
Belen Curcio 86350800c2 Merge branch 'master' of github.com:coralproject/talk into community 2016-11-08 17:43:00 -03:00
Belen Curcio a36524a55f merge 2016-11-08 17:21:12 -03:00
Riley Davis a15d2eade7 add ejs templating and serve coral-admin from /admin 2016-11-08 11:15:08 -07:00