Commit Graph

2881 Commits

Author SHA1 Message Date
Belen Curcio e85ebba21b Working plugin importer 2017-03-27 13:02:57 -03:00
Belen Curcio 3be9b13691 First draft of plugins working :) 2017-03-23 16:59:11 -03:00
Belen Curcio 2e80d2a36e fixing and separating broken tests /client /server 2017-03-23 12:27:30 -03:00
Belen Curcio 341a7320f9 Adding dynamic imports 2017-03-23 11:48:32 -03:00
Riley Davis c6401a2d08 Merge pull request #434 from coralproject/asset-url
asset_url and canonical link tags
2017-03-22 15:51:08 -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
Gabriela Rodríguez Berón 82068cd20e Merge pull request #370 from coralproject/story-138187767-mod-flag-names
Story 138187767  - Moderate Flag User Names
2017-03-22 12:10:43 -07:00
gaba d9af09d2a3 Email templates 2017-03-22 11:43:03 -07:00
gaba 046cea5043 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-22 11:33:25 -07:00
Gabriela Rodríguez Berón d7ccfa4eda Merge pull request #431 from coralproject/remove-express-dep
remove express dep from mailer service
2017-03-22 11:32:36 -07:00
gaba ac6a116896 Only the name for the template. 2017-03-22 11:21:41 -07: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
gaba 9782cf0b9d Mail SendSimple will not use app in the future but render from ejs. 2017-03-22 10:02:59 -07:00
Riley Davis b51cbebe1d Merge branch 'master' into story-138187767-mod-flag-names 2017-03-22 09:57:29 -06:00
David Erwin 2016546ca3 Merge pull request #426 from coralproject/no-reply-closed-streams
hide reply button if stream is closed
2017-03-22 10:53:15 -04:00
David Erwin 63fca6ba4c Merge branch 'master' into no-reply-closed-streams 2017-03-22 10:45:02 -04:00
gaba 7522bd9cd6 Sends a mail to the suspended user. 2017-03-21 15:08:46 -07:00
David Erwin 9cf974d098 Merge pull request #427 from coralproject/view-more-no-worky
Comment Stream Bugfix
2017-03-21 17:59:40 -04:00
David Erwin 072d332027 Merge branch 'master' into view-more-no-worky 2017-03-21 17:54:37 -04:00
Riley Davis 80ff090c45 better tracking of new/old comments 2017-03-21 15:52:26 -06:00
Riley Davis a61b784d2b Merge pull request #425 from coralproject/reCAPTCHA-docs
Added reCAPTCHA docs
2017-03-21 15:03:42 -06:00
Riley Davis 8804b5b63f Merge branch 'master' into reCAPTCHA-docs 2017-03-21 14:59:59 -06:00
David Erwin d7adf0c792 Merge pull request #423 from coralproject/stream-sorting
sort the stories by date
2017-03-21 16:47:27 -04:00
Riley Davis 442e384298 Merge branch 'master' into no-reply-closed-streams 2017-03-21 13:21:01 -06:00
Riley Davis afaf9dd26d Merge branch 'master' into stream-sorting 2017-03-21 13:20:53 -06:00
Riley Davis 94619ca291 actually pass the asset_id instead of undefined 2017-03-21 12:30:27 -06:00
Belén Curcio b9fc1a6186 Merge branch 'master' into view-more-no-worky 2017-03-21 15:08:27 -03:00
David Erwin 481c22b7dd Merge pull request #429 from coralproject/documentation-fix
Fixed plugin examples
2017-03-21 13:44:57 -04:00
Gabriela Rodríguez Berón b9960c3cc7 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-21 10:42:48 -07:00
gaba a09d41053f It uses Button instead of FabButton from coral-ui. 2017-03-21 10:36:21 -07:00
Riley Davis c8dc3c5ad2 disable replies too 2017-03-21 10:27:11 -06:00
Wyatt Johnson e5a2d627df Fixed plugin examples 2017-03-21 10:03:24 -06:00
Riley Davis ffc5379e11 Merge branch 'master' into stream-sorting 2017-03-21 09:12:04 -06:00
Riley Davis f5d1e0df8f Merge branch 'master' into no-reply-closed-streams 2017-03-21 09:11:54 -06:00
Riley Davis 894ea634c9 Merge branch 'master' into view-more-no-worky 2017-03-21 09:09:57 -06:00
Wyatt Johnson 033502626c Merge pull request #428 from coralproject/load-more-fix
Fixed bug in loading more comments
2017-03-21 08:07:00 -06:00
Riley Davis 9bfc4b5815 how did this get duplicated? 2017-03-20 16:26:52 -06:00
Riley Davis 546dd63d8c why did only this get changed? 2017-03-20 16:21:01 -06:00
gaba e5bac88bb5 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-20 15:02:38 -07:00
Wyatt Johnson 20348d5f05 Fixed bug in loading more comments 2017-03-20 15:58:33 -06:00
Riley Davis 0383d86021 load more replies if there are currently no replies 2017-03-20 15:09:45 -06:00
riley fb503798e8 use the reply id so we don't get weird behavior. fix a console warning 2017-03-20 14:46:59 -06:00
gaba be2ecf0838 Adds user and message to flagaction to display in FE. 2017-03-20 13:38:11 -07:00
gaba 9e76ca5d27 Fix CSS. 2017-03-20 12:37:21 -07:00
riley d7e554a055 hide reply button if stream is closed 2017-03-20 13:01:38 -06:00
Wyatt Johnson eceddf109a Added reCAPTCHA docs 2017-03-20 12:35:22 -06:00
gaba ac8c73c4e9 Merge branch 'master' into story-138187767-mod-flag-names 2017-03-20 10:47:04 -07:00
David Erwin 9ccdaec063 Merge pull request #422 from coralproject/plugin-patch
Update Dockerfile
2017-03-20 10:47:03 -07:00
Wyatt Johnson 69ad11adf5 Update Dockerfile 2017-03-20 10:47:03 -07:00
David Erwin af93953b17 Merge pull request #421 from coralproject/plugins
Server Graph Plugins
2017-03-20 10:47:02 -07:00