diff options
Diffstat (limited to 'app')
34 files changed, 271 insertions, 15 deletions
diff --git a/app/DoctrineMigrations/Version20160410190541.php b/app/DoctrineMigrations/Version20160410190541.php index 6294d842..5e5cae35 100644 --- a/app/DoctrineMigrations/Version20160410190541.php +++ b/app/DoctrineMigrations/Version20160410190541.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Added foreign keys for account resetting | 11 | * Added foreign keys for account resetting. |
12 | */ | 12 | */ |
13 | class Version20160410190541 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20160410190541 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20160812120952.php b/app/DoctrineMigrations/Version20160812120952.php index bd6e8d63..13272267 100644 --- a/app/DoctrineMigrations/Version20160812120952.php +++ b/app/DoctrineMigrations/Version20160812120952.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Added name field on wallabag_oauth2_clients | 11 | * Added name field on wallabag_oauth2_clients. |
12 | */ | 12 | */ |
13 | class Version20160812120952 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20160812120952 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20160911214952.php b/app/DoctrineMigrations/Version20160911214952.php index edef81ed..4eae46e7 100644 --- a/app/DoctrineMigrations/Version20160911214952.php +++ b/app/DoctrineMigrations/Version20160911214952.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Added settings for RabbitMQ and Redis imports | 11 | * Added settings for RabbitMQ and Redis imports. |
12 | */ | 12 | */ |
13 | class Version20160911214952 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20160911214952 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20160916201049.php b/app/DoctrineMigrations/Version20160916201049.php index 9f8e77e7..ff34c894 100644 --- a/app/DoctrineMigrations/Version20160916201049.php +++ b/app/DoctrineMigrations/Version20160916201049.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Added pocket_consumer_key field on wallabag_config | 11 | * Added pocket_consumer_key field on wallabag_config. |
12 | */ | 12 | */ |
13 | class Version20160916201049 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20160916201049 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20161001072726.php b/app/DoctrineMigrations/Version20161001072726.php index f247c236..ad761541 100644 --- a/app/DoctrineMigrations/Version20161001072726.php +++ b/app/DoctrineMigrations/Version20161001072726.php | |||
@@ -9,7 +9,7 @@ use Symfony\Component\DependencyInjection\ContainerInterface; | |||
9 | use Doctrine\DBAL\Migrations\SkipMigrationException; | 9 | use Doctrine\DBAL\Migrations\SkipMigrationException; |
10 | 10 | ||
11 | /** | 11 | /** |
12 | * Added pocket_consumer_key field on wallabag_config | 12 | * Added pocket_consumer_key field on wallabag_config. |
13 | */ | 13 | */ |
14 | class Version20161001072726 extends AbstractMigration implements ContainerAwareInterface | 14 | class Version20161001072726 extends AbstractMigration implements ContainerAwareInterface |
15 | { | 15 | { |
diff --git a/app/DoctrineMigrations/Version20161022134138.php b/app/DoctrineMigrations/Version20161022134138.php index c71166a0..39949e7d 100644 --- a/app/DoctrineMigrations/Version20161022134138.php +++ b/app/DoctrineMigrations/Version20161022134138.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Converted database to utf8mb4 encoding (for MySQL only) | 11 | * Converted database to utf8mb4 encoding (for MySQL only). |
12 | */ | 12 | */ |
13 | class Version20161022134138 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20161022134138 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20161024212538.php b/app/DoctrineMigrations/Version20161024212538.php index ecb872d1..b2f6aaf8 100644 --- a/app/DoctrineMigrations/Version20161024212538.php +++ b/app/DoctrineMigrations/Version20161024212538.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Added user_id column on oauth2_clients to prevent users to delete API clients from other users | 11 | * Added user_id column on oauth2_clients to prevent users to delete API clients from other users. |
12 | */ | 12 | */ |
13 | class Version20161024212538 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20161024212538 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20161031132655.php b/app/DoctrineMigrations/Version20161031132655.php index 83b97ca9..ef846412 100644 --- a/app/DoctrineMigrations/Version20161031132655.php +++ b/app/DoctrineMigrations/Version20161031132655.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Added the internal setting to enable/disable downloading pictures | 11 | * Added the internal setting to enable/disable downloading pictures. |
12 | */ | 12 | */ |
13 | class Version20161031132655 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20161031132655 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20161104073720.php b/app/DoctrineMigrations/Version20161104073720.php index fb8f5fa1..0e05f02e 100644 --- a/app/DoctrineMigrations/Version20161104073720.php +++ b/app/DoctrineMigrations/Version20161104073720.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Added created_at index on entry table | 11 | * Added created_at index on entry table. |
12 | */ | 12 | */ |
13 | class Version20161104073720 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20161104073720 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20161106113822.php b/app/DoctrineMigrations/Version20161106113822.php index de3702a4..facc14f4 100644 --- a/app/DoctrineMigrations/Version20161106113822.php +++ b/app/DoctrineMigrations/Version20161106113822.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Added action_mark_as_read field on config table | 11 | * Added action_mark_as_read field on config table. |
12 | */ | 12 | */ |
13 | class Version20161106113822 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20161106113822 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20161117071626.php b/app/DoctrineMigrations/Version20161117071626.php index 8daa2142..e779eacf 100644 --- a/app/DoctrineMigrations/Version20161117071626.php +++ b/app/DoctrineMigrations/Version20161117071626.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Added the internal setting to share articles to unmark.it | 11 | * Added the internal setting to share articles to unmark.it. |
12 | */ | 12 | */ |
13 | class Version20161117071626 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20161117071626 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20161214094402.php b/app/DoctrineMigrations/Version20161214094402.php index db125f76..8ca32b09 100644 --- a/app/DoctrineMigrations/Version20161214094402.php +++ b/app/DoctrineMigrations/Version20161214094402.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Renamed uuid to uid in entry table | 11 | * Renamed uuid to uid in entry table. |
12 | */ | 12 | */ |
13 | class Version20161214094402 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20161214094402 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20161214094403.php b/app/DoctrineMigrations/Version20161214094403.php index 5948b5fa..c7326f95 100644 --- a/app/DoctrineMigrations/Version20161214094403.php +++ b/app/DoctrineMigrations/Version20161214094403.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Added index on wallabag_entry.uid | 11 | * Added index on wallabag_entry.uid. |
12 | */ | 12 | */ |
13 | class Version20161214094403 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20161214094403 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20170127093841.php b/app/DoctrineMigrations/Version20170127093841.php index 20c79479..5bfd9670 100644 --- a/app/DoctrineMigrations/Version20170127093841.php +++ b/app/DoctrineMigrations/Version20170127093841.php | |||
@@ -8,7 +8,7 @@ use Symfony\Component\DependencyInjection\ContainerAwareInterface; | |||
8 | use Symfony\Component\DependencyInjection\ContainerInterface; | 8 | use Symfony\Component\DependencyInjection\ContainerInterface; |
9 | 9 | ||
10 | /** | 10 | /** |
11 | * Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived | 11 | * Added indexes on wallabag_entry.is_starred and wallabag_entry.is_archived. |
12 | */ | 12 | */ |
13 | class Version20170127093841 extends AbstractMigration implements ContainerAwareInterface | 13 | class Version20170127093841 extends AbstractMigration implements ContainerAwareInterface |
14 | { | 14 | { |
diff --git a/app/DoctrineMigrations/Version20170327194233.php b/app/DoctrineMigrations/Version20170327194233.php new file mode 100644 index 00000000..e1466b2f --- /dev/null +++ b/app/DoctrineMigrations/Version20170327194233.php | |||
@@ -0,0 +1,54 @@ | |||
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 the share_scuttle internal setting. | ||
12 | */ | ||
13 | class Version20170327194233 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 | $scuttle = $this->container | ||
36 | ->get('doctrine.orm.default_entity_manager') | ||
37 | ->getConnection() | ||
38 | ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'share_scuttle'"); | ||
39 | |||
40 | $this->skipIf(false !== $scuttle, 'It seems that you already played this migration.'); | ||
41 | |||
42 | $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('share_scuttle', '1', 'entry')"); | ||
43 | $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('scuttle_url', 'http://scuttle.org', 'entry')"); | ||
44 | } | ||
45 | |||
46 | /** | ||
47 | * @param Schema $schema | ||
48 | */ | ||
49 | public function down(Schema $schema) | ||
50 | { | ||
51 | $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'share_scuttle';"); | ||
52 | $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'scuttle_url';"); | ||
53 | } | ||
54 | } | ||
diff --git a/app/DoctrineMigrations/Version20170405182620.php b/app/DoctrineMigrations/Version20170405182620.php new file mode 100644 index 00000000..3ef9633f --- /dev/null +++ b/app/DoctrineMigrations/Version20170405182620.php | |||
@@ -0,0 +1,65 @@ | |||
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 published_at and published_by in `entry` table. | ||
12 | */ | ||
13 | class Version20170405182620 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 | |||
37 | $this->skipIf($entryTable->hasColumn('published_at'), 'It seems that you already played this migration.'); | ||
38 | |||
39 | $entryTable->addColumn('published_at', 'datetime', [ | ||
40 | 'notnull' => false, | ||
41 | ]); | ||
42 | |||
43 | $this->skipIf($entryTable->hasColumn('published_by'), 'It seems that you already played this migration.'); | ||
44 | |||
45 | $entryTable->addColumn('published_by', 'text', [ | ||
46 | 'notnull' => false, | ||
47 | ]); | ||
48 | } | ||
49 | |||
50 | /** | ||
51 | * @param Schema $schema | ||
52 | */ | ||
53 | public function down(Schema $schema) | ||
54 | { | ||
55 | $entryTable = $schema->getTable($this->getTable('entry')); | ||
56 | |||
57 | $this->skipIf(!$entryTable->hasColumn('published_at'), 'It seems that you already played this migration.'); | ||
58 | |||
59 | $entryTable->dropColumn('published_at'); | ||
60 | |||
61 | $this->skipIf(!$entryTable->hasColumn('published_by'), 'It seems that you already played this migration.'); | ||
62 | |||
63 | $entryTable->dropColumn('published_by'); | ||
64 | } | ||
65 | } | ||
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 | |||
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 | * Remove isPublic in Entry Table. | ||
12 | */ | ||
13 | class 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/app/DoctrineMigrations/Version20170420134133.php b/app/DoctrineMigrations/Version20170420134133.php new file mode 100644 index 00000000..b1ab7bcb --- /dev/null +++ b/app/DoctrineMigrations/Version20170420134133.php | |||
@@ -0,0 +1,52 @@ | |||
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 | * Remove download_pictures in craue_config_setting. | ||
12 | */ | ||
13 | class Version20170420134133 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('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'download_pictures';"); | ||
36 | } | ||
37 | |||
38 | /** | ||
39 | * @param Schema $schema | ||
40 | */ | ||
41 | public function down(Schema $schema) | ||
42 | { | ||
43 | $downloadPictures = $this->container | ||
44 | ->get('doctrine.orm.default_entity_manager') | ||
45 | ->getConnection() | ||
46 | ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'download_pictures'"); | ||
47 | |||
48 | $this->skipIf(false !== $downloadPictures, 'It seems that you already played this migration.'); | ||
49 | |||
50 | $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('download_pictures', '1', 'entry')"); | ||
51 | } | ||
52 | } | ||
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml index c65463db..d1f7e3b5 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml | |||
@@ -15,6 +15,7 @@ shaarli_url: Shaarli-URL, hvis tjenesten er aktiv | |||
15 | share_diaspora: Aktiver deling til Diaspora | 15 | share_diaspora: Aktiver deling til Diaspora |
16 | share_mail: Aktiver deling med email | 16 | share_mail: Aktiver deling med email |
17 | share_shaarli: Aktiver deling gennem Shaarli | 17 | share_shaarli: Aktiver deling gennem Shaarli |
18 | share_scuttle: Aktiver deling gennem Scuttle | ||
18 | share_twitter: Aktiver deling gennem Twitter | 19 | share_twitter: Aktiver deling gennem Twitter |
19 | share_unmark: Aktiver deling gennem Unmark.it | 20 | share_unmark: Aktiver deling gennem Unmark.it |
20 | show_printlink: Vis et link til print-indhold | 21 | show_printlink: Vis et link til print-indhold |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml index bc378147..1105675b 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml | |||
@@ -15,6 +15,7 @@ shaarli_url: Shaarli-URL, sofern der Service aktiviert ist | |||
15 | share_diaspora: Teilen zu Diaspora aktiveren | 15 | share_diaspora: Teilen zu Diaspora aktiveren |
16 | share_mail: Teilen via E-Mail aktiveren | 16 | share_mail: Teilen via E-Mail aktiveren |
17 | share_shaarli: Teilen zu Shaarli aktiveren | 17 | share_shaarli: Teilen zu Shaarli aktiveren |
18 | share_scuttle: Teilen zu Scuttle aktiveren | ||
18 | share_twitter: Teilen zu Twitter aktiveren | 19 | share_twitter: Teilen zu Twitter aktiveren |
19 | share_unmark: Teilen zu Unmark.it aktiveren | 20 | share_unmark: Teilen zu Unmark.it aktiveren |
20 | show_printlink: Link anzeigen, um den Inhalt auszudrucken | 21 | show_printlink: Link anzeigen, um den Inhalt auszudrucken |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml index 52cb8e20..802599b3 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml | |||
@@ -15,6 +15,7 @@ shaarli_url: Shaarli URL, if the service is enabled | |||
15 | share_diaspora: Enable share to Diaspora | 15 | share_diaspora: Enable share to Diaspora |
16 | share_mail: Enable share by email | 16 | share_mail: Enable share by email |
17 | share_shaarli: Enable share to Shaarli | 17 | share_shaarli: Enable share to Shaarli |
18 | share_scuttle: Enable share to Scuttle | ||
18 | share_twitter: Enable share to Twitter | 19 | share_twitter: Enable share to Twitter |
19 | share_unmark: Enable share to Unmark.it | 20 | share_unmark: Enable share to Unmark.it |
20 | show_printlink: Display a link to print content | 21 | show_printlink: Display a link to print content |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml index c338836d..b3ac18ed 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml | |||
@@ -15,6 +15,7 @@ shaarli_url: URL de Shaarli, si el servicio está activado | |||
15 | share_diaspora: Activar compartir con Diaspora | 15 | share_diaspora: Activar compartir con Diaspora |
16 | share_mail: Activar compartir con Email | 16 | share_mail: Activar compartir con Email |
17 | share_shaarli: Activar compartir con Shaarli | 17 | share_shaarli: Activar compartir con Shaarli |
18 | share_scuttle: Activar compartir con Scuttle | ||
18 | share_twitter: Activar compartir con Twitter | 19 | share_twitter: Activar compartir con Twitter |
19 | share_unmark: Activar compartir con Unmark.it | 20 | share_unmark: Activar compartir con Unmark.it |
20 | show_printlink: Mostrar un enlace para imprimir contenido | 21 | show_printlink: Mostrar un enlace para imprimir contenido |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml index 7a341e0b..c73d63e2 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml | |||
@@ -15,6 +15,7 @@ shaarli_url: نشانی Shaarli، اگر فعال بود | |||
15 | share_diaspora: فعالسازی همرسانی به Diaspora | 15 | share_diaspora: فعالسازی همرسانی به Diaspora |
16 | share_mail: فعالسازی همرسانی با ایمیل | 16 | share_mail: فعالسازی همرسانی با ایمیل |
17 | share_shaarli: فعالسازی همرسانی به Shaarli | 17 | share_shaarli: فعالسازی همرسانی به Shaarli |
18 | share_scuttle: فعالسازی همرسانی به Scuttle | ||
18 | share_twitter: فعالسازی همرسانی به Twitter | 19 | share_twitter: فعالسازی همرسانی به Twitter |
19 | share_unmark: فعالسازی همرسانی به Unmark.it | 20 | share_unmark: فعالسازی همرسانی به Unmark.it |
20 | show_printlink: نمایش پیوندی برای چاپ مطلب | 21 | show_printlink: نمایش پیوندی برای چاپ مطلب |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml index f5c886d6..a53174ae 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml | |||
@@ -15,6 +15,7 @@ shaarli_url: URL de Shaarli, si le service Shaarli est activé | |||
15 | share_diaspora: Activer le partage vers Diaspora | 15 | share_diaspora: Activer le partage vers Diaspora |
16 | share_mail: Activer le partage par email | 16 | share_mail: Activer le partage par email |
17 | share_shaarli: Activer le partage vers Shaarli | 17 | share_shaarli: Activer le partage vers Shaarli |
18 | share_scuttle: Activer le partage vers Scuttle | ||
18 | share_twitter: Activer le partage vers Twitter | 19 | share_twitter: Activer le partage vers Twitter |
19 | share_unmark: Activer le partage vers Unmark.it | 20 | share_unmark: Activer le partage vers Unmark.it |
20 | show_printlink: Afficher un lien pour imprimer | 21 | show_printlink: Afficher un lien pour imprimer |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml index 88a1b4f6..3d53fc8d 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml | |||
@@ -15,6 +15,7 @@ shaarli_url: Shaarli URL, se il servizio è abilitato | |||
15 | share_diaspora: Abilita la condivisione con Diaspora | 15 | share_diaspora: Abilita la condivisione con Diaspora |
16 | share_mail: Abilita la condivisione per email | 16 | share_mail: Abilita la condivisione per email |
17 | share_shaarli: Abilita la condivisione con Shaarli | 17 | share_shaarli: Abilita la condivisione con Shaarli |
18 | share_scuttle: Abilita la condivisione con Scuttle | ||
18 | share_twitter: Abilita la condivisione con Twitter | 19 | share_twitter: Abilita la condivisione con Twitter |
19 | share_unmark: Abilita la condivisione con Unmark.it | 20 | share_unmark: Abilita la condivisione con Unmark.it |
20 | show_printlink: Mostra un collegamento per stampare il contenuto | 21 | show_printlink: Mostra un collegamento per stampare il contenuto |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml index 04aaf0e8..79f75245 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml | |||
@@ -15,6 +15,7 @@ shaarli_url: URL de Shaarli, se lo servici Shaarli es activat | |||
15 | share_diaspora: Activar lo partatge cap a Diaspora | 15 | share_diaspora: Activar lo partatge cap a Diaspora |
16 | share_mail: Activar lo partatge per corrièl | 16 | share_mail: Activar lo partatge per corrièl |
17 | share_shaarli: Activar lo partatge cap a Shaarli | 17 | share_shaarli: Activar lo partatge cap a Shaarli |
18 | share_scuttle: Activar lo partatge cap a Scuttle | ||
18 | share_twitter: Activar lo partatge cap a Twitter | 19 | share_twitter: Activar lo partatge cap a Twitter |
19 | share_unmark: Activar lo partatge cap a Unmark.it | 20 | share_unmark: Activar lo partatge cap a Unmark.it |
20 | show_printlink: Afichar un ligam per imprimir | 21 | show_printlink: Afichar un ligam per imprimir |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml index 1203e159..02fe98e3 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml | |||
@@ -15,6 +15,7 @@ shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona | |||
15 | share_diaspora: Włącz udostępnianie dla Diaspora | 15 | share_diaspora: Włącz udostępnianie dla Diaspora |
16 | share_mail: Włącz udostępnianie przez email | 16 | share_mail: Włącz udostępnianie przez email |
17 | share_shaarli: Włącz udostępnianie dla Shaarli | 17 | share_shaarli: Włącz udostępnianie dla Shaarli |
18 | share_scuttle: Włącz udostępnianie dla Scuttle | ||
18 | share_twitter: Włącz udostępnianie dla Twitter | 19 | share_twitter: Włącz udostępnianie dla Twitter |
19 | share_unmark: Włącz udostępnianie dla Unmark.it | 20 | share_unmark: Włącz udostępnianie dla Unmark.it |
20 | show_printlink: Pokaż link do wydrukowania zawartości | 21 | show_printlink: Pokaż link do wydrukowania zawartości |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml index 1edde87a..4a061bce 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml | |||
@@ -15,6 +15,7 @@ shaarli_url: URL Shaarli, se o serviço está habilitado | |||
15 | share_diaspora: Habilitar compartilhamento para o Diaspora | 15 | share_diaspora: Habilitar compartilhamento para o Diaspora |
16 | share_mail: Habilitar compartilhamento por e-mail | 16 | share_mail: Habilitar compartilhamento por e-mail |
17 | share_shaarli: Habilitar compartilhamento para o Shaarli | 17 | share_shaarli: Habilitar compartilhamento para o Shaarli |
18 | share_scuttle: Habilitar compartilhamento para o Scuttle | ||
18 | share_twitter: Habilitar compartilhamento para o Twitter | 19 | share_twitter: Habilitar compartilhamento para o Twitter |
19 | share_unmark: Habilitar compartilhamento para o Unmark.it | 20 | share_unmark: Habilitar compartilhamento para o Unmark.it |
20 | show_printlink: Mostrar um link para imprimir o conteúdo | 21 | show_printlink: Mostrar um link para imprimir o conteúdo |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml index f0c935d3..5ee48074 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml | |||
@@ -15,6 +15,7 @@ shaarli_url: Shaarli URL, dacă serviciul este permis | |||
15 | share_diaspora: Permite share către Diaspora | 15 | share_diaspora: Permite share către Diaspora |
16 | share_mail: Permite share prin email | 16 | share_mail: Permite share prin email |
17 | share_shaarli: Permite share către Shaarli | 17 | share_shaarli: Permite share către Shaarli |
18 | share_scuttle: Permite share către Scuttle | ||
18 | share_twitter: Permite share către Twitter | 19 | share_twitter: Permite share către Twitter |
19 | share_unmark: Permite share către Unmark.it | 20 | share_unmark: Permite share către Unmark.it |
20 | show_printlink: Afișează un link pentru a printa content-ul | 21 | show_printlink: Afișează un link pentru a printa content-ul |
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml index eb40fc5e..d83a4b7b 100644 --- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml +++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml | |||
@@ -15,6 +15,7 @@ | |||
15 | # share_diaspora: Enable share to Diaspora | 15 | # share_diaspora: Enable share to Diaspora |
16 | # share_mail: Enable share by email | 16 | # share_mail: Enable share by email |
17 | # share_shaarli: Enable share to Shaarli | 17 | # share_shaarli: Enable share to Shaarli |
18 | # share_scuttle: Enable share to Scuttle | ||
18 | # share_twitter: Enable share to Twitter | 19 | # share_twitter: Enable share to Twitter |
19 | # share_unmark: Enable share to Unmark.it | 20 | # share_unmark: Enable share to Unmark.it |
20 | # show_printlink: Display a link to print content | 21 | # show_printlink: Display a link to print content |
diff --git a/app/Resources/static/themes/_global/img/icons/scuttle.png b/app/Resources/static/themes/_global/img/icons/scuttle.png new file mode 100644 index 00000000..3b8eb264 --- /dev/null +++ b/app/Resources/static/themes/_global/img/icons/scuttle.png | |||
Binary files differ | |||
diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index e16846ea..f82c6bee 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css | |||
@@ -912,6 +912,14 @@ a.add-to-wallabag-link-after::after { | |||
912 | content: "\e953"; | 912 | content: "\e953"; |
913 | } | 913 | } |
914 | 914 | ||
915 | .icon-pencil2::before { | ||
916 | content: "\e906"; | ||
917 | } | ||
918 | |||
919 | .icon-users::before { | ||
920 | content: "\e972"; | ||
921 | } | ||
922 | |||
915 | .icon-time::before { | 923 | .icon-time::before { |
916 | content: "\e952"; | 924 | content: "\e952"; |
917 | } | 925 | } |
@@ -947,6 +955,11 @@ a.add-to-wallabag-link-after::after { | |||
947 | background-image: url("../../_global/img/icons/shaarli.png"); | 955 | background-image: url("../../_global/img/icons/shaarli.png"); |
948 | } | 956 | } |
949 | 957 | ||
958 | /* scuttle */ | ||
959 | .icon-image--scuttle { | ||
960 | background-image: url("../../_global/img/icons/scuttle.png"); | ||
961 | } | ||
962 | |||
950 | /* ========================================================================== | 963 | /* ========================================================================== |
951 | Icon selected | 964 | Icon selected |
952 | ========================================================================== */ | 965 | ========================================================================== */ |
@@ -1063,6 +1076,10 @@ blockquote { | |||
1063 | content: "*"; | 1076 | content: "*"; |
1064 | } | 1077 | } |
1065 | 1078 | ||
1079 | .scuttle::before { | ||
1080 | content: "*"; | ||
1081 | } | ||
1082 | |||
1066 | .return { | 1083 | .return { |
1067 | text-decoration: none; | 1084 | text-decoration: none; |
1068 | margin-top: 1em; | 1085 | margin-top: 1em; |
diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index ee4ad4e0..45428e23 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css | |||
@@ -160,6 +160,11 @@ | |||
160 | background-image: url("../../_global/img/icons/shaarli.png"); | 160 | background-image: url("../../_global/img/icons/shaarli.png"); |
161 | } | 161 | } |
162 | 162 | ||
163 | /* Scuttle */ | ||
164 | .icon-image--scuttle { | ||
165 | background-image: url("../../_global/img/icons/scuttle.png"); | ||
166 | } | ||
167 | |||
163 | body { | 168 | body { |
164 | display: flex; | 169 | display: flex; |
165 | min-height: 100vh; | 170 | min-height: 100vh; |
diff --git a/app/config/config.yml b/app/config/config.yml index d7231112..4f4fb900 100644 --- a/app/config/config.yml +++ b/app/config/config.yml | |||
@@ -52,7 +52,7 @@ wallabag_core: | |||
52 | reading_speed: 1 | 52 | reading_speed: 1 |
53 | cache_lifetime: 10 | 53 | cache_lifetime: 10 |
54 | action_mark_as_read: 1 | 54 | action_mark_as_read: 1 |
55 | list_mode: 1 | 55 | list_mode: 0 |
56 | fetching_error_message: | | 56 | fetching_error_message: | |
57 | wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. | 57 | wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/master/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>. |
58 | 58 | ||