aboutsummaryrefslogtreecommitdiffhomepage
diff options
context:
space:
mode:
-rw-r--r--app/DoctrineMigrations/Version20170407200919.php51
-rw-r--r--composer.json2
-rw-r--r--src/Wallabag/CoreBundle/Entity/Entry.php25
-rw-r--r--src/Wallabag/CoreBundle/Form/Type/EditEntryType.php5
-rw-r--r--src/Wallabag/CoreBundle/Helper/DownloadImages.php2
-rw-r--r--src/Wallabag/CoreBundle/Helper/EntriesExport.php4
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.da.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.de.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.en.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.es.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.it.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml1
-rw-r--r--src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig5
19 files changed, 56 insertions, 50 deletions
diff --git a/app/DoctrineMigrations/Version20170407200919.php b/app/DoctrineMigrations/Version20170407200919.php
new file mode 100644
index 00000000..4b9d475a
--- /dev/null
+++ b/app/DoctrineMigrations/Version20170407200919.php
@@ -0,0 +1,51 @@
1<?php
2
3namespace Application\Migrations;
4
5use Doctrine\DBAL\Migrations\AbstractMigration;
6use Doctrine\DBAL\Schema\Schema;
7use Symfony\Component\DependencyInjection\ContainerAwareInterface;
8use Symfony\Component\DependencyInjection\ContainerInterface;
9
10/**
11 * Remove isPublic in Entry Table.
12 */
13class Version20170407200919 extends AbstractMigration implements ContainerAwareInterface
14{
15 /**
16 * @var ContainerInterface
17 */
18 private $container;
19
20 public function setContainer(ContainerInterface $container = null)
21 {
22 $this->container = $container;
23 }
24
25 private function getTable($tableName)
26 {
27 return $this->container->getParameter('database_table_prefix').$tableName;
28 }
29
30 /**
31 * @param Schema $schema
32 */
33 public function up(Schema $schema)
34 {
35 $entryTable = $schema->getTable($this->getTable('entry'));
36 $this->skipIf(!$entryTable->hasColumn('is_public'), 'It seems that you already played this migration.');
37
38 $entryTable->dropColumn('is_public');
39 }
40
41 /**
42 * @param Schema $schema
43 */
44 public function down(Schema $schema)
45 {
46 $entryTable = $schema->getTable($this->getTable('entry'));
47 $this->skipIf($entryTable->hasColumn('is_public'), 'It seems that you already played this migration.');
48
49 $entryTable->addColumn('is_public', 'boolean', ['notnull' => false, 'default' => 0]);
50 }
51}
diff --git a/composer.json b/composer.json
index ed0e30c1..5f9e6c1d 100644
--- a/composer.json
+++ b/composer.json
@@ -65,7 +65,7 @@
65 "liip/theme-bundle": "~1.1", 65 "liip/theme-bundle": "~1.1",
66 "lexik/form-filter-bundle": "~5.0", 66 "lexik/form-filter-bundle": "~5.0",
67 "j0k3r/graby": "~1.0", 67 "j0k3r/graby": "~1.0",
68 "friendsofsymfony/user-bundle": "2.0.x-dev", 68 "friendsofsymfony/user-bundle": "^2.0",
69 "friendsofsymfony/oauth-server-bundle": "^1.5", 69 "friendsofsymfony/oauth-server-bundle": "^1.5",
70 "stof/doctrine-extensions-bundle": "^1.2", 70 "stof/doctrine-extensions-bundle": "^1.2",
71 "scheb/two-factor-bundle": "~2.0", 71 "scheb/two-factor-bundle": "~2.0",
diff --git a/src/Wallabag/CoreBundle/Entity/Entry.php b/src/Wallabag/CoreBundle/Entity/Entry.php
index 8d385eb4..b71c467c 100644
--- a/src/Wallabag/CoreBundle/Entity/Entry.php
+++ b/src/Wallabag/CoreBundle/Entity/Entry.php
@@ -193,15 +193,6 @@ class Entry
193 private $previewPicture; 193 private $previewPicture;
194 194
195 /** 195 /**
196 * @var bool
197 *
198 * @ORM\Column(name="is_public", type="boolean", nullable=true, options={"default" = false})
199 *
200 * @Groups({"export_all"})
201 */
202 private $isPublic;
203
204 /**
205 * @var string 196 * @var string
206 * 197 *
207 * @ORM\Column(name="http_status", type="string", length=3, nullable=true) 198 * @ORM\Column(name="http_status", type="string", length=3, nullable=true)
@@ -550,22 +541,6 @@ class Entry
550 } 541 }
551 542
552 /** 543 /**
553 * @return bool
554 */
555 public function isPublic()
556 {
557 return $this->isPublic;
558 }
559
560 /**
561 * @param bool $isPublic
562 */
563 public function setIsPublic($isPublic)
564 {
565 $this->isPublic = $isPublic;
566 }
567
568 /**
569 * @return ArrayCollection<Tag> 544 * @return ArrayCollection<Tag>
570 */ 545 */
571 public function getTags() 546 public function getTags()
diff --git a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
index 40e5b5b9..1627cc44 100644
--- a/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
+++ b/src/Wallabag/CoreBundle/Form/Type/EditEntryType.php
@@ -3,7 +3,6 @@
3namespace Wallabag\CoreBundle\Form\Type; 3namespace Wallabag\CoreBundle\Form\Type;
4 4
5use Symfony\Component\Form\AbstractType; 5use Symfony\Component\Form\AbstractType;
6use Symfony\Component\Form\Extension\Core\Type\CheckboxType;
7use Symfony\Component\Form\Extension\Core\Type\SubmitType; 6use Symfony\Component\Form\Extension\Core\Type\SubmitType;
8use Symfony\Component\Form\Extension\Core\Type\TextType; 7use Symfony\Component\Form\Extension\Core\Type\TextType;
9use Symfony\Component\Form\FormBuilderInterface; 8use Symfony\Component\Form\FormBuilderInterface;
@@ -18,10 +17,6 @@ class EditEntryType extends AbstractType
18 'required' => true, 17 'required' => true,
19 'label' => 'entry.edit.title_label', 18 'label' => 'entry.edit.title_label',
20 ]) 19 ])
21 ->add('is_public', CheckboxType::class, [
22 'required' => false,
23 'label' => 'entry.edit.is_public_label',
24 ])
25 ->add('url', TextType::class, [ 20 ->add('url', TextType::class, [
26 'disabled' => true, 21 'disabled' => true,
27 'required' => false, 22 'required' => false,
diff --git a/src/Wallabag/CoreBundle/Helper/DownloadImages.php b/src/Wallabag/CoreBundle/Helper/DownloadImages.php
index c83f9618..0d330d2a 100644
--- a/src/Wallabag/CoreBundle/Helper/DownloadImages.php
+++ b/src/Wallabag/CoreBundle/Helper/DownloadImages.php
@@ -144,6 +144,8 @@ class DownloadImages
144 $this->logger->debug('DownloadImages: Re-creating jpg'); 144 $this->logger->debug('DownloadImages: Re-creating jpg');
145 break; 145 break;
146 case 'png': 146 case 'png':
147 imagealphablending($im, false);
148 imagesavealpha($im, true);
147 imagepng($im, $localPath, ceil(self::REGENERATE_PICTURES_QUALITY / 100 * 9)); 149 imagepng($im, $localPath, ceil(self::REGENERATE_PICTURES_QUALITY / 100 * 9));
148 $this->logger->debug('DownloadImages: Re-creating png'); 150 $this->logger->debug('DownloadImages: Re-creating png');
149 } 151 }
diff --git a/src/Wallabag/CoreBundle/Helper/EntriesExport.php b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
index 93c01fcb..3d36a4c8 100644
--- a/src/Wallabag/CoreBundle/Helper/EntriesExport.php
+++ b/src/Wallabag/CoreBundle/Helper/EntriesExport.php
@@ -148,8 +148,6 @@ class EntriesExport
148 $book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png'); 148 $book->setCoverImage('Cover.png', file_get_contents($this->logoPath), 'image/png');
149 } 149 }
150 150
151 $book->addChapter('Notices', 'Cover2.html', $content_start.$this->getExportInformation('PHPePub').$bookEnd);
152
153 $book->buildTOC(); 151 $book->buildTOC();
154 152
155 /* 153 /*
@@ -170,6 +168,8 @@ class EntriesExport
170 $book->addChapter($entry->getTitle(), htmlspecialchars($filename).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD); 168 $book->addChapter($entry->getTitle(), htmlspecialchars($filename).'.html', $chapter, true, EPub::EXTERNAL_REF_ADD);
171 } 169 }
172 170
171 $book->addChapter('Notices', 'Cover2.html', $content_start.$this->getExportInformation('PHPePub').$bookEnd);
172
173 return Response::create( 173 return Response::create(
174 $book->getBook(), 174 $book->getBook(),
175 200, 175 200,
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
index 3e841a18..72493fe3 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
@@ -237,7 +237,6 @@ entry:
237 # page_title: 'Edit an entry' 237 # page_title: 'Edit an entry'
238 # title_label: 'Title' 238 # title_label: 'Title'
239 url_label: 'Url' 239 url_label: 'Url'
240 # is_public_label: 'Public'
241 save_label: 'Gem' 240 save_label: 'Gem'
242 public: 241 public:
243 # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>" 242 # shared_by_wallabag: "This article has been shared by <a href=%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
index 3358b5d3..dbad8b16 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
@@ -237,7 +237,6 @@ entry:
237 page_title: 'Eintrag bearbeiten' 237 page_title: 'Eintrag bearbeiten'
238 title_label: 'Titel' 238 title_label: 'Titel'
239 url_label: 'URL' 239 url_label: 'URL'
240 is_public_label: 'Öffentlich'
241 save_label: 'Speichern' 240 save_label: 'Speichern'
242 public: 241 public:
243 shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt" 242 shared_by_wallabag: "Dieser Artikel wurde mittels <a href='%wallabag_instance%'>wallabag</a> geteilt"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
index 30f44350..7da9fe6b 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
@@ -237,7 +237,6 @@ entry:
237 page_title: 'Edit an entry' 237 page_title: 'Edit an entry'
238 title_label: 'Title' 238 title_label: 'Title'
239 url_label: 'Url' 239 url_label: 'Url'
240 is_public_label: 'Public'
241 save_label: 'Save' 240 save_label: 'Save'
242 public: 241 public:
243 shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 242 shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
index 363c94fb..6e21614e 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
@@ -237,7 +237,6 @@ entry:
237 page_title: 'Editar un artículo' 237 page_title: 'Editar un artículo'
238 title_label: 'Título' 238 title_label: 'Título'
239 url_label: 'URL' 239 url_label: 'URL'
240 is_public_label: 'Es público'
241 save_label: 'Guardar' 240 save_label: 'Guardar'
242 public: 241 public:
243 shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>" 242 shared_by_wallabag: "Este artículo se ha compartido con <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
index 972c2a5d..b938c80a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
@@ -237,7 +237,6 @@ entry:
237 page_title: 'ویرایش مقاله' 237 page_title: 'ویرایش مقاله'
238 title_label: 'عنوان' 238 title_label: 'عنوان'
239 url_label: 'نشانی' 239 url_label: 'نشانی'
240 is_public_label: 'عمومی'
241 save_label: 'ذخیره' 240 save_label: 'ذخیره'
242 public: 241 public:
243 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 242 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
index 04b1eeef..9abcda45 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
@@ -237,7 +237,6 @@ entry:
237 page_title: "Éditer un article" 237 page_title: "Éditer un article"
238 title_label: "Titre" 238 title_label: "Titre"
239 url_label: "Adresse" 239 url_label: "Adresse"
240 is_public_label: "Public"
241 save_label: "Enregistrer" 240 save_label: "Enregistrer"
242 public: 241 public:
243 shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>" 242 shared_by_wallabag: "Cet article a été partagé par <a href=\"%wallabag_instance%\">wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
index 7f6787c9..58d0962a 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
@@ -237,7 +237,6 @@ entry:
237 page_title: 'Modifica voce' 237 page_title: 'Modifica voce'
238 title_label: 'Titolo' 238 title_label: 'Titolo'
239 url_label: 'Url' 239 url_label: 'Url'
240 is_public_label: 'Pubblico'
241 save_label: 'Salva' 240 save_label: 'Salva'
242 public: 241 public:
243 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 242 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
index 5a760b87..825a0efd 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
@@ -237,7 +237,6 @@ entry:
237 page_title: 'Modificar un article' 237 page_title: 'Modificar un article'
238 title_label: 'Títol' 238 title_label: 'Títol'
239 url_label: 'Url' 239 url_label: 'Url'
240 is_public_label: 'Public'
241 save_label: 'Enregistrar' 240 save_label: 'Enregistrar'
242 public: 241 public:
243 shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>" 242 shared_by_wallabag: "Aqueste article es estat partejat per <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
index b2df8a0a..b02aa4ec 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
@@ -237,7 +237,6 @@ entry:
237 page_title: 'Edytuj wpis' 237 page_title: 'Edytuj wpis'
238 title_label: 'Tytuł' 238 title_label: 'Tytuł'
239 url_label: 'Adres URL' 239 url_label: 'Adres URL'
240 is_public_label: 'Publiczny'
241 save_label: 'Zapisz' 240 save_label: 'Zapisz'
242 public: 241 public:
243 shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>" 242 shared_by_wallabag: "Ten artykuł został udostępniony przez <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
index fb8c4d29..8aa7e5af 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
@@ -237,7 +237,6 @@ entry:
237 page_title: 'Editar uma entrada' 237 page_title: 'Editar uma entrada'
238 title_label: 'Título' 238 title_label: 'Título'
239 url_label: 'Url' 239 url_label: 'Url'
240 is_public_label: 'Público'
241 save_label: 'Salvar' 240 save_label: 'Salvar'
242 public: 241 public:
243 shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>" 242 shared_by_wallabag: "Este artigo foi compartilhado pelo <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
index d702159a..ce8d8d52 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
@@ -237,7 +237,6 @@ entry:
237 # page_title: 'Edit an entry' 237 # page_title: 'Edit an entry'
238 # title_label: 'Title' 238 # title_label: 'Title'
239 url_label: 'Url' 239 url_label: 'Url'
240 # is_public_label: 'Public'
241 save_label: 'Salvează' 240 save_label: 'Salvează'
242 public: 241 public:
243 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 242 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
index 6525afac..d8903608 100644
--- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
+++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
@@ -237,7 +237,6 @@ entry:
237 page_title: 'Makaleyi düzenle' 237 page_title: 'Makaleyi düzenle'
238 title_label: 'Başlık' 238 title_label: 'Başlık'
239 url_label: 'Url' 239 url_label: 'Url'
240 is_public_label: 'Herkes tarafından erişime açık olsun mu?'
241 save_label: 'Kaydet' 240 save_label: 'Kaydet'
242 public: 241 public:
243 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>" 242 # shared_by_wallabag: "This article has been shared by <a href='%wallabag_instance%'>wallabag</a>"
diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
index 1c5e2aab..b9537975 100644
--- a/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
+++ b/src/Wallabag/CoreBundle/Resources/views/themes/material/Entry/edit.html.twig
@@ -27,11 +27,6 @@
27 {{ form_label(form.url) }} 27 {{ form_label(form.url) }}
28 {{ form_widget(form.url) }} 28 {{ form_widget(form.url) }}
29 </div> 29 </div>
30
31 <div class="input-field s12">
32 {{ form_widget(form.is_public) }}
33 {{ form_label(form.is_public) }}
34 </div>
35 <br> 30 <br>
36 31
37 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }} 32 {{ form_widget(form.save, {'attr': {'class': 'btn waves-effect waves-light'}}) }}