diff options
Diffstat (limited to 'app')
47 files changed, 739 insertions, 45 deletions
diff --git a/app/AppKernel.php b/app/AppKernel.php index 52f85558..81b83ef9 100644 --- a/app/AppKernel.php +++ b/app/AppKernel.php | |||
@@ -29,8 +29,8 @@ class AppKernel extends Kernel | |||
29 | new KPhoen\RulerZBundle\KPhoenRulerZBundle(), | 29 | new KPhoen\RulerZBundle\KPhoenRulerZBundle(), |
30 | new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), | 30 | new Doctrine\Bundle\MigrationsBundle\DoctrineMigrationsBundle(), |
31 | new Craue\ConfigBundle\CraueConfigBundle(), | 31 | new Craue\ConfigBundle\CraueConfigBundle(), |
32 | new Lexik\Bundle\MaintenanceBundle\LexikMaintenanceBundle(), | ||
33 | new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(), | 32 | new WhiteOctober\PagerfantaBundle\WhiteOctoberPagerfantaBundle(), |
33 | new FOS\JsRoutingBundle\FOSJsRoutingBundle(), | ||
34 | 34 | ||
35 | // wallabag bundles | 35 | // wallabag bundles |
36 | new Wallabag\CoreBundle\WallabagCoreBundle(), | 36 | new Wallabag\CoreBundle\WallabagCoreBundle(), |
diff --git a/app/DoctrineMigrations/Version20160812120952.php b/app/DoctrineMigrations/Version20160812120952.php index 3aafea64..39423e2f 100644 --- a/app/DoctrineMigrations/Version20160812120952.php +++ b/app/DoctrineMigrations/Version20160812120952.php | |||
@@ -33,9 +33,11 @@ class Version20160812120952 extends AbstractMigration implements ContainerAwareI | |||
33 | case 'sqlite': | 33 | case 'sqlite': |
34 | $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext DEFAULT NULL'); | 34 | $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext DEFAULT NULL'); |
35 | break; | 35 | break; |
36 | |||
36 | case 'mysql': | 37 | case 'mysql': |
37 | $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL'); | 38 | $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name longtext COLLATE \'utf8_unicode_ci\' DEFAULT NULL'); |
38 | break; | 39 | break; |
40 | |||
39 | case 'postgresql': | 41 | case 'postgresql': |
40 | $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name text DEFAULT NULL'); | 42 | $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD name text DEFAULT NULL'); |
41 | } | 43 | } |
diff --git a/app/DoctrineMigrations/Version20161001072726.php b/app/DoctrineMigrations/Version20161001072726.php new file mode 100644 index 00000000..237db932 --- /dev/null +++ b/app/DoctrineMigrations/Version20161001072726.php | |||
@@ -0,0 +1,63 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Application\Migrations; | ||
4 | |||
5 | use Doctrine\DBAL\Migrations\AbstractMigration; | ||
6 | use Doctrine\DBAL\Schema\Schema; | ||
7 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; | ||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | ||
9 | |||
10 | class Version20161001072726 extends AbstractMigration implements ContainerAwareInterface | ||
11 | { | ||
12 | /** | ||
13 | * @var ContainerInterface | ||
14 | */ | ||
15 | private $container; | ||
16 | |||
17 | public function setContainer(ContainerInterface $container = null) | ||
18 | { | ||
19 | $this->container = $container; | ||
20 | } | ||
21 | |||
22 | private function getTable($tableName) | ||
23 | { | ||
24 | return $this->container->getParameter('database_table_prefix') . $tableName; | ||
25 | } | ||
26 | |||
27 | /** | ||
28 | * @param Schema $schema | ||
29 | */ | ||
30 | public function up(Schema $schema) | ||
31 | { | ||
32 | $this->skipIf($this->connection->getDatabasePlatform()->getName() == 'sqlite', 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.'); | ||
33 | |||
34 | // remove all FK from entry_tag | ||
35 | $query = $this->connection->query("SELECT CONSTRAINT_NAME FROM information_schema.key_column_usage WHERE TABLE_NAME = '".$this->getTable('entry_tag')."' AND CONSTRAINT_NAME LIKE 'FK_%' AND TABLE_SCHEMA = '".$this->connection->getDatabase()."'"); | ||
36 | $query->execute(); | ||
37 | |||
38 | foreach ($query->fetchAll() as $fk) { | ||
39 | $this->addSql('ALTER TABLE '.$this->getTable('entry_tag').' DROP FOREIGN KEY '.$fk['CONSTRAINT_NAME']); | ||
40 | } | ||
41 | |||
42 | $this->addSql('ALTER TABLE '.$this->getTable('entry_tag').' ADD CONSTRAINT FK_entry_tag_entry FOREIGN KEY (entry_id) REFERENCES '.$this->getTable('entry').' (id) ON DELETE CASCADE'); | ||
43 | $this->addSql('ALTER TABLE '.$this->getTable('entry_tag').' ADD CONSTRAINT FK_entry_tag_tag FOREIGN KEY (tag_id) REFERENCES '.$this->getTable('tag').' (id) ON DELETE CASCADE'); | ||
44 | |||
45 | // remove entry FK from annotation | ||
46 | $query = $this->connection->query("SELECT CONSTRAINT_NAME FROM information_schema.key_column_usage WHERE TABLE_NAME = '".$this->getTable('annotation')."' AND CONSTRAINT_NAME LIKE 'FK_%' and COLUMN_NAME = 'entry_id' AND TABLE_SCHEMA = '".$this->connection->getDatabase()."'"); | ||
47 | $query->execute(); | ||
48 | |||
49 | foreach ($query->fetchAll() as $fk) { | ||
50 | $this->addSql('ALTER TABLE '.$this->getTable('annotation').' DROP FOREIGN KEY '.$fk['CONSTRAINT_NAME']); | ||
51 | } | ||
52 | |||
53 | $this->addSql('ALTER TABLE '.$this->getTable('annotation').' ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES '.$this->getTable('entry').' (id) ON DELETE CASCADE'); | ||
54 | } | ||
55 | |||
56 | /** | ||
57 | * @param Schema $schema | ||
58 | */ | ||
59 | public function down(Schema $schema) | ||
60 | { | ||
61 | throw new SkipMigrationException('Too complex ...'); | ||
62 | } | ||
63 | } | ||
diff --git a/app/DoctrineMigrations/Version20161022134138.php b/app/DoctrineMigrations/Version20161022134138.php new file mode 100644 index 00000000..5cce55a5 --- /dev/null +++ b/app/DoctrineMigrations/Version20161022134138.php | |||
@@ -0,0 +1,77 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Application\Migrations; | ||
4 | |||
5 | use Doctrine\DBAL\Migrations\AbstractMigration; | ||
6 | use Doctrine\DBAL\Schema\Schema; | ||
7 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; | ||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | ||
9 | |||
10 | class Version20161022134138 extends AbstractMigration implements ContainerAwareInterface | ||
11 | { | ||
12 | /** | ||
13 | * @var ContainerInterface | ||
14 | */ | ||
15 | private $container; | ||
16 | |||
17 | public function setContainer(ContainerInterface $container = null) | ||
18 | { | ||
19 | $this->container = $container; | ||
20 | } | ||
21 | |||
22 | private function getTable($tableName) | ||
23 | { | ||
24 | return $this->container->getParameter('database_table_prefix') . $tableName; | ||
25 | } | ||
26 | |||
27 | /** | ||
28 | * @param Schema $schema | ||
29 | */ | ||
30 | public function up(Schema $schema) | ||
31 | { | ||
32 | $this->skipIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'This migration only apply to MySQL'); | ||
33 | |||
34 | $this->addSql('ALTER DATABASE '.$this->container->getParameter('database_name').' CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci;'); | ||
35 | |||
36 | $this->addSql('ALTER TABLE '.$this->getTable('annotation').' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); | ||
37 | $this->addSql('ALTER TABLE '.$this->getTable('entry').' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); | ||
38 | $this->addSql('ALTER TABLE '.$this->getTable('tag').' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); | ||
39 | $this->addSql('ALTER TABLE '.$this->getTable('user').' CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); | ||
40 | |||
41 | $this->addSql('ALTER TABLE '.$this->getTable('annotation').' CHANGE `text` `text` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); | ||
42 | $this->addSql('ALTER TABLE '.$this->getTable('annotation').' CHANGE `quote` `quote` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); | ||
43 | |||
44 | $this->addSql('ALTER TABLE '.$this->getTable('entry').' CHANGE `title` `title` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); | ||
45 | $this->addSql('ALTER TABLE '.$this->getTable('entry').' CHANGE `content` `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); | ||
46 | |||
47 | $this->addSql('ALTER TABLE '.$this->getTable('tag').' CHANGE `label` `label` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); | ||
48 | |||
49 | $this->addSql('ALTER TABLE '.$this->getTable('user').' CHANGE `name` `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci;'); | ||
50 | } | ||
51 | |||
52 | /** | ||
53 | * @param Schema $schema | ||
54 | */ | ||
55 | public function down(Schema $schema) | ||
56 | { | ||
57 | $this->skipIf($this->connection->getDatabasePlatform()->getName() !== 'mysql', 'This migration only apply to MySQL'); | ||
58 | |||
59 | $this->addSql('ALTER DATABASE '.$this->container->getParameter('database_name').' CHARACTER SET = utf8 COLLATE = utf8_unicode_ci;'); | ||
60 | |||
61 | $this->addSql('ALTER TABLE '.$this->getTable('annotation').' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;'); | ||
62 | $this->addSql('ALTER TABLE '.$this->getTable('entry').' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;'); | ||
63 | $this->addSql('ALTER TABLE '.$this->getTable('tag').' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;'); | ||
64 | $this->addSql('ALTER TABLE '.$this->getTable('user').' CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci;'); | ||
65 | |||
66 | $this->addSql('ALTER TABLE '.$this->getTable('annotation').' CHANGE `text` `text` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;'); | ||
67 | $this->addSql('ALTER TABLE '.$this->getTable('annotation').' CHANGE `quote` `quote` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci;'); | ||
68 | |||
69 | $this->addSql('ALTER TABLE '.$this->getTable('entry').' CHANGE `title` `title` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;'); | ||
70 | $this->addSql('ALTER TABLE '.$this->getTable('entry').' CHANGE `content` `content` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;'); | ||
71 | |||
72 | $this->addSql('ALTER TABLE '.$this->getTable('tag').' CHANGE `label` `label` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;'); | ||
73 | |||
74 | $this->addSql('ALTER TABLE '.$this->getTable('user').' CHANGE `name` `name` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci;'); | ||
75 | |||
76 | } | ||
77 | } | ||
diff --git a/app/DoctrineMigrations/Version20161024212538.php b/app/DoctrineMigrations/Version20161024212538.php new file mode 100644 index 00000000..f8e927e4 --- /dev/null +++ b/app/DoctrineMigrations/Version20161024212538.php | |||
@@ -0,0 +1,45 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Application\Migrations; | ||
4 | |||
5 | use Doctrine\DBAL\Migrations\AbstractMigration; | ||
6 | use Doctrine\DBAL\Schema\Schema; | ||
7 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; | ||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | ||
9 | |||
10 | class Version20161024212538 extends AbstractMigration implements ContainerAwareInterface | ||
11 | { | ||
12 | /** | ||
13 | * @var ContainerInterface | ||
14 | */ | ||
15 | private $container; | ||
16 | |||
17 | public function setContainer(ContainerInterface $container = null) | ||
18 | { | ||
19 | $this->container = $container; | ||
20 | } | ||
21 | |||
22 | private function getTable($tableName) | ||
23 | { | ||
24 | return $this->container->getParameter('database_table_prefix') . $tableName; | ||
25 | } | ||
26 | |||
27 | /** | ||
28 | * @param Schema $schema | ||
29 | */ | ||
30 | public function up(Schema $schema) | ||
31 | { | ||
32 | $this->skipIf($this->connection->getDatabasePlatform()->getName() == 'sqlite', 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.'); | ||
33 | |||
34 | $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD user_id INT(11) DEFAULT NULL'); | ||
35 | $this->addSql('ALTER TABLE '.$this->getTable('oauth2_clients').' ADD CONSTRAINT FK_clients_user_clients FOREIGN KEY (user_id) REFERENCES '.$this->getTable('user').' (id) ON DELETE CASCADE'); | ||
36 | } | ||
37 | |||
38 | /** | ||
39 | * @param Schema $schema | ||
40 | */ | ||
41 | public function down(Schema $schema) | ||
42 | { | ||
43 | |||
44 | } | ||
45 | } | ||
diff --git a/app/DoctrineMigrations/Version20161031132655.php b/app/DoctrineMigrations/Version20161031132655.php new file mode 100644 index 00000000..c7364428 --- /dev/null +++ b/app/DoctrineMigrations/Version20161031132655.php | |||
@@ -0,0 +1,44 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Application\Migrations; | ||
4 | |||
5 | use Doctrine\DBAL\Migrations\AbstractMigration; | ||
6 | use Doctrine\DBAL\Schema\Schema; | ||
7 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; | ||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | ||
9 | |||
10 | class Version20161031132655 extends AbstractMigration implements ContainerAwareInterface | ||
11 | { | ||
12 | /** | ||
13 | * @var ContainerInterface | ||
14 | */ | ||
15 | private $container; | ||
16 | |||
17 | public function setContainer(ContainerInterface $container = null) | ||
18 | { | ||
19 | $this->container = $container; | ||
20 | } | ||
21 | |||
22 | private function getTable($tableName) | ||
23 | { | ||
24 | return $this->container->getParameter('database_table_prefix') . $tableName; | ||
25 | } | ||
26 | |||
27 | /** | ||
28 | * @param Schema $schema | ||
29 | */ | ||
30 | public function up(Schema $schema) | ||
31 | { | ||
32 | $this->addSql("INSERT INTO \"".$this->getTable('craue_config_setting')."\" (name, value, section) VALUES ('download_images_enabled', 0, 'misc')"); | ||
33 | } | ||
34 | |||
35 | /** | ||
36 | * @param Schema $schema | ||
37 | */ | ||
38 | public function down(Schema $schema) | ||
39 | { | ||
40 | $this->abortIf($this->connection->getDatabasePlatform()->getName() == 'sqlite', 'Migration can only be executed safely on \'mysql\' or \'postgresql\'.'); | ||
41 | |||
42 | $this->addSql("DELETE FROM \"".$this->getTable('craue_config_setting')."\" WHERE name = 'download_images_enabled';"); | ||
43 | } | ||
44 | } | ||
diff --git a/app/DoctrineMigrations/Version20161104073720.php b/app/DoctrineMigrations/Version20161104073720.php new file mode 100644 index 00000000..16503b4b --- /dev/null +++ b/app/DoctrineMigrations/Version20161104073720.php | |||
@@ -0,0 +1,53 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Application\Migrations; | ||
4 | |||
5 | use Doctrine\DBAL\Migrations\AbstractMigration; | ||
6 | use Doctrine\DBAL\Schema\Schema; | ||
7 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; | ||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | ||
9 | |||
10 | class Version20161104073720 extends AbstractMigration implements ContainerAwareInterface | ||
11 | { | ||
12 | /** | ||
13 | * @var ContainerInterface | ||
14 | */ | ||
15 | private $container; | ||
16 | |||
17 | public function setContainer(ContainerInterface $container = null) | ||
18 | { | ||
19 | $this->container = $container; | ||
20 | } | ||
21 | |||
22 | private function getTable($tableName) | ||
23 | { | ||
24 | return $this->container->getParameter('database_table_prefix') . $tableName; | ||
25 | } | ||
26 | |||
27 | /** | ||
28 | * @param Schema $schema | ||
29 | */ | ||
30 | public function up(Schema $schema) | ||
31 | { | ||
32 | switch ($this->connection->getDatabasePlatform()->getName()) { | ||
33 | case 'sqlite': | ||
34 | $this->addSql('CREATE INDEX `created_at` ON `'.$this->getTable('entry').'` (`created_at` DESC)'); | ||
35 | break; | ||
36 | |||
37 | case 'mysql': | ||
38 | $this->addSql('ALTER TABLE '.$this->getTable('entry').' ADD INDEX created_at (created_at);'); | ||
39 | break; | ||
40 | |||
41 | case 'postgresql': | ||
42 | $this->addSql('CREATE INDEX created_at ON '.$this->getTable('entry').' (created_at DESC)'); | ||
43 | } | ||
44 | } | ||
45 | |||
46 | /** | ||
47 | * @param Schema $schema | ||
48 | */ | ||
49 | public function down(Schema $schema) | ||
50 | { | ||
51 | |||
52 | } | ||
53 | } | ||
diff --git a/app/DoctrineMigrations/Version20161106113822.php b/app/DoctrineMigrations/Version20161106113822.php new file mode 100644 index 00000000..edca54f5 --- /dev/null +++ b/app/DoctrineMigrations/Version20161106113822.php | |||
@@ -0,0 +1,44 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Application\Migrations; | ||
4 | |||
5 | use Doctrine\DBAL\Migrations\AbstractMigration; | ||
6 | use Doctrine\DBAL\Schema\Schema; | ||
7 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; | ||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | ||
9 | |||
10 | class Version20161106113822 extends AbstractMigration implements ContainerAwareInterface | ||
11 | { | ||
12 | /** | ||
13 | * @var ContainerInterface | ||
14 | */ | ||
15 | private $container; | ||
16 | |||
17 | public function setContainer(ContainerInterface $container = null) | ||
18 | { | ||
19 | $this->container = $container; | ||
20 | } | ||
21 | |||
22 | private function getTable($tableName) | ||
23 | { | ||
24 | return $this->container->getParameter('database_table_prefix') . $tableName; | ||
25 | } | ||
26 | |||
27 | /** | ||
28 | * @param Schema $schema | ||
29 | */ | ||
30 | public function up(Schema $schema) | ||
31 | { | ||
32 | $this->addSql('ALTER TABLE '.$this->getTable('config').' ADD action_mark_as_read INT DEFAULT 0'); | ||
33 | } | ||
34 | |||
35 | /** | ||
36 | * @param Schema $schema | ||
37 | */ | ||
38 | public function down(Schema $schema) | ||
39 | { | ||
40 | $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'sqlite', 'This down migration can\'t be executed on SQLite databases, because SQLite don\'t support DROP COLUMN.'); | ||
41 | |||
42 | $this->addSql('ALTER TABLE '.$this->getTable('config').' DROP action_mark_as_read'); | ||
43 | } | ||
44 | } | ||
diff --git a/app/DoctrineMigrations/Version20161117071626.php b/app/DoctrineMigrations/Version20161117071626.php new file mode 100644 index 00000000..9ae55b5f --- /dev/null +++ b/app/DoctrineMigrations/Version20161117071626.php | |||
@@ -0,0 +1,44 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Application\Migrations; | ||
4 | |||
5 | use Doctrine\DBAL\Migrations\AbstractMigration; | ||
6 | use Doctrine\DBAL\Schema\Schema; | ||
7 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; | ||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | ||
9 | |||
10 | class Version20161117071626 extends AbstractMigration implements ContainerAwareInterface | ||
11 | { | ||
12 | /** | ||
13 | * @var ContainerInterface | ||
14 | */ | ||
15 | private $container; | ||
16 | |||
17 | public function setContainer(ContainerInterface $container = null) | ||
18 | { | ||
19 | $this->container = $container; | ||
20 | } | ||
21 | |||
22 | private function getTable($tableName) | ||
23 | { | ||
24 | return $this->container->getParameter('database_table_prefix') . $tableName; | ||
25 | } | ||
26 | |||
27 | /** | ||
28 | * @param Schema $schema | ||
29 | */ | ||
30 | public function up(Schema $schema) | ||
31 | { | ||
32 | $this->addSql("INSERT INTO ".$this->getTable('craue_config_setting')." (name, value, section) VALUES ('share_unmark', 0, 'entry')"); | ||
33 | $this->addSql("INSERT INTO ".$this->getTable('craue_config_setting')." (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry')"); | ||
34 | } | ||
35 | |||
36 | /** | ||
37 | * @param Schema $schema | ||
38 | */ | ||
39 | public function down(Schema $schema) | ||
40 | { | ||
41 | $this->addSql("DELETE FROM ".$this->getTable('craue_config_setting')." WHERE name = 'share_unmark';"); | ||
42 | $this->addSql("DELETE FROM ".$this->getTable('craue_config_setting')." WHERE name = 'unmark_url';"); | ||
43 | } | ||
44 | } | ||
diff --git a/app/DoctrineMigrations/Version20161118134328.php b/app/DoctrineMigrations/Version20161118134328.php new file mode 100644 index 00000000..390e89ce --- /dev/null +++ b/app/DoctrineMigrations/Version20161118134328.php | |||
@@ -0,0 +1,47 @@ | |||
1 | <?php | ||
2 | |||
3 | namespace Application\Migrations; | ||
4 | |||
5 | use Doctrine\DBAL\Migrations\AbstractMigration; | ||
6 | use Doctrine\DBAL\Schema\Schema; | ||
7 | use Symfony\Component\DependencyInjection\ContainerAwareInterface; | ||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | ||
9 | |||
10 | /** | ||
11 | * Add http_status in `entry_table` | ||
12 | */ | ||
13 | class Version20161118134328 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 | $this->addSql('ALTER TABLE '.$this->getTable('entry').' ADD http_status VARCHAR(3) DEFAULT NULL'); | ||
36 | } | ||
37 | |||
38 | /** | ||
39 | * @param Schema $schema | ||
40 | */ | ||
41 | public function down(Schema $schema) | ||
42 | { | ||
43 | $this->abortIf($this->connection->getDatabasePlatform()->getName() != 'sqlite', 'This down migration can\'t be executed on SQLite databases, because SQLite don\'t support DROP COLUMN.'); | ||
44 | |||
45 | $this->addSql('ALTER TABLE '.$this->getTable('entry').' DROP http_status'); | ||
46 | } | ||
47 | } | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml index 3e11d675..fac3b4f8 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml | |||
@@ -1,3 +1,4 @@ | |||
1 | # settings_changed: Configuration updated | ||
1 | download_pictures: Download billeder på din server | 2 | download_pictures: Download billeder på din server |
2 | carrot: Aktiver deling til Carrot | 3 | carrot: Aktiver deling til Carrot |
3 | diaspora_url: Diaspora URL, hvis tjenesten er aktiv | 4 | diaspora_url: Diaspora URL, hvis tjenesten er aktiv |
@@ -15,6 +16,7 @@ share_diaspora: Aktiver deling til Diaspora | |||
15 | share_mail: Aktiver deling med email | 16 | share_mail: Aktiver deling med email |
16 | share_shaarli: Aktiver deling gennem Shaarli | 17 | share_shaarli: Aktiver deling gennem Shaarli |
17 | share_twitter: Aktiver deling gennem Twitter | 18 | share_twitter: Aktiver deling gennem Twitter |
19 | share_unmark: Aktiver deling gennem Unmark.it | ||
18 | show_printlink: Vis et link til print-indhold | 20 | show_printlink: Vis et link til print-indhold |
19 | wallabag_support_url: Support-URL for wallabag | 21 | wallabag_support_url: Support-URL for wallabag |
20 | wallabag_url: URL for *sin* wallabag-installation | 22 | wallabag_url: URL for *sin* wallabag-installation |
@@ -29,3 +31,4 @@ piwik_enabled: Aktiver Piwik | |||
29 | demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)" | 31 | demo_mode_enabled: "Aktiver demo-indstilling? (anvendes kun til wallabags offentlige demo)" |
30 | demo_mode_username: "Demobruger" | 32 | demo_mode_username: "Demobruger" |
31 | # share_public: Allow public url for entries | 33 | # share_public: Allow public url for entries |
34 | # download_images_enabled: Download images locally | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml index c74b5c1f..d382733c 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml | |||
@@ -1,3 +1,4 @@ | |||
1 | # settings_changed: Configuration updated | ||
1 | download_pictures: Bilder auf den Server herunterladen | 2 | download_pictures: Bilder auf den Server herunterladen |
2 | carrot: Teilen zu Carrot aktivieren | 3 | carrot: Teilen zu Carrot aktivieren |
3 | diaspora_url: Diaspora-URL, sofern der Service aktiviert ist | 4 | diaspora_url: Diaspora-URL, sofern der Service aktiviert ist |
@@ -15,6 +16,7 @@ share_diaspora: Teilen zu Diaspora aktiveren | |||
15 | share_mail: Teilen via E-Mail aktiveren | 16 | share_mail: Teilen via E-Mail aktiveren |
16 | share_shaarli: Teilen zu Shaarli aktiveren | 17 | share_shaarli: Teilen zu Shaarli aktiveren |
17 | share_twitter: Teilen zu Twitter aktiveren | 18 | share_twitter: Teilen zu Twitter aktiveren |
19 | share_unmark: Teilen zu Unmark.it aktiveren | ||
18 | show_printlink: Link anzeigen, um den Inhalt auszudrucken | 20 | show_printlink: Link anzeigen, um den Inhalt auszudrucken |
19 | wallabag_support_url: Support-URL für wallabag | 21 | wallabag_support_url: Support-URL für wallabag |
20 | wallabag_url: URL von *deiner* wallabag-Instanz | 22 | wallabag_url: URL von *deiner* wallabag-Instanz |
@@ -29,3 +31,4 @@ piwik_enabled: Piwik aktivieren | |||
29 | demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)" | 31 | demo_mode_enabled: "Test-Modus aktivieren? (nur für die öffentliche wallabag-Demo genutzt)" |
30 | demo_mode_username: "Test-Benutzer" | 32 | demo_mode_username: "Test-Benutzer" |
31 | share_public: Erlaube eine öffentliche URL für Einträge | 33 | share_public: Erlaube eine öffentliche URL für Einträge |
34 | # download_images_enabled: Download images locally | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml index 77c09db4..23de7a43 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml | |||
@@ -1,3 +1,4 @@ | |||
1 | settings_changed: Configuration updated | ||
1 | download_pictures: Download pictures on your server | 2 | download_pictures: Download pictures on your server |
2 | carrot: Enable share to Carrot | 3 | carrot: Enable share to Carrot |
3 | diaspora_url: Diaspora URL, if the service is enabled | 4 | diaspora_url: Diaspora URL, if the service is enabled |
@@ -15,6 +16,7 @@ share_diaspora: Enable share to Diaspora | |||
15 | share_mail: Enable share by email | 16 | share_mail: Enable share by email |
16 | share_shaarli: Enable share to Shaarli | 17 | share_shaarli: Enable share to Shaarli |
17 | share_twitter: Enable share to Twitter | 18 | share_twitter: Enable share to Twitter |
19 | share_unmark: Enable share to Unmark.it | ||
18 | show_printlink: Display a link to print content | 20 | show_printlink: Display a link to print content |
19 | wallabag_support_url: Support URL for wallabag | 21 | wallabag_support_url: Support URL for wallabag |
20 | wallabag_url: URL of *your* wallabag instance | 22 | wallabag_url: URL of *your* wallabag instance |
@@ -29,3 +31,4 @@ piwik_enabled: Enable Piwik | |||
29 | demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" | 31 | demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" |
30 | demo_mode_username: "Demo user" | 32 | demo_mode_username: "Demo user" |
31 | share_public: Allow public url for entries | 33 | share_public: Allow public url for entries |
34 | download_images_enabled: Download images locally | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml index baa83849..ff1dd04f 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml | |||
@@ -1,3 +1,4 @@ | |||
1 | # settings_changed: Configuration updated | ||
1 | download_pictures: Descargar imágenes | 2 | download_pictures: Descargar imágenes |
2 | carrot: Activar compartir con Carrot | 3 | carrot: Activar compartir con Carrot |
3 | diaspora_url: Diaspora URL, si el servicio está activado | 4 | diaspora_url: Diaspora URL, si el servicio está activado |
@@ -15,6 +16,7 @@ share_diaspora: Activar compartir con Diaspora | |||
15 | share_mail: Activar compartir con email | 16 | share_mail: Activar compartir con email |
16 | share_shaarli: Activar compartir con Shaarli | 17 | share_shaarli: Activar compartir con Shaarli |
17 | share_twitter: Activar compartir con Twitter | 18 | share_twitter: Activar compartir con Twitter |
19 | share_unmark: Activar compartir con Unmark.it | ||
18 | show_printlink: Mostrar un enlace para imprimir contenido | 20 | show_printlink: Mostrar un enlace para imprimir contenido |
19 | wallabag_support_url: URL de soporte de wallabag | 21 | wallabag_support_url: URL de soporte de wallabag |
20 | wallabag_url: URL de *tu* instancia de wallabag | 22 | wallabag_url: URL de *tu* instancia de wallabag |
@@ -29,3 +31,4 @@ piwik_enabled: Activar Piwik | |||
29 | demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)" | 31 | demo_mode_enabled: "Activar modo demo (sólo usado para la demo de wallabag)" |
30 | demo_mode_username: "Nombre de usuario demo" | 32 | demo_mode_username: "Nombre de usuario demo" |
31 | # share_public: Allow public url for entries | 33 | # share_public: Allow public url for entries |
34 | # download_images_enabled: Download images locally | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml index b394977e..4e712fdd 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml | |||
@@ -1,3 +1,4 @@ | |||
1 | # settings_changed: Configuration updated | ||
1 | download_pictures: تصاویر را در کارگزار خودتان باربگیرید | 2 | download_pictures: تصاویر را در کارگزار خودتان باربگیرید |
2 | carrot: فعالسازی همرسانی به Carrot | 3 | carrot: فعالسازی همرسانی به Carrot |
3 | diaspora_url: نشانی Diaspora، اگر فعال بود | 4 | diaspora_url: نشانی Diaspora، اگر فعال بود |
@@ -15,6 +16,7 @@ share_diaspora: فعالسازی همرسانی به Diaspora | |||
15 | share_mail: فعالسازی همرسانی با ایمیل | 16 | share_mail: فعالسازی همرسانی با ایمیل |
16 | share_shaarli: فعالسازی همرسانی به Shaarli | 17 | share_shaarli: فعالسازی همرسانی به Shaarli |
17 | share_twitter: فعالسازی همرسانی به Twitter | 18 | share_twitter: فعالسازی همرسانی به Twitter |
19 | share_unmark: فعالسازی همرسانی به Unmark.it | ||
18 | show_printlink: نمایش پیوندی برای چاپ مطلب | 20 | show_printlink: نمایش پیوندی برای چاپ مطلب |
19 | wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag | 21 | wallabag_support_url: نشانی صفحهٔ پشتیبانی wallabag |
20 | wallabag_url: نشانی صفحهٔ wallabag *شما* | 22 | wallabag_url: نشانی صفحهٔ wallabag *شما* |
@@ -29,3 +31,4 @@ modify_settings: "اعمال" | |||
29 | # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" | 31 | # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" |
30 | # demo_mode_username: "Demo user" | 32 | # demo_mode_username: "Demo user" |
31 | # share_public: Allow public url for entries | 33 | # share_public: Allow public url for entries |
34 | # download_images_enabled: Download images locally | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml index 31a80880..cae4c662 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml | |||
@@ -1,3 +1,4 @@ | |||
1 | settings_changed: Configuration mise à jour | ||
1 | download_pictures: Télécharger les images sur le serveur | 2 | download_pictures: Télécharger les images sur le serveur |
2 | carrot: Activer le partage vers Carrot | 3 | carrot: Activer le partage vers Carrot |
3 | diaspora_url: URL de Diaspora, si le service Diaspora est activé | 4 | diaspora_url: URL de Diaspora, si le service Diaspora est activé |
@@ -15,6 +16,7 @@ share_diaspora: Activer le partage vers Diaspora | |||
15 | share_mail: Activer le partage par email | 16 | share_mail: Activer le partage par email |
16 | share_shaarli: Activer le partage vers Shaarli | 17 | share_shaarli: Activer le partage vers Shaarli |
17 | share_twitter: Activer le partage vers Twitter | 18 | share_twitter: Activer le partage vers Twitter |
19 | share_unmark: Activer le partage vers Unmark.it | ||
18 | show_printlink: Afficher un lien pour imprimer | 20 | show_printlink: Afficher un lien pour imprimer |
19 | wallabag_support_url: URL de support de wallabag | 21 | wallabag_support_url: URL de support de wallabag |
20 | wallabag_url: URL de *votre* instance de wallabag | 22 | wallabag_url: URL de *votre* instance de wallabag |
@@ -29,3 +31,4 @@ piwik_enabled: Activer Piwik | |||
29 | demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)" | 31 | demo_mode_enabled: "Activer le mode démo ? (utiliser uniquement pour la démo publique de wallabag)" |
30 | demo_mode_username: "Utilisateur de la démo" | 32 | demo_mode_username: "Utilisateur de la démo" |
31 | share_public: Autoriser une URL publique pour les articles | 33 | share_public: Autoriser une URL publique pour les articles |
34 | download_images_enabled: Télécharger les images en local | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml index ba038556..f94f834f 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml | |||
@@ -1,3 +1,4 @@ | |||
1 | # settings_changed: Configuration updated | ||
1 | download_pictures: Scarica le immagini sul tuo server | 2 | download_pictures: Scarica le immagini sul tuo server |
2 | carrot: Abilita la condivisione con Carrot | 3 | carrot: Abilita la condivisione con Carrot |
3 | diaspora_url: Diaspora URL, se il servizio è abilitato | 4 | diaspora_url: Diaspora URL, se il servizio è abilitato |
@@ -15,6 +16,7 @@ share_diaspora: Abilita la condivisione con Diaspora | |||
15 | share_mail: Abilita la condivisione per email | 16 | share_mail: Abilita la condivisione per email |
16 | share_shaarli: Abilita la condivisione con Shaarli | 17 | share_shaarli: Abilita la condivisione con Shaarli |
17 | share_twitter: Abilita la condivisione con Twitter | 18 | share_twitter: Abilita la condivisione con Twitter |
19 | share_unmark: Abilita la condivisione con Unmark.it | ||
18 | show_printlink: Mostra un collegamento per stampare il contenuto | 20 | show_printlink: Mostra un collegamento per stampare il contenuto |
19 | wallabag_support_url: URL di supporto per wallabag | 21 | wallabag_support_url: URL di supporto per wallabag |
20 | wallabag_url: URL della *tua* installazione di wallabag | 22 | wallabag_url: URL della *tua* installazione di wallabag |
@@ -29,3 +31,4 @@ piwik_enabled: Abilita Piwik | |||
29 | demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)" | 31 | demo_mode_enabled: "Abilita modalità demo ? (usato solo per la demo pubblica di wallabag)" |
30 | demo_mode_username: "Utente Demo" | 32 | demo_mode_username: "Utente Demo" |
31 | # share_public: Allow public url for entries | 33 | # share_public: Allow public url for entries |
34 | # download_images_enabled: Download images locally | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml index 55249e33..de60a194 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml | |||
@@ -1,3 +1,4 @@ | |||
1 | # settings_changed: Configuration updated | ||
1 | download_pictures: Telecargar los imatges sul servidor | 2 | download_pictures: Telecargar los imatges sul servidor |
2 | carrot: Activar lo partatge cap a Carrot | 3 | carrot: Activar lo partatge cap a Carrot |
3 | diaspora_url: URL de Diaspora, se lo servici Diaspora es activat | 4 | diaspora_url: URL de Diaspora, se lo servici Diaspora es activat |
@@ -15,6 +16,7 @@ share_diaspora: Activar lo partatge cap a Diaspora | |||
15 | share_mail: Activar lo partatge per corrièl | 16 | share_mail: Activar lo partatge per corrièl |
16 | share_shaarli: Activar lo partatge cap a Shaarli | 17 | share_shaarli: Activar lo partatge cap a Shaarli |
17 | share_twitter: Activar lo partatge cap a Twitter | 18 | share_twitter: Activar lo partatge cap a Twitter |
19 | share_unmark: Activar lo partatge cap a Unmark.it | ||
18 | show_printlink: Afichar un ligam per imprimir | 20 | show_printlink: Afichar un ligam per imprimir |
19 | wallabag_support_url: URL d'assisténcia de wallabag | 21 | wallabag_support_url: URL d'assisténcia de wallabag |
20 | wallabag_url: URL de *vòstra* instància de wallabag | 22 | wallabag_url: URL de *vòstra* instància de wallabag |
@@ -29,3 +31,4 @@ piwik_enabled: Activar Piwik | |||
29 | demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)" | 31 | demo_mode_enabled: "Activar lo mode demostracion ? (utilizar solament per la demostracion publica de wallabag)" |
30 | demo_mode_username: "Utilizaire de la demostracion" | 32 | demo_mode_username: "Utilizaire de la demostracion" |
31 | # share_public: Allow public url for entries | 33 | # share_public: Allow public url for entries |
34 | # download_images_enabled: Download images locally | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml index 42cc5b52..11579745 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml | |||
@@ -1,3 +1,4 @@ | |||
1 | # settings_changed: Configuration updated | ||
1 | download_pictures: Pobierz obrazy na swój serwer | 2 | download_pictures: Pobierz obrazy na swój serwer |
2 | carrot: Włącz udostępnianie dla Carrot | 3 | carrot: Włącz udostępnianie dla Carrot |
3 | diaspora_url: Adres URL Diaspora, jeżeli usługa jest włączona | 4 | diaspora_url: Adres URL Diaspora, jeżeli usługa jest włączona |
@@ -15,6 +16,7 @@ share_diaspora: Włącz udostępnianie dla Diaspora | |||
15 | share_mail: Włącz udostępnianie przez email | 16 | share_mail: Włącz udostępnianie przez email |
16 | share_shaarli: Włącz udostępnianie dla Shaarli | 17 | share_shaarli: Włącz udostępnianie dla Shaarli |
17 | share_twitter: Włącz udostępnianie dla Twitter | 18 | share_twitter: Włącz udostępnianie dla Twitter |
19 | share_unmark: Włącz udostępnianie dla Unmark.it | ||
18 | show_printlink: Pokaż link do wydrukowania zawartości | 20 | show_printlink: Pokaż link do wydrukowania zawartości |
19 | wallabag_support_url: Adres URL wsparcia dla wallabag | 21 | wallabag_support_url: Adres URL wsparcia dla wallabag |
20 | wallabag_url: Adres *twojej* instacji wallabag | 22 | wallabag_url: Adres *twojej* instacji wallabag |
@@ -29,3 +31,4 @@ piwik_enabled: Włacz Piwik | |||
29 | demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)" | 31 | demo_mode_enabled: "Włacz tryb demo? (używany wyłącznie dla publicznej demonstracji Wallabag)" |
30 | demo_mode_username: "Użytkownik Demonstracyjny" | 32 | demo_mode_username: "Użytkownik Demonstracyjny" |
31 | share_public: Zezwalaj na publiczny adres url dla wpisow | 33 | share_public: Zezwalaj na publiczny adres url dla wpisow |
34 | # download_images_enabled: Download images locally | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml index e8260422..74ae5a44 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml | |||
@@ -1,3 +1,4 @@ | |||
1 | # settings_changed: Configuration updated | ||
1 | download_pictures: Download imagens no seu servidor | 2 | download_pictures: Download imagens no seu servidor |
2 | carrot: Habilitar compartilhamento para o Carrot | 3 | carrot: Habilitar compartilhamento para o Carrot |
3 | diaspora_url: URL Diaspora, se o serviço está habilitado | 4 | diaspora_url: URL Diaspora, se o serviço está habilitado |
@@ -8,12 +9,14 @@ export_csv: Habilita exportação para CSV | |||
8 | export_json: Habilita exportação para JSON | 9 | export_json: Habilita exportação para JSON |
9 | export_txt: Habilita exportação para TXT | 10 | export_txt: Habilita exportação para TXT |
10 | export_xml: Habilita exportação para XML | 11 | export_xml: Habilita exportação para XML |
11 | pocket_consumer_key: Chave de consumidor do Pocket para importar conteúdo (https://getpocket.com/developer/docs/authentication) | 12 | # import_with_rabbitmq: Enable RabbitMQ to import data asynchronously |
13 | # import_with_redis: Enable Redis to import data asynchronously | ||
12 | shaarli_url: URL Shaarli, se o serviço está habilitado | 14 | shaarli_url: URL Shaarli, se o serviço está habilitado |
13 | share_diaspora: Habilitar compartilhamento para o Diaspora | 15 | share_diaspora: Habilitar compartilhamento para o Diaspora |
14 | share_mail: Habilitar compartilhamento por e-mail | 16 | share_mail: Habilitar compartilhamento por e-mail |
15 | share_shaarli: Habilitar compartilhamento para o Shaarli | 17 | share_shaarli: Habilitar compartilhamento para o Shaarli |
16 | share_twitter: Habilitar compartilhamento para o Twitter | 18 | share_twitter: Habilitar compartilhamento para o Twitter |
19 | share_unmark: Habilitar compartilhamento para o Unmark.it | ||
17 | show_printlink: Mostrar um link para imprimir o conteúdo | 20 | show_printlink: Mostrar um link para imprimir o conteúdo |
18 | wallabag_support_url: URL de Suporte do wallabag | 21 | wallabag_support_url: URL de Suporte do wallabag |
19 | wallabag_url: URL de *sua* instância do wallabag | 22 | wallabag_url: URL de *sua* instância do wallabag |
@@ -27,3 +30,5 @@ piwik_site_id: ID de seu website Piwik | |||
27 | piwik_enabled: Habilitar Piwik | 30 | piwik_enabled: Habilitar Piwik |
28 | demo_mode_enabled: "Habilitar modo demo? (somente usado para o demo público do wallabag)" | 31 | demo_mode_enabled: "Habilitar modo demo? (somente usado para o demo público do wallabag)" |
29 | demo_mode_username: "Usuário demo" | 32 | demo_mode_username: "Usuário demo" |
33 | # share_public: Allow public url for entries | ||
34 | # download_images_enabled: Download images locally | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml index 8e72b955..5095dfa0 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml | |||
@@ -1,3 +1,4 @@ | |||
1 | # settings_changed: Configuration updated | ||
1 | download_pictures: Descarcă poze pe server | 2 | download_pictures: Descarcă poze pe server |
2 | carrot: Permite share către Carrot | 3 | carrot: Permite share către Carrot |
3 | diaspora_url: Diaspora URL, dacă serviciul este permis | 4 | diaspora_url: Diaspora URL, dacă serviciul este permis |
@@ -15,6 +16,7 @@ share_diaspora: Permite share către Diaspora | |||
15 | share_mail: Permite share prin email | 16 | share_mail: Permite share prin email |
16 | share_shaarli: Permite share către Shaarli | 17 | share_shaarli: Permite share către Shaarli |
17 | share_twitter: Permite share către Twitter | 18 | share_twitter: Permite share către Twitter |
19 | share_unmark: Permite share către Unmark.it | ||
18 | show_printlink: Afișează un link pentru a printa content-ul | 20 | show_printlink: Afișează un link pentru a printa content-ul |
19 | wallabag_support_url: URL-ul de suport pentru wallabag | 21 | wallabag_support_url: URL-ul de suport pentru wallabag |
20 | wallabag_url: URL-ul instanței tale wallabag | 22 | wallabag_url: URL-ul instanței tale wallabag |
@@ -29,3 +31,4 @@ modify_settings: "aplică" | |||
29 | # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" | 31 | # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" |
30 | # demo_mode_username: "Demo user" | 32 | # demo_mode_username: "Demo user" |
31 | # share_public: Allow public url for entries | 33 | # share_public: Allow public url for entries |
34 | # download_images_enabled: Download images locally | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml index 55f70843..cd42e595 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml | |||
@@ -1,3 +1,4 @@ | |||
1 | # settings_changed: Configuration updated | ||
1 | # download_pictures: Download pictures on your server | 2 | # download_pictures: Download pictures on your server |
2 | # carrot: Enable share to Carrot | 3 | # carrot: Enable share to Carrot |
3 | # diaspora_url: Diaspora URL, if the service is enabled | 4 | # diaspora_url: Diaspora URL, if the service is enabled |
@@ -15,6 +16,7 @@ | |||
15 | # share_mail: Enable share by email | 16 | # share_mail: Enable share by email |
16 | # share_shaarli: Enable share to Shaarli | 17 | # share_shaarli: Enable share to Shaarli |
17 | # share_twitter: Enable share to Twitter | 18 | # share_twitter: Enable share to Twitter |
19 | # share_unmark: Enable share to Unmark.it | ||
18 | # show_printlink: Display a link to print content | 20 | # show_printlink: Display a link to print content |
19 | # wallabag_support_url: Support URL for wallabag | 21 | # wallabag_support_url: Support URL for wallabag |
20 | # wallabag_url: URL of *your* wallabag instance | 22 | # wallabag_url: URL of *your* wallabag instance |
@@ -29,3 +31,4 @@ | |||
29 | # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" | 31 | # demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" |
30 | # demo_mode_username: "Demo user" | 32 | # demo_mode_username: "Demo user" |
31 | # share_public: Allow public url for entries | 33 | # share_public: Allow public url for entries |
34 | # download_images_enabled: Download images locally | ||
diff --git a/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png b/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png new file mode 100644 index 00000000..45f679ee --- /dev/null +++ b/app/Resources/static/themes/_global/img/icons/unmark-icon--black.png | |||
Binary files differ | |||
diff --git a/app/Resources/static/themes/_global/js/bookmarklet.js b/app/Resources/static/themes/_global/js/bookmarklet.js index 5174ff47..a497628b 100644 --- a/app/Resources/static/themes/_global/js/bookmarklet.js +++ b/app/Resources/static/themes/_global/js/bookmarklet.js | |||
@@ -1,4 +1,3 @@ | |||
1 | |||
2 | top['bookmarklet-url@wallabag.org'] = | 1 | top['bookmarklet-url@wallabag.org'] = |
3 | '<!DOCTYPE html><html><head><title>bag it!</title>' + | 2 | '<!DOCTYPE html><html><head><title>bag it!</title>' + |
4 | '<link rel="icon" href="tpl/img/favicon.ico" />' + | 3 | '<link rel="icon" href="tpl/img/favicon.ico" />' + |
diff --git a/app/Resources/static/themes/_global/js/shortcuts/entry.js b/app/Resources/static/themes/_global/js/shortcuts/entry.js new file mode 100644 index 00000000..e69de29b --- /dev/null +++ b/app/Resources/static/themes/_global/js/shortcuts/entry.js | |||
diff --git a/app/Resources/static/themes/_global/js/shortcuts/main.js b/app/Resources/static/themes/_global/js/shortcuts/main.js new file mode 100644 index 00000000..ef6a1b84 --- /dev/null +++ b/app/Resources/static/themes/_global/js/shortcuts/main.js | |||
@@ -0,0 +1,15 @@ | |||
1 | import Mousetrap from 'mousetrap'; | ||
2 | |||
3 | /** Shortcuts **/ | ||
4 | |||
5 | /* Go to */ | ||
6 | Mousetrap.bind('g u', () => { window.location.href = Routing.generate('homepage'); }); | ||
7 | Mousetrap.bind('g s', () => { window.location.href = Routing.generate('starred'); }); | ||
8 | Mousetrap.bind('g r', () => { window.location.href = Routing.generate('archive'); }); | ||
9 | Mousetrap.bind('g a', () => { window.location.href = Routing.generate('all'); }); | ||
10 | Mousetrap.bind('g t', () => { window.location.href = Routing.generate('tag'); }); | ||
11 | Mousetrap.bind('g c', () => { window.location.href = Routing.generate('config'); }); | ||
12 | Mousetrap.bind('g i', () => { window.location.href = Routing.generate('import'); }); | ||
13 | Mousetrap.bind('g d', () => { window.location.href = Routing.generate('developer'); }); | ||
14 | Mousetrap.bind('?', () => { window.location.href = Routing.generate('howto'); }); | ||
15 | Mousetrap.bind('g l', () => { window.location.href = Routing.generate('logout'); }); | ||
diff --git a/app/Resources/static/themes/_global/js/tools.js b/app/Resources/static/themes/_global/js/tools.js index ab30deb1..568b2dce 100644 --- a/app/Resources/static/themes/_global/js/tools.js +++ b/app/Resources/static/themes/_global/js/tools.js | |||
@@ -1,4 +1,9 @@ | |||
1 | const $ = require('jquery'); | 1 | import $ from 'jquery'; |
2 | import './shortcuts/main'; | ||
3 | import './shortcuts/entry'; | ||
4 | |||
5 | /* Allows inline call qr-code call */ | ||
6 | import jrQrcode from 'jr-qrcode'; // eslint-disable-line | ||
2 | 7 | ||
3 | function supportsLocalStorage() { | 8 | function supportsLocalStorage() { |
4 | try { | 9 | try { |
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 4dfa8790..4f48f8ca 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css | |||
@@ -936,6 +936,11 @@ a.add-to-wallabag-link-after::after { | |||
936 | background-image: url("../../_global/img/icons/diaspora-icon--black.png"); | 936 | background-image: url("../../_global/img/icons/diaspora-icon--black.png"); |
937 | } | 937 | } |
938 | 938 | ||
939 | /* Unmark.it */ | ||
940 | .icon-image--unmark { | ||
941 | background-image: url("../../_global/img/icons/unmark-icon--black.png"); | ||
942 | } | ||
943 | |||
939 | /* shaarli */ | 944 | /* shaarli */ |
940 | .icon-image--shaarli { | 945 | .icon-image--shaarli { |
941 | background-image: url("../../_global/img/icons/shaarli.png"); | 946 | background-image: url("../../_global/img/icons/shaarli.png"); |
diff --git a/app/Resources/static/themes/baggy/js/autoCompleteTags.js b/app/Resources/static/themes/baggy/js/autoCompleteTags.js index f287ebfa..64fdaa92 100755 --- a/app/Resources/static/themes/baggy/js/autoCompleteTags.js +++ b/app/Resources/static/themes/baggy/js/autoCompleteTags.js | |||
@@ -5,4 +5,4 @@ function extractLast(term) { | |||
5 | return split(term).pop(); | 5 | return split(term).pop(); |
6 | } | 6 | } |
7 | 7 | ||
8 | export { split, extractLast }; | 8 | export default { split, extractLast }; |
diff --git a/app/Resources/static/themes/baggy/js/init.js b/app/Resources/static/themes/baggy/js/init.js index dc11043a..05360a28 100755 --- a/app/Resources/static/themes/baggy/js/init.js +++ b/app/Resources/static/themes/baggy/js/init.js | |||
@@ -1,11 +1,26 @@ | |||
1 | import { savePercent, retrievePercent } from '../../_global/js/tools'; | 1 | /* jQuery */ |
2 | import { toggleSaveLinkForm } from './uiTools'; | 2 | import $ from 'jquery'; |
3 | |||
4 | /* eslint-disable no-unused-vars */ | ||
5 | /* jquery has default scope */ | ||
6 | import cookie from 'jquery.cookie'; | ||
7 | import ui from 'jquery-ui-browserify'; | ||
8 | /* eslint-enable no-unused-vars */ | ||
9 | |||
10 | /* Annotations */ | ||
11 | import annotator from 'annotator'; | ||
3 | 12 | ||
4 | const $ = global.jquery = require('jquery'); | 13 | /* Shortcuts */ |
5 | require('jquery.cookie'); | 14 | import './shortcuts/main'; |
6 | require('jquery-ui-browserify'); | 15 | import './shortcuts/entry'; |
7 | const annotator = require('annotator'); | 16 | import '../../_global/js/shortcuts/main'; |
17 | import '../../_global/js/shortcuts/entry'; | ||
18 | |||
19 | /* Tools */ | ||
20 | import { savePercent, retrievePercent } from '../../_global/js/tools'; | ||
21 | import toggleSaveLinkForm from './uiTools'; | ||
8 | 22 | ||
23 | global.jquery = $; | ||
9 | 24 | ||
10 | $.fn.ready(() => { | 25 | $.fn.ready(() => { |
11 | const $listmode = $('#listmode'); | 26 | const $listmode = $('#listmode'); |
diff --git a/app/Resources/static/themes/baggy/js/shortcuts/entry.js b/app/Resources/static/themes/baggy/js/shortcuts/entry.js new file mode 100644 index 00000000..728df8bd --- /dev/null +++ b/app/Resources/static/themes/baggy/js/shortcuts/entry.js | |||
@@ -0,0 +1,22 @@ | |||
1 | import Mousetrap from 'mousetrap'; | ||
2 | import $ from 'jquery'; | ||
3 | |||
4 | /* Article view */ | ||
5 | Mousetrap.bind('o', () => { | ||
6 | $('div#article_toolbar ul.links a.original')[0].click(); | ||
7 | }); | ||
8 | |||
9 | /* mark as favorite */ | ||
10 | Mousetrap.bind('s', () => { | ||
11 | $('div#article_toolbar ul.links a.favorite')[0].click(); | ||
12 | }); | ||
13 | |||
14 | /* mark as read */ | ||
15 | Mousetrap.bind('a', () => { | ||
16 | $('div#article_toolbar ul.links a.markasread')[0].click(); | ||
17 | }); | ||
18 | |||
19 | /* delete */ | ||
20 | Mousetrap.bind('del', () => { | ||
21 | $('div#article_toolbar ul.links a.delete')[0].click(); | ||
22 | }); | ||
diff --git a/app/Resources/static/themes/baggy/js/shortcuts/main.js b/app/Resources/static/themes/baggy/js/shortcuts/main.js new file mode 100644 index 00000000..aed09aee --- /dev/null +++ b/app/Resources/static/themes/baggy/js/shortcuts/main.js | |||
@@ -0,0 +1,7 @@ | |||
1 | $(document).ready(() => { | ||
2 | Mousetrap.bind('s', () => { | ||
3 | $('#search').trigger('click'); | ||
4 | $('#search_entry_term').focus(); | ||
5 | return false; | ||
6 | }); | ||
7 | }); | ||
diff --git a/app/Resources/static/themes/baggy/js/uiTools.js b/app/Resources/static/themes/baggy/js/uiTools.js index 900b2707..713c53f7 100644 --- a/app/Resources/static/themes/baggy/js/uiTools.js +++ b/app/Resources/static/themes/baggy/js/uiTools.js | |||
@@ -1,4 +1,4 @@ | |||
1 | const $ = require('jquery'); | 1 | import $ from 'jquery'; |
2 | 2 | ||
3 | function toggleSaveLinkForm(url, event) { | 3 | function toggleSaveLinkForm(url, event) { |
4 | $('#add-link-result').empty(); | 4 | $('#add-link-result').empty(); |
@@ -32,4 +32,4 @@ function toggleSaveLinkForm(url, event) { | |||
32 | plainUrl.focus(); | 32 | plainUrl.focus(); |
33 | } | 33 | } |
34 | 34 | ||
35 | export { toggleSaveLinkForm }; | 35 | export default toggleSaveLinkForm; |
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index 408fe14c..8e33cfbc 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css | |||
@@ -150,6 +150,11 @@ | |||
150 | background-image: url("../../_global/img/icons/diaspora-icon--black.png"); | 150 | background-image: url("../../_global/img/icons/diaspora-icon--black.png"); |
151 | } | 151 | } |
152 | 152 | ||
153 | /* Unmark.it */ | ||
154 | .icon-image--unmark { | ||
155 | background-image: url("../../_global/img/icons/unmark-icon--black.png"); | ||
156 | } | ||
157 | |||
153 | /* Shaarli */ | 158 | /* Shaarli */ |
154 | .icon-image--shaarli { | 159 | .icon-image--shaarli { |
155 | background-image: url("../../_global/img/icons/shaarli.png"); | 160 | background-image: url("../../_global/img/icons/shaarli.png"); |
@@ -317,11 +322,13 @@ nav input { | |||
317 | color: #444; | 322 | color: #444; |
318 | } | 323 | } |
319 | 324 | ||
320 | .input-field.nav-panel-add label { | 325 | .input-field.nav-panel-add label, |
326 | .input-field.nav-panel-search label { | ||
321 | left: 1rem; | 327 | left: 1rem; |
322 | } | 328 | } |
323 | 329 | ||
324 | .input-field.nav-panel-add .close { | 330 | .input-field.nav-panel-add .close, |
331 | .input-field.nav-panel-search .close { | ||
325 | position: absolute; | 332 | position: absolute; |
326 | top: 0; | 333 | top: 0; |
327 | right: 1rem; | 334 | right: 1rem; |
@@ -340,7 +347,9 @@ nav input { | |||
340 | } | 347 | } |
341 | 348 | ||
342 | .input-field.nav-panel-add, | 349 | .input-field.nav-panel-add, |
343 | .input-field.nav-panel-add form { | 350 | .input-field.nav-panel-add form, |
351 | .input-field.nav-panel-search, | ||
352 | .input-field.nav-panel-search form { | ||
344 | height: 100%; | 353 | height: 100%; |
345 | } | 354 | } |
346 | 355 | ||
diff --git a/app/Resources/static/themes/material/js/init.js b/app/Resources/static/themes/material/js/init.js index a68269e0..0b2832c0 100755 --- a/app/Resources/static/themes/material/js/init.js +++ b/app/Resources/static/themes/material/js/init.js | |||
@@ -1,10 +1,21 @@ | |||
1 | /* jQuery */ | ||
2 | import $ from 'jquery'; | ||
3 | |||
4 | /* Annotations */ | ||
5 | import annotator from 'annotator'; | ||
6 | |||
7 | /* Tools */ | ||
1 | import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools'; | 8 | import { savePercent, retrievePercent, initFilters, initExport } from '../../_global/js/tools'; |
2 | 9 | ||
3 | const $ = require('jquery'); | 10 | /* Import shortcuts */ |
11 | import './shortcuts/main'; | ||
12 | import './shortcuts/entry'; | ||
13 | import '../../_global/js/shortcuts/main'; | ||
14 | import '../../_global/js/shortcuts/entry'; | ||
4 | 15 | ||
5 | global.jQuery = $; | ||
6 | require('materialize'); // eslint-disable-line | 16 | require('materialize'); // eslint-disable-line |
7 | const annotator = require('annotator'); | 17 | |
18 | global.jQuery = $; | ||
8 | 19 | ||
9 | $(document).ready(() => { | 20 | $(document).ready(() => { |
10 | // sideNav | 21 | // sideNav |
@@ -44,7 +55,7 @@ $(document).ready(() => { | |||
44 | $('.nav-panels .action').hide(100); | 55 | $('.nav-panels .action').hide(100); |
45 | $('.nav-panel-menu').addClass('hidden'); | 56 | $('.nav-panel-menu').addClass('hidden'); |
46 | $('.nav-panels').css('background', 'white'); | 57 | $('.nav-panels').css('background', 'white'); |
47 | $('#searchfield').focus(); | 58 | $('#search_entry_term').focus(); |
48 | return false; | 59 | return false; |
49 | }); | 60 | }); |
50 | $('.close').on('click', () => { | 61 | $('.close').on('click', () => { |
diff --git a/app/Resources/static/themes/material/js/shortcuts/entry.js b/app/Resources/static/themes/material/js/shortcuts/entry.js new file mode 100644 index 00000000..357c22fe --- /dev/null +++ b/app/Resources/static/themes/material/js/shortcuts/entry.js | |||
@@ -0,0 +1,22 @@ | |||
1 | import Mousetrap from 'mousetrap'; | ||
2 | import $ from 'jquery'; | ||
3 | |||
4 | /* open original article */ | ||
5 | Mousetrap.bind('o', () => { | ||
6 | $('ul.side-nav a.original i')[0].click(); | ||
7 | }); | ||
8 | |||
9 | /* mark as favorite */ | ||
10 | Mousetrap.bind('s', () => { | ||
11 | $('ul.side-nav a.favorite i')[0].click(); | ||
12 | }); | ||
13 | |||
14 | /* mark as read */ | ||
15 | Mousetrap.bind('a', () => { | ||
16 | $('ul.side-nav a.markasread i')[0].click(); | ||
17 | }); | ||
18 | |||
19 | /* delete */ | ||
20 | Mousetrap.bind('del', () => { | ||
21 | $('ul.side-nav a.delete i')[0].click(); | ||
22 | }); | ||
diff --git a/app/Resources/static/themes/material/js/shortcuts/main.js b/app/Resources/static/themes/material/js/shortcuts/main.js new file mode 100644 index 00000000..ad4ca80a --- /dev/null +++ b/app/Resources/static/themes/material/js/shortcuts/main.js | |||
@@ -0,0 +1,76 @@ | |||
1 | import Mousetrap from 'mousetrap'; | ||
2 | import $ from 'jquery'; | ||
3 | |||
4 | function toggleFocus(cardToToogleFocus) { | ||
5 | if (cardToToogleFocus) { | ||
6 | $(cardToToogleFocus).toggleClass('z-depth-4'); | ||
7 | } | ||
8 | } | ||
9 | |||
10 | $(document).ready(() => { | ||
11 | let cardIndex = 0; | ||
12 | const cardNumber = $('#content ul.data > li').length; | ||
13 | let card = $('#content ul.data > li')[cardIndex]; | ||
14 | const pagination = $('.pagination'); | ||
15 | |||
16 | /* Show nothing on quickstart */ | ||
17 | if ($('#content > div.quickstart').length > 0) { | ||
18 | return; | ||
19 | } | ||
20 | |||
21 | /* If we come from next page */ | ||
22 | if (window.location.hash === '#prev') { | ||
23 | cardIndex = cardNumber - 1; | ||
24 | card = $('ul.data > li')[cardIndex]; | ||
25 | } | ||
26 | |||
27 | /* Focus current card */ | ||
28 | toggleFocus(card); | ||
29 | |||
30 | /* Actions */ | ||
31 | Mousetrap.bind('g n', () => { | ||
32 | $('#nav-btn-add').trigger('click'); | ||
33 | return false; | ||
34 | }); | ||
35 | |||
36 | Mousetrap.bind('s', () => { | ||
37 | $('#nav-btn-search').trigger('click'); | ||
38 | return false; | ||
39 | }); | ||
40 | |||
41 | Mousetrap.bind('esc', () => { | ||
42 | $('.close').trigger('click'); | ||
43 | }); | ||
44 | |||
45 | /* Select right card. If there's a next page, go to next page */ | ||
46 | Mousetrap.bind('right', () => { | ||
47 | if (cardIndex >= 0 && cardIndex < cardNumber - 1) { | ||
48 | toggleFocus(card); | ||
49 | cardIndex += 1; | ||
50 | card = $('ul.data > li')[cardIndex]; | ||
51 | toggleFocus(card); | ||
52 | return; | ||
53 | } | ||
54 | if (pagination.length > 0 && pagination.find('li.next:not(.disabled)').length > 0 && cardIndex === cardNumber - 1) { | ||
55 | window.location.href = window.location.origin + $(pagination).find('li.next a').attr('href'); | ||
56 | } | ||
57 | }); | ||
58 | |||
59 | /* Select previous card. If there's a previous page, go to next page */ | ||
60 | Mousetrap.bind('left', () => { | ||
61 | if (cardIndex > 0 && cardIndex < cardNumber) { | ||
62 | toggleFocus(card); | ||
63 | cardIndex -= 1; | ||
64 | card = $('ul.data > li')[cardIndex]; | ||
65 | toggleFocus(card); | ||
66 | return; | ||
67 | } | ||
68 | if (pagination.length > 0 && $(pagination).find('li.prev:not(.disabled)').length > 0 && cardIndex === 0) { | ||
69 | window.location.href = `${window.location.origin + $(pagination).find('li.prev a').attr('href')}#prev`; | ||
70 | } | ||
71 | }); | ||
72 | |||
73 | Mousetrap.bind('enter', () => { | ||
74 | window.location.href = window.location.origin + $(card).find('span.card-title a').attr('href'); | ||
75 | }); | ||
76 | }); | ||
diff --git a/app/config/config.yml b/app/config/config.yml index 3d9067d1..487e934b 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -78,7 +78,7 @@ doctrine: | |||
78 | dbname: "%database_name%" | 78 | dbname: "%database_name%" |
79 | user: "%database_user%" | 79 | user: "%database_user%" |
80 | password: "%database_password%" | 80 | password: "%database_password%" |
81 | charset: UTF8 | 81 | charset: "%database_charset%" |
82 | path: "%database_path%" | 82 | path: "%database_path%" |
83 | unix_socket: "%database_socket%" | 83 | unix_socket: "%database_socket%" |
84 | server_version: 5.6 | 84 | server_version: 5.6 |
@@ -115,12 +115,26 @@ swiftmailer: | |||
115 | fos_rest: | 115 | fos_rest: |
116 | param_fetcher_listener: true | 116 | param_fetcher_listener: true |
117 | body_listener: true | 117 | body_listener: true |
118 | format_listener: true | ||
119 | view: | 118 | view: |
119 | mime_types: | ||
120 | csv: | ||
121 | - 'text/csv' | ||
122 | - 'text/plain' | ||
123 | pdf: | ||
124 | - 'application/pdf' | ||
125 | epub: | ||
126 | - 'application/epub+zip' | ||
127 | mobi: | ||
128 | - 'application/x-mobipocket-ebook' | ||
120 | view_response_listener: 'force' | 129 | view_response_listener: 'force' |
121 | formats: | 130 | formats: |
122 | xml: true | 131 | xml: true |
123 | json : true | 132 | json: true |
133 | txt: true | ||
134 | csv: true | ||
135 | pdf: true | ||
136 | epub: true | ||
137 | mobi: true | ||
124 | templating_formats: | 138 | templating_formats: |
125 | html: true | 139 | html: true |
126 | force_redirects: | 140 | force_redirects: |
@@ -129,10 +143,21 @@ fos_rest: | |||
129 | default_engine: twig | 143 | default_engine: twig |
130 | routing_loader: | 144 | routing_loader: |
131 | default_format: json | 145 | default_format: json |
146 | format_listener: | ||
147 | enabled: true | ||
148 | rules: | ||
149 | - { path: "^/api/entries/([0-9]+)/export.(.*)", priorities: ['epub', 'mobi', 'pdf', 'txt', 'csv'], fallback_format: false, prefer_extension: false } | ||
150 | - { path: "^/api", priorities: ['json', 'xml'], fallback_format: false, prefer_extension: false } | ||
151 | - { path: "^/annotations", priorities: ['json', 'xml'], fallback_format: false, prefer_extension: false } | ||
152 | # for an unknown reason, EACH REQUEST goes to FOS\RestBundle\EventListener\FormatListener | ||
153 | # so we need to add custom rule for custom api export but also for all other routes of the application... | ||
154 | - { path: '^/', priorities: ['text/html', '*/*'], fallback_format: html, prefer_extension: false } | ||
132 | 155 | ||
133 | nelmio_api_doc: | 156 | nelmio_api_doc: |
134 | sandbox: | 157 | sandbox: |
135 | enabled: false | 158 | enabled: false |
159 | cache: | ||
160 | enabled: true | ||
136 | name: wallabag API documentation | 161 | name: wallabag API documentation |
137 | 162 | ||
138 | nelmio_cors: | 163 | nelmio_cors: |
@@ -213,16 +238,6 @@ kphoen_rulerz: | |||
213 | executors: | 238 | executors: |
214 | doctrine: true | 239 | doctrine: true |
215 | 240 | ||
216 | lexik_maintenance: | ||
217 | authorized: | ||
218 | ips: ['127.0.0.1'] | ||
219 | driver: | ||
220 | ttl: 3600 | ||
221 | class: 'Lexik\Bundle\MaintenanceBundle\Drivers\DatabaseDriver' | ||
222 | response: | ||
223 | code: 503 | ||
224 | status: "wallabag Service Temporarily Unavailable" | ||
225 | |||
226 | old_sound_rabbit_mq: | 241 | old_sound_rabbit_mq: |
227 | connections: | 242 | connections: |
228 | default: | 243 | default: |
@@ -243,6 +258,11 @@ old_sound_rabbit_mq: | |||
243 | exchange_options: | 258 | exchange_options: |
244 | name: 'wallabag.import.readability' | 259 | name: 'wallabag.import.readability' |
245 | type: topic | 260 | type: topic |
261 | import_pinboard: | ||
262 | connection: default | ||
263 | exchange_options: | ||
264 | name: 'wallabag.import.pinboard' | ||
265 | type: topic | ||
246 | import_instapaper: | 266 | import_instapaper: |
247 | connection: default | 267 | connection: default |
248 | exchange_options: | 268 | exchange_options: |
@@ -293,6 +313,14 @@ old_sound_rabbit_mq: | |||
293 | queue_options: | 313 | queue_options: |
294 | name: 'wallabag.import.instapaper' | 314 | name: 'wallabag.import.instapaper' |
295 | callback: wallabag_import.consumer.amqp.instapaper | 315 | callback: wallabag_import.consumer.amqp.instapaper |
316 | import_pinboard: | ||
317 | connection: default | ||
318 | exchange_options: | ||
319 | name: 'wallabag.import.pinboard' | ||
320 | type: topic | ||
321 | queue_options: | ||
322 | name: 'wallabag.import.pinboard' | ||
323 | callback: wallabag_import.consumer.amqp.pinboard | ||
296 | import_wallabag_v1: | 324 | import_wallabag_v1: |
297 | connection: default | 325 | connection: default |
298 | exchange_options: | 326 | exchange_options: |
@@ -325,3 +353,17 @@ old_sound_rabbit_mq: | |||
325 | queue_options: | 353 | queue_options: |
326 | name: 'wallabag.import.chrome' | 354 | name: 'wallabag.import.chrome' |
327 | callback: wallabag_import.consumer.amqp.chrome | 355 | callback: wallabag_import.consumer.amqp.chrome |
356 | |||
357 | fos_js_routing: | ||
358 | routes_to_expose: | ||
359 | - homepage | ||
360 | - starred | ||
361 | - archive | ||
362 | - all | ||
363 | - tag | ||
364 | - config | ||
365 | - import | ||
366 | - developer | ||
367 | - howto | ||
368 | - logout | ||
369 | - new | ||
diff --git a/app/config/config_test.yml b/app/config/config_test.yml index 3eab6fb2..f5e2c25e 100644 --- a/app/config/config_test.yml +++ b/app/config/config_test.yml | |||
@@ -28,7 +28,7 @@ doctrine: | |||
28 | dbname: "%test_database_name%" | 28 | dbname: "%test_database_name%" |
29 | user: "%test_database_user%" | 29 | user: "%test_database_user%" |
30 | password: "%test_database_password%" | 30 | password: "%test_database_password%" |
31 | charset: UTF8 | 31 | charset: "%test_database_charset%" |
32 | path: "%test_database_path%" | 32 | path: "%test_database_path%" |
33 | orm: | 33 | orm: |
34 | metadata_cache_driver: | 34 | metadata_cache_driver: |
diff --git a/app/config/parameters.yml.dist b/app/config/parameters.yml.dist index ece4903a..f821f2a8 100644 --- a/app/config/parameters.yml.dist +++ b/app/config/parameters.yml.dist | |||
@@ -19,16 +19,18 @@ parameters: | |||
19 | database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" | 19 | database_path: "%kernel.root_dir%/../data/db/wallabag.sqlite" |
20 | database_table_prefix: wallabag_ | 20 | database_table_prefix: wallabag_ |
21 | database_socket: null | 21 | database_socket: null |
22 | # with MySQL, use "utf8mb4" if you got problem with content with emojis | ||
23 | database_charset: utf8 | ||
22 | 24 | ||
23 | mailer_transport: smtp | 25 | mailer_transport: smtp |
24 | mailer_host: 127.0.0.1 | 26 | mailer_host: 127.0.0.1 |
25 | mailer_user: ~ | 27 | mailer_user: ~ |
26 | mailer_password: ~ | 28 | mailer_password: ~ |
27 | 29 | ||
28 | locale: en | 30 | locale: en |
29 | 31 | ||
30 | # A secret key that's used to generate certain security-related tokens | 32 | # A secret key that's used to generate certain security-related tokens |
31 | secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv | 33 | secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv |
32 | 34 | ||
33 | # two factor stuff | 35 | # two factor stuff |
34 | twofactor_auth: true | 36 | twofactor_auth: true |
@@ -53,3 +55,4 @@ parameters: | |||
53 | redis_host: localhost | 55 | redis_host: localhost |
54 | redis_port: 6379 | 56 | redis_port: 6379 |
55 | redis_path: null | 57 | redis_path: null |
58 | redis_password: null | ||
diff --git a/app/config/parameters_test.yml b/app/config/parameters_test.yml index 2943b27a..5f2e25bb 100644 --- a/app/config/parameters_test.yml +++ b/app/config/parameters_test.yml | |||
@@ -6,3 +6,4 @@ parameters: | |||
6 | test_database_user: null | 6 | test_database_user: null |
7 | test_database_password: null | 7 | test_database_password: null |
8 | test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite' | 8 | test_database_path: '%kernel.root_dir%/../data/db/wallabag_test.sqlite' |
9 | test_database_charset: utf8 | ||
diff --git a/app/config/routing.yml b/app/config/routing.yml index 750ed435..eedf51d5 100644 --- a/app/config/routing.yml +++ b/app/config/routing.yml | |||
@@ -52,3 +52,6 @@ craue_config_settings_modify: | |||
52 | path: /settings | 52 | path: /settings |
53 | defaults: | 53 | defaults: |
54 | _controller: CraueConfigBundle:Settings:modify | 54 | _controller: CraueConfigBundle:Settings:modify |
55 | |||
56 | fos_js_routing: | ||
57 | resource: "@FOSJsRoutingBundle/Resources/config/routing/routing.xml" | ||
diff --git a/app/config/routing_rest.yml b/app/config/routing_rest.yml index 52d395dd..29f4ab14 100644 --- a/app/config/routing_rest.yml +++ b/app/config/routing_rest.yml | |||
@@ -1,4 +1,3 @@ | |||
1 | Rest_Wallabag: | 1 | Rest_Wallabag: |
2 | type : rest | 2 | type : rest |
3 | resource: "@WallabagApiBundle/Resources/config/routing_rest.yml" | 3 | resource: "@WallabagApiBundle/Resources/config/routing_rest.yml" |
4 | |||
diff --git a/app/config/services.yml b/app/config/services.yml index a57ef0f3..9a1ce80b 100644 --- a/app/config/services.yml +++ b/app/config/services.yml | |||
@@ -32,13 +32,13 @@ services: | |||
32 | - { name: twig.extension } | 32 | - { name: twig.extension } |
33 | 33 | ||
34 | wallabag.locale_listener: | 34 | wallabag.locale_listener: |
35 | class: Wallabag\CoreBundle\EventListener\LocaleListener | 35 | class: Wallabag\CoreBundle\Event\Listener\LocaleListener |
36 | arguments: ["%kernel.default_locale%"] | 36 | arguments: ["%kernel.default_locale%"] |
37 | tags: | 37 | tags: |
38 | - { name: kernel.event_subscriber } | 38 | - { name: kernel.event_subscriber } |
39 | 39 | ||
40 | wallabag.user_locale_listener: | 40 | wallabag.user_locale_listener: |
41 | class: Wallabag\CoreBundle\EventListener\UserLocaleListener | 41 | class: Wallabag\CoreBundle\Event\Listener\UserLocaleListener |
42 | arguments: ["@session"] | 42 | arguments: ["@session"] |
43 | tags: | 43 | tags: |
44 | - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } | 44 | - { name: kernel.event_listener, event: security.interactive_login, method: onInteractiveLogin } |
diff --git a/app/config/tests/parameters_test.mysql.yml b/app/config/tests/parameters_test.mysql.yml index d8512845..bca2d466 100644 --- a/app/config/tests/parameters_test.mysql.yml +++ b/app/config/tests/parameters_test.mysql.yml | |||
@@ -6,3 +6,4 @@ parameters: | |||
6 | test_database_user: root | 6 | test_database_user: root |
7 | test_database_password: ~ | 7 | test_database_password: ~ |
8 | test_database_path: ~ | 8 | test_database_path: ~ |
9 | test_database_charset: utf8mb4 | ||
diff --git a/app/config/tests/parameters_test.pgsql.yml b/app/config/tests/parameters_test.pgsql.yml index 41383868..3e18d4a0 100644 --- a/app/config/tests/parameters_test.pgsql.yml +++ b/app/config/tests/parameters_test.pgsql.yml | |||
@@ -6,3 +6,4 @@ parameters: | |||
6 | test_database_user: travis | 6 | test_database_user: travis |
7 | test_database_password: ~ | 7 | test_database_password: ~ |
8 | test_database_path: ~ | 8 | test_database_path: ~ |
9 | test_database_charset: utf8 | ||
diff --git a/app/config/tests/parameters_test.sqlite.yml b/app/config/tests/parameters_test.sqlite.yml index 1952e3a6..b8a5f41a 100644 --- a/app/config/tests/parameters_test.sqlite.yml +++ b/app/config/tests/parameters_test.sqlite.yml | |||
@@ -6,3 +6,4 @@ parameters: | |||
6 | test_database_user: ~ | 6 | test_database_user: ~ |
7 | test_database_password: ~ | 7 | test_database_password: ~ |
8 | test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite" | 8 | test_database_path: "%kernel.root_dir%/../data/db/wallabag_test.sqlite" |
9 | test_database_charset: utf8 | ||