aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/DoctrineMigrations/Version20171008195606.php1
-rw-r--r--app/DoctrineMigrations/Version20171105202000.php55
-rw-r--r--app/DoctrineMigrations/Version20171120163128.php52
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml3
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml3
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml23
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml3
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml3
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml3
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml3
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml3
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml2
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml3
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml3
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ru.yml4
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml3
-rw-r--r--app/Resources/static/themes/material/css/cards.scss1
-rw-r--r--app/Resources/static/themes/material/css/nav.scss5
-rwxr-xr-xapp/Resources/static/themes/material/index.js5
-rw-r--r--app/config/wallabag.yml4
-rw-r--r--app/config/webpack/common.js4
21 files changed, 174 insertions, 12 deletions
diff --git a/app/DoctrineMigrations/Version20171008195606.php b/app/DoctrineMigrations/Version20171008195606.php
index c190f4ed..f09726c8 100644
--- a/app/DoctrineMigrations/Version20171008195606.php
+++ b/app/DoctrineMigrations/Version20171008195606.php
@@ -31,6 +31,7 @@ class Version20171008195606 extends AbstractMigration implements ContainerAwareI
31 31
32 switch ($this->connection->getDatabasePlatform()->getName()) { 32 switch ($this->connection->getDatabasePlatform()->getName()) {
33 case 'mysql': 33 case 'mysql':
34 $this->addSql('UPDATE ' . $this->getTable('entry') . ' SET reading_time = 0 WHERE reading_time IS NULL;');
34 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11) NOT NULL;'); 35 $this->addSql('ALTER TABLE ' . $this->getTable('entry') . ' CHANGE reading_time reading_time INT(11) NOT NULL;');
35 break; 36 break;
36 case 'postgresql': 37 case 'postgresql':
diff --git a/app/DoctrineMigrations/Version20171105202000.php b/app/DoctrineMigrations/Version20171105202000.php
new file mode 100644
index 00000000..3769045f
--- /dev/null
+++ b/app/DoctrineMigrations/Version20171105202000.php
@@ -0,0 +1,55 @@
1<?php
2
3namespace Application\Migrations;
4
5use Doctrine\DBAL\Migrations\AbstractMigration;
6use Doctrine\DBAL\Schema\Schema;
7use Symfony\Component\DependencyInjection\ContainerAwareInterface;
8use Symfony\Component\DependencyInjection\ContainerInterface;
9
10/**
11 * Add origin_url column.
12 */
13class Version20171105202000 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 /**
26 * @param Schema $schema
27 */
28 public function up(Schema $schema)
29 {
30 $entryTable = $schema->getTable($this->getTable('entry'));
31
32 $this->skipIf($entryTable->hasColumn('origin_url'), 'It seems that you already played this migration.');
33
34 $entryTable->addColumn('origin_url', 'text', [
35 'notnull' => false,
36 ]);
37 }
38
39 /**
40 * @param Schema $schema
41 */
42 public function down(Schema $schema)
43 {
44 $entryTable = $schema->getTable($this->getTable('entry'));
45
46 $this->skipIf(!$entryTable->hasColumn('origin_url'), 'It seems that you already played this migration.');
47
48 $entryTable->dropColumn('origin_url');
49 }
50
51 private function getTable($tableName)
52 {
53 return $this->container->getParameter('database_table_prefix') . $tableName;
54 }
55}
diff --git a/app/DoctrineMigrations/Version20171120163128.php b/app/DoctrineMigrations/Version20171120163128.php
new file mode 100644
index 00000000..fc3d4c37
--- /dev/null
+++ b/app/DoctrineMigrations/Version20171120163128.php
@@ -0,0 +1,52 @@
1<?php
2
3namespace Application\Migrations;
4
5use Doctrine\DBAL\Migrations\AbstractMigration;
6use Doctrine\DBAL\Schema\Schema;
7use Symfony\Component\DependencyInjection\ContainerAwareInterface;
8use Symfony\Component\DependencyInjection\ContainerInterface;
9
10/**
11 * Add store_article_headers in craue_config_setting.
12 */
13class Version20171120163128 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 /**
26 * @param Schema $schema
27 */
28 public function up(Schema $schema)
29 {
30 $storeArticleHeaders = $this->container
31 ->get('doctrine.orm.default_entity_manager')
32 ->getConnection()
33 ->fetchArray('SELECT * FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'store_article_headers'");
34
35 $this->skipIf(false !== $storeArticleHeaders, 'It seems that you already played this migration.');
36
37 $this->addSql('INSERT INTO ' . $this->getTable('craue_config_setting') . " (name, value, section) VALUES ('store_article_headers', '0', 'entry')");
38 }
39
40 /**
41 * @param Schema $schema
42 */
43 public function down(Schema $schema)
44 {
45 $this->addSql('DELETE FROM ' . $this->getTable('craue_config_setting') . " WHERE name = 'store_article_headers';");
46 }
47
48 private function getTable($tableName)
49 {
50 return $this->container->getParameter('database_table_prefix') . $tableName;
51 }
52}
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
index 5475e571..c3fd843f 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
@@ -12,6 +12,8 @@ export_xml: Aktiver eksport til XML
12# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously 12# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
13# import_with_redis: Enable Redis to import data asynchronously 13# import_with_redis: Enable Redis to import data asynchronously
14shaarli_url: Shaarli-URL, hvis tjenesten er aktiv 14shaarli_url: Shaarli-URL, hvis tjenesten er aktiv
15scuttle_url: Scuttle-URL, hvis tjenesten er aktiv
16unmark_url: Unmark-URL, hvis tjenesten er aktiv
15share_diaspora: Aktiver deling til Diaspora 17share_diaspora: Aktiver deling til Diaspora
16share_mail: Aktiver deling med email 18share_mail: Aktiver deling med email
17share_shaarli: Aktiver deling gennem Shaarli 19share_shaarli: Aktiver deling gennem Shaarli
@@ -34,3 +36,4 @@ demo_mode_username: "Demobruger"
34# download_images_enabled: Download images locally 36# download_images_enabled: Download images locally
35# restricted_access: Enable authentication for websites with paywall 37# restricted_access: Enable authentication for websites with paywall
36# api_user_registration: Enable user to be registered using the API 38# api_user_registration: Enable user to be registered using the API
39# store_article_headers: Enable if wallabag stores HTTP headers for each article
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
index a066c8e3..37da383e 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
@@ -12,6 +12,8 @@ export_xml: 'XML-Export aktivieren'
12import_with_rabbitmq: 'Aktiviere RabbitMQ, um Artikel asynchron zu importieren' 12import_with_rabbitmq: 'Aktiviere RabbitMQ, um Artikel asynchron zu importieren'
13import_with_redis: 'Aktiviere Redis, um Artikel asynchron zu importieren' 13import_with_redis: 'Aktiviere Redis, um Artikel asynchron zu importieren'
14shaarli_url: 'Shaarli-URL, sofern der Service aktiviert ist' 14shaarli_url: 'Shaarli-URL, sofern der Service aktiviert ist'
15scuttle_url: 'Scuttle-URL, sofern der Service aktiviert ist'
16unmark_url: 'Unmark-URL, sofern der Service aktiviert ist'
15share_diaspora: 'Teilen zu Diaspora aktiveren' 17share_diaspora: 'Teilen zu Diaspora aktiveren'
16share_mail: 'Teilen via E-Mail aktiveren' 18share_mail: 'Teilen via E-Mail aktiveren'
17share_shaarli: 'Teilen zu Shaarli aktiveren' 19share_shaarli: 'Teilen zu Shaarli aktiveren'
@@ -34,3 +36,4 @@ share_public: 'Erlaube eine öffentliche URL für Einträge'
34download_images_enabled: 'Bilder lokal herunterladen' 36download_images_enabled: 'Bilder lokal herunterladen'
35restricted_access: 'Authentifizierung für Webseiten mit Paywall aktivieren' 37restricted_access: 'Authentifizierung für Webseiten mit Paywall aktivieren'
36api_user_registration: 'Registrierung eines Benutzers über die API ermöglichen' 38api_user_registration: 'Registrierung eines Benutzers über die API ermöglichen'
39# store_article_headers: Enable if wallabag stores HTTP headers for each article
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index 1e4f4668..0a89ce2c 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -1,7 +1,7 @@
1settings_changed: Configuration updated 1settings_changed: Configuration updated
2download_pictures: Download pictures on your server 2download_pictures: Download pictures on your server
3carrot: Enable share to Carrot 3carrot: Enable share to Carrot
4diaspora_url: Diaspora URL, if the service is enabled 4diaspora_url: diaspora* URL, if the service is enabled
5export_epub: Enable ePub export 5export_epub: Enable ePub export
6export_mobi: Enable .mobi export 6export_mobi: Enable .mobi export
7export_pdf: Enable PDF export 7export_pdf: Enable PDF export
@@ -12,12 +12,14 @@ export_xml: Enable XML export
12import_with_rabbitmq: Enable RabbitMQ to import data asynchronously 12import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
13import_with_redis: Enable Redis to import data asynchronously 13import_with_redis: Enable Redis to import data asynchronously
14shaarli_url: Shaarli URL, if the service is enabled 14shaarli_url: Shaarli URL, if the service is enabled
15share_diaspora: Enable share to Diaspora 15scuttle_url: Scuttle URL, if the service is enabled
16share_mail: Enable share by email 16unmark_url: Unmark URL, if the service is enabled
17share_shaarli: Enable share to Shaarli 17share_diaspora: Enable share to diaspora*
18share_scuttle: Enable share to Scuttle 18share_mail: Enable share by e-mail
19share_twitter: Enable share to Twitter 19share_shaarli: Enable sharing to Shaarli
20share_unmark: Enable share to Unmark.it 20share_scuttle: Enable sharing to Scuttle
21share_twitter: Enable sharing to Twitter
22share_unmark: Enable sharing to Unmark.it
21show_printlink: Display a link to print content 23show_printlink: Display a link to print content
22wallabag_support_url: Support URL for wallabag 24wallabag_support_url: Support URL for wallabag
23entry: "article" 25entry: "article"
@@ -28,9 +30,10 @@ modify_settings: "apply"
28piwik_host: Host of your website in Piwik (without http:// ou https://) 30piwik_host: Host of your website in Piwik (without http:// ou https://)
29piwik_site_id: ID of your website in Piwik 31piwik_site_id: ID of your website in Piwik
30piwik_enabled: Enable Piwik 32piwik_enabled: Enable Piwik
31demo_mode_enabled: "Enable demo mode ? (only used for the wallabag public demo)" 33demo_mode_enabled: "Enable demo mode? (Only used for the public wallabag demo)"
32demo_mode_username: "Demo user" 34demo_mode_username: "Demo user"
33share_public: Allow public url for entries 35share_public: Allow public URL for entries
34download_images_enabled: Download images locally 36download_images_enabled: Download images locally
35restricted_access: Enable authentication for websites with paywall 37restricted_access: Enable authentication for paywalled websites
36api_user_registration: Enable user to be registered using the API 38api_user_registration: Enable user to be registered using the API
39store_article_headers: Enable if wallabag stores HTTP headers for each article
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
index 46ed4040..db5858d6 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
@@ -12,6 +12,8 @@ export_xml: Activar exportación a XML
12import_with_rabbitmq: Activar RabbitMQ para importar datos de forma asíncrona 12import_with_rabbitmq: Activar RabbitMQ para importar datos de forma asíncrona
13import_with_redis: Activar Redis para importar datos de forma asíncrona 13import_with_redis: Activar Redis para importar datos de forma asíncrona
14shaarli_url: URL de Shaarli, si el servicio está activado 14shaarli_url: URL de Shaarli, si el servicio está activado
15scuttle_url: URL de Scuttle, si el servicio está activado
16unmark_url: URL de Unmark, si el servicio está activado
15share_diaspora: Activar compartir con Diaspora 17share_diaspora: Activar compartir con Diaspora
16share_mail: Activar compartir con Email 18share_mail: Activar compartir con Email
17share_shaarli: Activar compartir con Shaarli 19share_shaarli: Activar compartir con Shaarli
@@ -34,3 +36,4 @@ share_public: Permitir URL pública para los artículos
34download_images_enabled: Descargar imágenes localmente 36download_images_enabled: Descargar imágenes localmente
35restricted_access: Activar autenticación para websites con paywall 37restricted_access: Activar autenticación para websites con paywall
36# api_user_registration: Enable user to be registered using the API 38# api_user_registration: Enable user to be registered using the API
39# store_article_headers: Enable if wallabag stores HTTP headers for each article
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
index f8da4acf..11cc601b 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@@ -12,6 +12,8 @@ export_xml: فعال‌سازی برون‌سپاری به XML
12# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously 12# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
13# import_with_redis: Enable Redis to import data asynchronously 13# import_with_redis: Enable Redis to import data asynchronously
14shaarli_url: نشانی Shaarli، اگر فعال بود 14shaarli_url: نشانی Shaarli، اگر فعال بود
15scuttle_url: نشانی Scuttle، اگر فعال بود
16unmark_url: نشانی Unmark، اگر فعال بود
15share_diaspora: فعال‌سازی هم‌رسانی به Diaspora 17share_diaspora: فعال‌سازی هم‌رسانی به Diaspora
16share_mail: فعال‌سازی هم‌رسانی با ایمیل 18share_mail: فعال‌سازی هم‌رسانی با ایمیل
17share_shaarli: فعال‌سازی هم‌رسانی به Shaarli 19share_shaarli: فعال‌سازی هم‌رسانی به Shaarli
@@ -34,3 +36,4 @@ modify_settings: "اعمال"
34# download_images_enabled: Download images locally 36# download_images_enabled: Download images locally
35# restricted_access: Enable authentication for websites with paywall 37# restricted_access: Enable authentication for websites with paywall
36# api_user_registration: Enable user to be registered using the API 38# api_user_registration: Enable user to be registered using the API
39# store_article_headers: Enable if wallabag stores HTTP headers for each article
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index a79409b4..f23b5bf9 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -12,6 +12,8 @@ export_xml: Activer l'export XML
12import_with_rabbitmq: Activer RabbitMQ pour gérer les imports de façon asynchrone 12import_with_rabbitmq: Activer RabbitMQ pour gérer les imports de façon asynchrone
13import_with_redis: Activer Redis pour gérer les imports de façon asynchrone 13import_with_redis: Activer Redis pour gérer les imports de façon asynchrone
14shaarli_url: URL de Shaarli, si le service Shaarli est activé 14shaarli_url: URL de Shaarli, si le service Shaarli est activé
15scuttle_url: URL de Scuttle, si le service Scuttle est activé
16unmark_url: URL de Unmark, si le service Unmark est activé
15share_diaspora: Activer le partage vers Diaspora 17share_diaspora: Activer le partage vers Diaspora
16share_mail: Activer le partage par email 18share_mail: Activer le partage par email
17share_shaarli: Activer le partage vers Shaarli 19share_shaarli: Activer le partage vers Shaarli
@@ -34,3 +36,4 @@ share_public: Autoriser une URL publique pour les articles
34download_images_enabled: Télécharger les images en local 36download_images_enabled: Télécharger les images en local
35restricted_access: Activer l'authentification pour les articles derrière un paywall 37restricted_access: Activer l'authentification pour les articles derrière un paywall
36api_user_registration: Activer la création de compte depuis l'API 38api_user_registration: Activer la création de compte depuis l'API
39store_article_headers: Activer le stockage des en-têtes HTTP de chaque article
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
index dd4def4b..ade6f7da 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
@@ -12,6 +12,8 @@ export_xml: Abilita esportazione XML
12# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously 12# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
13# import_with_redis: Enable Redis to import data asynchronously 13# import_with_redis: Enable Redis to import data asynchronously
14shaarli_url: Shaarli URL, se il servizio è abilitato 14shaarli_url: Shaarli URL, se il servizio è abilitato
15scuttle_url: Scuttle URL, se il servizio è abilitato
16unmark_url: Unmark URL, se il servizio è abilitato
15share_diaspora: Abilita la condivisione con Diaspora 17share_diaspora: Abilita la condivisione con Diaspora
16share_mail: Abilita la condivisione per email 18share_mail: Abilita la condivisione per email
17share_shaarli: Abilita la condivisione con Shaarli 19share_shaarli: Abilita la condivisione con Shaarli
@@ -34,3 +36,4 @@ demo_mode_username: "Utente Demo"
34# download_images_enabled: Download images locally 36# download_images_enabled: Download images locally
35# restricted_access: Enable authentication for websites with paywall 37# restricted_access: Enable authentication for websites with paywall
36api_user_registration: Abilita la registrazione dell'utente attraverso l'API 38api_user_registration: Abilita la registrazione dell'utente attraverso l'API
39# store_article_headers: Enable if wallabag stores HTTP headers for each article
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
index fb163ce7..99986642 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@@ -12,6 +12,8 @@ export_xml: Activar l'expòrt XML
12import_with_rabbitmq: Activar RabbitMQ per importar de donadas de manièra asincròna 12import_with_rabbitmq: Activar RabbitMQ per importar de donadas de manièra asincròna
13import_with_redis: Activar Redis per importar de donadas de manièra asincròna 13import_with_redis: Activar Redis per importar de donadas de manièra asincròna
14shaarli_url: URL de Shaarli, se lo servici Shaarli es activat 14shaarli_url: URL de Shaarli, se lo servici Shaarli es activat
15scuttle_url: URL de Scuttle, se lo servici Scuttle es activat
16unmark_url: URL de Unmark, se lo servici Scuttle es activat
15share_diaspora: Activar lo partatge cap a Diaspora* 17share_diaspora: Activar lo partatge cap a Diaspora*
16share_mail: Activar lo partatge per corrièl 18share_mail: Activar lo partatge per corrièl
17share_shaarli: Activar lo partatge cap a Shaarli 19share_shaarli: Activar lo partatge cap a Shaarli
@@ -34,3 +36,4 @@ share_public: Autorizar una URL publica pels articles
34download_images_enabled: Telecargar los imatges en local 36download_images_enabled: Telecargar los imatges en local
35restricted_access: Activar l'autenticacion pels sites amb peatge 37restricted_access: Activar l'autenticacion pels sites amb peatge
36api_user_registration: Autorizar los utilizaires a se marcar amb l'API 38api_user_registration: Autorizar los utilizaires a se marcar amb l'API
39# store_article_headers: Enable if wallabag stores HTTP headers for each article
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
index 04ad4fd3..8b8f2ebd 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@@ -12,6 +12,7 @@ export_xml: Włącz eksport do XML
12import_with_rabbitmq: Włącz RabbitMQ dla asynchronicznego importu danych 12import_with_rabbitmq: Włącz RabbitMQ dla asynchronicznego importu danych
13import_with_redis: Włącz Redis dla asynchronicznego importu danych 13import_with_redis: Włącz Redis dla asynchronicznego importu danych
14shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona 14shaarli_url: Adress URL Shaarli, jeżeli usługa jest włączona
15scuttle_url: Adress URL Scuttle, jeżeli usługa jest włączona
15share_diaspora: Włącz udostępnianie dla Diaspora 16share_diaspora: Włącz udostępnianie dla Diaspora
16share_mail: Włącz udostępnianie przez email 17share_mail: Włącz udostępnianie przez email
17share_shaarli: Włącz udostępnianie dla Shaarli 18share_shaarli: Włącz udostępnianie dla Shaarli
@@ -34,3 +35,4 @@ share_public: Zezwalaj na publiczny adres url dla wpisow
34download_images_enabled: Pobierz obrazy lokalnie 35download_images_enabled: Pobierz obrazy lokalnie
35restricted_access: Włącz autoryzację dla stron z paywallem 36restricted_access: Włącz autoryzację dla stron z paywallem
36api_user_registration: Włącz rejestrację użytkownika przy użyciu API 37api_user_registration: Włącz rejestrację użytkownika przy użyciu API
38# store_article_headers: Enable if wallabag stores HTTP headers for each article
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
index 77e22b37..76cb0174 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
@@ -12,6 +12,8 @@ export_xml: Habilita exportação para XML
12# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously 12# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
13# import_with_redis: Enable Redis to import data asynchronously 13# import_with_redis: Enable Redis to import data asynchronously
14shaarli_url: URL Shaarli, se o serviço está habilitado 14shaarli_url: URL Shaarli, se o serviço está habilitado
15scuttle_url: URL Scuttle, se o serviço está habilitado
16unmark_url: URL Unmark, se o serviço está habilitado
15share_diaspora: Habilitar compartilhamento para o Diaspora 17share_diaspora: Habilitar compartilhamento para o Diaspora
16share_mail: Habilitar compartilhamento por e-mail 18share_mail: Habilitar compartilhamento por e-mail
17share_shaarli: Habilitar compartilhamento para o Shaarli 19share_shaarli: Habilitar compartilhamento para o Shaarli
@@ -34,3 +36,4 @@ demo_mode_username: "Usuário demo"
34# download_images_enabled: Download images locally 36# download_images_enabled: Download images locally
35# restricted_access: Enable authentication for websites with paywall 37# restricted_access: Enable authentication for websites with paywall
36# api_user_registration: Enable user to be registered using the API 38# api_user_registration: Enable user to be registered using the API
39# store_article_headers: Enable if wallabag stores HTTP headers for each article
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
index 1b4bfb5b..8300cec8 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
@@ -12,6 +12,8 @@ export_xml: Permite exportare XML
12# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously 12# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
13# import_with_redis: Enable Redis to import data asynchronously 13# import_with_redis: Enable Redis to import data asynchronously
14shaarli_url: Shaarli URL, dacă serviciul este permis 14shaarli_url: Shaarli URL, dacă serviciul este permis
15scuttle_url: Scuttle URL, dacă serviciul este permis
16unmark_url: Unmark URL, dacă serviciul este permis
15share_diaspora: Permite share către Diaspora 17share_diaspora: Permite share către Diaspora
16share_mail: Permite share prin email 18share_mail: Permite share prin email
17share_shaarli: Permite share către Shaarli 19share_shaarli: Permite share către Shaarli
@@ -34,3 +36,4 @@ modify_settings: "aplică"
34# download_images_enabled: Download images locally 36# download_images_enabled: Download images locally
35# restricted_access: Enable authentication for websites with paywall 37# restricted_access: Enable authentication for websites with paywall
36# api_user_registration: Enable user to be registered using the API 38# api_user_registration: Enable user to be registered using the API
39# store_article_headers: Enable if wallabag stores HTTP headers for each article
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ru.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ru.yml
index 37b4bbfd..8fed84ae 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ru.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ru.yml
@@ -12,6 +12,8 @@ export_xml: "Включить XML экспорт"
12import_with_rabbitmq: "Включить RabbitMQ для импорта данных(асинхронно)" 12import_with_rabbitmq: "Включить RabbitMQ для импорта данных(асинхронно)"
13import_with_redis: "Включить Redis для импорта данных(асинхронно)" 13import_with_redis: "Включить Redis для импорта данных(асинхронно)"
14shaarli_url: "Shaarli URL, если сервис включен" 14shaarli_url: "Shaarli URL, если сервис включен"
15scuttle_url: "Scuttle URL, если сервис включен"
16unmark_url: "Unmark URL, если сервис включен"
15share_diaspora: "Включить возможность поделиться в соц.сети Diaspora" 17share_diaspora: "Включить возможность поделиться в соц.сети Diaspora"
16share_mail: "Включить возможность поделиться по email" 18share_mail: "Включить возможность поделиться по email"
17share_shaarli: "Включить возможность поделиться в Shaarli" 19share_shaarli: "Включить возможность поделиться в Shaarli"
@@ -33,3 +35,5 @@ demo_mode_username: "Демо пользователь"
33share_public: "Разрешить публичные ссылки на записи" 35share_public: "Разрешить публичные ссылки на записи"
34download_images_enabled: "Скачивать изображения локально" 36download_images_enabled: "Скачивать изображения локально"
35restricted_access: "Включить авторизацию на сайте с помощью paywall" 37restricted_access: "Включить авторизацию на сайте с помощью paywall"
38# api_user_registration: Enable user to be registered using the API
39# store_article_headers: Enable if wallabag stores HTTP headers for each article
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
index 1579366d..b992ccc2 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
@@ -12,6 +12,8 @@
12# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously 12# import_with_rabbitmq: Enable RabbitMQ to import data asynchronously
13# import_with_redis: Enable Redis to import data asynchronously 13# import_with_redis: Enable Redis to import data asynchronously
14# shaarli_url: Shaarli URL, if the service is enabled 14# shaarli_url: Shaarli URL, if the service is enabled
15# scuttle_url: Scuttle URL, if the service is enabled
16# unmark_url: Unmark URL, if the service is enabled
15# share_diaspora: Enable share to Diaspora 17# share_diaspora: Enable share to Diaspora
16# share_mail: Enable share by email 18# share_mail: Enable share by email
17# share_shaarli: Enable share to Shaarli 19# share_shaarli: Enable share to Shaarli
@@ -35,3 +37,4 @@
35# download_images_enabled: Download images locally 37# download_images_enabled: Download images locally
36# restricted_access: Enable authentication for websites with paywall 38# restricted_access: Enable authentication for websites with paywall
37# api_user_registration: Enable user to be registered using the API 39# api_user_registration: Enable user to be registered using the API
40# store_article_headers: Enable if wallabag stores HTTP headers for each article
diff --git a/app/Resources/static/themes/material/css/cards.scss b/app/Resources/static/themes/material/css/cards.scss
index 3edbe673..7b38a743 100644
--- a/app/Resources/static/themes/material/css/cards.scss
+++ b/app/Resources/static/themes/material/css/cards.scss
@@ -134,6 +134,7 @@ main {
134 .card-fullimage .preview { 134 .card-fullimage .preview {
135 height: 14em; 135 height: 14em;
136 background: no-repeat 50%/cover; 136 background: no-repeat 50%/cover;
137 display: block;
137 } 138 }
138 139
139 &.sw { 140 &.sw {
diff --git a/app/Resources/static/themes/material/css/nav.scss b/app/Resources/static/themes/material/css/nav.scss
index 1a25a5be..7898f662 100644
--- a/app/Resources/static/themes/material/css/nav.scss
+++ b/app/Resources/static/themes/material/css/nav.scss
@@ -95,6 +95,11 @@ nav {
95 display: flex; 95 display: flex;
96 flex: 1; 96 flex: 1;
97 } 97 }
98
99 &.nav-panel-add form.disabled,
100 &.nav-panel-add form.disabled input {
101 background-color: whitesmoke;
102 }
98} 103}
99 104
100#button_filters { 105#button_filters {
diff --git a/app/Resources/static/themes/material/index.js b/app/Resources/static/themes/material/index.js
index d6afbb8a..36505d71 100755
--- a/app/Resources/static/themes/material/index.js
+++ b/app/Resources/static/themes/material/index.js
@@ -50,6 +50,11 @@ $(document).ready(() => {
50 $('#entry_url').focus(); 50 $('#entry_url').focus();
51 return false; 51 return false;
52 }); 52 });
53 const materialAddForm = $('.nav-panel-add form[name=entry]');
54 materialAddForm.on('submit', () => {
55 materialAddForm.addClass('disabled');
56 $('input#entry_url', materialAddForm).prop('readonly', true).trigger('blur');
57 });
53 $('#nav-btn-search').on('click', () => { 58 $('#nav-btn-search').on('click', () => {
54 $('.nav-panel-buttom').hide(100); 59 $('.nav-panel-buttom').hide(100);
55 $('.nav-panel-search').show(100); 60 $('.nav-panel-search').show(100);
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
index bbc587b0..7795bae6 100644
--- a/app/config/wallabag.yml
+++ b/app/config/wallabag.yml
@@ -153,6 +153,10 @@ wallabag_core:
153 name: api_user_registration 153 name: api_user_registration
154 value: 0 154 value: 0
155 section: api 155 section: api
156 -
157 name: store_article_headers
158 value: 0
159 section: entry
156 160
157wallabag_user: 161wallabag_user:
158 registration_enabled: "%fosuser_registration%" 162 registration_enabled: "%fosuser_registration%"
diff --git a/app/config/webpack/common.js b/app/config/webpack/common.js
index c497689a..47113950 100644
--- a/app/config/webpack/common.js
+++ b/app/config/webpack/common.js
@@ -13,8 +13,8 @@ module.exports = function () {
13 }, 13 },
14 output: { 14 output: {
15 filename: '[name].js', 15 filename: '[name].js',
16 path: path.resolve(rootDir, 'web/bundles/wallabagcore'), 16 path: path.resolve(rootDir, 'web/wallassets'),
17 publicPath: '/bundles/wallabagcore/', 17 publicPath: '/wallassets/',
18 }, 18 },
19 plugins: [ 19 plugins: [
20 new webpack.ProvidePlugin({ 20 new webpack.ProvidePlugin({