diff options
16 files changed, 10 insertions, 24 deletions
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index e4fcbd74..ac4a4cc8 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -35,7 +35,7 @@ parameters: | |||
35 | locale: en | 35 | locale: en |
36 | 36 | ||
37 | # A secret key that's used to generate certain security-related tokens | 37 | # A secret key that's used to generate certain security-related tokens |
38 | secret: ThisTokenIsNotSoSecretChangeIt | 38 | secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv |
39 | 39 | ||
40 | # wallabag misc | 40 | # wallabag misc |
41 | app.version: 2.0.0-alpha | 41 | app.version: 2.0.0-alpha |
diff --git a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php index d9035cac..84bc14a9 100644 --- a/src/Wallabag/ApiBundle/Controller/WallabagRestController.php +++ b/src/Wallabag/ApiBundle/Controller/WallabagRestController.php | |||
@@ -9,6 +9,7 @@ use Nelmio\ApiDocBundle\Annotation\ApiDoc; | |||
9 | use Symfony\Component\HttpFoundation\Request; | 9 | use Symfony\Component\HttpFoundation\Request; |
10 | use Symfony\Component\HttpFoundation\Response; | 10 | use Symfony\Component\HttpFoundation\Response; |
11 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; | 11 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
12 | use Symfony\Component\Security\Core\Exception\AccessDeniedException; | ||
12 | use Wallabag\CoreBundle\Entity\Entry; | 13 | use Wallabag\CoreBundle\Entity\Entry; |
13 | use Wallabag\CoreBundle\Entity\Tag; | 14 | use Wallabag\CoreBundle\Entity\Tag; |
14 | 15 | ||
@@ -73,7 +74,6 @@ class WallabagRestController extends FOSRestController | |||
73 | $order = $request->query->get('order', 'desc'); | 74 | $order = $request->query->get('order', 'desc'); |
74 | $page = (int) $request->query->get('page', 1); | 75 | $page = (int) $request->query->get('page', 1); |
75 | $perPage = (int) $request->query->get('perPage', 30); | 76 | $perPage = (int) $request->query->get('perPage', 30); |
76 | $tags = $request->query->get('tags', []); | ||
77 | 77 | ||
78 | $pager = $this->getDoctrine() | 78 | $pager = $this->getDoctrine() |
79 | ->getRepository('WallabagCoreBundle:Entry') | 79 | ->getRepository('WallabagCoreBundle:Entry') |
diff --git a/src/Wallabag/ApiBundle/DependencyInjection/Configuration.php b/src/Wallabag/ApiBundle/DependencyInjection/Configuration.php index cec45412..f70a5835 100644 --- a/src/Wallabag/ApiBundle/DependencyInjection/Configuration.php +++ b/src/Wallabag/ApiBundle/DependencyInjection/Configuration.php | |||
@@ -20,10 +20,6 @@ class Configuration implements ConfigurationInterface | |||
20 | $treeBuilder = new TreeBuilder(); | 20 | $treeBuilder = new TreeBuilder(); |
21 | $rootNode = $treeBuilder->root('wallabag_api'); | 21 | $rootNode = $treeBuilder->root('wallabag_api'); |
22 | 22 | ||
23 | // Here you should define the parameters that are allowed to | ||
24 | // configure your bundle. See the documentation linked above for | ||
25 | // more information on that topic. | ||
26 | |||
27 | return $treeBuilder; | 23 | return $treeBuilder; |
28 | } | 24 | } |
29 | } | 25 | } |
diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index da099a19..63032dbb 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php | |||
@@ -64,7 +64,6 @@ class InstallCommand extends ContainerAwareCommand | |||
64 | 64 | ||
65 | $fulfilled = true; | 65 | $fulfilled = true; |
66 | 66 | ||
67 | // @TODO: find a better way to check requirements | ||
68 | $label = '<comment>PCRE</comment>'; | 67 | $label = '<comment>PCRE</comment>'; |
69 | if (extension_loaded('pcre')) { | 68 | if (extension_loaded('pcre')) { |
70 | $status = '<info>OK!</info>'; | 69 | $status = '<info>OK!</info>'; |
diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index 6c375909..b01aaa7f 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php | |||
@@ -198,7 +198,7 @@ class ConfigController extends Controller | |||
198 | * | 198 | * |
199 | * @return \Symfony\Component\HttpFoundation\RedirectResponse | 199 | * @return \Symfony\Component\HttpFoundation\RedirectResponse |
200 | */ | 200 | */ |
201 | public function deleteTaggingRule(TaggingRule $rule) | 201 | public function deleteTaggingRuleAction(TaggingRule $rule) |
202 | { | 202 | { |
203 | if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { | 203 | if ($this->getUser()->getId() != $rule->getConfig()->getUser()->getId()) { |
204 | throw $this->createAccessDeniedException('You can not access this tagging ryle.'); | 204 | throw $this->createAccessDeniedException('You can not access this tagging ryle.'); |
diff --git a/src/Wallabag/CoreBundle/Controller/EntryController.php b/src/Wallabag/CoreBundle/Controller/EntryController.php index 3e1b512f..ea77d138 100644 --- a/src/Wallabag/CoreBundle/Controller/EntryController.php +++ b/src/Wallabag/CoreBundle/Controller/EntryController.php | |||
@@ -9,7 +9,7 @@ use Symfony\Bundle\FrameworkBundle\Controller\Controller; | |||
9 | use Symfony\Component\HttpFoundation\Request; | 9 | use Symfony\Component\HttpFoundation\Request; |
10 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; | 10 | use Symfony\Component\Routing\Generator\UrlGeneratorInterface; |
11 | use Wallabag\CoreBundle\Entity\Entry; | 11 | use Wallabag\CoreBundle\Entity\Entry; |
12 | use Wallabag\CoreBundle\Filter\EntryFilterType; | 12 | use Wallabag\CoreBundle\Form\Type\EntryFilterType; |
13 | use Wallabag\CoreBundle\Form\Type\EditEntryType; | 13 | use Wallabag\CoreBundle\Form\Type\EditEntryType; |
14 | use Wallabag\CoreBundle\Form\Type\NewEntryType; | 14 | use Wallabag\CoreBundle\Form\Type\NewEntryType; |
15 | 15 | ||
@@ -81,7 +81,7 @@ class EntryController extends Controller | |||
81 | * | 81 | * |
82 | * @return \Symfony\Component\HttpFoundation\Response | 82 | * @return \Symfony\Component\HttpFoundation\Response |
83 | */ | 83 | */ |
84 | public function addEntryViaBookmarklet(Request $request) | 84 | public function addEntryViaBookmarkletAction(Request $request) |
85 | { | 85 | { |
86 | $entry = new Entry($this->getUser()); | 86 | $entry = new Entry($this->getUser()); |
87 | $entry->setUrl($request->get('url')); | 87 | $entry->setUrl($request->get('url')); |
diff --git a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php index 0cb29881..2b1e1ef4 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php | |||
@@ -16,11 +16,6 @@ class EditEntryType extends AbstractType | |||
16 | $builder | 16 | $builder |
17 | ->add('title', TextType::class, array('required' => true)) | 17 | ->add('title', TextType::class, array('required' => true)) |
18 | ->add('is_public', CheckboxType::class, array('required' => false)) | 18 | ->add('is_public', CheckboxType::class, array('required' => false)) |
19 | // @todo: add autocomplete | ||
20 | // ->add('tags', 'entity', array( | ||
21 | // 'class' => 'Wallabag\CoreBundle\Entity\Tag', | ||
22 | // 'choice_translation_domain' => true, | ||
23 | // )) | ||
24 | ->add('save', SubmitType::class) | 19 | ->add('save', SubmitType::class) |
25 | ; | 20 | ; |
26 | } | 21 | } |
diff --git a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php index c38be832..ee10bc8b 100644 --- a/src/Wallabag/CoreBundle/Filter/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php | |||
@@ -1,6 +1,6 @@ | |||
1 | <?php | 1 | <?php |
2 | 2 | ||
3 | namespace Wallabag\CoreBundle\Filter; | 3 | namespace Wallabag\CoreBundle\Form\Type; |
4 | 4 | ||
5 | use Doctrine\ORM\EntityRepository; | 5 | use Doctrine\ORM\EntityRepository; |
6 | use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; | 6 | use Lexik\Bundle\FormFilterBundle\Filter\Query\QueryInterface; |
diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index 25d71cba..7d24d488 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml | |||
@@ -15,7 +15,7 @@ services: | |||
15 | - { name: form.type } | 15 | - { name: form.type } |
16 | 16 | ||
17 | wallabag_core.filter.type.entry: | 17 | wallabag_core.filter.type.entry: |
18 | class: Wallabag\CoreBundle\Filter\EntryFilterType | 18 | class: Wallabag\CoreBundle\Form\Type\EntryFilterType |
19 | arguments: | 19 | arguments: |
20 | - "@wallabag_core.entry_repository" | 20 | - "@wallabag_core.entry_repository" |
21 | - "@security.token_storage" | 21 | - "@security.token_storage" |
diff --git a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css index d3f92926..62f2964c 100755 --- a/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css +++ b/src/Wallabag/CoreBundle/Resources/public/themes/baggy/css/main.css | |||
@@ -564,7 +564,7 @@ img.preview { | |||
564 | height: 100%; | 564 | height: 100%; |
565 | width: 100%; | 565 | width: 100%; |
566 | margin: 0; | 566 | margin: 0; |
567 | margin-top: -30% !important; /* TODO: get rid of !important here; overridden by .messages selector */ | 567 | margin-top: -30% !important; |
568 | padding: 2em; | 568 | padding: 2em; |
569 | display: none; | 569 | display: none; |
570 | border-left: 1px #EEE solid; | 570 | border-left: 1px #EEE solid; |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md index 1f0054a4..3db07873 100755..100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/README.md | |||
@@ -1,3 +1,3 @@ | |||
1 | # Baggy Theme | 1 | # Baggy Theme |
2 | 2 | ||
3 | theme created by Thomas LEBEAU alias Courgette http://thomaslebeau.fr/ \ No newline at end of file | 3 | theme created by Thomas LEBEAU alias Courgette http://thomaslebeau.fr/ |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig index 38f08da6..38f08da6 100755..100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Static/about.html.twig | |||
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md b/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md index 534eea30..54e8a0e2 100755..100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/README.md | |||
@@ -2,4 +2,4 @@ | |||
2 | 2 | ||
3 | Theme created by Danilow (@modos189) Alexandr http://modos189.ru/ | 3 | Theme created by Danilow (@modos189) Alexandr http://modos189.ru/ |
4 | 4 | ||
5 | Used framework http://materializecss.com/ \ No newline at end of file | 5 | Used framework http://materializecss.com/ |
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig index d6b8e28a..d6b8e28a 100755..100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Static/about.html.twig | |||
diff --git a/src/Wallabag/ImportBundle/Import/PocketImport.php b/src/Wallabag/ImportBundle/Import/PocketImport.php index 72b9047c..617d5514 100644 --- a/src/Wallabag/ImportBundle/Import/PocketImport.php +++ b/src/Wallabag/ImportBundle/Import/PocketImport.php | |||
@@ -23,7 +23,6 @@ class PocketImport implements ImportInterface | |||
23 | private $skippedEntries = 0; | 23 | private $skippedEntries = 0; |
24 | private $importedEntries = 0; | 24 | private $importedEntries = 0; |
25 | protected $accessToken; | 25 | protected $accessToken; |
26 | private $translator; | ||
27 | 26 | ||
28 | public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey) | 27 | public function __construct(TokenStorageInterface $tokenStorage, EntityManager $em, ContentProxy $contentProxy, $consumerKey) |
29 | { | 28 | { |
@@ -177,9 +176,6 @@ class PocketImport implements ImportInterface | |||
177 | $this->client = $client; | 176 | $this->client = $client; |
178 | } | 177 | } |
179 | 178 | ||
180 | /** | ||
181 | * @todo move that in a more global place | ||
182 | */ | ||
183 | private function assignTagsToEntry(Entry $entry, $tags) | 179 | private function assignTagsToEntry(Entry $entry, $tags) |
184 | { | 180 | { |
185 | foreach ($tags as $tag) { | 181 | foreach ($tags as $tag) { |
diff --git a/web/favicon.ico b/web/favicon.ico new file mode 100644 index 00000000..0346558b --- /dev/null +++ b/web/favicon.ico | |||
Binary files differ | |||