mirror of
https://github.com/wallabag/wallabag.git
synced 2024-12-23 08:06:33 +00:00
Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight
[#1604] First draft to fix SensioLabsInsight report
This commit is contained in:
commit
e43d27f845
16 changed files with 10 additions and 24 deletions
|
@ -35,7 +35,7 @@ parameters:
|
|||
locale: en
|
||||
|
||||
# A secret key that's used to generate certain security-related tokens
|
||||
secret: ThisTokenIsNotSoSecretChangeIt
|
||||
secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv
|
||||
|
||||
# wallabag misc
|
||||
app.version: 2.0.0-alpha
|
||||
|
|
|
@ -9,6 +9,7 @@ use Nelmio\ApiDocBundle\Annotation\ApiDoc;
|
|||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\HttpFoundation\Response;
|
||||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||
use Symfony\Component\Security\Core\Exception\AccessDeniedException;
|
||||
use Wallabag\CoreBundle\Entity\Entry;
|
||||
use Wallabag\CoreBundle\Entity\Tag;
|
||||
|
||||
|
@ -73,7 +74,6 @@ class WallabagRestController extends FOSRestController
|
|||
$order = $request->query->get('order', 'desc');
|
||||
$page = (int) $request->query->get('page', 1);
|
||||
$perPage = (int) $request->query->get('perPage', 30);
|
||||
$tags = $request->query->get('tags', []);
|
||||
|
||||
$pager = $this->getDoctrine()
|
||||
->getRepository('WallabagCoreBundle:Entry')
|
||||
|
|
|
@ -20,10 +20,6 @@ class Configuration implements ConfigurationInterface
|
|||
$treeBuilder = new TreeBuilder();
|
||||
$rootNode = $treeBuilder->root('wallabag_api');
|
||||
|
||||
// Here you should define the parameters that are allowed to
|
||||
// configure your bundle. See the documentation linked above for
|
||||
// more information on that topic.
|
||||
|
||||
return $treeBuilder;
|
||||
}
|
||||
}
|
||||
|
|
|
@ -64,7 +64,6 @@ class InstallCommand extends ContainerAwareCommand
|
|||
|
||||
$fulfilled = true;
|
||||
|
||||
// @TODO: find a better way to check requirements
|
||||
$label = '<comment>PCRE</comment>';
|
||||
if (extension_loaded('pcre')) {
|
||||
$status = '<info>OK!</info>';
|
||||
|
|
|
@ -198,7 +198,7 @@ class ConfigController extends Controller
|
|||
*
|
||||
* @return \Symfony\Component\HttpFoundation\RedirectResponse
|
||||
*/
|
||||
public function deleteTaggingRule(TaggingRule $rule)
|
||||
public function deleteTaggingRuleAction(TaggingRule $rule)
|
||||
{
|
||||
if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) {
|
||||
throw $this->createAccessDeniedException('You can not access this tagging ryle.');
|
||||
|
|
|
@ -9,7 +9,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller;
|
|||
use Symfony\Component\HttpFoundation\Request;
|
||||
use Symfony\Component\Routing\Generator\UrlGeneratorInterface;
|
||||
use Wallabag\CoreBundle\Entity\Entry;
|
||||
use Wallabag\CoreBundle\Filter\EntryFilterType;
|
||||
use Wallabag\CoreBundle\Form\Type\EntryFilterType;
|
||||
use Wallabag\CoreBundle\Form\Type\EditEntryType;
|
||||
use Wallabag\CoreBundle\Form\Type\NewEntryType;
|
||||
|
||||
|
@ -81,7 +81,7 @@ class EntryController extends Controller
|
|||
*
|
||||
* @return \Symfony\Component\HttpFoundation\Response
|
||||
*/
|
||||
public function addEntryViaBookmarklet(Request $request)
|
||||
public function addEntryViaBookmarkletAction(Request $request)
|
||||
{
|
||||
$entry = new Entry($this->getUser());
|
||||
$entry->setUrl($request->get('url'));
|
||||
|
|
|
@ -16,11 +16,6 @@ class EditEntryType extends AbstractType
|
|||
$builder
|
||||
->add('title', TextType::class, array('required' => true))
|
||||
->add('is_public', CheckboxType::class, array('required' => false))
|
||||
// @todo: add autocomplete
|
||||
// ->add('tags', 'entity', array(
|
||||
// 'class' => 'Wallabag\CoreBundle\Entity\Tag',
|
||||
// 'choice_translation_domain' => true,
|
||||
// ))
|
||||
->add('save', SubmitType::class)
|
||||
;
|
||||
}
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?php
|
||||
|
||||
namespace Wallabag\CoreBundle\Filter;
|
||||
namespace Wallabag\CoreBundle\Form\Type;
|
||||
|
||||
use Doctrine\ORM\EntityRepository;
|
||||
use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface;
|
|
@ -15,7 +15,7 @@ services:
|
|||
- { name: form.type }
|
||||
|
||||
wallabag_core.filter.type.entry:
|
||||
class: Wallabag\CoreBundle\Filter\EntryFilterType
|
||||
class: Wallabag\CoreBundle\Form\Type\EntryFilterType
|
||||
arguments:
|
||||
- "@wallabag_core.entry_repository"
|
||||
- "@security.token_storage"
|
||||
|
|
|
@ -564,7 +564,7 @@ img.preview {
|
|||
height: 100%;
|
||||
width: 100%;
|
||||
margin: 0;
|
||||
margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */
|
||||
margin-top: -30% !important;
|
||||
padding: 2em;
|
||||
display: none;
|
||||
border-left: 1px #EEE solid;
|
||||
|
|
2
src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md
Executable file → Normal file
2
src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md
Executable file → Normal file
|
@ -1,3 +1,3 @@
|
|||
# Baggy Theme
|
||||
|
||||
theme created by Thomas LEBEAU alias Courgette http://thomaslebeau.fr/
|
||||
theme created by Thomas LEBEAU alias Courgette http://thomaslebeau.fr/
|
||||
|
|
0
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
Executable file → Normal file
0
src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig
Executable file → Normal file
2
src/Wallabag/CoreBundle/Resources/views/themes/material/README.md
Executable file → Normal file
2
src/Wallabag/CoreBundle/Resources/views/themes/material/README.md
Executable file → Normal file
|
@ -2,4 +2,4 @@
|
|||
|
||||
Theme created by Danilow (@modos189) Alexandr http://modos189.ru/
|
||||
|
||||
Used framework http://materializecss.com/
|
||||
Used framework http://materializecss.com/
|
||||
|
|
0
src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
Executable file → Normal file
0
src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig
Executable file → Normal file
|
@ -23,7 +23,6 @@ class PocketImport implements ImportInterface
|
|||
private $skippedEntries = 0;
|
||||
private $importedEntries = 0;
|
||||
protected $accessToken;
|
||||
private $translator;
|
||||
|
||||
public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey)
|
||||
{
|
||||
|
@ -177,9 +176,6 @@ class PocketImport implements ImportInterface
|
|||
$this->client = $client;
|
||||
}
|
||||
|
||||
/**
|
||||
* @todo move that in a more global place
|
||||
*/
|
||||
private function assignTagsToEntry(Entry $entry, $tags)
|
||||
{
|
||||
foreach ($tags as $tag) {
|
||||
|
|
BIN
web/favicon.ico
Normal file
BIN
web/favicon.ico
Normal file
Binary file not shown.
After Width: | Height: | Size: 34 KiB |
Loading…
Reference in a new issue