From db3838545cef117e05c63afc1e7ebfdf8c8d3a4e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 6 Nov 2016 15:34:08 +0100 Subject: Removed Maintenance bundle --- docs/de/developer/maintenance.rst | 32 -------------------------------- docs/de/index.rst | 1 - 2 files changed, 33 deletions(-) delete mode 100644 docs/de/developer/maintenance.rst (limited to 'docs/de') diff --git a/docs/de/developer/maintenance.rst b/docs/de/developer/maintenance.rst deleted file mode 100644 index 31343876..00000000 --- a/docs/de/developer/maintenance.rst +++ /dev/null @@ -1,32 +0,0 @@ -Wartungsmodus -============= - -Wenn du längere Aufgaben auf deiner wallabag Instanz ausführen willst, kannst du den Wartungsmodus aktivieren. -Keiner wird dann Zugang zu deiner Instanz haben. - -Aktivieren des Wartungsmodus ----------------------------- - -Um den Wartungsmodus zu aktivieren, führe folgendes Kommando aus: - -:: - - bin/console lexik:maintenance:lock -e=prod --no-interaction - -Du kannst deine IP Adresse in ``app/config/config.yml`` setzen, wenn du Zugriff zu wallabag haben willst, auch wenn der Wartungsmodus aktiv ist. Zum Beispiel: - -:: - - lexik_maintenance: - authorized: - ips: ['127.0.0.1'] - - -Deaktivieren des Wartungsmodus ------------------------- - -Um den Wartungsmodus zu deaktivieren, führe dieses Kommando aus: - -:: - - bin/console lexik:maintenance:unlock -e=prod diff --git a/docs/de/index.rst b/docs/de/index.rst index b422bf83..8f5b1361 100644 --- a/docs/de/index.rst +++ b/docs/de/index.rst @@ -57,6 +57,5 @@ Die Dokumentation ist in anderen Sprachen verfügbar : developer/docker developer/documentation developer/translate - developer/maintenance developer/redis developer/rabbitmq -- cgit v1.2.3 From 2e4efb596544fa9c2071653af16d3a87bb3eaacc Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 6 Nov 2016 23:27:55 +0100 Subject: Add english doc into german one --- docs/de/user/import.rst | 49 ++++++++++++++++++++++++++++++++++++++++++++----- 1 file changed, 44 insertions(+), 5 deletions(-) (limited to 'docs/de') diff --git a/docs/de/user/import.rst b/docs/de/user/import.rst index ecd3134b..04a4360c 100644 --- a/docs/de/user/import.rst +++ b/docs/de/user/import.rst @@ -30,15 +30,54 @@ Du musst wallabag erlauben, mit deinem Pocketaccount zu interagieren. Deine Daten werden importiert. Datenimport kann ein sehr anspruchsvoller Prozess für deinen Server sein (wir müssen daran arbeiten, um diesen Import zu verbessern). -Von Instapaper --------------- +From Readability +---------------- -*Funktion noch nicht implementiert in wallabag v2.* +Export your Readability data +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +On the tools (`https://www.readability.com/tools/ `_) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact). + +Import your data into wallabag 2.x +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Click on ``Import`` link in the menu, on ``Import contents`` in Readability section +and then select your json file and upload it. + +Your data will be imported. Data import can be a demanding process for your server. + +From Pinboard +------------- + +Export your Pinboard data +~~~~~~~~~~~~~~~~~~~~~~~~~ + +On the backup (`https://pinboard.in/settings/backup `_) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like ``pinboard_export``). + +Import your data into wallabag 2.x +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Von Readability +Click on ``Import`` link in the menu, on ``Import contents`` in Pinboard section +and then select your json file and upload it. + +Your data will be imported. Data import can be a demanding process for your server. + +From Instapaper --------------- -*Funktion noch nicht implementiert in wallabag v2.* +Export your Instapaper data +~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +On the settings (`https://www.instapaper.com/user `_) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like ``instapaper-export.csv``). + +Import your data into wallabag 2.x +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Click on ``Import`` link in the menu, on ``Import contents`` in Instapaper section +and then select your CSV file and upload it. + +Your data will be imported. Data import can be a demanding process for your server. + Von einer HTML oder JSON Datei ------------------------------ -- cgit v1.2.3 From 82f9a5207888e0f1abbb5dda0e5f01c3589769b6 Mon Sep 17 00:00:00 2001 From: Strubbl Date: Mon, 7 Nov 2016 21:00:57 +0100 Subject: docs: update german import.rst --- docs/de/user/import.rst | 39 ++++++++++++++++++--------------------- 1 file changed, 18 insertions(+), 21 deletions(-) (limited to 'docs/de') diff --git a/docs/de/user/import.rst b/docs/de/user/import.rst index 04a4360c..aeedb0dd 100644 --- a/docs/de/user/import.rst +++ b/docs/de/user/import.rst @@ -30,53 +30,50 @@ Du musst wallabag erlauben, mit deinem Pocketaccount zu interagieren. Deine Daten werden importiert. Datenimport kann ein sehr anspruchsvoller Prozess für deinen Server sein (wir müssen daran arbeiten, um diesen Import zu verbessern). -From Readability +Von Readability ---------------- -Export your Readability data +Exportiere deine Readability Daten ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -On the tools (`https://www.readability.com/tools/ `_) page, click on "Export your data" in the "Data Export" section. You will received an email to download a json (which does not end with .json in fact). +Auf der Seite Tools (`https://www.readability.com/tools/ `_), klicke auf "Exportiere deine Daten" in dem Abschnitt "Daten Export". Du wirst eine E-Mail empfangen, um eine JSON Datei herunterladen zu können (Datei endet aber nicht auf .json). -Import your data into wallabag 2.x +Importiere deine Daten in wallabag 2.x ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Click on ``Import`` link in the menu, on ``Import contents`` in Readability section -and then select your json file and upload it. +Klicke auf den ``Importieren`` Link im Menü, auf ``Importiere Inhalte`` in dem Readability Abschnitt und wähle dann deine JSON Datei aus und lade sie hoch. -Your data will be imported. Data import can be a demanding process for your server. +Deine Daten werden importiert. Der Datenimport can ein beanspruchender Prozess für deinen Server sein. -From Pinboard +Von Pinboard ------------- -Export your Pinboard data +Exportiere deine Pinboard Daten ~~~~~~~~~~~~~~~~~~~~~~~~~ -On the backup (`https://pinboard.in/settings/backup `_) page, click on "JSON" in the "Bookmarks" section. A JSON file will be downloaded (like ``pinboard_export``). +Auf der Seite Backup (`https://pinboard.in/settings/backup `_), klicke auf "JSON" in dem Abschnitt "Lesezeichen". Eine JSON Datei wird heruntergeladen (z.B. ``pinboard_export``). -Import your data into wallabag 2.x +Importiere deine Daten in wallabag 2.x ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Click on ``Import`` link in the menu, on ``Import contents`` in Pinboard section -and then select your json file and upload it. +Klicke auf den ``Importieren`` Link im Menü, auf ``Importiere Inhalte`` in dem Pinboard Abschnitt und wähle dann deine JSON Datei aus und lade sie hoch. -Your data will be imported. Data import can be a demanding process for your server. +Deine Daten werden importiert. Der Datenimport can ein beanspruchender Prozess für deinen Server sein. -From Instapaper +Von Instapaper --------------- -Export your Instapaper data +Exportiere deine Instapaper Daten ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -On the settings (`https://www.instapaper.com/user `_) page, click on "Download .CSV file" in the "Export" section. A CSV file will be downloaded (like ``instapaper-export.csv``). +Auf der Seite Einstellungen (`https://www.instapaper.com/user `_), klicke auf "Download .CSV Datei" in dem Abschnitt "Export". Eine CSV Datei wird heruntergeladen (z.B. ``instapaper-export.csv``). -Import your data into wallabag 2.x +Importiere deine Daten in wallabag 2.x ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Click on ``Import`` link in the menu, on ``Import contents`` in Instapaper section -and then select your CSV file and upload it. +Klicke auf den ``Importieren`` Link im Menü, auf ``Importiere Inhalte`` in dem Instapaper Abschnitt und wähle dann deine JSON Datei aus und lade sie hoch. -Your data will be imported. Data import can be a demanding process for your server. +Deine Daten werden importiert. Der Datenimport can ein beanspruchender Prozess für deinen Server sein. Von einer HTML oder JSON Datei -- cgit v1.2.3 From a42f38d9fb7906b785285fab2a09f8c2b9efe996 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Sun, 6 Nov 2016 12:02:39 +0100 Subject: Added a configuration to define the redirection after archiving an entry Fix #496 --- docs/de/user/configuration.rst | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'docs/de') diff --git a/docs/de/user/configuration.rst b/docs/de/user/configuration.rst index 0b0793b1..7596a1d3 100644 --- a/docs/de/user/configuration.rst +++ b/docs/de/user/configuration.rst @@ -28,6 +28,15 @@ Lesegeschwindigkeit wallabag berechnet die Lesezeit für jeden Artikel. Du kannst hier definieren, dank dieser Liste, ob du ein schneller oder langsamer Leser bist. wallabag wird die Lesezeit für jeden Artikel neu berechnen. +Where do you want to be redirected after mark an article as read? +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Each time you'll do some actions (after marking an article as read/favorite, +after deleting an article, after removing a tag from an entry), you can be redirected: + +- To the homepage +- To the current page + Sprache ~~~~~~~ -- cgit v1.2.3 From 5d52cc411bdccab59b3b53d96ccf8ece8afbdb2b Mon Sep 17 00:00:00 2001 From: Strubbl Date: Sun, 6 Nov 2016 20:40:19 +0100 Subject: update German configuration.rst --- docs/de/user/configuration.rst | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) (limited to 'docs/de') diff --git a/docs/de/user/configuration.rst b/docs/de/user/configuration.rst index 7596a1d3..075a5290 100644 --- a/docs/de/user/configuration.rst +++ b/docs/de/user/configuration.rst @@ -28,14 +28,13 @@ Lesegeschwindigkeit wallabag berechnet die Lesezeit für jeden Artikel. Du kannst hier definieren, dank dieser Liste, ob du ein schneller oder langsamer Leser bist. wallabag wird die Lesezeit für jeden Artikel neu berechnen. -Where do you want to be redirected after mark an article as read? +Wohin möchtest du weitergeleitet werden, nach dem ein Artikel als gelesen markiert wurde? ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Each time you'll do some actions (after marking an article as read/favorite, -after deleting an article, after removing a tag from an entry), you can be redirected: +Jedes Mal, wenn du eine Aktion ausführst (nach dem Markieren eines Artikels als gelesen oder Favorit, nach dem Löschen eines Artikels oder dem Entfernen eines Tag von einem Eintrag), kannst du weitergeleitet werden: -- To the homepage -- To the current page +- zur Homepage +- zur aktuellen Seite Sprache ~~~~~~~ -- cgit v1.2.3 From 10b3509757c704943aa9cdd69c1d02bedfa937a3 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 18 Nov 2016 15:09:21 +0100 Subject: Added http_status in Entry entity --- docs/de/user/filters.rst | 5 +++++ 1 file changed, 5 insertions(+) (limited to 'docs/de') diff --git a/docs/de/user/filters.rst b/docs/de/user/filters.rst index c9cda6b6..94b82b24 100644 --- a/docs/de/user/filters.rst +++ b/docs/de/user/filters.rst @@ -30,6 +30,11 @@ Sprache wallabag (via graby) kann die Artikelsprache erkennen. Es ist einfach für dich, Artikel in einer bestimmten Sprache zu filtern. +HTTP status +----------- + +You can retrieve the articles by filtering by their HTTP status code: 200, 404, 500, etc. + Lesezeit -------- -- cgit v1.2.3 From 27dce581caba158a8ffffa5bc30648a21f47da12 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sat, 19 Nov 2016 15:34:20 +0100 Subject: Messed up DE import translation --- docs/de/user/import.rst | 35 +---------------------------------- 1 file changed, 1 insertion(+), 34 deletions(-) (limited to 'docs/de') diff --git a/docs/de/user/import.rst b/docs/de/user/import.rst index e657e336..399a1b98 100644 --- a/docs/de/user/import.rst +++ b/docs/de/user/import.rst @@ -42,7 +42,6 @@ Du musst wallabag erlauben, mit deinem Pocketaccount zu interagieren. Deine Daten werden importiert. Datenimport kann ein sehr anspruchsvoller Prozess für deinen Server sein (wir müssen daran arbeiten, um diesen Import zu verbessern). -<<<<<<< HEAD Von Readability ---------------- @@ -88,37 +87,6 @@ Klicke auf den ``Importieren`` Link im Menü, auf ``Importiere Inhalte`` in dem Deine Daten werden importiert. Der Datenimport can ein beanspruchender Prozess für deinen Server sein. -======= -Readability ------------ - -Exportiere deine Readability-Daten -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Auf der Tools-Seite (`https://www.readability.com/tools/ `_), klicke auf "Daten exportieren" im "Daten-Export"-Abschnitt. Du wirst eine E-Mail mit einem Downloadlink zu einer JSON-Datei erhalten, welche zugegebenermaßen nicht mit .json endet. - -Importiere deine Daten in wallabag 2.x -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Klicke auf den ``Importieren``-Link im Menü, auf ``Inhalte importieren`` im Readability-Abschnitt und wähle dann deine JSON-Datei aus und lade sie hoch. - -Deine Daten werden dann importiert. Dies kann eine starke Belastung für den Server sein. - -Instapaper ----------- - -Exportiere deine Instapaper-Daten -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Klicke in den Einstellungen (`https://www.instapaper.com/user `_) auf "CSV-Datei herunterladen" im Export-Abschnitt. Eine CSV-Datei mit dem Namen ``instapaper-export.csv`` wird heruntergeladen. - -Importiere deine Daten in wallabag 2.x -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Klicke auf den ``Importieren``-Link im Menü, auf ``Inhalte importieren`` im Instapaper-Abschnitt und wähle dann deine CSV-Datei aus und lade sie hoch. - -Deine Daten werden dann importiert. Dies kann eine starke Belastung für den Server sein. - wallabag 1.x ------------ @@ -175,11 +143,10 @@ Wenn du alle Artikel als gelesen markieren möchtest, kannst du die ``--markAsRe Um eine wallabag 2.x-Datei zu importieren, musst du die Option ``--importer=v2`` hinzufügen. Als Ergebnis wirst du so etwas erhalten: ->>>>>>> origin/master :: Start : 05-04-2016 11:36:07 --- 403 imported 0 already saved - End : 05-04-2016 11:36:09 --- \ No newline at end of file + End : 05-04-2016 11:36:09 --- -- cgit v1.2.3 From 16eb124e4ae238db4bffb30556f1245cf6ff97ca Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 20 Nov 2016 09:46:03 +0100 Subject: Add documentation about RSS paging --- docs/de/user/configuration.rst | 3 +++ 1 file changed, 3 insertions(+) (limited to 'docs/de') diff --git a/docs/de/user/configuration.rst b/docs/de/user/configuration.rst index c0a8cd67..47c60f4c 100644 --- a/docs/de/user/configuration.rst +++ b/docs/de/user/configuration.rst @@ -52,6 +52,9 @@ Jetzt hast du drei Links, einen für jeden Status: Füge sie in deinem liebsten Du kannst auch definieren wie viele Artikel du in deinem RSS Feed (Standardwert: 50) haben willst. +There is also a pagination available for these feeds. You can add ``?page=2`` to jump to the second page. +The pagination follow `the RFC `_ about that, which means you'll find the ``next``, ``previous`` & ``last`` page link inside the `` tag of each RSS feed. + Benutzer-Informationen ---------------------- -- cgit v1.2.3 From 7c05d59153cb89d5a714f1c8dfb8862d9c4f89d1 Mon Sep 17 00:00:00 2001 From: mathieui Date: Sun, 20 Nov 2016 14:51:14 +0100 Subject: Change documentation links to HTTPS Even though all the websites used in the commands redirect http to https, a man in the middle can happen with the initial request, leading to arbitrary code execution. --- docs/de/user/installation.rst | 4 ++-- docs/de/user/upgrade.rst | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) (limited to 'docs/de') diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst index 131aa1f8..cec62d18 100644 --- a/docs/de/user/installation.rst +++ b/docs/de/user/installation.rst @@ -16,7 +16,7 @@ Composer installieren: :: - curl -s http://getcomposer.org/installer | php + curl -s https://getcomposer.org/installer | php Du kannst eine spezifische Anleitung `hier `__ finden. @@ -86,7 +86,7 @@ Führe dieses Kommando aus, um das neueste Paket herunterzuladen und zu entpacke .. code-block:: bash - wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package + wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package Du findest die `md5 Hashsumme des neuesten Pakets auf unserer Website `_. diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst index ad020dd8..fbbf29f4 100644 --- a/docs/de/user/upgrade.rst +++ b/docs/de/user/upgrade.rst @@ -36,7 +36,7 @@ Lade das 2.1.1-Release von wallabag herunter: .. code-block:: bash - wget http://framabag.org/wallabag-release-2.1.1.tar.gz && tar xvf wallabag-release-2.1.1.tar.gz + wget https://framabag.org/wallabag-release-2.1.1.tar.gz && tar xvf wallabag-release-2.1.1.tar.gz (md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``) @@ -81,7 +81,7 @@ Lade das letzte Release von wallabag herunter: .. code-block:: bash - wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package + wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package Du findest den `aktuellen MD5-Hash auf unserer Webseite `_. -- cgit v1.2.3 From c1683778abb662ee4fcca2fca204bb00c92b8f13 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 20 Nov 2016 20:23:30 +0100 Subject: Add ability to use Redis with password --- docs/de/user/parameters.rst | 2 ++ 1 file changed, 2 insertions(+) (limited to 'docs/de') diff --git a/docs/de/user/parameters.rst b/docs/de/user/parameters.rst index a5a4e4f2..661d9121 100644 --- a/docs/de/user/parameters.rst +++ b/docs/de/user/parameters.rst @@ -39,6 +39,7 @@ Wenn du nicht weißt, welchen Wert du setzen sollst, belasse es bei dem Standard redis_host: localhost redis_port: 6379 redis_path: null + redis_password: null Bedeutung von jedem Parameter ----------------------------- @@ -91,3 +92,4 @@ Bedeutung von jedem Parameter "redis_host", "localhost", "IP oder Hostname des Zielservers (ignoriert bei Unix Schema)" "redis_port", "6379", "TCP/IP Port des Zielservers (ignoriert bei Unix Schema)" "redis_path", "null", "Pfad zur Unix Domain Socket Datei, wenn Redis Unix Domain Sockets nutzt" + "redis_password", "null", "Password defined in the Redis server configuration (parameter `requirepass` in `redis.conf`)" -- cgit v1.2.3 From 59c42a4aad20f691fb7f2b615eb71981b3d2e0b5 Mon Sep 17 00:00:00 2001 From: Julian Oster Date: Sun, 20 Nov 2016 20:42:44 +0100 Subject: Add german translation --- docs/de/user/parameters.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/de') diff --git a/docs/de/user/parameters.rst b/docs/de/user/parameters.rst index 661d9121..8d8f9206 100644 --- a/docs/de/user/parameters.rst +++ b/docs/de/user/parameters.rst @@ -92,4 +92,4 @@ Bedeutung von jedem Parameter "redis_host", "localhost", "IP oder Hostname des Zielservers (ignoriert bei Unix Schema)" "redis_port", "6379", "TCP/IP Port des Zielservers (ignoriert bei Unix Schema)" "redis_path", "null", "Pfad zur Unix Domain Socket Datei, wenn Redis Unix Domain Sockets nutzt" - "redis_password", "null", "Password defined in the Redis server configuration (parameter `requirepass` in `redis.conf`)" + "redis_password", "null", "Kennwort, welches in der Redis-Server-Konfiguration definiert ist (Parameter `requirepass` in `redis.conf`)" -- cgit v1.2.3 From d51093a7d964ca720793d0cfcf4af601f2de448a Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Tue, 22 Nov 2016 15:58:00 +0100 Subject: Added documentation and missing translations --- docs/de/developer/paywall.rst | 56 +++++++++++++++++++++++++++++++++++++++++++ docs/de/index.rst | 1 + 2 files changed, 57 insertions(+) create mode 100644 docs/de/developer/paywall.rst (limited to 'docs/de') diff --git a/docs/de/developer/paywall.rst b/docs/de/developer/paywall.rst new file mode 100644 index 00000000..365027b4 --- /dev/null +++ b/docs/de/developer/paywall.rst @@ -0,0 +1,56 @@ +Articles behind a paywall +========================= + +wallabag can fetch articles from websites which use a paywall system. + +Enable paywall authentication +----------------------------- + +In internal settings, in the **Article** section, enable authentication for websites with paywall (with the value 1). + +Configure credentials in wallabag +--------------------------------- + +Edit your ``app/config/parameters.yml`` file to edit credentials for each website with paywall. Here is an example for some french websites: + +.. code:: yaml + + sites_credentials: + mediapart.fr: {username: "myMediapartLogin", password: "mypassword"} + arretsurimages.net: {username: "myASILogin", password: "mypassword"} + +.. note:: + + These credentials will be shared between each user of your wallabag instance. + +Parsing configuration files +--------------------------- + +.. note:: + + Read `this part of the documentation `_ to understand the configuration files. + +Each parsing configuration file needs to be improved by adding ``requires_login``, ``login_uri``, +``login_username_field``, ``login_password_field`` and ``not_logged_in_xpath``. + +Be careful, the login form must be in the page content when wallabag loads it. It's impossible for wallabag to be authenticated +on a website where the login form is loaded after the page (by ajax for example). + +``login_uri`` is the action URL of the form (``action`` attribute in the form). +``login_username_field`` is the ``name`` attribute of the login field. +``login_password_field`` is the ``name`` attribute of the password field. + +For example: + +.. code:: + + title://div[@id="titrage-contenu"]/h1[@class="title"] + body: //div[@class="contenu-html"]/div[@class="page-pane"] + + requires_login: yes + + login_uri: http://www.arretsurimages.net/forum/login.php + login_username_field: username + login_password_field: password + + not_logged_in_xpath: //body[@class="not-logged-in"] diff --git a/docs/de/index.rst b/docs/de/index.rst index c1ce7d4b..1c3e4873 100644 --- a/docs/de/index.rst +++ b/docs/de/index.rst @@ -46,6 +46,7 @@ Die Dokumentation ist in anderen Sprachen verfügbar : developer/api developer/docker + developer/paywall developer/documentation developer/translate developer/asynchronous -- cgit v1.2.3 From 9624b3adfaa51ff1a911b63996a5336358dd1a62 Mon Sep 17 00:00:00 2001 From: Jeremy Benoist Date: Sun, 20 Nov 2016 20:06:26 +0100 Subject: =?UTF-8?q?These=20files=20aren=E2=80=99t=20used=20anymore?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Translation were moved to the global one --- docs/de/developer/translate.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/de') diff --git a/docs/de/developer/translate.rst b/docs/de/developer/translate.rst index 50e136ea..10544e31 100644 --- a/docs/de/developer/translate.rst +++ b/docs/de/developer/translate.rst @@ -20,7 +20,7 @@ der ISO 639-1 Code deiner Sprache ist (`siehe Wikipedia Date: Wed, 30 Nov 2016 22:02:08 +0100 Subject: Fixed typo in asynchronous documentation --- docs/de/developer/asynchronous.rst | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) (limited to 'docs/de') diff --git a/docs/de/developer/asynchronous.rst b/docs/de/developer/asynchronous.rst index 1d241a72..1707f321 100644 --- a/docs/de/developer/asynchronous.rst +++ b/docs/de/developer/asynchronous.rst @@ -149,10 +149,10 @@ Abhängig davon, über welchen Service du importieren möchtest, musst du den en bin/console wallabag:import:redis-worker -e=prod firefox -vv >> /path/to/wallabag/var/logs/redis-firefox.log # für den Chrome-Import - bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-chrome.log + bin/console wallabag:import:redis-worker -e=prod chrome -vv >> /path/to/wallabag/var/logs/redis-chrome.log Wenn du den Import nur für einige Artikel nutzen willst, kannst du die Nummer festlegen (hier: 12) und der Consumer wird nach dem zwölften Artikel aufhören: .. code:: bash - bin/console wallabag:import:redis-worker -e=prod pocket -vv --maxIterations=12 \ No newline at end of file + bin/console wallabag:import:redis-worker -e=prod pocket -vv --maxIterations=12 -- cgit v1.2.3 From 881b0578e782e947706124a4e1d625a3dd3ddc1c Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 15 Dec 2016 21:58:20 +0100 Subject: Moved RabbitMQ QoS to parameters --- docs/de/developer/asynchronous.rst | 1 + 1 file changed, 1 insertion(+) (limited to 'docs/de') diff --git a/docs/de/developer/asynchronous.rst b/docs/de/developer/asynchronous.rst index 1707f321..742dd3e5 100644 --- a/docs/de/developer/asynchronous.rst +++ b/docs/de/developer/asynchronous.rst @@ -47,6 +47,7 @@ Bearbeite deine ``app/config/parameters.yml``-Datei, um die RabbitMQ-Parameter z rabbitmq_port: 5672 rabbitmq_user: guest rabbitmq_password: guest + rabbitmq_prefetch_count: 10 # lesen http://www.rabbitmq.com/consumer-prefetch.html RabbitMQ in wallabag aktivieren ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -- cgit v1.2.3 From 80aee45fa865ea72034dc8712967d4e787f70043 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Thu, 24 Nov 2016 22:21:18 +0100 Subject: Added french translation --- docs/de/user/upgrade.rst | 90 ++++++++++++++++++++++++++++++------------------ 1 file changed, 57 insertions(+), 33 deletions(-) (limited to 'docs/de') diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst index fbbf29f4..51cdf055 100644 --- a/docs/de/user/upgrade.rst +++ b/docs/de/user/upgrade.rst @@ -3,42 +3,53 @@ wallabag-Installation aktualisieren Du wirst hier mehrere Wege finden, um deine wallabag zu aktualisieren: +- `von 2.1.x zu 2.2.x <#upgrade-von-2-1-x-zu-2-2-x>`_ - `von 2.0.x zu 2.1.1 <#upgrade-von-2-0-x-zu-2-1-1>`_ -- `von 2.1.x zu 2.1.y <#upgrade-von-2-1-x-zu-2-1-y>`_ - `von 1.x zu 2.x <#upgrade-von-1-x>`_ -Upgrade von 2.0.x zu 2.1.1 ---------------------------- - -.. warning:: - - Mache eine Sicherung deines Pocket-Consumer-Key, falls hinzugefügt, da dieser nach dem Upgrade erneut hinzugefügt werden muss. +Upgrade von 2.1.x zu 2.2.x +-------------------------- Upgrade auf einem dedizierten Webserver ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ :: - rm -rf var/cache/* - git fetch origin - git fetch --tags - git checkout 2.1.1 --force - SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist - php bin/console doctrine:migrations:migrate --env=prod - php bin/console cache:clear --env=prod + make update + +Explanations about database migrations +"""""""""""""""""""""""""""""""""""""" + +During the update, we execute database migrations. + +All the database migrations are stored in ``app/DoctrineMigrations``. You can execute each migration individually: +``bin/console doctrine:migrations:migrate 20161001072726 --env=prod``. + +Here is the migrations list for 2.1.x to 2.2.0 release: + +* ``20161001072726``: added foreign keys for account resetting +* ``20161022134138``: converted database to ``utf8mb4`` encoding (for MySQL only) +* ``20161024212538``: added ``user_id`` column on ``oauth2_clients`` to prevent users to delete API clients from other users +* ``20161031132655``: added the internal setting to enable/disable downloading pictures +* ``20161104073720``: added ``created_at`` index on ``entry`` table +* ``20161106113822``: added ``action_mark_as_read`` field on ``config`` table +* ``20161117071626``: added the internal setting to share articles to unmark.it +* ``20161118134328``: added ``http_status`` field on ``entry`` table +* ``20161122144743``: added the internal setting to enable/disable fetching articles with paywall +* ``20161122203647``: dropped ``expired`` and ``credentials_expired`` fields on ``user`` table Upgrade auf einem Shared Hosting ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Sichere deine ``app/config/parameters.yml``-Datei. -Lade das 2.1.1-Release von wallabag herunter: +Lade das letzte Release von wallabag herunter: .. code-block:: bash - wget https://framabag.org/wallabag-release-2.1.1.tar.gz && tar xvf wallabag-release-2.1.1.tar.gz + wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package -(md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``) +Du findest den `aktuellen MD5-Hash auf unserer Webseite `_. Extrahiere das Archiv in deinen wallabag-Ordner und ersetze die ``app/config/parameters.yml`` mit deiner. @@ -52,38 +63,39 @@ Du musst einige SQL-Abfragen durchführen, um deine Datenbank zu aktualisieren. .. code-block:: sql - ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL; - INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry'); - ALTER TABLE `wallabag_oauth2_clients` ADD name longtext COLLATE 'utf8_unicode_ci' DEFAULT NULL; - INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_redis', '0', 'import'); - INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_rabbitmq', '0', 'import'); - ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL; - DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key'; -Upgrade von 2.1.x zu 2.1.y ------------------------------ +Upgrade von 2.0.x zu 2.1.1 +--------------------------- + +.. warning:: + + Mache eine Sicherung deines Pocket-Consumer-Key, falls hinzugefügt, da dieser nach dem Upgrade erneut hinzugefügt werden muss. Upgrade auf einem dedizierten Webserver ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -Um deine wallabag-Installation auf die letzte Version zu aktualisieren, führe den folgenden Befehl in deinem wallabag-Ordner aus: - :: - make update + rm -rf var/cache/* + git fetch origin + git fetch --tags + git checkout 2.1.1 --force + SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist + php bin/console doctrine:migrations:migrate --env=prod + php bin/console cache:clear --env=prod Upgrade auf einem Shared Hosting ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ Sichere deine ``app/config/parameters.yml``-Datei. -Lade das letzte Release von wallabag herunter: +Lade das 2.1.1-Release von wallabag herunter: .. code-block:: bash - wget https://wllbg.org/latest-v2-package && tar xvf latest-v2-package + wget http://framabag.org/wallabag-release-2.1.1.tar.gz && tar xvf wallabag-release-2.1.1.tar.gz -Du findest den `aktuellen MD5-Hash auf unserer Webseite `_. +(md5 hash of the 2.1.1 package: ``9584a3b60a2b2a4de87f536548caac93``) Extrahiere das Archiv in deinen wallabag-Ordner und ersetze die ``app/config/parameters.yml`` mit deiner. @@ -93,6 +105,18 @@ Falls du SQLite nutzt, musst du außerdem deinen ``data/``-Ordner in die neue In Leere den ``var/cache``-Ordner. +Du musst einige SQL-Abfragen durchführen, um deine Datenbank zu aktualisieren. Wir gehen in diesem Fall davon aus, dass das Tabellenpräfix ``wallabag_`` ist und eine MySQL-Datenbank verwendet wird: + +.. code-block:: sql + + ALTER TABLE `wallabag_entry` ADD `uuid` LONGTEXT DEFAULT NULL; + INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('share_public', '1', 'entry'); + ALTER TABLE `wallabag_oauth2_clients` ADD name longtext COLLATE 'utf8_unicode_ci' DEFAULT NULL; + INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_redis', '0', 'import'); + INSERT INTO `wallabag_craue_config_setting` (`name`, `value`, `section`) VALUES ('import_with_rabbitmq', '0', 'import'); + ALTER TABLE `wallabag_config` ADD `pocket_consumer_key` VARCHAR(255) DEFAULT NULL; + DELETE FROM `wallabag_craue_config_setting` WHERE `name` = 'pocket_consumer_key'; + Upgrade von 1.x --------------- @@ -100,4 +124,4 @@ Es gibt kein automatisiertes Skript, um wallabag 1.x auf wallabag 2.x zu aktuali - deine Daten exportieren - wallabag 2.x installieren (Dokumentation `_ ) -- die Daten in die neue Installation importieren (`Dokumentation `_ ) \ No newline at end of file +- die Daten in die neue Installation importieren (`Dokumentation `_ ) -- cgit v1.2.3 From 500ae20c9475a7e7718e4cf7d8c8b116a48a5e78 Mon Sep 17 00:00:00 2001 From: Julian Oster Date: Thu, 24 Nov 2016 22:52:01 +0100 Subject: Add translation for :de: --- docs/de/user/upgrade.rst | 32 ++++++++++++++++---------------- 1 file changed, 16 insertions(+), 16 deletions(-) (limited to 'docs/de') diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst index 51cdf055..c2256347 100644 --- a/docs/de/user/upgrade.rst +++ b/docs/de/user/upgrade.rst @@ -17,26 +17,26 @@ Upgrade auf einem dedizierten Webserver make update -Explanations about database migrations -"""""""""""""""""""""""""""""""""""""" +Erklärungen über die Datenbankmigration +""""""""""""""""""""""""""""""""""""""" -During the update, we execute database migrations. +Während des Updates migrieren wir die Datenbank. -All the database migrations are stored in ``app/DoctrineMigrations``. You can execute each migration individually: +Alle Datenbankmigrationen sind im Verzeichnis ``app/DoctrineMigrations`` gespeichert. Jede von ihnen kann einzeln ausgeführt werden: ``bin/console doctrine:migrations:migrate 20161001072726 --env=prod``. -Here is the migrations list for 2.1.x to 2.2.0 release: - -* ``20161001072726``: added foreign keys for account resetting -* ``20161022134138``: converted database to ``utf8mb4`` encoding (for MySQL only) -* ``20161024212538``: added ``user_id`` column on ``oauth2_clients`` to prevent users to delete API clients from other users -* ``20161031132655``: added the internal setting to enable/disable downloading pictures -* ``20161104073720``: added ``created_at`` index on ``entry`` table -* ``20161106113822``: added ``action_mark_as_read`` field on ``config`` table -* ``20161117071626``: added the internal setting to share articles to unmark.it -* ``20161118134328``: added ``http_status`` field on ``entry`` table -* ``20161122144743``: added the internal setting to enable/disable fetching articles with paywall -* ``20161122203647``: dropped ``expired`` and ``credentials_expired`` fields on ``user`` table +Dies ist die Migrationsliste von 2.1.x auf 2.2.0: + +* ``20161001072726``: Fremdschlüssel für das Zurücksetzen des Kontos hinzugefügt +* ``20161022134138``: Datenbank zum ``utf8mb4``-Encoding ändern (nur für MySQL) +* ``20161024212538``: ``user_id``-Spalte zu ``oauth2_clients`` hinzugefügt, um Benutzer davon abzuhalten, API-Clients anderer Nutzer zu löschen +* ``20161031132655``: Interne Einstellung für das (de-)aktivieren vom Bilder-Download hinzugefügt +* ``20161104073720``: ``created_at``-Index zur ``entry``-Tabelle hinzugefügt +* ``20161106113822``: ``action_mark_as_read``-Feld zur ``config``-Tabelle hinzugefügt +* ``20161117071626``: Interne Einstellung zum Teilen mit unmark.it hinzugefügt +* ``20161118134328``: ``http_status``-Feld zur ``entry``-Tabelle hinzugefügt +* ``20161122144743``: Interne Einstellung für das (de-)aktivieren zum Holen von Artikeln mit einer Paywall hinzugefügt +* ``20161122203647``: ``expired``- und ``credentials_expired``-Feld aus der ``user``-Tabelle entfernt Upgrade auf einem Shared Hosting ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ -- cgit v1.2.3 From b87f1712336564ec14e37487f512568bc4d986f7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Fri, 13 Jan 2017 14:51:37 +0100 Subject: Added information about latest migrations --- docs/de/user/upgrade.rst | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'docs/de') diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst index c2256347..6557e2a5 100644 --- a/docs/de/user/upgrade.rst +++ b/docs/de/user/upgrade.rst @@ -23,7 +23,7 @@ Erklärungen über die Datenbankmigration Während des Updates migrieren wir die Datenbank. Alle Datenbankmigrationen sind im Verzeichnis ``app/DoctrineMigrations`` gespeichert. Jede von ihnen kann einzeln ausgeführt werden: -``bin/console doctrine:migrations:migrate 20161001072726 --env=prod``. +``bin/console doctrine:migrations:execute 20161001072726 --env=prod``. Dies ist die Migrationsliste von 2.1.x auf 2.2.0: -- cgit v1.2.3 From 5d916d03afaec6fbe32d2a95624628096325744e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Nicolas=20L=C5=93uillet?= Date: Wed, 25 Jan 2017 12:34:20 +0100 Subject: Moved queries in a separate file --- docs/de/user/query-upgrade-21-22.rst | 797 +++++++++++++++++++++++++++++++++++ docs/de/user/upgrade.rst | 5 +- 2 files changed, 799 insertions(+), 3 deletions(-) create mode 100644 docs/de/user/query-upgrade-21-22.rst (limited to 'docs/de') diff --git a/docs/de/user/query-upgrade-21-22.rst b/docs/de/user/query-upgrade-21-22.rst new file mode 100644 index 00000000..cd201dc2 --- /dev/null +++ b/docs/de/user/query-upgrade-21-22.rst @@ -0,0 +1,797 @@ +Migration 20161001072726 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry_tag DROP FOREIGN KEY FK_C9F0DD7CBA364942 + ALTER TABLE wallabag_entry_tag DROP FOREIGN KEY FK_C9F0DD7CBAD26311 + ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE + ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_tag FOREIGN KEY (tag_id) REFERENCES wallabag_tag (id) ON DELETE CASCADE + ALTER TABLE wallabag_annotation DROP FOREIGN KEY FK_A7AED006BA364942 + ALTER TABLE wallabag_annotation ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE + +Migration down +"""""""""""""" + +We didn't write down migration for ``20161001072726``. + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry_tag DROP CONSTRAINT fk_c9f0dd7cba364942 + ALTER TABLE wallabag_entry_tag DROP CONSTRAINT fk_c9f0dd7cbad26311 + ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE + ALTER TABLE wallabag_entry_tag ADD CONSTRAINT FK_entry_tag_tag FOREIGN KEY (tag_id) REFERENCES wallabag_tag (id) ON DELETE CASCADE + ALTER TABLE wallabag_annotation DROP CONSTRAINT fk_a7aed006ba364942 + ALTER TABLE wallabag_annotation ADD CONSTRAINT FK_annotation_entry FOREIGN KEY (entry_id) REFERENCES wallabag_entry (id) ON DELETE CASCADE + +Migration down +"""""""""""""" + +We didn't write down migration for ``20161001072726``. + +SQLite +^^^^^^ + +This migration can only be executed safely on MySQL or PostgreSQL. + +Migration 20161022134138 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER DATABASE wallabag CHARACTER SET = utf8mb4 COLLATE = utf8mb4_unicode_ci; + ALTER TABLE wallabag_user CHANGE confirmation_token confirmation_token VARCHAR(180) DEFAULT NULL; + ALTER TABLE wallabag_user CHANGE salt salt VARCHAR(180) NOT NULL; + ALTER TABLE wallabag_user CHANGE password password VARCHAR(180) NOT NULL; + ALTER TABLE wallabag_annotation CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + ALTER TABLE wallabag_entry CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + ALTER TABLE wallabag_tag CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + ALTER TABLE wallabag_user CONVERT TO CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + ALTER TABLE wallabag_annotation CHANGE `text` `text` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + ALTER TABLE wallabag_annotation CHANGE `quote` `quote` VARCHAR(191) CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + ALTER TABLE wallabag_entry CHANGE `title` `title` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + ALTER TABLE wallabag_entry CHANGE `content` `content` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + ALTER TABLE wallabag_tag CHANGE `label` `label` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + ALTER TABLE wallabag_user CHANGE `name` `name` longtext CHARACTER SET utf8mb4 COLLATE utf8mb4_unicode_ci; + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER DATABASE wallabag CHARACTER SET = utf8 COLLATE = utf8_unicode_ci; + ALTER TABLE wallabag_annotation CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci; + ALTER TABLE wallabag_entry CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci; + ALTER TABLE wallabag_tag CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci; + ALTER TABLE wallabag_user CONVERT TO CHARACTER SET utf8 COLLATE utf8_unicode_ci; + ALTER TABLE wallabag_annotation CHANGE `text` `text` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci; + ALTER TABLE wallabag_annotation CHANGE `quote` `quote` VARCHAR(255) CHARACTER SET utf8 COLLATE utf8_unicode_ci; + ALTER TABLE wallabag_entry CHANGE `title` `title` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci; + ALTER TABLE wallabag_entry CHANGE `content` `content` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci; + ALTER TABLE wallabag_tag CHANGE `label` `label` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci; + ALTER TABLE wallabag_user CHANGE `name` `name` longtext CHARACTER SET utf8 COLLATE utf8_unicode_ci; + +PostgreSQL and SQLite +^^^^^^^^^^^^^^^^^^^^^ + +This migration only apply to MySQL. + +Migration 20161024212538 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_oauth2_clients ADD user_id INT NOT NULL + ALTER TABLE wallabag_oauth2_clients ADD CONSTRAINT IDX_user_oauth_client FOREIGN KEY (user_id) REFERENCES wallabag_user (id) ON DELETE CASCADE + CREATE INDEX IDX_635D765EA76ED395 ON wallabag_oauth2_clients (user_id) + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_oauth2_clients DROP FOREIGN KEY IDX_user_oauth_client + ALTER TABLE wallabag_oauth2_clients DROP user_id + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_oauth2_clients ADD user_id INT DEFAULT NULL + ALTER TABLE wallabag_oauth2_clients ADD CONSTRAINT IDX_user_oauth_client FOREIGN KEY (user_id) REFERENCES wallabag_user (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE + CREATE INDEX IDX_635D765EA76ED395 ON wallabag_oauth2_clients (user_id) + + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_oauth2_clients DROP CONSTRAINT idx_user_oauth_client + ALTER TABLE wallabag_oauth2_clients DROP user_id + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + CREATE TEMPORARY TABLE __temp__wallabag_oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM wallabag_oauth2_clients + DROP TABLE wallabag_oauth2_clients + CREATE TABLE wallabag_oauth2_clients (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, random_id VARCHAR(255) NOT NULL COLLATE BINARY, redirect_uris CLOB NOT NULL COLLATE BINARY, secret VARCHAR(255) NOT NULL COLLATE BINARY, allowed_grant_types CLOB NOT NULL COLLATE BINARY, name CLOB DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id), CONSTRAINT IDX_user_oauth_client FOREIGN KEY (user_id) REFERENCES wallabag_user (id) ON DELETE CASCADE NOT DEFERRABLE INITIALLY IMMEDIATE) + INSERT INTO wallabag_oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types, name) SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM __temp__wallabag_oauth2_clients + DROP TABLE __temp__wallabag_oauth2_clients + CREATE INDEX IDX_635D765EA76ED395 ON wallabag_oauth2_clients (user_id) + +Migration down +"""""""""""""" + +.. code-block:: sql + + DROP INDEX IDX_635D765EA76ED395 + CREATE TEMPORARY TABLE __temp__wallabag_oauth2_clients AS SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM wallabag_oauth2_clients + DROP TABLE wallabag_oauth2_clients + CREATE TABLE wallabag_oauth2_clients (id INTEGER NOT NULL, random_id VARCHAR(255) NOT NULL COLLATE BINARY, redirect_uris CLOB NOT NULL COLLATE BINARY, secret VARCHAR(255) NOT NULL COLLATE BINARY, allowed_grant_types CLOB NOT NULL COLLATE BINARY, name CLOB DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id)) + INSERT INTO wallabag_oauth2_clients (id, random_id, redirect_uris, secret, allowed_grant_types, name) SELECT id, random_id, redirect_uris, secret, allowed_grant_types, name FROM __temp__wallabag_oauth2_clients + DROP TABLE __temp__wallabag_oauth2_clients + +Migration 20161031132655 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('download_images_enabled', 0, 'misc') + +Migration down +"""""""""""""" + +.. code-block:: sql + + DELETE FROM wallabag_craue_config_setting WHERE name = 'download_images_enabled'; + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('download_images_enabled', 0, 'misc') + +Migration down +"""""""""""""" + +.. code-block:: sql + + DELETE FROM wallabag_craue_config_setting WHERE name = 'download_images_enabled'; + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('download_images_enabled', 0, 'misc') + +Migration down +"""""""""""""" + +.. code-block:: sql + + DELETE FROM wallabag_craue_config_setting WHERE name = 'download_images_enabled'; + +Migration 20161104073720 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + CREATE INDEX IDX_entry_created_at ON wallabag_entry (created_at) + +Migration down +"""""""""""""" + +.. code-block:: sql + + DROP INDEX IDX_entry_created_at ON wallabag_entry + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + CREATE INDEX IDX_entry_created_at ON wallabag_entry (created_at) + +Migration down +"""""""""""""" + +.. code-block:: sql + + DROP INDEX idx_entry_created_at + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + DROP INDEX created_at_idx + DROP INDEX IDX_F4D18282A76ED395 + CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry + DROP TABLE wallabag_entry + CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uuid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id)) + INSERT INTO wallabag_entry (id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry + DROP TABLE __temp__wallabag_entry + CREATE INDEX created_at_idx ON wallabag_entry (created_at) + CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id) + CREATE INDEX IDX_entry_created_at ON wallabag_entry (created_at) + +Migration down +"""""""""""""" + +.. code-block:: sql + + DROP INDEX IDX_entry_created_at + DROP INDEX IDX_F4D18282A76ED395 + DROP INDEX created_at_idx + CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry + DROP TABLE wallabag_entry + CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uuid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id)) + INSERT INTO wallabag_entry (id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry + DROP TABLE __temp__wallabag_entry + CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id) + CREATE INDEX created_at_idx ON wallabag_entry (created_at) + +Migration 20161106113822 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_config ADD action_mark_as_read INT DEFAULT 0 + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_config DROP action_mark_as_read + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_config ADD action_mark_as_read INT DEFAULT 0 + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_config DROP action_mark_as_read + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_config ADD COLUMN action_mark_as_read INTEGER DEFAULT 0 + +Migration down +"""""""""""""" + +.. code-block:: sql + + DROP INDEX UNIQ_87E64C53A76ED395 + CREATE TEMPORARY TABLE __temp__wallabag_config AS SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM wallabag_config + DROP TABLE wallabag_config + CREATE TABLE wallabag_config (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL COLLATE BINARY, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL COLLATE BINARY, rss_token VARCHAR(255) DEFAULT NULL COLLATE BINARY, rss_limit INTEGER DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, pocket_consumer_key VARCHAR(255) DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id)) + INSERT INTO wallabag_config (id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key) SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM __temp__wallabag_config + DROP TABLE __temp__wallabag_config + CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON wallabag_config (user_id) + +Migration 20161117071626 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('share_unmark', 0, 'entry') + INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry') + +Migration down +"""""""""""""" + +.. code-block:: sql + + DELETE FROM wallabag_craue_config_setting WHERE name = 'share_unmark'; + DELETE FROM wallabag_craue_config_setting WHERE name = 'unmark_url'; + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('share_unmark', 0, 'entry') + INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry') + +Migration down +"""""""""""""" + +.. code-block:: sql + + DELETE FROM wallabag_craue_config_setting WHERE name = 'share_unmark'; + DELETE FROM wallabag_craue_config_setting WHERE name = 'unmark_url'; + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('share_unmark', 0, 'entry') + INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('unmark_url', 'https://unmark.it', 'entry') + +Migration down +"""""""""""""" + +.. code-block:: sql + + DELETE FROM wallabag_craue_config_setting WHERE name = 'share_unmark'; + DELETE FROM wallabag_craue_config_setting WHERE name = 'unmark_url'; + +Migration 20161118134328 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry ADD http_status VARCHAR(3) DEFAULT NULL + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry DROP http_status + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry ADD http_status VARCHAR(3) DEFAULT NULL + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry DROP http_status + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_entry ADD COLUMN http_status VARCHAR(3) DEFAULT NULL + +Migration down +"""""""""""""" + +.. code-block:: sql + + DROP INDEX created_at_idx + DROP INDEX IDX_F4D18282A76ED395 + CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry + DROP TABLE wallabag_entry + CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uuid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id)) + INSERT INTO wallabag_entry (id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uuid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry + DROP TABLE __temp__wallabag_entry + CREATE INDEX created_at_idx ON wallabag_entry (created_at) + CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id) + +Migration 20161122144743 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('restricted_access', 0, 'entry') + +Migration down +"""""""""""""" + +.. code-block:: sql + + DELETE FROM wallabag_craue_config_setting WHERE name = 'restricted_access'; + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('restricted_access', 0, 'entry') + +Migration down +"""""""""""""" + +.. code-block:: sql + + DELETE FROM wallabag_craue_config_setting WHERE name = 'restricted_access'; + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + INSERT INTO wallabag_craue_config_setting (name, value, section) VALUES ('restricted_access', 0, 'entry') + +Migration down +"""""""""""""" + +.. code-block:: sql + + DELETE FROM wallabag_craue_config_setting WHERE name = 'restricted_access'; + +Migration 20161122203647 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_user DROP expired, DROP credentials_expired + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_user ADD expired SMALLINT DEFAULT NULL, ADD credentials_expired SMALLINT DEFAULT NULL + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_user DROP expired + ALTER TABLE wallabag_user DROP credentials_expired + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_user ADD expired SMALLINT DEFAULT NULL + ALTER TABLE wallabag_user ADD credentials_expired SMALLINT DEFAULT NULL + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + DROP INDEX UNIQ_1D63E7E5C05FB297 + DROP INDEX UNIQ_1D63E7E5A0D96FBF + DROP INDEX UNIQ_1D63E7E592FC23A8 + CREATE TEMPORARY TABLE __temp__wallabag_user AS SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, locked, expires_at, confirmation_token, password_requested_at, roles, credentials_expire_at, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted FROM wallabag_user + DROP TABLE wallabag_user + CREATE TABLE wallabag_user (id INTEGER NOT NULL, username VARCHAR(180) NOT NULL COLLATE BINARY, username_canonical VARCHAR(180) NOT NULL COLLATE BINARY, email VARCHAR(180) NOT NULL COLLATE BINARY, email_canonical VARCHAR(180) NOT NULL COLLATE BINARY, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL COLLATE BINARY, password VARCHAR(255) NOT NULL COLLATE BINARY, last_login DATETIME DEFAULT NULL, locked BOOLEAN NOT NULL, expires_at DATETIME DEFAULT NULL, confirmation_token VARCHAR(180) DEFAULT NULL COLLATE BINARY, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL COLLATE BINARY, credentials_expire_at DATETIME DEFAULT NULL, name CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted CLOB DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id)) + INSERT INTO wallabag_user (id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, locked, expires_at, confirmation_token, password_requested_at, roles, credentials_expire_at, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted) SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, locked, expires_at, confirmation_token, password_requested_at, roles, credentials_expire_at, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted FROM __temp__wallabag_user + DROP TABLE __temp__wallabag_user + CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON wallabag_user (confirmation_token) + CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON wallabag_user (email_canonical) + CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON wallabag_user (username_canonical) + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_user ADD COLUMN expired SMALLINT DEFAULT NULL + ALTER TABLE wallabag_user ADD COLUMN credentials_expired SMALLINT DEFAULT NULL + +Migration 20161128084725 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_config ADD list_mode INT DEFAULT NULL + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_config DROP list_mode + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_config ADD list_mode INT DEFAULT NULL + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_config DROP list_mode + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_config ADD COLUMN list_mode INTEGER DEFAULT NULL + +Migration down +"""""""""""""" + +.. code-block:: sql + + DROP INDEX UNIQ_87E64C53A76ED395 + CREATE TEMPORARY TABLE __temp__wallabag_config AS SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM wallabag_config + DROP TABLE wallabag_config + CREATE TABLE wallabag_config (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, theme VARCHAR(255) NOT NULL COLLATE BINARY, items_per_page INTEGER NOT NULL, language VARCHAR(255) NOT NULL COLLATE BINARY, rss_token VARCHAR(255) DEFAULT NULL COLLATE BINARY, rss_limit INTEGER DEFAULT NULL, reading_speed DOUBLE PRECISION DEFAULT NULL, pocket_consumer_key VARCHAR(255) DEFAULT NULL COLLATE BINARY, PRIMARY KEY(id)) + INSERT INTO wallabag_config (id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key) SELECT id, user_id, theme, items_per_page, language, rss_token, rss_limit, reading_speed, pocket_consumer_key FROM __temp__wallabag_config + DROP TABLE __temp__wallabag_config + CREATE UNIQUE INDEX UNIQ_87E64C53A76ED395 ON wallabag_config (user_id) + +Migration 20161128131503 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_user DROP locked, DROP credentials_expire_at, DROP expires_at + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_user ADD locked SMALLINT DEFAULT NULL, ADD credentials_expire_at DATETIME DEFAULT NULL, ADD expires_at DATETIME DEFAULT NULL + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_user DROP locked + ALTER TABLE wallabag_user DROP credentials_expire_at + ALTER TABLE wallabag_user DROP expires_at + +Migration down +"""""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_user ADD locked SMALLINT DEFAULT NULL + ALTER TABLE wallabag_user ADD credentials_expire_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL + ALTER TABLE wallabag_user ADD expires_at TIMESTAMP(0) WITHOUT TIME ZONE DEFAULT NULL + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + ALTER TABLE wallabag_user ADD COLUMN locked SMALLINT DEFAULT NULL + ALTER TABLE wallabag_user ADD COLUMN credentials_expire_at DATETIME DEFAULT NULL + ALTER TABLE wallabag_user ADD COLUMN expires_at DATETIME DEFAULT NULL + +Migration down +"""""""""""""" + +.. code-block:: sql + + DROP INDEX UNIQ_1D63E7E592FC23A8 + DROP INDEX UNIQ_1D63E7E5A0D96FBF + DROP INDEX UNIQ_1D63E7E5C05FB297 + CREATE TEMPORARY TABLE __temp__wallabag_user AS SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted, expired, credentials_expired FROM wallabag_user + DROP TABLE wallabag_user + CREATE TABLE wallabag_user (id INTEGER NOT NULL, username VARCHAR(180) NOT NULL COLLATE BINARY, username_canonical VARCHAR(180) NOT NULL COLLATE BINARY, email VARCHAR(180) NOT NULL COLLATE BINARY, email_canonical VARCHAR(180) NOT NULL COLLATE BINARY, enabled BOOLEAN NOT NULL, salt VARCHAR(255) NOT NULL COLLATE BINARY, password VARCHAR(255) NOT NULL COLLATE BINARY, last_login DATETIME DEFAULT NULL, confirmation_token VARCHAR(180) DEFAULT NULL COLLATE BINARY, password_requested_at DATETIME DEFAULT NULL, roles CLOB NOT NULL COLLATE BINARY, name CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, authCode INTEGER DEFAULT NULL, twoFactorAuthentication BOOLEAN NOT NULL, trusted CLOB DEFAULT NULL COLLATE BINARY, expired SMALLINT DEFAULT NULL, credentials_expired SMALLINT DEFAULT NULL, PRIMARY KEY(id)) + INSERT INTO wallabag_user (id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted, expired, credentials_expired) SELECT id, username, username_canonical, email, email_canonical, enabled, salt, password, last_login, confirmation_token, password_requested_at, roles, name, created_at, updated_at, authCode, twoFactorAuthentication, trusted, expired, credentials_expired FROM __temp__wallabag_user + DROP TABLE __temp__wallabag_user + CREATE UNIQUE INDEX UNIQ_1D63E7E592FC23A8 ON wallabag_user (username_canonical) + CREATE UNIQUE INDEX UNIQ_1D63E7E5A0D96FBF ON wallabag_user (email_canonical) + CREATE UNIQUE INDEX UNIQ_1D63E7E5C05FB297 ON wallabag_user (confirmation_token) + +Migration 20161214094403 +------------------------ + +MySQL +^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + CREATE INDEX IDX_entry_uid ON wallabag_entry (uid) + +Migration down +"""""""""""""" + +.. code-block:: sql + + DROP INDEX IDX_entry_uid ON wallabag_entry + +PostgreSQL +^^^^^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + CREATE INDEX IDX_entry_uid ON wallabag_entry (uid) + +Migration down +"""""""""""""" + +.. code-block:: sql + + DROP INDEX idx_entry_uid + +SQLite +^^^^^^ + +Migration up +"""""""""""" + +.. code-block:: sql + + DROP INDEX IDX_F4D18282A76ED395 + DROP INDEX created_at_idx + CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry + DROP TABLE wallabag_entry + CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id)) + INSERT INTO wallabag_entry (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry + DROP TABLE __temp__wallabag_entry + CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id) + CREATE INDEX created_at_idx ON wallabag_entry (created_at) + CREATE INDEX IDX_entry_uid ON wallabag_entry (uid) + +Migration down +"""""""""""""" + +.. code-block:: sql + + DROP INDEX IDX_entry_uid + DROP INDEX created_at_idx + DROP INDEX IDX_F4D18282A76ED395 + CREATE TEMPORARY TABLE __temp__wallabag_entry AS SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM wallabag_entry + DROP TABLE wallabag_entry + CREATE TABLE wallabag_entry (id INTEGER NOT NULL, user_id INTEGER DEFAULT NULL, uid CLOB DEFAULT NULL COLLATE BINARY, title CLOB DEFAULT NULL COLLATE BINARY, url CLOB DEFAULT NULL COLLATE BINARY, is_archived BOOLEAN NOT NULL, is_starred BOOLEAN NOT NULL, content CLOB DEFAULT NULL COLLATE BINARY, created_at DATETIME NOT NULL, updated_at DATETIME NOT NULL, mimetype CLOB DEFAULT NULL COLLATE BINARY, language CLOB DEFAULT NULL COLLATE BINARY, reading_time INTEGER DEFAULT NULL, domain_name CLOB DEFAULT NULL COLLATE BINARY, preview_picture CLOB DEFAULT NULL COLLATE BINARY, is_public BOOLEAN DEFAULT '0', PRIMARY KEY(id)) + INSERT INTO wallabag_entry (id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public) SELECT id, user_id, uid, title, url, is_archived, is_starred, content, created_at, updated_at, mimetype, language, reading_time, domain_name, preview_picture, is_public FROM __temp__wallabag_entry + DROP TABLE __temp__wallabag_entry + CREATE INDEX created_at_idx ON wallabag_entry (created_at) + CREATE INDEX IDX_F4D18282A76ED395 ON wallabag_entry (user_id) diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst index 6557e2a5..1107616e 100644 --- a/docs/de/user/upgrade.rst +++ b/docs/de/user/upgrade.rst @@ -59,10 +59,9 @@ Falls du SQLite nutzt, musst du außerdem deinen ``data/``-Ordner in die neue In Leere den ``var/cache``-Ordner. -Du musst einige SQL-Abfragen durchführen, um deine Datenbank zu aktualisieren. Wir gehen in diesem Fall davon aus, dass das Tabellenpräfix ``wallabag_`` ist und eine MySQL-Datenbank verwendet wird: - -.. code-block:: sql +Du musst einige SQL-Abfragen durchführen, um deine Datenbank zu aktualisieren. Wir gehen in diesem Fall davon aus, dass das Tabellenpräfix ``wallabag_`` ist. +`You can find all the queries here `_. Upgrade von 2.0.x zu 2.1.1 --------------------------- -- cgit v1.2.3