aboutsummaryrefslogtreecommitdiffhomepage
path: root/app
diff options
context:
space:
mode:
Diffstat (limited to 'app')
-rw-r--r--app/DoctrineMigrations/Version20170602075214.php52
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml1
-rw-r--r--app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml1
-rw-r--r--app/config/config.yml37
-rw-r--r--app/config/security.yml1
-rw-r--r--app/config/wallabag.yml164
16 files changed, 230 insertions, 36 deletions
diff --git a/app/DoctrineMigrations/Version20170602075214.php b/app/DoctrineMigrations/Version20170602075214.php
new file mode 100644
index 00000000..451d16ba
--- /dev/null
+++ b/app/DoctrineMigrations/Version20170602075214.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 api_user_registration in craue_config_setting.
12 */
13class Version20170602075214 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 $apiUserRegistration = $this->container
36 ->get('doctrine.orm.default_entity_manager')
37 ->getConnection()
38 ->fetchArray('SELECT * FROM '.$this->getTable('craue_config_setting')." WHERE name = 'api_user_registration'");
39
40 $this->skipIf(false !== $apiUserRegistration, 'It seems that you already played this migration.');
41
42 $this->addSql('INSERT INTO '.$this->getTable('craue_config_setting')." (name, value, section) VALUES ('api_user_registration', '0', 'api')");
43 }
44
45 /**
46 * @param Schema $schema
47 */
48 public function down(Schema $schema)
49 {
50 $this->addSql('DELETE FROM '.$this->getTable('craue_config_setting')." WHERE name = 'api_user_registration';");
51 }
52}
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
index d1f7e3b5..20e938f5 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.da.yml
@@ -34,3 +34,4 @@ demo_mode_username: "Demobruger"
34# share_public: Allow public url for entries 34# share_public: Allow public url for entries
35# download_images_enabled: Download images locally 35# download_images_enabled: Download images locally
36# restricted_access: Enable authentication for websites with paywall 36# restricted_access: Enable authentication for websites with paywall
37# api_user_registration: Enable user to be registered using the API
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
index 1105675b..526d41bc 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.de.yml
@@ -34,3 +34,4 @@ demo_mode_username: "Test-Benutzer"
34share_public: Erlaube eine öffentliche URL für Einträge 34share_public: Erlaube eine öffentliche URL für Einträge
35# download_images_enabled: Download images locally 35# download_images_enabled: Download images locally
36# restricted_access: Enable authentication for websites with paywall 36# restricted_access: Enable authentication for websites with paywall
37# api_user_registration: Enable user to be registered using the API
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
index 802599b3..3c0037f3 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.en.yml
@@ -34,3 +34,4 @@ demo_mode_username: "Demo user"
34share_public: Allow public url for entries 34share_public: Allow public url for entries
35download_images_enabled: Download images locally 35download_images_enabled: Download images locally
36restricted_access: Enable authentication for websites with paywall 36restricted_access: Enable authentication for websites with paywall
37api_user_registration: Enable user to be registered using the API
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
index b3ac18ed..99869669 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.es.yml
@@ -34,3 +34,4 @@ demo_mode_username: "Nombre de usuario demo"
34share_public: Permitir URL pública para los artículos 34share_public: Permitir URL pública para los artículos
35download_images_enabled: Descargar imágenes localmente 35download_images_enabled: Descargar imágenes localmente
36restricted_access: Activar autenticación para websites con paywall 36restricted_access: Activar autenticación para websites con paywall
37# api_user_registration: Enable user to be registered using the API
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
index c73d63e2..2e1307e5 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fa.yml
@@ -34,3 +34,4 @@ modify_settings: "اعمال"
34# share_public: Allow public url for entries 34# share_public: Allow public url for entries
35# download_images_enabled: Download images locally 35# download_images_enabled: Download images locally
36# restricted_access: Enable authentication for websites with paywall 36# restricted_access: Enable authentication for websites with paywall
37# api_user_registration: Enable user to be registered using the API
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
index a53174ae..454053ad 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.fr.yml
@@ -34,3 +34,4 @@ demo_mode_username: "Utilisateur de la démo"
34share_public: Autoriser une URL publique pour les articles 34share_public: Autoriser une URL publique pour les articles
35download_images_enabled: Télécharger les images en local 35download_images_enabled: Télécharger les images en local
36restricted_access: Activer l'authentification pour les articles derrière un paywall 36restricted_access: Activer l'authentification pour les articles derrière un paywall
37api_user_registration: Activer la création de compte depuis l'API
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
index 3d53fc8d..4dbd2ff8 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.it.yml
@@ -34,3 +34,4 @@ demo_mode_username: "Utente Demo"
34# share_public: Allow public url for entries 34# share_public: Allow public url for entries
35# download_images_enabled: Download images locally 35# download_images_enabled: Download images locally
36# restricted_access: Enable authentication for websites with paywall 36# restricted_access: Enable authentication for websites with paywall
37api_user_registration: Abilita la registrazione dell'utente attraverso l'API
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
index 79f75245..00c06638 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.oc.yml
@@ -34,3 +34,4 @@ demo_mode_username: "Utilizaire de la demostracion"
34share_public: Autorizar una URL publica pels articles 34share_public: Autorizar una URL publica pels articles
35download_images_enabled: Telecargar los imatges en local 35download_images_enabled: Telecargar los imatges en local
36restricted_access: Activar l'autenticacion pels sites amb peatge 36restricted_access: Activar l'autenticacion pels sites amb peatge
37# api_user_registration: Enable user to be registered using the API
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
index 02fe98e3..ada11b3a 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pl.yml
@@ -34,3 +34,4 @@ demo_mode_username: "Użytkownik Demonstracyjny"
34share_public: Zezwalaj na publiczny adres url dla wpisow 34share_public: Zezwalaj na publiczny adres url dla wpisow
35download_images_enabled: Pobierz obrazy lokalnie 35download_images_enabled: Pobierz obrazy lokalnie
36restricted_access: Włącz autoryzację dla stron z paywallem 36restricted_access: Włącz autoryzację dla stron z paywallem
37api_user_registration: Włącz rejestrację użytkownika przy użyciu API
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
index 4a061bce..59af9610 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.pt.yml
@@ -34,3 +34,4 @@ demo_mode_username: "Usuário demo"
34# share_public: Allow public url for entries 34# share_public: Allow public url for entries
35# download_images_enabled: Download images locally 35# download_images_enabled: Download images locally
36# restricted_access: Enable authentication for websites with paywall 36# restricted_access: Enable authentication for websites with paywall
37# api_user_registration: Enable user to be registered using the API
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
index 5ee48074..104e37c6 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.ro.yml
@@ -34,3 +34,4 @@ modify_settings: "aplică"
34# share_public: Allow public url for entries 34# share_public: Allow public url for entries
35# download_images_enabled: Download images locally 35# download_images_enabled: Download images locally
36# restricted_access: Enable authentication for websites with paywall 36# restricted_access: Enable authentication for websites with paywall
37# api_user_registration: Enable user to be registered using the API
diff --git a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
index d83a4b7b..1579366d 100644
--- a/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
+++ b/app/Resources/CraueConfigBundle/translations/CraueConfigBundle.tr.yml
@@ -34,3 +34,4 @@
34# share_public: Allow public url for entries 34# share_public: Allow public url for entries
35# download_images_enabled: Download images locally 35# download_images_enabled: Download images locally
36# restricted_access: Enable authentication for websites with paywall 36# restricted_access: Enable authentication for websites with paywall
37# api_user_registration: Enable user to be registered using the API
diff --git a/app/config/config.yml b/app/config/config.yml
index 04f8547d..2bc5e3b3 100644
--- a/app/config/config.yml
+++ b/app/config/config.yml
@@ -2,6 +2,7 @@ imports:
2 - { resource: parameters.yml } 2 - { resource: parameters.yml }
3 - { resource: security.yml } 3 - { resource: security.yml }
4 - { resource: services.yml } 4 - { resource: services.yml }
5 - { resource: wallabag.yml }
5 6
6parameters: 7parameters:
7 # Allows to use the live reload feature for changes in assets 8 # Allows to use the live reload feature for changes in assets
@@ -34,42 +35,6 @@ framework:
34 http_method_override: true 35 http_method_override: true
35 assets: ~ 36 assets: ~
36 37
37wallabag_core:
38 version: 2.2.3
39 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
40 languages:
41 en: 'English'
42 fr: 'Français'
43 de: 'Deutsch'
44 tr: 'Türkçe'
45 fa: 'فارسی'
46 ro: 'Română'
47 pl: 'Polish'
48 da: 'Dansk'
49 es: 'Español'
50 oc: 'Occitan'
51 it: 'Italiano'
52 pt: 'Português'
53 items_on_page: 12
54 theme: material
55 language: '%locale%'
56 rss_limit: 50
57 reading_speed: 1
58 cache_lifetime: 10
59 action_mark_as_read: 1
60 list_mode: 0
61 fetching_error_message_title: 'No title found'
62 fetching_error_message: |
63 wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
64 api_limit_mass_actions: 10
65
66wallabag_user:
67 registration_enabled: "%fosuser_registration%"
68
69wallabag_import:
70 allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv']
71 resource_dir: "%kernel.root_dir%/../web/uploads/import"
72
73# Twig Configuration 38# Twig Configuration
74twig: 39twig:
75 debug: "%kernel.debug%" 40 debug: "%kernel.debug%"
diff --git a/app/config/security.yml b/app/config/security.yml
index efb00a53..ffb1d356 100644
--- a/app/config/security.yml
+++ b/app/config/security.yml
@@ -56,6 +56,7 @@ security:
56 access_control: 56 access_control:
57 - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY } 57 - { path: ^/api/doc, roles: IS_AUTHENTICATED_ANONYMOUSLY }
58 - { path: ^/api/version, roles: IS_AUTHENTICATED_ANONYMOUSLY } 58 - { path: ^/api/version, roles: IS_AUTHENTICATED_ANONYMOUSLY }
59 - { path: ^/api/user, roles: IS_AUTHENTICATED_ANONYMOUSLY }
59 - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY } 60 - { path: ^/login, roles: IS_AUTHENTICATED_ANONYMOUSLY }
60 - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY } 61 - { path: ^/register, role: IS_AUTHENTICATED_ANONYMOUSLY }
61 - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY } 62 - { path: ^/resetting, role: IS_AUTHENTICATED_ANONYMOUSLY }
diff --git a/app/config/wallabag.yml b/app/config/wallabag.yml
new file mode 100644
index 00000000..d8c593c6
--- /dev/null
+++ b/app/config/wallabag.yml
@@ -0,0 +1,164 @@
1wallabag_core:
2 version: 2.2.3
3 paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb"
4 languages:
5 en: 'English'
6 fr: 'Français'
7 de: 'Deutsch'
8 tr: 'Türkçe'
9 fa: 'فارسی'
10 ro: 'Română'
11 pl: 'Polish'
12 da: 'Dansk'
13 es: 'Español'
14 oc: 'Occitan'
15 it: 'Italiano'
16 pt: 'Português'
17 items_on_page: 12
18 theme: material
19 language: '%locale%'
20 rss_limit: 50
21 reading_speed: 1
22 cache_lifetime: 10
23 action_mark_as_read: 1
24 list_mode: 0
25 fetching_error_message_title: 'No title found'
26 fetching_error_message: |
27 wallabag can't retrieve contents for this article. Please <a href="http://doc.wallabag.org/en/user/errors_during_fetching.html#how-can-i-help-to-fix-that">troubleshoot this issue</a>.
28 api_limit_mass_actions: 10
29 default_internal_settings:
30 -
31 name: share_public
32 value: 1
33 section: entry
34 -
35 name: carrot
36 value: 1
37 section: entry
38 -
39 name: share_diaspora
40 value: 1
41 section: entry
42 -
43 name: diaspora_url
44 value: http://diasporapod.com
45 section: entry
46 -
47 name: share_unmark
48 value: 1
49 section: entry
50 -
51 name: unmark_url
52 value: https://unmark.it
53 section: entry
54 -
55 name: share_shaarli
56 value: 1
57 section: entry
58 -
59 name: share_scuttle
60 value: 1
61 section: entry
62 -
63 name: shaarli_url
64 value: http://myshaarli.com
65 section: entry
66 -
67 name: scuttle_url
68 value: http://scuttle.org
69 section: entry
70 -
71 name: share_mail
72 value: 1
73 section: entry
74 -
75 name: share_twitter
76 value: 1
77 section: entry
78 -
79 name: show_printlink
80 value: 1
81 section: entry
82 -
83 name: restricted_access
84 value: 0
85 section: entry
86 -
87 name: export_epub
88 value: 1
89 section: export
90 -
91 name: export_mobi
92 value: 1
93 section: export
94 -
95 name: export_pdf
96 value: 1
97 section: export
98 -
99 name: export_csv
100 value: 1
101 section: export
102 -
103 name: export_json
104 value: 1
105 section: export
106 -
107 name: export_txt
108 value: 1
109 section: export
110 -
111 name: export_xml
112 value: 1
113 section: export
114 -
115 name: import_with_redis
116 value: 0
117 section: import
118 -
119 name: import_with_rabbitmq
120 value: 0
121 section: import
122 -
123 name: piwik_enabled
124 value: 0
125 section: analytics
126 -
127 name: piwik_host
128 value: v2.wallabag.org
129 section: analytics
130 -
131 name: piwik_site_id
132 value: 1
133 section: analytics
134 -
135 name: demo_mode_enabled
136 value: 0
137 section: misc
138 -
139 name: demo_mode_username
140 value: wallabag
141 section: misc
142 -
143 name: download_images_enabled
144 value: 0
145 section: misc
146 -
147 name: wallabag_support_url
148 value: https://www.wallabag.org/pages/support.html
149 section: misc
150 -
151 name: wallabag_url
152 value: http://v2.wallabag.org
153 section: misc
154 -
155 name: api_user_registration
156 value: 0
157 section: api
158
159wallabag_user:
160 registration_enabled: "%fosuser_registration%"
161
162wallabag_import:
163 allow_mimetypes: ['application/octet-stream', 'application/json', 'text/plain', 'text/csv']
164 resource_dir: "%kernel.root_dir%/../web/uploads/import"