Merge branch 'master' of https://github.com/alchemy-fr/Phraseanet into PHRAS-3057-worker-in-core-4-1

This commit is contained in:
aynsix
2020-05-15 21:01:55 +03:00
21 changed files with 306 additions and 187 deletions

View File

@@ -268,9 +268,11 @@ class FeedController extends Controller
'texte' => '<p>' . $this->app->trans(
'publication::Voici votre fil RSS personnel. Il vous permettra d\'etre tenu au courrant des publications.'
) . '</p><p>' . $this->app->trans('publications::Ne le partagez pas, il est strictement confidentiel') . '</p>
<div><input type="text" style="width:100%" value="' . $link->getURI() . '"/></div>',
'titre' => $this->app->trans('publications::votre rss personnel')
<div class="feed_input_block"><input type="text" readonly="readonly" id="input-select-copy" class="input_select_copy" value="' . $link->getURI()
. '"/><button type="button" class="btn-info copy-feed" id="copy-feed">' . $this->app->trans('publications::copy') . '</button></div>',
'titre' => $this->app->trans('publications::votre rss personnel'),
]);
}
public function ensureUserHasPublishRight()