diff --git a/.editorconfig b/.editorconfig index c347663eb..92c9a4c35 100644 --- a/.editorconfig +++ b/.editorconfig @@ -9,6 +9,6 @@ indent_size = 4 trim_trailing_whitespace = true insert_final_newline = true -[*.js] +[*.{js,css}] indent_style = space indent_size = 2 diff --git a/.github/PULL_REQUEST_TEMPLATE.md b/.github/PULL_REQUEST_TEMPLATE.md index b761f8f22..214b906b0 100644 --- a/.github/PULL_REQUEST_TEMPLATE.md +++ b/.github/PULL_REQUEST_TEMPLATE.md @@ -1,11 +1,16 @@ | Q | A | ------------- | --- -| Bug fix? | yes|no -| New feature? | yes|no -| BC breaks? | yes|no -| Deprecations? | yes|no -| Tests pass? | yes|no -| Documentation | yes|no -| Translation | yes|no -| Fixed tickets | comma-separated list of tickets fixed by the PR, if any +| Bug fix? | yes/no +| New feature? | yes/no +| BC breaks? | yes/no +| Deprecations? | yes/no +| Tests pass? | yes/no +| Documentation | yes/no +| Translation | yes/no +| Fixed tickets | #... | License | MIT + + diff --git a/CHANGELOG.md b/CHANGELOG.md index 947dff6f3..de523f911 100644 --- a/CHANGELOG.md +++ b/CHANGELOG.md @@ -1,881 +1,480 @@ -# Changelog +## Changelog -## [2.1.2](https://github.com/wallabag/wallabag/tree/2.1.2) (2016-10-17) +### 2.1.4 2016/11/19 +- [#2604](https://github.com/wallabag/wallabag/pull/2604) wallabag can’t work on PostgreSQL <= 9.1 (@j0k3r) +- [#2605](https://github.com/wallabag/wallabag/pull/2605) Add .travis.yml change to RELEASE_PROCESS (@j0k3r) +- [#2603](https://github.com/wallabag/wallabag/pull/2603) Fix clear-cache problem using —no-dev (@j0k3r) +- [#2596](https://github.com/wallabag/wallabag/pull/2596) Prepare wallabag 2.1.4 :rocket: (@nicosomb) +- [#2550](https://github.com/wallabag/wallabag/pull/2550) Reordered documentation (@jlnostr, @nicosomb) +- [#2578](https://github.com/wallabag/wallabag/pull/2578) Added help on config screen (@nicosomb) +- [#2570](https://github.com/wallabag/wallabag/pull/2570) Added creation date on entries view (@nicosomb) +- [#2587](https://github.com/wallabag/wallabag/pull/2587) User-agents have moved to site-config (@j0k3r) +- [#2584](https://github.com/wallabag/wallabag/pull/2584) fix #2582 - Documentation, Nginx config: disable all other PHP file from symphony (@blankoworld) +- [#2577](https://github.com/wallabag/wallabag/pull/2577) Added tooltips in header bar (@nicosomb) +- [#2562](https://github.com/wallabag/wallabag/pull/2562) Bigger image preview in case of only image content (@j0k3r) +- [#2571](https://github.com/wallabag/wallabag/pull/2571) Changed behavior when we change language (@nicosomb) +- [#2565](https://github.com/wallabag/wallabag/pull/2565) Removed support website on about page (@nicosomb) +- [#2563](https://github.com/wallabag/wallabag/pull/2563) Improve PR template (@j0k3r) +- [#2561](https://github.com/wallabag/wallabag/pull/2561) fix #2559 (@Rurik19) +- [#2555](https://github.com/wallabag/wallabag/pull/2555) Reorder variable assignation in update.sh script, fix #2554 (@dkrmr) +- [#2556](https://github.com/wallabag/wallabag/pull/2556) Replaced TokenStorage with TokenStorageInterface (@nicosomb) +- [#2552](https://github.com/wallabag/wallabag/pull/2552) Round readingtime to avoid crazy number (@j0k3r) +- [#2546](https://github.com/wallabag/wallabag/pull/2546) Updated default parameters.yml file in documentation (@nicosomb) +- [#2545](https://github.com/wallabag/wallabag/pull/2545) Update the upgrade documentation (@nicosomb) -**Merged pull requests:** +### 2.1.3 2016/11/04 +- [#2536](https://github.com/wallabag/wallabag/pull/2536) Prepare wallabag 2.1.3 :rocket: (@nicosomb) +- [#2460](https://github.com/wallabag/wallabag/pull/2460) UI Changes (@tcitworld, @j0k3r) +- [#2534](https://github.com/wallabag/wallabag/pull/2534) Use created_at as default sort (@j0k3r) +- [#2530](https://github.com/wallabag/wallabag/pull/2530) Added documentation about failed to load external entity error (@j0k3r, @Strubbl, @nicosomb) +- [#2519](https://github.com/wallabag/wallabag/pull/2519) Translation update - French (@j0k3r, @Jibec) +- [#2528](https://github.com/wallabag/wallabag/pull/2528) Force user-agent for .slashdot.org (@Kdecherf) +- [#2524](https://github.com/wallabag/wallabag/pull/2524) Add Instapaper to CLI import (@lologhi) +- [#2521](https://github.com/wallabag/wallabag/pull/2521) fix path for the install scripts (@foxmask) +- [#2520](https://github.com/wallabag/wallabag/pull/2520) Inject parameter instead of service (@j0k3r) +- [#2518](https://github.com/wallabag/wallabag/pull/2518) docs: fix link to wallabag-stats project (@Strubbl) +- [#2514](https://github.com/wallabag/wallabag/pull/2514) docs: update 3rd party projects by Strubbl (@Strubbl) +- [#2513](https://github.com/wallabag/wallabag/pull/2513) Updated Capistrano configuration (@nicosomb) +- [#2506](https://github.com/wallabag/wallabag/pull/2506) Fixed entries export filtered with a tag (@nicosomb) +- [#2509](https://github.com/wallabag/wallabag/pull/2509) Exploded WallabagRestController into many controllers (@nicosomb) +- [#2508](https://github.com/wallabag/wallabag/pull/2508) Added the whole path to parameters.yml file (@nicosomb) +- [#2507](https://github.com/wallabag/wallabag/pull/2507) Added require.sh to check if composer is installed (@nicosomb) +- [#2500](https://github.com/wallabag/wallabag/pull/2500) Added a check in Makefile to see if composer is installed (@nicosomb) +- [#2504](https://github.com/wallabag/wallabag/pull/2504) Added tag label in the page title (@nicosomb) +- [#2473](https://github.com/wallabag/wallabag/pull/2473) Portuguese (Brazilian) translation (@pmichelazzo, @j0k3r, @nicosomb, @Quent-in, @danbartram, @even-allmighty, @Strubbl, @tcitworld, @benages, @Simounet, @charno6, @Rurik19, @bmillemathias, @cstuder, @egilli, @pmartin) +- [#2493](https://github.com/wallabag/wallabag/pull/2493) Add relevant links to fetch content error page (@nicosomb, @bmillemathias) +- [#2486](https://github.com/wallabag/wallabag/pull/2486) Added :fr: documentation for wallabag backup (@jlnostr, @nicosomb) +- [#2484](https://github.com/wallabag/wallabag/pull/2484) Document what to backup in Wallabag (@bmillemathias) +- [#2485](https://github.com/wallabag/wallabag/pull/2485) Fix missing words in Android application documentation (@bmillemathias) +- [#2481](https://github.com/wallabag/wallabag/pull/2481) Some fixes (@j0k3r) +- [#2482](https://github.com/wallabag/wallabag/pull/2482) If reload content failed, don’t update it (@j0k3r) +- [#2467](https://github.com/wallabag/wallabag/pull/2467) Update wallabag version for master branch (@nicosomb) +- [#2466](https://github.com/wallabag/wallabag/pull/2466) Removed MD5 hash in documentation (@nicosomb) -- Fixed hardcoded title for internal settings [\#2464](https://github.com/wallabag/wallabag/pull/2464) ([nicosomb](https://github.com/nicosomb)) -- German: improve existing and add missing translation [\#2459](https://github.com/wallabag/wallabag/pull/2459) ([Strubbl](https://github.com/Strubbl)) -- add link to German documentation in about page [\#2457](https://github.com/wallabag/wallabag/pull/2457) ([Strubbl](https://github.com/Strubbl)) -- Fix tabs on material [\#2455](https://github.com/wallabag/wallabag/pull/2455) ([tcitworld](https://github.com/tcitworld)) -- Fix baggy display on small screens [\#2454](https://github.com/wallabag/wallabag/pull/2454) ([tcitworld](https://github.com/tcitworld)) -- Bring make dev [\#2451](https://github.com/wallabag/wallabag/pull/2451) ([tcitworld](https://github.com/tcitworld)) -- View improvements [\#2450](https://github.com/wallabag/wallabag/pull/2450) ([nicosomb](https://github.com/nicosomb)) -- Fixed french and german doc homepages [\#2447](https://github.com/wallabag/wallabag/pull/2447) ([nicosomb](https://github.com/nicosomb)) -- Added information about tagging rules in documentation [\#2446](https://github.com/wallabag/wallabag/pull/2446) ([nicosomb](https://github.com/nicosomb)) -- Mention example instance in docs [\#2444](https://github.com/wallabag/wallabag/pull/2444) ([Kaligule](https://github.com/Kaligule)) -- Minor fixes in the english documentation [\#2439](https://github.com/wallabag/wallabag/pull/2439) ([zertrin](https://github.com/zertrin)) -- Update messages.pl.yml [\#2438](https://github.com/wallabag/wallabag/pull/2438) ([mruminski](https://github.com/mruminski)) -- Added french documentation for upgrade [\#2435](https://github.com/wallabag/wallabag/pull/2435) ([nicosomb](https://github.com/nicosomb)) -- Added french documentation for parameters.yml [\#2434](https://github.com/wallabag/wallabag/pull/2434) ([nicosomb](https://github.com/nicosomb)) -- Update ISSUE\_TEMPLATE.md [\#2432](https://github.com/wallabag/wallabag/pull/2432) ([j0k3r](https://github.com/j0k3r)) -- Lock deps for FOSUser [\#2429](https://github.com/wallabag/wallabag/pull/2429) ([j0k3r](https://github.com/j0k3r)) -- Fix links on english documentation homepage [\#2426](https://github.com/wallabag/wallabag/pull/2426) ([nicosomb](https://github.com/nicosomb)) -- Fixed display for note in installation page [\#2422](https://github.com/wallabag/wallabag/pull/2422) ([nicosomb](https://github.com/nicosomb)) -- Avoid error when Redis isn't here in tests [\#2420](https://github.com/wallabag/wallabag/pull/2420) ([j0k3r](https://github.com/j0k3r)) -- Fixed Twitter Cards by adding a description tag [\#2419](https://github.com/wallabag/wallabag/pull/2419) ([nicosomb](https://github.com/nicosomb)) -- Added support of Twitter Cards for public articles [\#2418](https://github.com/wallabag/wallabag/pull/2418) ([nicosomb](https://github.com/nicosomb)) -- Define a dev version for the master [\#2417](https://github.com/wallabag/wallabag/pull/2417) ([j0k3r](https://github.com/j0k3r)) -- Remove automatic closing of the window from bookmarklet [\#2414](https://github.com/wallabag/wallabag/pull/2414) ([szafranek](https://github.com/szafranek)) -- When a sub command fail, display error message [\#2413](https://github.com/wallabag/wallabag/pull/2413) ([j0k3r](https://github.com/j0k3r)) -- Fix PostgreSQL migrations [\#2412](https://github.com/wallabag/wallabag/pull/2412) ([j0k3r](https://github.com/j0k3r)) -- Fix entities definition [\#2411](https://github.com/wallabag/wallabag/pull/2411) ([j0k3r](https://github.com/j0k3r)) -- Optimize tag list display [\#2410](https://github.com/wallabag/wallabag/pull/2410) ([j0k3r](https://github.com/j0k3r)) -- Occitan version update [\#2409](https://github.com/wallabag/wallabag/pull/2409) ([Quent-in](https://github.com/Quent-in)) -- Show number of annotations instead of nbAnnotations placeholder [\#2406](https://github.com/wallabag/wallabag/pull/2406) ([szafranek](https://github.com/szafranek)) -- Fix few invalid HTML tags [\#2405](https://github.com/wallabag/wallabag/pull/2405) ([szafranek](https://github.com/szafranek)) -- Cleaned up documentation for installation process [\#2403](https://github.com/wallabag/wallabag/pull/2403) ([nicosomb](https://github.com/nicosomb)) -- Removed 1.x stuff in CHANGELOG [\#2402](https://github.com/wallabag/wallabag/pull/2402) ([nicosomb](https://github.com/nicosomb)) -- Set env to prod in documentation [\#2400](https://github.com/wallabag/wallabag/pull/2400) ([j0k3r](https://github.com/j0k3r)) -- Use default locale for user config [\#2399](https://github.com/wallabag/wallabag/pull/2399) ([j0k3r](https://github.com/j0k3r)) -- Ensure orphan tag are remove in API [\#2397](https://github.com/wallabag/wallabag/pull/2397) ([j0k3r](https://github.com/j0k3r)) -- Update messages.pl.yml [\#2396](https://github.com/wallabag/wallabag/pull/2396) ([mruminski](https://github.com/mruminski)) -- Add ability to use socket [\#2395](https://github.com/wallabag/wallabag/pull/2395) ([j0k3r](https://github.com/j0k3r)) -- Ability to check multiple urls in API [\#2393](https://github.com/wallabag/wallabag/pull/2393) ([j0k3r](https://github.com/j0k3r)) -- Added default picture if preview picture is null [\#2389](https://github.com/wallabag/wallabag/pull/2389) ([nicosomb](https://github.com/nicosomb)) -- Fixed two-factor checkbox display in user admin panel [\#2388](https://github.com/wallabag/wallabag/pull/2388) ([nicosomb](https://github.com/nicosomb)) -- Changed Changelog by using github-changelog-generator from @skywinder [\#2386](https://github.com/wallabag/wallabag/pull/2386) ([nicosomb](https://github.com/nicosomb)) -- Added documentation about siteconfig fix [\#2385](https://github.com/wallabag/wallabag/pull/2385) ([nicosomb](https://github.com/nicosomb)) -- Added OpenGraph support for public articles [\#2383](https://github.com/wallabag/wallabag/pull/2383) ([nicosomb](https://github.com/nicosomb)) -- Fix exists API call [\#2377](https://github.com/wallabag/wallabag/pull/2377) ([tcitworld](https://github.com/tcitworld)) -- try to reduce assets build npm connection failing by updating nodejs [\#2375](https://github.com/wallabag/wallabag/pull/2375) ([tcitworld](https://github.com/tcitworld)) -- Clickable tags [\#2374](https://github.com/wallabag/wallabag/pull/2374) ([tcitworld](https://github.com/tcitworld)) -- API: ability to export entry in all available format \(epub, pdf, etc...\) [\#2372](https://github.com/wallabag/wallabag/pull/2372) ([pmartin](https://github.com/pmartin)) -- Remove mouf/nodejs-installer from composer [\#2363](https://github.com/wallabag/wallabag/pull/2363) ([j0k3r](https://github.com/j0k3r)) -- Changed relation between API client and refresh token [\#2351](https://github.com/wallabag/wallabag/pull/2351) ([nicosomb](https://github.com/nicosomb)) -- Fix relations export for Entry [\#2332](https://github.com/wallabag/wallabag/pull/2332) ([j0k3r](https://github.com/j0k3r)) -- Delete user [\#2177](https://github.com/wallabag/wallabag/pull/2177) ([tcitworld](https://github.com/tcitworld)) +### 2.1.2 2016/10/17 +- [#2452](https://github.com/wallabag/wallabag/pull/2452) Prepare wallabag 2.1.2 :rocket: (@nicosomb) +- [#2464](https://github.com/wallabag/wallabag/pull/2464) Fixed hardcoded title for internal settings (@nicosomb) +- [#2455](https://github.com/wallabag/wallabag/pull/2455) Fix tabs on material (@tcitworld) +- [#2454](https://github.com/wallabag/wallabag/pull/2454) Fix baggy display on small screens (@tcitworld) +- [#2459](https://github.com/wallabag/wallabag/pull/2459) German: improve existing and add missing translation (@Strubbl) +- [#2457](https://github.com/wallabag/wallabag/pull/2457) add link to German documentation in about page (@Strubbl) +- [#2451](https://github.com/wallabag/wallabag/pull/2451) Bring make dev (@tcitworld) +- [#2450](https://github.com/wallabag/wallabag/pull/2450) View improvements (@tcitworld) +- [#2412](https://github.com/wallabag/wallabag/pull/2412) Fix PostgreSQL migrations (@j0k3r) +- [#2446](https://github.com/wallabag/wallabag/pull/2446) Added information about tagging rules in documentation (@Strubbl, @nicosomb) +- [#2447](https://github.com/wallabag/wallabag/pull/2447) Fixed french and german doc homepages (@nicosomb) +- [#2444](https://github.com/wallabag/wallabag/pull/2444) Mention example instance in docs (@Kaligule) +- [#1](https://github.com/wallabag/wallabag/pull/1) Mention example instance (@Kaligule) +- [#2435](https://github.com/wallabag/wallabag/pull/2435) Added french documentation for upgrade (@nicosomb, @Strubbl) +- [#2434](https://github.com/wallabag/wallabag/pull/2434) Added french documentation for parameters.yml (@Strubbl, @nicosomb) +- [#2439](https://github.com/wallabag/wallabag/pull/2439) Minor fixes in the english documentation (@zertrin) +- [#2432](https://github.com/wallabag/wallabag/pull/2432) Update ISSUE_TEMPLATE.md (@j0k3r) +- [#2429](https://github.com/wallabag/wallabag/pull/2429) Lock deps for FOSUser (@j0k3r) +- [#2422](https://github.com/wallabag/wallabag/pull/2422) Fixed display for note in installation page (@nicosomb) +- [#2426](https://github.com/wallabag/wallabag/pull/2426) Fix links on english documentation homepage (@nicosomb) +- [#2420](https://github.com/wallabag/wallabag/pull/2420) Avoid error when Redis isn't here in tests (@j0k3r) +- [#2403](https://github.com/wallabag/wallabag/pull/2403) Cleaned up documentation for installation process (@nicosomb, @j0k3r, @Strubbl) +- [#2419](https://github.com/wallabag/wallabag/pull/2419) Fixed Twitter Cards by adding a description tag (@nicosomb) +- [#2418](https://github.com/wallabag/wallabag/pull/2418) Added support of Twitter Cards for public articles (@nicosomb) +- [#2417](https://github.com/wallabag/wallabag/pull/2417) Define a dev version for the master (@j0k3r) +- [#2411](https://github.com/wallabag/wallabag/pull/2411) Fix entities definition (@j0k3r) +- [#2414](https://github.com/wallabag/wallabag/pull/2414) Remove automatic closing of the window from bookmarklet (@szafranek) +- [#2413](https://github.com/wallabag/wallabag/pull/2413) When a sub command fail, display error message (@j0k3r) +- [#2410](https://github.com/wallabag/wallabag/pull/2410) Optimize tag list display (@j0k3r) +- [#2406](https://github.com/wallabag/wallabag/pull/2406) Show number of annotations instead of nbAnnotations placeholder (@szafranek) +- [#2405](https://github.com/wallabag/wallabag/pull/2405) Fix few invalid HTML tags (@szafranek) +- [#2402](https://github.com/wallabag/wallabag/pull/2402) Removed 1.x stuff in CHANGELOG (@nicosomb) +- [#2351](https://github.com/wallabag/wallabag/pull/2351) Changed relation between API client and refresh token (@j0k3r, @nicosomb) +- [#2393](https://github.com/wallabag/wallabag/pull/2393) Ability to check multiple urls in API (@j0k3r) +- [#2397](https://github.com/wallabag/wallabag/pull/2397) Ensure orphan tag are remove in API (@j0k3r) +- [#2399](https://github.com/wallabag/wallabag/pull/2399) Use default locale for user config (@j0k3r) +- [#2400](https://github.com/wallabag/wallabag/pull/2400) Set env to prod in documentation (@j0k3r) +- [#2396](https://github.com/wallabag/wallabag/pull/2396) Update messages.pl.yml (@mruminski) +- [#2395](https://github.com/wallabag/wallabag/pull/2395) Add ability to use socket (@j0k3r) +- [#2386](https://github.com/wallabag/wallabag/pull/2386) Changed Changelog by using github-changelog-generator from @skywinder (@nicosomb) +- [#2389](https://github.com/wallabag/wallabag/pull/2389) Added default picture if preview picture is null (@nicosomb) +- [#2388](https://github.com/wallabag/wallabag/pull/2388) Fixed two-factor checkbox display in user admin panel (@nicosomb) +- [#2385](https://github.com/wallabag/wallabag/pull/2385) Added documentation about siteconfig fix (@nicosomb) +- [#2383](https://github.com/wallabag/wallabag/pull/2383) Added OpenGraph support for public articles (@nicosomb) +- [#2332](https://github.com/wallabag/wallabag/pull/2332) Fix relations export for Entry (@j0k3r) +- [#2377](https://github.com/wallabag/wallabag/pull/2377) Fix exists API call (@j0k3r, @tcitworld) +- [#2374](https://github.com/wallabag/wallabag/pull/2374) Clickable tags (@tcitworld) +- [#2375](https://github.com/wallabag/wallabag/pull/2375) try to reduce assets build npm connection failing by updating nodejs (@tcitworld) +- [#2363](https://github.com/wallabag/wallabag/pull/2363) Remove mouf/nodejs-installer from composer (@j0k3r) -## [2.1.1](https://github.com/wallabag/wallabag/tree/2.1.1) (2016-10-04) -**Merged pull requests:** +### 2.1.1 2016/10/04 +- [#2349](https://github.com/wallabag/wallabag/pull/2349) Prepare wallabag 2.1.1 (@nicosomb, @j0k3r) +- [#2353](https://github.com/wallabag/wallabag/pull/2353) Basically, fix everything (@tcitworld, @nicosomb, @j0k3r) +- [#2359](https://github.com/wallabag/wallabag/pull/2359) Create config even if user is disabled (@j0k3r) +- [#2354](https://github.com/wallabag/wallabag/pull/2354) Add php-bcmath extension to requirements (@Zayon) +- [#2341](https://github.com/wallabag/wallabag/pull/2341) Update messages.pl.yml (@mruminski) +- [#2340](https://github.com/wallabag/wallabag/pull/2340) small improvement for german translation (@Strubbl) +- [#2338](https://github.com/wallabag/wallabag/pull/2338) Fix for 2.1 installation (@j0k3r) -- Create config even if user is disabled [\#2359](https://github.com/wallabag/wallabag/pull/2359) ([j0k3r](https://github.com/j0k3r)) -- Add php-bcmath extension to requirements [\#2354](https://github.com/wallabag/wallabag/pull/2354) ([Zayon](https://github.com/Zayon)) -- Basically, fix everything [\#2353](https://github.com/wallabag/wallabag/pull/2353) ([tcitworld](https://github.com/tcitworld)) -- Prepare wallabag 2.1.1 [\#2349](https://github.com/wallabag/wallabag/pull/2349) ([nicosomb](https://github.com/nicosomb)) -- Update messages.pl.yml [\#2341](https://github.com/wallabag/wallabag/pull/2341) ([mruminski](https://github.com/mruminski)) -- small improvement for german translation [\#2340](https://github.com/wallabag/wallabag/pull/2340) ([Strubbl](https://github.com/Strubbl)) -- Fix for 2.1 installation [\#2338](https://github.com/wallabag/wallabag/pull/2338) ([j0k3r](https://github.com/j0k3r)) +### 2.1.0 2016/10/03 +- [#2334](https://github.com/wallabag/wallabag/pull/2334) Prepare wallabag 2.1.0 :rocket: (@nicosomb) +- [#2335](https://github.com/wallabag/wallabag/pull/2335) Fixed CSS for quickstart links (@nicosomb) +- [#2333](https://github.com/wallabag/wallabag/pull/2333) for 2.1, translate all strings to German, which haven't been translated yet (@j0k3r, @nicosomb, @jlnostr, @Strubbl) +- [#2314](https://github.com/wallabag/wallabag/pull/2314) Assets work (@tcitworld) +- [#2331](https://github.com/wallabag/wallabag/pull/2331) Fix parameters in API _links (@j0k3r) +- [#2327](https://github.com/wallabag/wallabag/pull/2327) Add users management UI (@j0k3r) +- [#2330](https://github.com/wallabag/wallabag/pull/2330) Remove error message when creating ePub versions (@pmichelazzo) +- [#2325](https://github.com/wallabag/wallabag/pull/2325) Add an exists endpoint in API (@j0k3r) +- [#2328](https://github.com/wallabag/wallabag/pull/2328) Avoid duplicate url with accents (@j0k3r) +- [#2326](https://github.com/wallabag/wallabag/pull/2326) Changed quickstart layout (@j0k3r, @nicosomb) +- [#2324](https://github.com/wallabag/wallabag/pull/2324) Add ability to edit a tagging rule (@j0k3r) +- [#2323](https://github.com/wallabag/wallabag/pull/2323) Add simple stats in footer (@j0k3r) +- [#2329](https://github.com/wallabag/wallabag/pull/2329) Occitan version update (@j0k3r, @Quent-in) +- [#2322](https://github.com/wallabag/wallabag/pull/2322) Customize errors templates (@j0k3r) +- [#2320](https://github.com/wallabag/wallabag/pull/2320) Create user config in one place. (@j0k3r) +- [#2319](https://github.com/wallabag/wallabag/pull/2319) Docker : install PHP 'gd' extension (@pmartin) +- [#2318](https://github.com/wallabag/wallabag/pull/2318) Removed duplicated templates files (@nicosomb) +- [#2315](https://github.com/wallabag/wallabag/pull/2315) Fixes about upgrade (@nicosomb, @Strubbl, @jlnostr) +- [#2316](https://github.com/wallabag/wallabag/pull/2316) Update messages.pl.yml (@mruminski) +- [#2313](https://github.com/wallabag/wallabag/pull/2313) Remove CSS class who caused long loading on Firefox (@nicosomb) +- [#2309](https://github.com/wallabag/wallabag/pull/2309) Update messages.pl.yml (@mruminski) +- [#2192](https://github.com/wallabag/wallabag/pull/2192) Import Firefox & Chrome bookmarks into wallabag (@nicosomb, @j0k3r, @tcitworld) +- [#2308](https://github.com/wallabag/wallabag/pull/2308) Fix duplicate tags on import (@j0k3r) +- [#2306](https://github.com/wallabag/wallabag/pull/2306) Some checks about Redis & RabbitMQ (@j0k3r) +- [#2301](https://github.com/wallabag/wallabag/pull/2301) fix feeds not syncing on android app (@tcitworld, @nicosomb, @Quent-in, @j0k3r, @danbartram, @even-allmighty, @Strubbl, @benages, @Simounet, @charno6, @Rurik19, @bmillemathias, @cstuder, @egilli) +- [#2239](https://github.com/wallabag/wallabag/pull/2239) Update documentation with new features for 2.1 (@nicosomb) +- [#2299](https://github.com/wallabag/wallabag/pull/2299) polish version (@mruminski) +- [#2297](https://github.com/wallabag/wallabag/pull/2297) Fix issue #2296: epub export with special chars in the title. (@egilli) +- [#1941](https://github.com/wallabag/wallabag/pull/1941) Use asynchronous jobs for imports (@j0k3r, @nicosomb) +- [#2292](https://github.com/wallabag/wallabag/pull/2292) Fixed label for mark as read link in entry view (@nicosomb) +- [#2291](https://github.com/wallabag/wallabag/pull/2291) Add links to translations in documentation homepage (@nicosomb) +- [#2287](https://github.com/wallabag/wallabag/pull/2287) Remove footer part (@nicosomb) +- [#2290](https://github.com/wallabag/wallabag/pull/2290) Update messages.oc.yml (@Quent-in) +- [#2279](https://github.com/wallabag/wallabag/pull/2279) Check if asset is enable instead of opposite (@j0k3r) +- [#2275](https://github.com/wallabag/wallabag/pull/2275) Export dates from entries (@j0k3r) +- [#2274](https://github.com/wallabag/wallabag/pull/2274) Re-use JsonResponse (@j0k3r) -## [2.1.0](https://github.com/wallabag/wallabag/tree/2.1.0) (2016-10-03) -**Merged pull requests:** +### 2.0.8 2016/09/07 +- [#2271](https://github.com/wallabag/wallabag/pull/2271) Prepare wallabag 2.0.8 (@nicosomb) +- [#2266](https://github.com/wallabag/wallabag/pull/2266) Added tags counter in sidebar (material theme) (@nicosomb) +- [#2267](https://github.com/wallabag/wallabag/pull/2267) Occitan updated (@Quent-in) +- [#2263](https://github.com/wallabag/wallabag/pull/2263) Instead of selecting the whole data, just count it (@j0k3r) +- [#2002](https://github.com/wallabag/wallabag/pull/2002) Feature display items number (@nicosomb) +- [#2262](https://github.com/wallabag/wallabag/pull/2262) Add a check for the database connection (@j0k3r) +- [#2260](https://github.com/wallabag/wallabag/pull/2260) Fixed different font-size for labels in config screen (@nicosomb) +- [#2252](https://github.com/wallabag/wallabag/pull/2252) Fixed last merge who caused CSS/JS bugs (@j0k3r, @nicosomb) +- [#2242](https://github.com/wallabag/wallabag/pull/2242) Fix print / article views (@nicosomb) +- [#2258](https://github.com/wallabag/wallabag/pull/2258) Update messages.pl.yml (@mruminski) +- [#2255](https://github.com/wallabag/wallabag/pull/2255) Add Readability import (@nicosomb, @j0k3r) +- [#2243](https://github.com/wallabag/wallabag/pull/2243) Add untagged entries (@j0k3r, @nicosomb) +- [#2245](https://github.com/wallabag/wallabag/pull/2245) Changed where page title is displayed (@nicosomb) +- [#2240](https://github.com/wallabag/wallabag/pull/2240) Add icon for public share link (@nicosomb) +- [#2241](https://github.com/wallabag/wallabag/pull/2241) Fix issue #1991: correction of the height field to add articles (@modos189) +- [#2238](https://github.com/wallabag/wallabag/pull/2238) V2 improve view (@modos189) +- [#2237](https://github.com/wallabag/wallabag/pull/2237) Add original link in public view of the article (@nicosomb) +- [#1904](https://github.com/wallabag/wallabag/pull/1904) Share entry with a public URL (@j0k3r, @nicosomb) +- [#2236](https://github.com/wallabag/wallabag/pull/2236) Allow failure for PHP 7.1 (@j0k3r) +- [#2186](https://github.com/wallabag/wallabag/pull/2186) Add option to disable registration (@nicosomb, @j0k3r, @tcitworld) +- [#2234](https://github.com/wallabag/wallabag/pull/2234) Fixes mailto link in documentation (@cstuder) +- [#2235](https://github.com/wallabag/wallabag/pull/2235) Add configuration for german documentation (@nicosomb) +- [#2230](https://github.com/wallabag/wallabag/pull/2230) Cut entries title in card view: continued (@bmillemathias) +- [#2218](https://github.com/wallabag/wallabag/pull/2218) Delete tag or tags by label (@j0k3r, @tcitworld, @nicosomb) -- Docker : install PHP 'gd' extension [\#2319](https://github.com/wallabag/wallabag/pull/2319) ([pmartin](https://github.com/pmartin)) -- Update messages.pl.yml [\#2309](https://github.com/wallabag/wallabag/pull/2309) ([mruminski](https://github.com/mruminski)) -- Fix issue \#2296: epub export with special chars in the title. [\#2297](https://github.com/wallabag/wallabag/pull/2297) ([egilli](https://github.com/egilli)) -- Update messages.oc.yml [\#2290](https://github.com/wallabag/wallabag/pull/2290) ([Quent-in](https://github.com/Quent-in)) -- Fixed CSS for quickstart links [\#2335](https://github.com/wallabag/wallabag/pull/2335) ([nicosomb](https://github.com/nicosomb)) -- Prepare wallabag 2.1.0 :rocket: [\#2334](https://github.com/wallabag/wallabag/pull/2334) ([nicosomb](https://github.com/nicosomb)) -- for 2.1, translate all strings to German, which haven't been translated yet [\#2333](https://github.com/wallabag/wallabag/pull/2333) ([Strubbl](https://github.com/Strubbl)) -- Fix parameters in API \_links [\#2331](https://github.com/wallabag/wallabag/pull/2331) ([j0k3r](https://github.com/j0k3r)) -- Remove error message when creating ePub versions [\#2330](https://github.com/wallabag/wallabag/pull/2330) ([pmichelazzo](https://github.com/pmichelazzo)) -- Occitan version update [\#2329](https://github.com/wallabag/wallabag/pull/2329) ([Quent-in](https://github.com/Quent-in)) -- Avoid duplicate url with accents [\#2328](https://github.com/wallabag/wallabag/pull/2328) ([j0k3r](https://github.com/j0k3r)) -- Add users management UI [\#2327](https://github.com/wallabag/wallabag/pull/2327) ([j0k3r](https://github.com/j0k3r)) -- Changed quickstart layout [\#2326](https://github.com/wallabag/wallabag/pull/2326) ([nicosomb](https://github.com/nicosomb)) -- Add an exists endpoint in API [\#2325](https://github.com/wallabag/wallabag/pull/2325) ([j0k3r](https://github.com/j0k3r)) -- Add ability to edit a tagging rule [\#2324](https://github.com/wallabag/wallabag/pull/2324) ([j0k3r](https://github.com/j0k3r)) -- Add simple stats in footer [\#2323](https://github.com/wallabag/wallabag/pull/2323) ([j0k3r](https://github.com/j0k3r)) -- Customize errors templates [\#2322](https://github.com/wallabag/wallabag/pull/2322) ([j0k3r](https://github.com/j0k3r)) -- Create user config in one place. [\#2320](https://github.com/wallabag/wallabag/pull/2320) ([j0k3r](https://github.com/j0k3r)) -- Removed duplicated templates files [\#2318](https://github.com/wallabag/wallabag/pull/2318) ([nicosomb](https://github.com/nicosomb)) -- Update messages.pl.yml [\#2316](https://github.com/wallabag/wallabag/pull/2316) ([mruminski](https://github.com/mruminski)) -- Fixes about upgrade [\#2315](https://github.com/wallabag/wallabag/pull/2315) ([nicosomb](https://github.com/nicosomb)) -- Assets work [\#2314](https://github.com/wallabag/wallabag/pull/2314) ([tcitworld](https://github.com/tcitworld)) -- Remove CSS class who caused long loading on Firefox [\#2313](https://github.com/wallabag/wallabag/pull/2313) ([nicosomb](https://github.com/nicosomb)) -- Add Instapaper import [\#2310](https://github.com/wallabag/wallabag/pull/2310) ([j0k3r](https://github.com/j0k3r)) -- Fix duplicate tags on import [\#2308](https://github.com/wallabag/wallabag/pull/2308) ([j0k3r](https://github.com/j0k3r)) -- Some checks about Redis & RabbitMQ [\#2306](https://github.com/wallabag/wallabag/pull/2306) ([j0k3r](https://github.com/j0k3r)) -- fix feeds not syncing on android app [\#2301](https://github.com/wallabag/wallabag/pull/2301) ([tcitworld](https://github.com/tcitworld)) -- polish version [\#2299](https://github.com/wallabag/wallabag/pull/2299) ([mruminski](https://github.com/mruminski)) -- Fixed label for mark as read link in entry view [\#2292](https://github.com/wallabag/wallabag/pull/2292) ([nicosomb](https://github.com/nicosomb)) -- Add links to translations in documentation homepage [\#2291](https://github.com/wallabag/wallabag/pull/2291) ([nicosomb](https://github.com/nicosomb)) -- Remove footer part [\#2287](https://github.com/wallabag/wallabag/pull/2287) ([nicosomb](https://github.com/nicosomb)) -- Check if asset is enable instead of opposite [\#2279](https://github.com/wallabag/wallabag/pull/2279) ([j0k3r](https://github.com/j0k3r)) -- Export dates from entries [\#2275](https://github.com/wallabag/wallabag/pull/2275) ([j0k3r](https://github.com/j0k3r)) -- Re-use JsonResponse [\#2274](https://github.com/wallabag/wallabag/pull/2274) ([j0k3r](https://github.com/j0k3r)) -- Added tags counter in sidebar \(material theme\) [\#2266](https://github.com/wallabag/wallabag/pull/2266) ([nicosomb](https://github.com/nicosomb)) -- Instead of selecting the whole data, just count it [\#2263](https://github.com/wallabag/wallabag/pull/2263) ([j0k3r](https://github.com/j0k3r)) -- Fixed different font-size for labels in config screen [\#2260](https://github.com/wallabag/wallabag/pull/2260) ([nicosomb](https://github.com/nicosomb)) -- Update messages.pl.yml [\#2258](https://github.com/wallabag/wallabag/pull/2258) ([mruminski](https://github.com/mruminski)) -- Add Readability import [\#2255](https://github.com/wallabag/wallabag/pull/2255) ([j0k3r](https://github.com/j0k3r)) -- Fixed last merge who caused CSS/JS bugs [\#2252](https://github.com/wallabag/wallabag/pull/2252) ([nicosomb](https://github.com/nicosomb)) -- Changed where page title is displayed [\#2245](https://github.com/wallabag/wallabag/pull/2245) ([nicosomb](https://github.com/nicosomb)) -- Add untagged entries [\#2243](https://github.com/wallabag/wallabag/pull/2243) ([nicosomb](https://github.com/nicosomb)) -- Fix print / article views [\#2242](https://github.com/wallabag/wallabag/pull/2242) ([nicosomb](https://github.com/nicosomb)) -- Add icon for public share link [\#2240](https://github.com/wallabag/wallabag/pull/2240) ([nicosomb](https://github.com/nicosomb)) -- Update documentation with new features for 2.1 [\#2239](https://github.com/wallabag/wallabag/pull/2239) ([nicosomb](https://github.com/nicosomb)) -- Add original link in public view of the article [\#2237](https://github.com/wallabag/wallabag/pull/2237) ([nicosomb](https://github.com/nicosomb)) -- Delete tag or tags by label [\#2218](https://github.com/wallabag/wallabag/pull/2218) ([nicosomb](https://github.com/nicosomb)) -- Fix PHPunit 5 warnings [\#2201](https://github.com/wallabag/wallabag/pull/2201) ([j0k3r](https://github.com/j0k3r)) -- Import Firefox & Chrome bookmarks into wallabag [\#2192](https://github.com/wallabag/wallabag/pull/2192) ([tcitworld](https://github.com/tcitworld)) -- Add option to disable registration [\#2186](https://github.com/wallabag/wallabag/pull/2186) ([tcitworld](https://github.com/tcitworld)) -- Bring tags on entries view to baggy [\#2183](https://github.com/wallabag/wallabag/pull/2183) ([tcitworld](https://github.com/tcitworld)) -- Add since parameter [\#2176](https://github.com/wallabag/wallabag/pull/2176) ([tcitworld](https://github.com/tcitworld)) -- Add filter for tags on API [\#2174](https://github.com/wallabag/wallabag/pull/2174) ([tcitworld](https://github.com/tcitworld)) -- Name api clients [\#2171](https://github.com/wallabag/wallabag/pull/2171) ([tcitworld](https://github.com/tcitworld)) -- Add tags on entries view and minor ui fixes [\#2170](https://github.com/wallabag/wallabag/pull/2170) ([tcitworld](https://github.com/tcitworld)) -- fix font paths [\#2169](https://github.com/wallabag/wallabag/pull/2169) ([tcitworld](https://github.com/tcitworld)) -- Add modules when NodeJS versions are too low. [\#2168](https://github.com/wallabag/wallabag/pull/2168) ([tcitworld](https://github.com/tcitworld)) -- Manage assets through npm [\#2142](https://github.com/wallabag/wallabag/pull/2142) ([tcitworld](https://github.com/tcitworld)) -- Feature display items number [\#2002](https://github.com/wallabag/wallabag/pull/2002) ([nicosomb](https://github.com/nicosomb)) -- wallabag 2.1 [\#1999](https://github.com/wallabag/wallabag/pull/1999) ([nicosomb](https://github.com/nicosomb)) -- Add CLI import for wallabag v2 files [\#1990](https://github.com/wallabag/wallabag/pull/1990) ([nicosomb](https://github.com/nicosomb)) -- Links on each tag in Tags view [\#1943](https://github.com/wallabag/wallabag/pull/1943) ([nicosomb](https://github.com/nicosomb)) -- Use asynchronous jobs for imports [\#1941](https://github.com/wallabag/wallabag/pull/1941) ([nicosomb](https://github.com/nicosomb)) -- Share entry with a public URL [\#1904](https://github.com/wallabag/wallabag/pull/1904) ([nicosomb](https://github.com/nicosomb)) +### 2.0.7 2016/08/22 +- [#2226](https://github.com/wallabag/wallabag/pull/2226) Prepare wallabag 2.0.7 (@nicosomb) +- [#2222](https://github.com/wallabag/wallabag/pull/2222) Added creation date and reading time on article view (@j0k3r, @nicosomb) +- [#2221](https://github.com/wallabag/wallabag/pull/2221) Replaced favorite word/icon with star one (@nicosomb) +- [#2224](https://github.com/wallabag/wallabag/pull/2224) Avoid breaking import when fetching fail (@j0k3r) +- [#2220](https://github.com/wallabag/wallabag/pull/2220) Enable PATCH method for CORS in API part (@Rurik19) +- [#2134](https://github.com/wallabag/wallabag/pull/2134) Run tests on an uptodate HHVM (@j0k3r) +- [#2095](https://github.com/wallabag/wallabag/pull/2095) Fix form user display when 2FA is disabled (@j0k3r, @nicosomb) +- [#2216](https://github.com/wallabag/wallabag/pull/2216) Enable CORS headers for OAUTH part (@Rurik19) -## [2.0.8](https://github.com/wallabag/wallabag/tree/2.0.8) (2016-09-07) -**Merged pull requests:** +### 2.0.6 2016/08/10 +- [#2212](https://github.com/wallabag/wallabag/pull/2212) Prepare release 2.0.6 (@nicosomb) +- [#2202](https://github.com/wallabag/wallabag/pull/2202) add some missing phpdoc parameters (@tcitworld) +- [#2200](https://github.com/wallabag/wallabag/pull/2200) Fixed typo in entry:notice:entry_saved (@charno6) +- [#2199](https://github.com/wallabag/wallabag/pull/2199) Handling socials links into a config file (@Simounet) +- [#2198](https://github.com/wallabag/wallabag/pull/2198) FIX image inside a figure element max-width (@Simounet) +- [#2195](https://github.com/wallabag/wallabag/pull/2195) Remove binary from repo (@j0k3r) +- [#2048](https://github.com/wallabag/wallabag/pull/2048) Run PHP 7.1 on Travis (@j0k3r) +- [#2194](https://github.com/wallabag/wallabag/pull/2194) Fixed spelling Artúclos --> Artículos (@benages) +- [#2183](https://github.com/wallabag/wallabag/pull/2183) Bring tags on entries view to baggy (@tcitworld) +- [#2185](https://github.com/wallabag/wallabag/pull/2185) Fix 3rd-Party Apps links (Chrome & Firefox) (@tcitworld) +- [#2174](https://github.com/wallabag/wallabag/pull/2174) Add filter for tags on API (@tcitworld) +- [#2176](https://github.com/wallabag/wallabag/pull/2176) Add since parameter (@tcitworld) +- [#2170](https://github.com/wallabag/wallabag/pull/2170) Add tags on entries view and minor ui fixes (@tcitworld) +- [#2172](https://github.com/wallabag/wallabag/pull/2172) Change the way to login user in tests (@j0k3r) +- [#2169](https://github.com/wallabag/wallabag/pull/2169) fix font paths (@tcitworld) +- [#2168](https://github.com/wallabag/wallabag/pull/2168) Add modules when NodeJS versions are too low. (@tcitworld) +- [#2157](https://github.com/wallabag/wallabag/pull/2157) Handle only upper or only lower reading filter (@j0k3r) +- [#2165](https://github.com/wallabag/wallabag/pull/2165) Fix a few french translations typos (@tcitworld) +- [#2142](https://github.com/wallabag/wallabag/pull/2142) Manage assets through npm (@tcitworld) +- [#2132](https://github.com/wallabag/wallabag/pull/2132) Jump to Symfony 3.1 (@j0k3r) +- [#2160](https://github.com/wallabag/wallabag/pull/2160) Update symlink to php-cs-fixer (@j0k3r) +- [#2155](https://github.com/wallabag/wallabag/pull/2155) Use friendsofphp instead of fabpot (@j0k3r) +- [#2156](https://github.com/wallabag/wallabag/pull/2156) Try to find bad redirection after delete (@j0k3r) +- [#2148](https://github.com/wallabag/wallabag/pull/2148) translate documentation to German (@Strubbl) +- [#2145](https://github.com/wallabag/wallabag/pull/2145) Corrected Regex for lighttpd rewrite (@even-allmighty) -- Occitan updated [\#2267](https://github.com/wallabag/wallabag/pull/2267) ([Quent-in](https://github.com/Quent-in)) -- Allow failure for PHP 7.1 [\#2236](https://github.com/wallabag/wallabag/pull/2236) ([j0k3r](https://github.com/j0k3r)) -- Prepare wallabag 2.0.8 [\#2271](https://github.com/wallabag/wallabag/pull/2271) ([nicosomb](https://github.com/nicosomb)) -- Add a check for the database connection [\#2262](https://github.com/wallabag/wallabag/pull/2262) ([j0k3r](https://github.com/j0k3r)) -- Fix issue \#1991: correction of the height field to add articles [\#2241](https://github.com/wallabag/wallabag/pull/2241) ([modos189](https://github.com/modos189)) -- V2 improve view [\#2238](https://github.com/wallabag/wallabag/pull/2238) ([modos189](https://github.com/modos189)) -- Add configuration for german documentation [\#2235](https://github.com/wallabag/wallabag/pull/2235) ([nicosomb](https://github.com/nicosomb)) -- Fixes mailto link in documentation [\#2234](https://github.com/wallabag/wallabag/pull/2234) ([cstuder](https://github.com/cstuder)) -- Cut entries title in card view: continued [\#2230](https://github.com/wallabag/wallabag/pull/2230) ([modos189](https://github.com/modos189)) +### 2.0.5 2016/05/31 +- [#2118](https://github.com/wallabag/wallabag/pull/2118) Prepare wallabag 2.0.5 (@nicosomb) +- [#2122](https://github.com/wallabag/wallabag/pull/2122) Fix the deletion of Tags/Entries relation when delete an entry (@j0k3r, @nicosomb) +- [#2052](https://github.com/wallabag/wallabag/pull/2052) Add unread filter to entries pages (@danbartram) +- [#2112](https://github.com/wallabag/wallabag/pull/2112) Docs proposal (@Poorchop) +- [#2111](https://github.com/wallabag/wallabag/pull/2111) add screenshots of android docu in English (@Strubbl) +- [#2109](https://github.com/wallabag/wallabag/pull/2109) Improve English translation (@Poorchop) +- [#2097](https://github.com/wallabag/wallabag/pull/2097) Fix image path in 2-factor authentification email (@bmillemathias) +- [#2098](https://github.com/wallabag/wallabag/pull/2098) CS (@j0k3r) +- [#2092](https://github.com/wallabag/wallabag/pull/2092) Starred and Archived clears if article is already exists (@Rurik19) +- [#2093](https://github.com/wallabag/wallabag/pull/2093) Replace vertical dots in material theme with horizontal dots (@nicosomb) +- [#2094](https://github.com/wallabag/wallabag/pull/2094) Update CONTRIBUTING file (@nicosomb) +- [#2069](https://github.com/wallabag/wallabag/pull/2069) Do not specify language in Firefox addon link (@merwan) +- [#2068](https://github.com/wallabag/wallabag/pull/2068) Added information about permissions on data/ (@mariovor) +- [#2054](https://github.com/wallabag/wallabag/pull/2054) Update CraueConfigBundle.it.yml (@jamiroconca) +- [#2049](https://github.com/wallabag/wallabag/pull/2049) Update api.rst (@joshp23) +- [#2044](https://github.com/wallabag/wallabag/pull/2044) Update api.rst (@joshp23) +- [#2038](https://github.com/wallabag/wallabag/pull/2038) new details in the doc about the rights access again;) (@foxmask) -## [2.0.7](https://github.com/wallabag/wallabag/tree/2.0.7) (2016-08-22) -**Merged pull requests:** +### 2.0.4 2016/05/07 +- [#2035](https://github.com/wallabag/wallabag/pull/2035) Prepare wallabag 2.0.4 (@nicosomb) +- [#2023](https://github.com/wallabag/wallabag/pull/2023) Fix translation for validators (@nicosomb) +- [#2016](https://github.com/wallabag/wallabag/pull/2016) Update documentation (@nicosomb) +- [#2020](https://github.com/wallabag/wallabag/pull/2020) Fix number of entries in tag/list (@nicosomb) +- [#2024](https://github.com/wallabag/wallabag/pull/2024) Update messages.it.yml (@jamiroconca) +- [#2029](https://github.com/wallabag/wallabag/pull/2029) Change Travis/Scrutinizer pictures in README (@nicosomb) +- [#2028](https://github.com/wallabag/wallabag/pull/2028) Docu for android app (@Strubbl) +- [#2022](https://github.com/wallabag/wallabag/pull/2022) Fix pagination bar on small devices (@nicosomb) +- [#2017](https://github.com/wallabag/wallabag/pull/2017) Create messages.it.yml (@jamiroconca) +- [#2018](https://github.com/wallabag/wallabag/pull/2018) Update config.yml, add italian as available language (@jamiroconca) +- [#2019](https://github.com/wallabag/wallabag/pull/2019) Create CraueConfigBundle.it.yml (@jamiroconca) +- [#2013](https://github.com/wallabag/wallabag/pull/2013) Fix tags listing (@nicosomb) +- [#1976](https://github.com/wallabag/wallabag/pull/1976) Fix filter reading time (@nicosomb) +- [#2005](https://github.com/wallabag/wallabag/pull/2005) Fix reading speed not defined when user was created via config page (@nicosomb) +- [#2012](https://github.com/wallabag/wallabag/pull/2012) integrate upgrade.rst (@biva) +- [#2011](https://github.com/wallabag/wallabag/pull/2011) upgrade.rst (Creation of an upgrade page in the documentation) (@biva) +- [#2010](https://github.com/wallabag/wallabag/pull/2010) Set the title via POST /api/entries (@nicosomb) +- [#2001](https://github.com/wallabag/wallabag/pull/2001) Fix old branch name urls (@tcitworld) +- [#1992](https://github.com/wallabag/wallabag/pull/1992) Update CraueConfigBundle.es.yml (@jami7) +- [#1985](https://github.com/wallabag/wallabag/pull/1985) Rights access to the folders of the project (@foxmask) +- [#1977](https://github.com/wallabag/wallabag/pull/1977) Es translation (@j0k3r, @jami7) +- [#1970](https://github.com/wallabag/wallabag/pull/1970) Fix typos in API documentation (@nicosomb) +- [#1969](https://github.com/wallabag/wallabag/pull/1969) Create 3rd Resources chapter in API documentation (@nicosomb) +- [#1967](https://github.com/wallabag/wallabag/pull/1967) Add FAQ page in documentation (@nicosomb) -- Prepare wallabag 2.0.7 [\#2226](https://github.com/wallabag/wallabag/pull/2226) ([nicosomb](https://github.com/nicosomb)) -- Avoid breaking import when fetching fail [\#2224](https://github.com/wallabag/wallabag/pull/2224) ([j0k3r](https://github.com/j0k3r)) -- Added creation date and reading time on article view [\#2222](https://github.com/wallabag/wallabag/pull/2222) ([nicosomb](https://github.com/nicosomb)) -- Replaced favorite word/icon with star one [\#2221](https://github.com/wallabag/wallabag/pull/2221) ([nicosomb](https://github.com/nicosomb)) -- Enable PATCH method for CORS in API part [\#2220](https://github.com/wallabag/wallabag/pull/2220) ([Rurik19](https://github.com/Rurik19)) -- Enable CORS headers for OAUTH part [\#2216](https://github.com/wallabag/wallabag/pull/2216) ([Rurik19](https://github.com/Rurik19)) -- Run tests on an uptodate HHVM [\#2134](https://github.com/wallabag/wallabag/pull/2134) ([j0k3r](https://github.com/j0k3r)) -- Fix form user display when 2FA is disabled [\#2095](https://github.com/wallabag/wallabag/pull/2095) ([nicosomb](https://github.com/nicosomb)) +### 2.0.3 2016/04/22 +- [#1965](https://github.com/wallabag/wallabag/pull/1965) Prepare release 2.0.3 (@nicosomb) +- [#1962](https://github.com/wallabag/wallabag/pull/1962) Update API documentation with cURL examples (@nicosomb) -## [2.0.6](https://github.com/wallabag/wallabag/tree/2.0.6) (2016-08-10) -**Merged pull requests:** +### 2.0.2 2016/04/21 +- [#1948](https://github.com/wallabag/wallabag/pull/1948) Prepare release 2.0.2 (@nicosomb) +- [#1957](https://github.com/wallabag/wallabag/pull/1957) Fix translation for Go to your account button after subscription (@nicosomb) +- [#1945](https://github.com/wallabag/wallabag/pull/1945) Added some curl examples (@ddeimeke) +- [#1954](https://github.com/wallabag/wallabag/pull/1954) Update links in documentation (@nicosomb) +- [#1953](https://github.com/wallabag/wallabag/pull/1953) Actualisation des liens morts (Documentation de traduction) (@maxi62330) +- [#1942](https://github.com/wallabag/wallabag/pull/1942) Optimize import (@nicosomb) +- [#1944](https://github.com/wallabag/wallabag/pull/1944) Update Travis configuration with branches renaming (@nicosomb) -- add some missing phpdoc parameters [\#2202](https://github.com/wallabag/wallabag/pull/2202) ([tcitworld](https://github.com/tcitworld)) -- Run PHP 7.1 on Travis [\#2048](https://github.com/wallabag/wallabag/pull/2048) ([j0k3r](https://github.com/j0k3r)) -- Prepare release 2.0.6 [\#2212](https://github.com/wallabag/wallabag/pull/2212) ([nicosomb](https://github.com/nicosomb)) -- Fixed typo in entry:notice:entry\_saved [\#2200](https://github.com/wallabag/wallabag/pull/2200) ([charno6](https://github.com/charno6)) -- Handling socials links into a config file [\#2199](https://github.com/wallabag/wallabag/pull/2199) ([Simounet](https://github.com/Simounet)) -- FIX image inside a figure element max-width [\#2198](https://github.com/wallabag/wallabag/pull/2198) ([Simounet](https://github.com/Simounet)) -- Remove binary from repo [\#2195](https://github.com/wallabag/wallabag/pull/2195) ([j0k3r](https://github.com/j0k3r)) -- Fixed spelling Artúclos --\> Artículos [\#2194](https://github.com/wallabag/wallabag/pull/2194) ([benages](https://github.com/benages)) -- Fix 3rd-Party Apps links \(Chrome & Firefox\) [\#2185](https://github.com/wallabag/wallabag/pull/2185) ([tcitworld](https://github.com/tcitworld)) -- Change the way to login user in tests [\#2172](https://github.com/wallabag/wallabag/pull/2172) ([j0k3r](https://github.com/j0k3r)) -- Fix a few french translations typos [\#2165](https://github.com/wallabag/wallabag/pull/2165) ([tcitworld](https://github.com/tcitworld)) -- Update symlink to php-cs-fixer [\#2160](https://github.com/wallabag/wallabag/pull/2160) ([j0k3r](https://github.com/j0k3r)) -- Handle only upper or only lower reading filter [\#2157](https://github.com/wallabag/wallabag/pull/2157) ([j0k3r](https://github.com/j0k3r)) -- Try to find bad redirection after delete [\#2156](https://github.com/wallabag/wallabag/pull/2156) ([j0k3r](https://github.com/j0k3r)) -- Use friendsofphp instead of fabpot [\#2155](https://github.com/wallabag/wallabag/pull/2155) ([j0k3r](https://github.com/j0k3r)) -- translate documentation to German [\#2148](https://github.com/wallabag/wallabag/pull/2148) ([Strubbl](https://github.com/Strubbl)) -- Corrected Regex for lighttpd rewrite [\#2145](https://github.com/wallabag/wallabag/pull/2145) ([even-allmighty](https://github.com/even-allmighty)) -- Jump to Symfony 3.1 [\#2132](https://github.com/wallabag/wallabag/pull/2132) ([j0k3r](https://github.com/j0k3r)) +### 1.9.2 2016/04/18 +- [#1938](https://github.com/wallabag/wallabag/pull/1938) Display pagination only if we have more than one page (@nicosomb) +- [#1935](https://github.com/wallabag/wallabag/pull/1935) Update messages.es.yml (@jami7) +- [#1933](https://github.com/wallabag/wallabag/pull/1933) Hide pagination if we only have one entry to display (@nicosomb) +- [#1925](https://github.com/wallabag/wallabag/pull/1925) Redirect to homepage if referer is null (@nicosomb) +- [#1929](https://github.com/wallabag/wallabag/pull/1929) Change guid and link in RSS feeds to give original entry URL (@nicosomb) +- [#1916](https://github.com/wallabag/wallabag/pull/1916) Convert array + phpDoc (@j0k3r) +- [#1918](https://github.com/wallabag/wallabag/pull/1918) Improve pagination when user has lot of entries (@nicosomb) +- [#1919](https://github.com/wallabag/wallabag/pull/1919) Remove useless dependancy (@nicosomb) +- [#1911](https://github.com/wallabag/wallabag/pull/1911) add title hover on entry titles (@tcitworld) +- [#1915](https://github.com/wallabag/wallabag/pull/1915) Fix doc links (@j0k3r) -## [2.0.5](https://github.com/wallabag/wallabag/tree/2.0.5) (2016-05-31) -**Merged pull requests:** +### 2.0.1 2016/04/11 +- [#1912](https://github.com/wallabag/wallabag/pull/1912) Move setup config outside setupAdmin (@j0k3r) +- [#1909](https://github.com/wallabag/wallabag/pull/1909) Prepare release 2.0.1 (@nicosomb) +- [#1902](https://github.com/wallabag/wallabag/pull/1902) Add changelog (@nicosomb) +- [#1823](https://github.com/wallabag/wallabag/pull/1823) Translation fa (@j0k3r, @mabkenar) +- [#1903](https://github.com/wallabag/wallabag/pull/1903) Force server version to avoid connexion error (@j0k3r) +- [#1901](https://github.com/wallabag/wallabag/pull/1901) Update Spanish translation (@j0k3r, @jami7) +- [#1887](https://github.com/wallabag/wallabag/pull/1887) Fix duplicate article when added via the bookmarklet (@nicosomb) +- [#1895](https://github.com/wallabag/wallabag/pull/1895) All the entries are fetched via GET /api/entries (@nicosomb) +- [#1900](https://github.com/wallabag/wallabag/pull/1900) Remove empty portugese documentation (@nicosomb) +- [#1899](https://github.com/wallabag/wallabag/pull/1899) Add documentation about importing large file into nginx (@nicosomb) +- [#1898](https://github.com/wallabag/wallabag/pull/1898) Fix estimated reading time in material view (@nicosomb) +- [#1896](https://github.com/wallabag/wallabag/pull/1896) Fix internal settings (@nicosomb) +- [#1894](https://github.com/wallabag/wallabag/pull/1894) Fix documentation link in developer page (@nicosomb) +- [#1891](https://github.com/wallabag/wallabag/pull/1891) Fix typo on configuration page (@nicosomb) +- [#1824](https://github.com/wallabag/wallabag/pull/1824) Remove SMTP configuration environment overrides (@nicosomb) +- [#1879](https://github.com/wallabag/wallabag/pull/1879) Move tag form in Material theme (@nicosomb) +- [#1884](https://github.com/wallabag/wallabag/pull/1884) Change the installation method in issue template (@nicosomb) +- [#1804](https://github.com/wallabag/wallabag/pull/1804) Force user-agent for iansommerville.com (@j0k3r) +- [#1868](https://github.com/wallabag/wallabag/pull/1868) Remove keyboard shortcut and add tagging rule panel in baggy (@nicosomb) +- [#1862](https://github.com/wallabag/wallabag/pull/1862) Add production environment for CLI import (@nicosomb) +- [#1861](https://github.com/wallabag/wallabag/pull/1861) Round estimated time and add reading speed for Baggy (@nicosomb) +- [#1856](https://github.com/wallabag/wallabag/pull/1856) Documentation about wallabag v1 CLI import (@nicosomb) +- [#1840](https://github.com/wallabag/wallabag/pull/1840) Fix Archive page title translation (@nicosomb) -- Improve English translation [\#2109](https://github.com/wallabag/wallabag/pull/2109) ([Poorchop](https://github.com/Poorchop)) -- Update api.rst [\#2044](https://github.com/wallabag/wallabag/pull/2044) ([joshp23](https://github.com/joshp23)) -- new details in the doc about the rights access again;\) [\#2038](https://github.com/wallabag/wallabag/pull/2038) ([foxmask](https://github.com/foxmask)) -- Fix the deletion of Tags/Entries relation when delete an entry [\#2122](https://github.com/wallabag/wallabag/pull/2122) ([nicosomb](https://github.com/nicosomb)) -- Prepare wallabag 2.0.5 [\#2118](https://github.com/wallabag/wallabag/pull/2118) ([nicosomb](https://github.com/nicosomb)) -- Docs proposal [\#2112](https://github.com/wallabag/wallabag/pull/2112) ([Poorchop](https://github.com/Poorchop)) -- add screenshots of android docu in English [\#2111](https://github.com/wallabag/wallabag/pull/2111) ([Strubbl](https://github.com/Strubbl)) -- CS [\#2098](https://github.com/wallabag/wallabag/pull/2098) ([j0k3r](https://github.com/j0k3r)) -- Fix image path in 2-factor authentification email [\#2097](https://github.com/wallabag/wallabag/pull/2097) ([bmillemathias](https://github.com/bmillemathias)) -- Update CONTRIBUTING file [\#2094](https://github.com/wallabag/wallabag/pull/2094) ([nicosomb](https://github.com/nicosomb)) -- Replace vertical dots in material theme with horizontal dots [\#2093](https://github.com/wallabag/wallabag/pull/2093) ([nicosomb](https://github.com/nicosomb)) -- Starred and Archived clears if article is already exists [\#2092](https://github.com/wallabag/wallabag/pull/2092) ([Rurik19](https://github.com/Rurik19)) -- Do not specify language in Firefox addon link [\#2069](https://github.com/wallabag/wallabag/pull/2069) ([merwan](https://github.com/merwan)) -- Added information about permissions on data/ [\#2068](https://github.com/wallabag/wallabag/pull/2068) ([mariovor](https://github.com/mariovor)) -- Update CraueConfigBundle.it.yml [\#2054](https://github.com/wallabag/wallabag/pull/2054) ([jamiroconca](https://github.com/jamiroconca)) -- Add unread filter to entries pages [\#2052](https://github.com/wallabag/wallabag/pull/2052) ([danbartram](https://github.com/danbartram)) -- Update api.rst [\#2049](https://github.com/wallabag/wallabag/pull/2049) ([joshp23](https://github.com/joshp23)) +### 2.0.0 2016/04/03 +- [#1835](https://github.com/wallabag/wallabag/pull/1835) :rocket: Prepare v2.0.0 :birthday: (@nicosomb) +- [#1838](https://github.com/wallabag/wallabag/pull/1838) Hide search buttons (@nicosomb) +- [#1832](https://github.com/wallabag/wallabag/pull/1832) Check selected PDO driver on install (@j0k3r) +- [#3](https://github.com/wallabag/wallabag/pull/3) Fix simple quote (@j0k3r) +- [#1822](https://github.com/wallabag/wallabag/pull/1822) Update messages.es.yml (@jami7) +- [#1820](https://github.com/wallabag/wallabag/pull/1820) Refacto wallabag import (@j0k3r) +- [#1821](https://github.com/wallabag/wallabag/pull/1821) Update messages.es.yml (@jami7) +- [#1805](https://github.com/wallabag/wallabag/pull/1805) Fix #1768 Split tags with commas from UI (@j0k3r) +- [#1819](https://github.com/wallabag/wallabag/pull/1819) Some cleanup (@j0k3r) +- [#1818](https://github.com/wallabag/wallabag/pull/1818) add migration docs (@tcitworld) +- [#1817](https://github.com/wallabag/wallabag/pull/1817) Correct translation (@mruminski) +- [#1813](https://github.com/wallabag/wallabag/pull/1813) [v2] German translation (@wallabag) +- [#1807](https://github.com/wallabag/wallabag/pull/1807) fix typo diaspora* share (@nikaro) +- [#1806](https://github.com/wallabag/wallabag/pull/1806) Translate flash message in baggy theme (@nicosomb) +- [#1774](https://github.com/wallabag/wallabag/pull/1774) Switch to keys in translated files (@j0k3r) +- [#1767](https://github.com/wallabag/wallabag/pull/1767) Setting for reading time (@nicosomb) +- [#1799](https://github.com/wallabag/wallabag/pull/1799) fix tabs display on mobile view (@tcitworld) +- [#1791](https://github.com/wallabag/wallabag/pull/1791) fix api properties and typo (@tcitworld) +- [#1797](https://github.com/wallabag/wallabag/pull/1797) Don't add entry through API if it already exists (@tcitworld) +- [#1792](https://github.com/wallabag/wallabag/pull/1792) add tests on user in API responses (@tcitworld) +- [#1786](https://github.com/wallabag/wallabag/pull/1786) API shows just what needed for user (@tcitworld) +- [#1784](https://github.com/wallabag/wallabag/pull/1784) add refresh-token grant-type (@tcitworld) -## [2.0.4](https://github.com/wallabag/wallabag/tree/2.0.4) (2016-05-07) -**Merged pull requests:** +### 2.0.0-beta.2 2016/03/12 +- [#1775](https://github.com/wallabag/wallabag/pull/1775) Some fixes (@j0k3r) +- [#1776](https://github.com/wallabag/wallabag/pull/1776) clarify that wllbg is compatible php 7 (@tcitworld) +- [#1763](https://github.com/wallabag/wallabag/pull/1763) Prepare files for 2.0.0-beta.2 (@nicosomb) +- [#1771](https://github.com/wallabag/wallabag/pull/1771) Docker timezone (@DjayDev) +- [#1766](https://github.com/wallabag/wallabag/pull/1766) Fix #1756: Added 'wallabag' in page title (@nicosomb) +- [#1762](https://github.com/wallabag/wallabag/pull/1762) Change documentation links in quickstart (@nicosomb) +- [#1761](https://github.com/wallabag/wallabag/pull/1761) V2 api version (@tcitworld, @ZeddZull) +- [#1675](https://github.com/wallabag/wallabag/pull/1675) Ability to create new client for the API (@j0k3r, @nicosomb, @tcitworld) +- [#1750](https://github.com/wallabag/wallabag/pull/1750) Documentation about filters / Quickstart changes (@nicosomb) +- [#1670](https://github.com/wallabag/wallabag/pull/1670) Mark all imported articles as read (@j0k3r, @tcitworld) +- [#1754](https://github.com/wallabag/wallabag/pull/1754) Add starred & archive properties to API (@j0k3r, @tcitworld) +- [#1753](https://github.com/wallabag/wallabag/pull/1753) Doc: fix typo in php-hash ext name (@Horgix) +- [#1745](https://github.com/wallabag/wallabag/pull/1745) V2 spanish translation (@benages) +- [#1743](https://github.com/wallabag/wallabag/pull/1743) Releasing documentation (@nicosomb) +- [#1615](https://github.com/wallabag/wallabag/pull/1615) Added RELEASE_PROCESS document (@bdunogier) +- [#1740](https://github.com/wallabag/wallabag/pull/1740) minor typofix again (@goofy-bz) +- [#1742](https://github.com/wallabag/wallabag/pull/1742) Add the way to install (package or composer) (@nicosomb) -- Prepare wallabag 2.0.4 [\#2035](https://github.com/wallabag/wallabag/pull/2035) ([nicosomb](https://github.com/nicosomb)) -- Change Travis/Scrutinizer pictures in README [\#2029](https://github.com/wallabag/wallabag/pull/2029) ([nicosomb](https://github.com/nicosomb)) -- Docu for android app [\#2028](https://github.com/wallabag/wallabag/pull/2028) ([Strubbl](https://github.com/Strubbl)) -- Update messages.it.yml [\#2024](https://github.com/wallabag/wallabag/pull/2024) ([jamiroconca](https://github.com/jamiroconca)) -- Fix translation for validators [\#2023](https://github.com/wallabag/wallabag/pull/2023) ([nicosomb](https://github.com/nicosomb)) -- Fix pagination bar on small devices [\#2022](https://github.com/wallabag/wallabag/pull/2022) ([nicosomb](https://github.com/nicosomb)) -- Fix number of entries in tag/list [\#2020](https://github.com/wallabag/wallabag/pull/2020) ([nicosomb](https://github.com/nicosomb)) -- Create CraueConfigBundle.it.yml [\#2019](https://github.com/wallabag/wallabag/pull/2019) ([jamiroconca](https://github.com/jamiroconca)) -- Update config.yml, add italian as available language [\#2018](https://github.com/wallabag/wallabag/pull/2018) ([jamiroconca](https://github.com/jamiroconca)) -- Create messages.it.yml [\#2017](https://github.com/wallabag/wallabag/pull/2017) ([jamiroconca](https://github.com/jamiroconca)) -- Update documentation [\#2016](https://github.com/wallabag/wallabag/pull/2016) ([nicosomb](https://github.com/nicosomb)) -- Fix tags listing [\#2013](https://github.com/wallabag/wallabag/pull/2013) ([nicosomb](https://github.com/nicosomb)) -- integrate upgrade.rst [\#2012](https://github.com/wallabag/wallabag/pull/2012) ([biva](https://github.com/biva)) -- upgrade.rst \(Creation of an upgrade page in the documentation\) [\#2011](https://github.com/wallabag/wallabag/pull/2011) ([biva](https://github.com/biva)) -- Set the title via POST /api/entries [\#2010](https://github.com/wallabag/wallabag/pull/2010) ([nicosomb](https://github.com/nicosomb)) -- Fix reading speed not defined when user was created via config page [\#2005](https://github.com/wallabag/wallabag/pull/2005) ([nicosomb](https://github.com/nicosomb)) -- Fix old branch name urls [\#2001](https://github.com/wallabag/wallabag/pull/2001) ([tcitworld](https://github.com/tcitworld)) -- Update CraueConfigBundle.es.yml [\#1992](https://github.com/wallabag/wallabag/pull/1992) ([jami7](https://github.com/jami7)) -- Rights access to the folders of the project [\#1985](https://github.com/wallabag/wallabag/pull/1985) ([foxmask](https://github.com/foxmask)) -- Es translation [\#1977](https://github.com/wallabag/wallabag/pull/1977) ([j0k3r](https://github.com/j0k3r)) -- Fix filter reading time [\#1976](https://github.com/wallabag/wallabag/pull/1976) ([nicosomb](https://github.com/nicosomb)) -- Fix typos in API documentation [\#1970](https://github.com/wallabag/wallabag/pull/1970) ([nicosomb](https://github.com/nicosomb)) -- Create 3rd Resources chapter in API documentation [\#1969](https://github.com/wallabag/wallabag/pull/1969) ([nicosomb](https://github.com/nicosomb)) -- Add FAQ page in documentation [\#1967](https://github.com/wallabag/wallabag/pull/1967) ([nicosomb](https://github.com/nicosomb)) +### 2.0.0-beta.1 2016/03/01 +- [#1738](https://github.com/wallabag/wallabag/pull/1738) Prepare wallabag for first beta :rocket: (@nicosomb) +- [#1739](https://github.com/wallabag/wallabag/pull/1739) minor typofix + missing quotes (@goofy-bz) +- [#1736](https://github.com/wallabag/wallabag/pull/1736) Update Capistrano libraries with last versions (@nicosomb) +- [#1734](https://github.com/wallabag/wallabag/pull/1734) Remove extra definition (@j0k3r) +- [#1732](https://github.com/wallabag/wallabag/pull/1732) Adding Danish translations to Wallabag v2 (@mjjzf) +- [#1731](https://github.com/wallabag/wallabag/pull/1731) Fix: #1703: authentication for PR by external contributors (@nicosomb) +- [#1653](https://github.com/wallabag/wallabag/pull/1653) V2 annotator comments (@nicosomb, @tcitworld) +- [#1728](https://github.com/wallabag/wallabag/pull/1728) Fix #1717: Change remove tag icon in entry view with material theme (@wallabag) +- [#1723](https://github.com/wallabag/wallabag/pull/1723) Make English welcome message more natural (@shtrom) +- [#1712](https://github.com/wallabag/wallabag/pull/1712) Fix #1711: Update CONTRIBUTING file (@nicosomb) +- [#1716](https://github.com/wallabag/wallabag/pull/1716) Fix #1603: Enhance requirements in InstallCommand (@j0k3r, @tcitworld) +- [#1710](https://github.com/wallabag/wallabag/pull/1710) Fix #811: Display a human message when graby fails to fetch articles (@nicosomb) +- [#1715](https://github.com/wallabag/wallabag/pull/1715) Fix #1694 #1669 #1684: Add contributors and 3rd party libraries (@wallabag) +- [#1714](https://github.com/wallabag/wallabag/pull/1714) Change wording for create a new user (@j0k3r) +- [#1683](https://github.com/wallabag/wallabag/pull/1683) Demonstration mode to prevent password changes (@j0k3r) +- [#1701](https://github.com/wallabag/wallabag/pull/1701) Fix #1351: add maintenance mode (@j0k3r) +- [#1709](https://github.com/wallabag/wallabag/pull/1709) Fix #1708: typos in french documentation (@wallabag) +- [#1702](https://github.com/wallabag/wallabag/pull/1702) Added Piwik implementation (@j0k3r) +- [#1707](https://github.com/wallabag/wallabag/pull/1707) typo in french documentation (@nicosomb) +- [#1706](https://github.com/wallabag/wallabag/pull/1706) Documentation for wallabag installation (@tcitworld, @nicosomb) +- [#1705](https://github.com/wallabag/wallabag/pull/1705) French translation for documentation (@nicosomb) +- [#1699](https://github.com/wallabag/wallabag/pull/1699) Move assignTagsToEntry in ContentProxy helper (@j0k3r) +- [#1700](https://github.com/wallabag/wallabag/pull/1700) Fix #1551 - Redirect to the last page when current page is out of range (@delyriand) +- [#1693](https://github.com/wallabag/wallabag/pull/1693) Fix #1691 create ISSUE_TEMPLATE and PULL_REQUEST_TEMPLATE (@wallabag) +- [#1696](https://github.com/wallabag/wallabag/pull/1696) Add some missing french translations (@wallabag) +- [#1688](https://github.com/wallabag/wallabag/pull/1688) Create messages.pl.yml (@mruminski) +- [#1690](https://github.com/wallabag/wallabag/pull/1690) translate estimated time minutes (@tcitworld) +- [#1689](https://github.com/wallabag/wallabag/pull/1689) Create validators.pl.yml (@mruminski) +- [#1686](https://github.com/wallabag/wallabag/pull/1686) Polish translation (@mruminski) +- [#1687](https://github.com/wallabag/wallabag/pull/1687) Translated another two files into romanian. (@0wnrepo) +- [#1681](https://github.com/wallabag/wallabag/pull/1681) two more Persian translated files (@mabkenar) +- [#1679](https://github.com/wallabag/wallabag/pull/1679) Documentation about translation (@wallabag) +- [#1680](https://github.com/wallabag/wallabag/pull/1680) Update Capistrano configuration for symfony3 (@wallabag) +- [#1678](https://github.com/wallabag/wallabag/pull/1678) Translation file for the 'Romanian' language. Also recognised by ro_RO. Known in romanian as "Română". (@0wnrepo) +- [#1676](https://github.com/wallabag/wallabag/pull/1676) Translation for Persian (@mabkenar) +- [#1668](https://github.com/wallabag/wallabag/pull/1668) Few updates (@j0k3r) +- [#1672](https://github.com/wallabag/wallabag/pull/1672) improve baggy theme (add new tag panel) (@tcitworld) +- [#1671](https://github.com/wallabag/wallabag/pull/1671) display pictures properly (@tcitworld) +- [#1658](https://github.com/wallabag/wallabag/pull/1658) import tags from v1 (#1657) (@tcitworld) +- [#1656](https://github.com/wallabag/wallabag/pull/1656) fix labels on new user prompt (@tcitworld) +- [#1654](https://github.com/wallabag/wallabag/pull/1654) fix #1636 (@tcitworld) +- [#1663](https://github.com/wallabag/wallabag/pull/1663) remove tag from entry #1377 (@tcitworld) +- [#1665](https://github.com/wallabag/wallabag/pull/1665) lots of diverse translation stuff & some typos (@tcitworld) +- [#1666](https://github.com/wallabag/wallabag/pull/1666) reimport v1 entries if they were not fetched (@tcitworld) +- [#1659](https://github.com/wallabag/wallabag/pull/1659) Update README.md with the environment parameters (@0wnrepo) +- [#1651](https://github.com/wallabag/wallabag/pull/1651) Test if some keys are missing in v2 import (@wallabag) +- [#1650](https://github.com/wallabag/wallabag/pull/1650) Exported entries were added twice in export file (@wallabag) +- [#1652](https://github.com/wallabag/wallabag/pull/1652) User created via wallabag:install is now a SUPER_ADMIN :crown: (@wallabag) +- [#1648](https://github.com/wallabag/wallabag/pull/1648) Fix project version in installation command (@lologhi) +- [#1647](https://github.com/wallabag/wallabag/pull/1647) Force prod env on project creation (@j0k3r) +- [#1633](https://github.com/wallabag/wallabag/pull/1633) Exporttxt (@j0k3r, @tcitworld) +- [#1642](https://github.com/wallabag/wallabag/pull/1642) Unescape content for Material card (@j0k3r) +- [#1644](https://github.com/wallabag/wallabag/pull/1644) Fix #1622: parameter for FosUser confirmation (@wallabag) +- [#1645](https://github.com/wallabag/wallabag/pull/1645) Fix #1643: fix the way to load the HTML template in 2factor auth (@wallabag) +- [#1612](https://github.com/wallabag/wallabag/pull/1612) Settings page (@j0k3r) +- [#1641](https://github.com/wallabag/wallabag/pull/1641) Update import.rst to fix a doc typo (@nicosomb) +- [#1601](https://github.com/wallabag/wallabag/pull/1601) [#1590] Add JSON import from wallabag v2 (@wallabag) +- [#1605](https://github.com/wallabag/wallabag/pull/1605) [#1604] First draft to fix SensioLabsInsight report (@wallabag) +- [#1639](https://github.com/wallabag/wallabag/pull/1639) Fix #1635: change database name for test environments (mysql/pgsql) (@wallabag) +- [#1630](https://github.com/wallabag/wallabag/pull/1630) Add @GitterHQ badge on README (@nicosomb) +- [#1629](https://github.com/wallabag/wallabag/pull/1629) fix #1620 and introduce new parameters to export (@tcitworld) +- [#1628](https://github.com/wallabag/wallabag/pull/1628) Add Turkish translation (@ogunkarakus) +- [#1625](https://github.com/wallabag/wallabag/pull/1625) [#1621] Add default address for FosUser (@nicosomb) +- [#1619](https://github.com/wallabag/wallabag/pull/1619) Move public assets for themes (@j0k3r) +- [#1618](https://github.com/wallabag/wallabag/pull/1618) Updated version in README (@wallabag) -## [2.0.3](https://github.com/wallabag/wallabag/tree/2.0.3) (2016-04-22) -**Merged pull requests:** +### 2.0.0-alpha.2 2016/01/22 +- [#1614](https://github.com/wallabag/wallabag/pull/1614) Few fixes (@j0k3r) +- [#1565](https://github.com/wallabag/wallabag/pull/1565) Use HTML email for 2FA (@j0k3r) +- [#1610](https://github.com/wallabag/wallabag/pull/1610) Disable xdebug all the time (@j0k3r) +- [#1606](https://github.com/wallabag/wallabag/pull/1606) Remove tag relation when removing an entry (@j0k3r) +- [#1607](https://github.com/wallabag/wallabag/pull/1607) Ignore composer.lock (@j0k3r) +- [#1599](https://github.com/wallabag/wallabag/pull/1599) Add configuration for portuguese documentation (@wallabag) +- [#1594](https://github.com/wallabag/wallabag/pull/1594) Create index.rst (@araujo0205) +- [#1587](https://github.com/wallabag/wallabag/pull/1587) Use translator interface instead of final class (@j0k3r) +- [#1584](https://github.com/wallabag/wallabag/pull/1584) some cleanup (@wallabag) +- [#1564](https://github.com/wallabag/wallabag/pull/1564) Remove Flattr references (@wallabag) +- [#1583](https://github.com/wallabag/wallabag/pull/1583) Fix `findOneByUrl` side effect in tests (@j0k3r) +- [#1524](https://github.com/wallabag/wallabag/pull/1524) Upgrade to Symfony 3.0 (@j0k3r) +- [#1560](https://github.com/wallabag/wallabag/pull/1560) Fix #1501 Quickstart for beginners (@nicosomb) +- [#1574](https://github.com/wallabag/wallabag/pull/1574) Fix typo and set version in the README (@jjanvier) +- [#1561](https://github.com/wallabag/wallabag/pull/1561) Add basic docker-compose configuration (@FabienM) +- [#1563](https://github.com/wallabag/wallabag/pull/1563) #1394 Fixed 'mark as read' and 'mark as unread' links (@nicosomb) +- [#1562](https://github.com/wallabag/wallabag/pull/1562) add import link on baggy theme (@nicosomb) +- [#1558](https://github.com/wallabag/wallabag/pull/1558) [v2] documentation cleaning (@wallabag) +- [#1559](https://github.com/wallabag/wallabag/pull/1559) Installation & configuration of Doctrine Migrations (@j0k3r) -- Prepare release 2.0.3 [\#1965](https://github.com/wallabag/wallabag/pull/1965) ([nicosomb](https://github.com/nicosomb)) -- Update API documentation with cURL examples [\#1962](https://github.com/wallabag/wallabag/pull/1962) ([nicosomb](https://github.com/nicosomb)) - -## [2.0.2](https://github.com/wallabag/wallabag/tree/2.0.2) (2016-04-21) -**Merged pull requests:** - -- Update messages.es.yml [\#1935](https://github.com/wallabag/wallabag/pull/1935) ([jami7](https://github.com/jami7)) -- Fix UTF-8 encoding before JSON export [\#1866](https://github.com/wallabag/wallabag/pull/1866) ([ymage](https://github.com/ymage)) -- \[Do Not Merge\] Wallabag 1.9.2 [\#1814](https://github.com/wallabag/wallabag/pull/1814) ([tcitworld](https://github.com/tcitworld)) -- Fix translation for Go to your account button after subscription [\#1957](https://github.com/wallabag/wallabag/pull/1957) ([nicosomb](https://github.com/nicosomb)) -- Update links in documentation [\#1954](https://github.com/wallabag/wallabag/pull/1954) ([nicosomb](https://github.com/nicosomb)) -- Actualisation des liens morts \(Documentation de traduction\) [\#1953](https://github.com/wallabag/wallabag/pull/1953) ([maxi62330](https://github.com/maxi62330)) -- Prepare release 2.0.2 [\#1948](https://github.com/wallabag/wallabag/pull/1948) ([nicosomb](https://github.com/nicosomb)) -- Added some curl examples [\#1945](https://github.com/wallabag/wallabag/pull/1945) ([ddeimeke](https://github.com/ddeimeke)) -- Update Travis configuration with branches renaming [\#1944](https://github.com/wallabag/wallabag/pull/1944) ([nicosomb](https://github.com/nicosomb)) -- Optimize import [\#1942](https://github.com/wallabag/wallabag/pull/1942) ([nicosomb](https://github.com/nicosomb)) -- Display pagination only if we have more than one page [\#1938](https://github.com/wallabag/wallabag/pull/1938) ([nicosomb](https://github.com/nicosomb)) -- Hide pagination if we only have one entry to display [\#1933](https://github.com/wallabag/wallabag/pull/1933) ([nicosomb](https://github.com/nicosomb)) -- Change guid and link in RSS feeds to give original entry URL [\#1929](https://github.com/wallabag/wallabag/pull/1929) ([nicosomb](https://github.com/nicosomb)) -- Redirect to homepage if referer is null [\#1925](https://github.com/wallabag/wallabag/pull/1925) ([nicosomb](https://github.com/nicosomb)) -- Remove useless dependancy [\#1919](https://github.com/wallabag/wallabag/pull/1919) ([nicosomb](https://github.com/nicosomb)) -- Improve pagination when user has lot of entries [\#1918](https://github.com/wallabag/wallabag/pull/1918) ([nicosomb](https://github.com/nicosomb)) -- Convert array + phpDoc [\#1916](https://github.com/wallabag/wallabag/pull/1916) ([j0k3r](https://github.com/j0k3r)) -- Fix doc links [\#1915](https://github.com/wallabag/wallabag/pull/1915) ([j0k3r](https://github.com/j0k3r)) -- add title hover on entry titles [\#1911](https://github.com/wallabag/wallabag/pull/1911) ([tcitworld](https://github.com/tcitworld)) - -## [2.0.1](https://github.com/wallabag/wallabag/tree/2.0.1) (2016-04-11) -**Merged pull requests:** - -- Fix estimated reading time in material view [\#1898](https://github.com/wallabag/wallabag/pull/1898) ([nicosomb](https://github.com/nicosomb)) -- Move setup config outside setupAdmin [\#1912](https://github.com/wallabag/wallabag/pull/1912) ([j0k3r](https://github.com/j0k3r)) -- Prepare release 2.0.1 [\#1909](https://github.com/wallabag/wallabag/pull/1909) ([nicosomb](https://github.com/nicosomb)) -- Force server version to avoid connexion error [\#1903](https://github.com/wallabag/wallabag/pull/1903) ([j0k3r](https://github.com/j0k3r)) -- Add changelog [\#1902](https://github.com/wallabag/wallabag/pull/1902) ([nicosomb](https://github.com/nicosomb)) -- Update Spanish translation [\#1901](https://github.com/wallabag/wallabag/pull/1901) ([j0k3r](https://github.com/j0k3r)) -- Remove empty portugese documentation [\#1900](https://github.com/wallabag/wallabag/pull/1900) ([nicosomb](https://github.com/nicosomb)) -- Add documentation about importing large file into nginx [\#1899](https://github.com/wallabag/wallabag/pull/1899) ([nicosomb](https://github.com/nicosomb)) -- Fix internal settings [\#1896](https://github.com/wallabag/wallabag/pull/1896) ([nicosomb](https://github.com/nicosomb)) -- All the entries are fetched via GET /api/entries [\#1895](https://github.com/wallabag/wallabag/pull/1895) ([nicosomb](https://github.com/nicosomb)) -- Fix documentation link in developer page [\#1894](https://github.com/wallabag/wallabag/pull/1894) ([nicosomb](https://github.com/nicosomb)) -- Fix typo on configuration page [\#1891](https://github.com/wallabag/wallabag/pull/1891) ([nicosomb](https://github.com/nicosomb)) -- Fix duplicate article when added via the bookmarklet [\#1887](https://github.com/wallabag/wallabag/pull/1887) ([nicosomb](https://github.com/nicosomb)) -- Change the installation method in issue template [\#1884](https://github.com/wallabag/wallabag/pull/1884) ([nicosomb](https://github.com/nicosomb)) -- Move tag form in Material theme [\#1879](https://github.com/wallabag/wallabag/pull/1879) ([nicosomb](https://github.com/nicosomb)) -- Remove keyboard shortcut and add tagging rule panel in baggy [\#1868](https://github.com/wallabag/wallabag/pull/1868) ([nicosomb](https://github.com/nicosomb)) -- Add production environment for CLI import [\#1862](https://github.com/wallabag/wallabag/pull/1862) ([nicosomb](https://github.com/nicosomb)) -- Round estimated time and add reading speed for Baggy [\#1861](https://github.com/wallabag/wallabag/pull/1861) ([nicosomb](https://github.com/nicosomb)) -- Documentation about wallabag v1 CLI import [\#1856](https://github.com/wallabag/wallabag/pull/1856) ([nicosomb](https://github.com/nicosomb)) -- English documentation about wallabag API [\#1854](https://github.com/wallabag/wallabag/pull/1854) ([nicosomb](https://github.com/nicosomb)) -- Lock ocramius/proxy-manager [\#1844](https://github.com/wallabag/wallabag/pull/1844) ([j0k3r](https://github.com/j0k3r)) -- Fix Archive page title translation [\#1840](https://github.com/wallabag/wallabag/pull/1840) ([nicosomb](https://github.com/nicosomb)) -- Remove SMTP configuration environment overrides [\#1824](https://github.com/wallabag/wallabag/pull/1824) ([nicosomb](https://github.com/nicosomb)) -- Translation fa [\#1823](https://github.com/wallabag/wallabag/pull/1823) ([mabkenar](https://github.com/mabkenar)) -- Force user-agent for iansommerville.com [\#1804](https://github.com/wallabag/wallabag/pull/1804) ([j0k3r](https://github.com/j0k3r)) - -## [2.0.0](https://github.com/wallabag/wallabag/tree/2.0.0) (2016-04-03) -**Merged pull requests:** - -- Occitan version [\#1829](https://github.com/wallabag/wallabag/pull/1829) ([Quent-in](https://github.com/Quent-in)) -- remove buggy swipe actions [\#1825](https://github.com/wallabag/wallabag/pull/1825) ([tcitworld](https://github.com/tcitworld)) -- Update messages.es.yml [\#1822](https://github.com/wallabag/wallabag/pull/1822) ([jami7](https://github.com/jami7)) -- Update messages.es.yml [\#1821](https://github.com/wallabag/wallabag/pull/1821) ([jami7](https://github.com/jami7)) -- Correct translation [\#1817](https://github.com/wallabag/wallabag/pull/1817) ([mruminski](https://github.com/mruminski)) -- Add message on unread page about v2 [\#1815](https://github.com/wallabag/wallabag/pull/1815) ([nicosomb](https://github.com/nicosomb)) -- \[v2\] German translation [\#1813](https://github.com/wallabag/wallabag/pull/1813) ([jlnostr](https://github.com/jlnostr)) -- fix typo diaspora\* share [\#1807](https://github.com/wallabag/wallabag/pull/1807) ([nikaro](https://github.com/nikaro)) -- Hide search buttons [\#1838](https://github.com/wallabag/wallabag/pull/1838) ([nicosomb](https://github.com/nicosomb)) -- :rocket: Prepare v2.0.0 :birthday: [\#1835](https://github.com/wallabag/wallabag/pull/1835) ([nicosomb](https://github.com/nicosomb)) -- Check selected PDO driver on install [\#1832](https://github.com/wallabag/wallabag/pull/1832) ([j0k3r](https://github.com/j0k3r)) -- Refacto wallabag import [\#1820](https://github.com/wallabag/wallabag/pull/1820) ([j0k3r](https://github.com/j0k3r)) -- Some cleanup [\#1819](https://github.com/wallabag/wallabag/pull/1819) ([j0k3r](https://github.com/j0k3r)) -- add migration docs [\#1818](https://github.com/wallabag/wallabag/pull/1818) ([tcitworld](https://github.com/tcitworld)) -- Translate flash message in baggy theme [\#1806](https://github.com/wallabag/wallabag/pull/1806) ([nicosomb](https://github.com/nicosomb)) -- Fix \#1768 Split tags with commas from UI [\#1805](https://github.com/wallabag/wallabag/pull/1805) ([nicosomb](https://github.com/nicosomb)) -- fix tabs display on mobile view [\#1799](https://github.com/wallabag/wallabag/pull/1799) ([tcitworld](https://github.com/tcitworld)) -- Don't add entry through API if it already exists [\#1797](https://github.com/wallabag/wallabag/pull/1797) ([tcitworld](https://github.com/tcitworld)) -- add tests on user in API responses [\#1792](https://github.com/wallabag/wallabag/pull/1792) ([tcitworld](https://github.com/tcitworld)) -- fix api properties and typo [\#1791](https://github.com/wallabag/wallabag/pull/1791) ([tcitworld](https://github.com/tcitworld)) -- API shows just what needed for user [\#1786](https://github.com/wallabag/wallabag/pull/1786) ([tcitworld](https://github.com/tcitworld)) -- add refresh-token grant-type [\#1784](https://github.com/wallabag/wallabag/pull/1784) ([tcitworld](https://github.com/tcitworld)) -- Switch to keys in translated files [\#1774](https://github.com/wallabag/wallabag/pull/1774) ([j0k3r](https://github.com/j0k3r)) -- Setting for reading time [\#1767](https://github.com/wallabag/wallabag/pull/1767) ([nicosomb](https://github.com/nicosomb)) -- reimport v1 entries if they were not fetched [\#1666](https://github.com/wallabag/wallabag/pull/1666) ([tcitworld](https://github.com/tcitworld)) -- lots of diverse translation stuff & some typos [\#1665](https://github.com/wallabag/wallabag/pull/1665) ([tcitworld](https://github.com/tcitworld)) -- remove tag from entry \#1377 [\#1663](https://github.com/wallabag/wallabag/pull/1663) ([tcitworld](https://github.com/tcitworld)) -- v2 – Fix some deprecated for Symfony3 [\#1510](https://github.com/wallabag/wallabag/pull/1510) ([j0k3r](https://github.com/j0k3r)) -- Fix quote strategy for reserved keyword in Postgres [\#1500](https://github.com/wallabag/wallabag/pull/1500) ([j0k3r](https://github.com/j0k3r)) -- Rule based tags [\#1478](https://github.com/wallabag/wallabag/pull/1478) ([K-Phoen](https://github.com/K-Phoen)) -- \[WIP\] language selection on config screen [\#1446](https://github.com/wallabag/wallabag/pull/1446) ([nicosomb](https://github.com/nicosomb)) -- Add multiple database tests on Travis [\#1434](https://github.com/wallabag/wallabag/pull/1434) ([j0k3r](https://github.com/j0k3r)) - -## [2.0.0-beta.2](https://github.com/wallabag/wallabag/tree/2.0.0-beta.2) (2016-03-12) -**Merged pull requests:** - -- clarify that wllbg is compatible php 7 [\#1776](https://github.com/wallabag/wallabag/pull/1776) ([tcitworld](https://github.com/tcitworld)) -- Some fixes [\#1775](https://github.com/wallabag/wallabag/pull/1775) ([j0k3r](https://github.com/j0k3r)) -- Docker timezone [\#1771](https://github.com/wallabag/wallabag/pull/1771) ([j0k3r](https://github.com/j0k3r)) -- Fix \#1756: Added 'wallabag' in page title [\#1766](https://github.com/wallabag/wallabag/pull/1766) ([nicosomb](https://github.com/nicosomb)) -- Prepare files for 2.0.0-beta.2 [\#1763](https://github.com/wallabag/wallabag/pull/1763) ([nicosomb](https://github.com/nicosomb)) -- Change documentation links in quickstart [\#1762](https://github.com/wallabag/wallabag/pull/1762) ([nicosomb](https://github.com/nicosomb)) -- V2 api version [\#1761](https://github.com/wallabag/wallabag/pull/1761) ([tcitworld](https://github.com/tcitworld)) -- Add starred & archive properties to API [\#1754](https://github.com/wallabag/wallabag/pull/1754) ([j0k3r](https://github.com/j0k3r)) -- Doc: fix typo in php-hash ext name [\#1753](https://github.com/wallabag/wallabag/pull/1753) ([Horgix](https://github.com/Horgix)) -- Documentation about filters / Quickstart changes [\#1750](https://github.com/wallabag/wallabag/pull/1750) ([nicosomb](https://github.com/nicosomb)) -- V2 spanish translation [\#1745](https://github.com/wallabag/wallabag/pull/1745) ([benages](https://github.com/benages)) -- Releasing documentation [\#1743](https://github.com/wallabag/wallabag/pull/1743) ([nicosomb](https://github.com/nicosomb)) -- Add the way to install \(package or composer\) [\#1742](https://github.com/wallabag/wallabag/pull/1742) ([nicosomb](https://github.com/nicosomb)) -- minor typofix again [\#1740](https://github.com/wallabag/wallabag/pull/1740) ([goofy-bz](https://github.com/goofy-bz)) -- Ability to create new client for the API [\#1675](https://github.com/wallabag/wallabag/pull/1675) ([nicosomb](https://github.com/nicosomb)) -- Mark all imported articles as read [\#1670](https://github.com/wallabag/wallabag/pull/1670) ([tcitworld](https://github.com/tcitworld)) -- Added RELEASE\_PROCESS document [\#1615](https://github.com/wallabag/wallabag/pull/1615) ([bdunogier](https://github.com/bdunogier)) - -## [2.0.0-beta.1](https://github.com/wallabag/wallabag/tree/2.0.0-beta.1) (2016-03-01) -**Merged pull requests:** - -- minor typofix + missing quotes [\#1739](https://github.com/wallabag/wallabag/pull/1739) ([goofy-bz](https://github.com/goofy-bz)) -- Remove extra definition [\#1734](https://github.com/wallabag/wallabag/pull/1734) ([j0k3r](https://github.com/j0k3r)) -- Adding Danish translations to Wallabag v2 [\#1732](https://github.com/wallabag/wallabag/pull/1732) ([mjjzf](https://github.com/mjjzf)) -- Make English welcome message more natural [\#1723](https://github.com/wallabag/wallabag/pull/1723) ([shtrom](https://github.com/shtrom)) -- display how much comments there are for an entry [\#1722](https://github.com/wallabag/wallabag/pull/1722) ([tcitworld](https://github.com/tcitworld)) -- Change wording for create a new user [\#1714](https://github.com/wallabag/wallabag/pull/1714) ([j0k3r](https://github.com/j0k3r)) -- Create validators.pl.yml [\#1689](https://github.com/wallabag/wallabag/pull/1689) ([mruminski](https://github.com/mruminski)) -- Create messages.pl.yml [\#1688](https://github.com/wallabag/wallabag/pull/1688) ([mruminski](https://github.com/mruminski)) -- Translated another two files into romanian. [\#1687](https://github.com/wallabag/wallabag/pull/1687) ([0wnrepo](https://github.com/0wnrepo)) -- Polish translation [\#1686](https://github.com/wallabag/wallabag/pull/1686) ([mruminski](https://github.com/mruminski)) -- two more Persian translated files [\#1681](https://github.com/wallabag/wallabag/pull/1681) ([mabkenar](https://github.com/mabkenar)) -- Translation file for the 'Romanian' language. Also recognised by ro\_RO. Known in romanian as "Română". [\#1678](https://github.com/wallabag/wallabag/pull/1678) ([0wnrepo](https://github.com/0wnrepo)) -- Translation for Persian [\#1676](https://github.com/wallabag/wallabag/pull/1676) ([mabkenar](https://github.com/mabkenar)) -- improve baggy theme \(add new tag panel\) [\#1672](https://github.com/wallabag/wallabag/pull/1672) ([tcitworld](https://github.com/tcitworld)) -- display pictures properly [\#1671](https://github.com/wallabag/wallabag/pull/1671) ([tcitworld](https://github.com/tcitworld)) -- Add @GitterHQ badge on README [\#1630](https://github.com/wallabag/wallabag/pull/1630) ([nicosomb](https://github.com/nicosomb)) -- Add Turkish translation [\#1628](https://github.com/wallabag/wallabag/pull/1628) ([ogunkarakus](https://github.com/ogunkarakus)) -- Prepare wallabag for first beta :rocket: [\#1738](https://github.com/wallabag/wallabag/pull/1738) ([nicosomb](https://github.com/nicosomb)) -- Update Capistrano libraries with last versions [\#1736](https://github.com/wallabag/wallabag/pull/1736) ([nicosomb](https://github.com/nicosomb)) -- Fix: \#1703: authentication for PR by external contributors [\#1731](https://github.com/wallabag/wallabag/pull/1731) ([nicosomb](https://github.com/nicosomb)) -- Fix \#1717: Change remove tag icon in entry view with material theme [\#1728](https://github.com/wallabag/wallabag/pull/1728) ([nicosomb](https://github.com/nicosomb)) -- move annotatorjs to the bottom of the body so that the "article" tag is loaded before [\#1721](https://github.com/wallabag/wallabag/pull/1721) ([tcitworld](https://github.com/tcitworld)) -- Fix \#1603: Enhance requirements in InstallCommand [\#1716](https://github.com/wallabag/wallabag/pull/1716) ([nicosomb](https://github.com/nicosomb)) -- Fix \#1694 \#1669 \#1684: Add contributors and 3rd party libraries [\#1715](https://github.com/wallabag/wallabag/pull/1715) ([nicosomb](https://github.com/nicosomb)) -- Fix \#1711: Update CONTRIBUTING file [\#1712](https://github.com/wallabag/wallabag/pull/1712) ([nicosomb](https://github.com/nicosomb)) -- Fix \#811: Display a human message when graby fails to fetch articles [\#1710](https://github.com/wallabag/wallabag/pull/1710) ([nicosomb](https://github.com/nicosomb)) -- Fix \#1708: typos in french documentation [\#1709](https://github.com/wallabag/wallabag/pull/1709) ([nicosomb](https://github.com/nicosomb)) -- typo in french documentation [\#1707](https://github.com/wallabag/wallabag/pull/1707) ([nicosomb](https://github.com/nicosomb)) -- Documentation for wallabag installation [\#1706](https://github.com/wallabag/wallabag/pull/1706) ([nicosomb](https://github.com/nicosomb)) -- French translation for documentation [\#1705](https://github.com/wallabag/wallabag/pull/1705) ([nicosomb](https://github.com/nicosomb)) -- Added Piwik implementation [\#1702](https://github.com/wallabag/wallabag/pull/1702) ([nicosomb](https://github.com/nicosomb)) -- Fix \#1351: add maintenance mode [\#1701](https://github.com/wallabag/wallabag/pull/1701) ([nicosomb](https://github.com/nicosomb)) -- Fix \#1551 - Redirect to the last page when current page is out of range [\#1700](https://github.com/wallabag/wallabag/pull/1700) ([delyriand](https://github.com/delyriand)) -- Move assignTagsToEntry in ContentProxy helper [\#1699](https://github.com/wallabag/wallabag/pull/1699) ([j0k3r](https://github.com/j0k3r)) -- Add some missing french translations [\#1696](https://github.com/wallabag/wallabag/pull/1696) ([nicosomb](https://github.com/nicosomb)) -- Fix \#1691 create ISSUE\_TEMPLATE and PULL\_REQUEST\_TEMPLATE [\#1693](https://github.com/wallabag/wallabag/pull/1693) ([nicosomb](https://github.com/nicosomb)) -- translate estimated time minutes [\#1690](https://github.com/wallabag/wallabag/pull/1690) ([tcitworld](https://github.com/tcitworld)) -- Demonstration mode to prevent password changes [\#1683](https://github.com/wallabag/wallabag/pull/1683) ([nicosomb](https://github.com/nicosomb)) -- Update Capistrano configuration for symfony3 [\#1680](https://github.com/wallabag/wallabag/pull/1680) ([nicosomb](https://github.com/nicosomb)) -- Documentation about translation [\#1679](https://github.com/wallabag/wallabag/pull/1679) ([nicosomb](https://github.com/nicosomb)) -- Few updates [\#1668](https://github.com/wallabag/wallabag/pull/1668) ([j0k3r](https://github.com/j0k3r)) -- Update README.md with the environment parameters [\#1659](https://github.com/wallabag/wallabag/pull/1659) ([0wnrepo](https://github.com/0wnrepo)) -- import tags from v1 \(\#1657\) [\#1658](https://github.com/wallabag/wallabag/pull/1658) ([tcitworld](https://github.com/tcitworld)) -- fix labels on new user prompt [\#1656](https://github.com/wallabag/wallabag/pull/1656) ([tcitworld](https://github.com/tcitworld)) -- fix \#1636 [\#1654](https://github.com/wallabag/wallabag/pull/1654) ([tcitworld](https://github.com/tcitworld)) -- V2 annotator comments [\#1653](https://github.com/wallabag/wallabag/pull/1653) ([tcitworld](https://github.com/tcitworld)) -- User created via wallabag:install is now a SUPER\_ADMIN :crown: [\#1652](https://github.com/wallabag/wallabag/pull/1652) ([nicosomb](https://github.com/nicosomb)) -- Test if some keys are missing in v2 import [\#1651](https://github.com/wallabag/wallabag/pull/1651) ([nicosomb](https://github.com/nicosomb)) -- Exported entries were added twice in export file [\#1650](https://github.com/wallabag/wallabag/pull/1650) ([nicosomb](https://github.com/nicosomb)) -- Fix project version in installation command [\#1648](https://github.com/wallabag/wallabag/pull/1648) ([lologhi](https://github.com/lologhi)) -- Force prod env on project creation [\#1647](https://github.com/wallabag/wallabag/pull/1647) ([j0k3r](https://github.com/j0k3r)) -- Fix \#1643: fix the way to load the HTML template in 2factor auth [\#1645](https://github.com/wallabag/wallabag/pull/1645) ([nicosomb](https://github.com/nicosomb)) -- Fix \#1622: parameter for FosUser confirmation [\#1644](https://github.com/wallabag/wallabag/pull/1644) ([nicosomb](https://github.com/nicosomb)) -- Unescape content for Material card [\#1642](https://github.com/wallabag/wallabag/pull/1642) ([j0k3r](https://github.com/j0k3r)) -- Update import.rst to fix a doc typo [\#1641](https://github.com/wallabag/wallabag/pull/1641) ([nicosomb](https://github.com/nicosomb)) -- Fix \#1635: change database name for test environments \(mysql/pgsql\) [\#1639](https://github.com/wallabag/wallabag/pull/1639) ([nicosomb](https://github.com/nicosomb)) -- Exporttxt [\#1633](https://github.com/wallabag/wallabag/pull/1633) ([tcitworld](https://github.com/tcitworld)) -- fix \#1620 and introduce new parameters to export [\#1629](https://github.com/wallabag/wallabag/pull/1629) ([tcitworld](https://github.com/tcitworld)) -- \[\#1621\] Add default address for FosUser [\#1625](https://github.com/wallabag/wallabag/pull/1625) ([nicosomb](https://github.com/nicosomb)) -- Move public assets for themes [\#1619](https://github.com/wallabag/wallabag/pull/1619) ([j0k3r](https://github.com/j0k3r)) -- Updated version in README [\#1618](https://github.com/wallabag/wallabag/pull/1618) ([nicosomb](https://github.com/nicosomb)) -- Few fixes [\#1614](https://github.com/wallabag/wallabag/pull/1614) ([j0k3r](https://github.com/j0k3r)) -- Settings page [\#1612](https://github.com/wallabag/wallabag/pull/1612) ([j0k3r](https://github.com/j0k3r)) -- Disable xdebug all the time [\#1610](https://github.com/wallabag/wallabag/pull/1610) ([j0k3r](https://github.com/j0k3r)) -- Remove tag relation when removing an entry [\#1606](https://github.com/wallabag/wallabag/pull/1606) ([j0k3r](https://github.com/j0k3r)) -- \[\#1604\] First draft to fix SensioLabsInsight report [\#1605](https://github.com/wallabag/wallabag/pull/1605) ([nicosomb](https://github.com/nicosomb)) -- \[\#1590\] Add JSON import from wallabag v2 [\#1601](https://github.com/wallabag/wallabag/pull/1601) ([nicosomb](https://github.com/nicosomb)) -- Use translator interface instead of final class [\#1587](https://github.com/wallabag/wallabag/pull/1587) ([j0k3r](https://github.com/j0k3r)) -- some cleanup [\#1584](https://github.com/wallabag/wallabag/pull/1584) ([nicosomb](https://github.com/nicosomb)) -- Fix `findOneByUrl` side effect in tests [\#1583](https://github.com/wallabag/wallabag/pull/1583) ([j0k3r](https://github.com/j0k3r)) -- Fix typo and set version in the README [\#1574](https://github.com/wallabag/wallabag/pull/1574) ([jjanvier](https://github.com/jjanvier)) -- Use HTML email for 2FA [\#1565](https://github.com/wallabag/wallabag/pull/1565) ([j0k3r](https://github.com/j0k3r)) -- Remove Flattr references [\#1564](https://github.com/wallabag/wallabag/pull/1564) ([nicosomb](https://github.com/nicosomb)) -- \#1394 Fixed 'mark as read' and 'mark as unread' links [\#1563](https://github.com/wallabag/wallabag/pull/1563) ([nicosomb](https://github.com/nicosomb)) -- Fix \#1501 Quickstart for beginners [\#1560](https://github.com/wallabag/wallabag/pull/1560) ([nicosomb](https://github.com/nicosomb)) -- Installation & configuration of Doctrine Migrations [\#1559](https://github.com/wallabag/wallabag/pull/1559) ([nicosomb](https://github.com/nicosomb)) -- Upgrade to Symfony 3.0 [\#1524](https://github.com/wallabag/wallabag/pull/1524) ([j0k3r](https://github.com/j0k3r)) - -## [2.0.0-alpha.2](https://github.com/wallabag/wallabag/tree/2.0.0-alpha.2) (2016-01-22) -**Merged pull requests:** - -- Ignore composer.lock [\#1607](https://github.com/wallabag/wallabag/pull/1607) ([j0k3r](https://github.com/j0k3r)) -- Add configuration for portuguese documentation [\#1599](https://github.com/wallabag/wallabag/pull/1599) ([nicosomb](https://github.com/nicosomb)) -- Create index.rst [\#1594](https://github.com/wallabag/wallabag/pull/1594) ([araujo0205](https://github.com/araujo0205)) -- \#1490 HTML in E-Mails [\#1592](https://github.com/wallabag/wallabag/pull/1592) ([modos189](https://github.com/modos189)) -- Add caffereggio.net [\#1588](https://github.com/wallabag/wallabag/pull/1588) ([benages](https://github.com/benages)) -- Fix grammatical typo [\#1582](https://github.com/wallabag/wallabag/pull/1582) ([simark](https://github.com/simark)) -- add import link on baggy theme [\#1562](https://github.com/wallabag/wallabag/pull/1562) ([nicosomb](https://github.com/nicosomb)) -- Add basic docker-compose configuration [\#1561](https://github.com/wallabag/wallabag/pull/1561) ([FabienM](https://github.com/FabienM)) -- \[v2\] documentation cleaning [\#1558](https://github.com/wallabag/wallabag/pull/1558) ([nicosomb](https://github.com/nicosomb)) - -## [2.0.0-alpha.1](https://github.com/wallabag/wallabag/tree/2.0.0-alpha.1) (2016-01-07) -**Merged pull requests:** - -- Updated composer.lock [\#1537](https://github.com/wallabag/wallabag/pull/1537) ([bdunogier](https://github.com/bdunogier)) -- Add popehat.com [\#1535](https://github.com/wallabag/wallabag/pull/1535) ([benages](https://github.com/benages)) -- Modified blog.cloudflare.com [\#1530](https://github.com/wallabag/wallabag/pull/1530) ([benages](https://github.com/benages)) -- Add letraslibres and lawfareblog [\#1526](https://github.com/wallabag/wallabag/pull/1526) ([benages](https://github.com/benages)) -- SMTP from environment variables [\#1518](https://github.com/wallabag/wallabag/pull/1518) ([mathbruyen](https://github.com/mathbruyen)) -- add docs [\#1495](https://github.com/wallabag/wallabag/pull/1495) ([nicosomb](https://github.com/nicosomb)) -- v2 – 1st draft for Pocket import via API & Wallabag v1 import [\#1493](https://github.com/wallabag/wallabag/pull/1493) ([nicosomb](https://github.com/nicosomb)) -- Correction to naiz.eus [\#1489](https://github.com/wallabag/wallabag/pull/1489) ([benages](https://github.com/benages)) -- Corrections to chronicle.com [\#1486](https://github.com/wallabag/wallabag/pull/1486) ([benages](https://github.com/benages)) -- fix Content-Disposition header \#1481 [\#1483](https://github.com/wallabag/wallabag/pull/1483) ([alkahan](https://github.com/alkahan)) -- V2 material [\#1475](https://github.com/wallabag/wallabag/pull/1475) ([modos189](https://github.com/modos189)) -- Add three new sites [\#1466](https://github.com/wallabag/wallabag/pull/1466) ([benages](https://github.com/benages)) -- Add aclu.org [\#1460](https://github.com/wallabag/wallabag/pull/1460) ([benages](https://github.com/benages)) -- fix \#1457 & update materialize [\#1459](https://github.com/wallabag/wallabag/pull/1459) ([tcitworld](https://github.com/tcitworld)) -- Add diagonalperiodico.net [\#1455](https://github.com/wallabag/wallabag/pull/1455) ([benages](https://github.com/benages)) -- Add wired.de site config [\#1451](https://github.com/wallabag/wallabag/pull/1451) ([benages](https://github.com/benages)) -- Add support to timeshighereducation.com [\#1450](https://github.com/wallabag/wallabag/pull/1450) ([benages](https://github.com/benages)) -- typo [\#1447](https://github.com/wallabag/wallabag/pull/1447) ([tcitworld](https://github.com/tcitworld)) -- Hide export button if we are not on entries list [\#1553](https://github.com/wallabag/wallabag/pull/1553) ([nicosomb](https://github.com/nicosomb)) -- v2 – Fix wrong if when deleting an entry [\#1547](https://github.com/wallabag/wallabag/pull/1547) ([j0k3r](https://github.com/j0k3r)) -- v2 – Ability to reload an entry [\#1546](https://github.com/wallabag/wallabag/pull/1546) ([j0k3r](https://github.com/j0k3r)) -- v2 – Remove user reference in tag [\#1545](https://github.com/wallabag/wallabag/pull/1545) ([j0k3r](https://github.com/j0k3r)) -- v2 – Add custom email for 2FA [\#1544](https://github.com/wallabag/wallabag/pull/1544) ([j0k3r](https://github.com/j0k3r)) -- v2 – Avoid multiple tag creation [\#1542](https://github.com/wallabag/wallabag/pull/1542) ([j0k3r](https://github.com/j0k3r)) -- v2 – Don't redirect to the content page after deletion [\#1540](https://github.com/wallabag/wallabag/pull/1540) ([j0k3r](https://github.com/j0k3r)) -- changed table name for tagging rule [\#1529](https://github.com/wallabag/wallabag/pull/1529) ([nicosomb](https://github.com/nicosomb)) -- Typo [\#1523](https://github.com/wallabag/wallabag/pull/1523) ([tcitworld](https://github.com/tcitworld)) -- Add graby log [\#1505](https://github.com/wallabag/wallabag/pull/1505) ([j0k3r](https://github.com/j0k3r)) -- fix \#1005 V2 redirect after deletion [\#1496](https://github.com/wallabag/wallabag/pull/1496) ([nicosomb](https://github.com/nicosomb)) -- Add german translation. [\#1491](https://github.com/wallabag/wallabag/pull/1491) ([jlnostr](https://github.com/jlnostr)) -- Slug for tags [\#1488](https://github.com/wallabag/wallabag/pull/1488) ([nicosomb](https://github.com/nicosomb)) -- 2factor authentication via email [\#1484](https://github.com/wallabag/wallabag/pull/1484) ([nicosomb](https://github.com/nicosomb)) -- fix \#1470: clean material theme [\#1472](https://github.com/wallabag/wallabag/pull/1472) ([nicosomb](https://github.com/nicosomb)) -- implement bookmarklet [\#1471](https://github.com/wallabag/wallabag/pull/1471) ([nicosomb](https://github.com/nicosomb)) -- fix bug on detect active theme [\#1468](https://github.com/wallabag/wallabag/pull/1468) ([nicosomb](https://github.com/nicosomb)) -- fix type hint for User [\#1464](https://github.com/wallabag/wallabag/pull/1464) ([nicosomb](https://github.com/nicosomb)) -- fix \#1433: add test for removeWww Twig Extension [\#1461](https://github.com/wallabag/wallabag/pull/1461) ([nicosomb](https://github.com/nicosomb)) -- Add french translation [\#1441](https://github.com/wallabag/wallabag/pull/1441) ([nicosomb](https://github.com/nicosomb)) -- fix \#1433: remove www. on entries view [\#1440](https://github.com/wallabag/wallabag/pull/1440) ([nicosomb](https://github.com/nicosomb)) -- fix Capistrano configuration [\#1439](https://github.com/wallabag/wallabag/pull/1439) ([nicosomb](https://github.com/nicosomb)) -- some cleanup on material theme [\#1437](https://github.com/wallabag/wallabag/pull/1437) ([nicosomb](https://github.com/nicosomb)) -- Public registration & oAuth2 \o/ [\#1436](https://github.com/wallabag/wallabag/pull/1436) ([nicosomb](https://github.com/nicosomb)) -- Enabled created user from Config [\#1435](https://github.com/wallabag/wallabag/pull/1435) ([j0k3r](https://github.com/j0k3r)) -- V2 – Handle language in entry [\#1429](https://github.com/wallabag/wallabag/pull/1429) ([j0k3r](https://github.com/j0k3r)) -- V2 – Export entries [\#1422](https://github.com/wallabag/wallabag/pull/1422) ([tcitworld](https://github.com/tcitworld)) - -## [2.0.0-alpha.0](https://github.com/wallabag/wallabag/tree/2.0.0-alpha.0) (2015-09-14) -**Merged pull requests:** - -- improved display pictures [\#1420](https://github.com/wallabag/wallabag/pull/1420) ([modos189](https://github.com/modos189)) -- Update CONTRIBUTING.md [\#1415](https://github.com/wallabag/wallabag/pull/1415) ([sridharrajs](https://github.com/sridharrajs)) -- Use full size of the panel for domain-filtering [\#1403](https://github.com/wallabag/wallabag/pull/1403) ([tcitworld](https://github.com/tcitworld)) -- Enable code rating on Scrutinizer [\#1390](https://github.com/wallabag/wallabag/pull/1390) ([j0k3r](https://github.com/j0k3r)) -- change timeout because scrutinizer failed [\#1358](https://github.com/wallabag/wallabag/pull/1358) ([nicosomb](https://github.com/nicosomb)) -- fixes material [\#1337](https://github.com/wallabag/wallabag/pull/1337) ([modos189](https://github.com/modos189)) -- Update Useragent to Win8.1 and FF36 [\#1318](https://github.com/wallabag/wallabag/pull/1318) ([ticoombs](https://github.com/ticoombs)) -- Fix ff social [\#1301](https://github.com/wallabag/wallabag/pull/1301) ([tcitworld](https://github.com/tcitworld)) -- fix material [\#1298](https://github.com/wallabag/wallabag/pull/1298) ([modos189](https://github.com/modos189)) -- 1.9.1-b [\#1274](https://github.com/wallabag/wallabag/pull/1274) ([nicosomb](https://github.com/nicosomb)) -- remove new syntax for array [\#1272](https://github.com/wallabag/wallabag/pull/1272) ([nicosomb](https://github.com/nicosomb)) -- 1.9.1 [\#1267](https://github.com/wallabag/wallabag/pull/1267) ([nicosomb](https://github.com/nicosomb)) -- Fix site config [\#1266](https://github.com/wallabag/wallabag/pull/1266) ([nicosomb](https://github.com/nicosomb)) -- Dev autoclose [\#1257](https://github.com/wallabag/wallabag/pull/1257) ([freddyb](https://github.com/freddyb)) -- fix security bug with PHP\_AUTH\_USER [\#1252](https://github.com/wallabag/wallabag/pull/1252) ([tcitworld](https://github.com/tcitworld)) -- fix link to documentation [\#1251](https://github.com/wallabag/wallabag/pull/1251) ([axelsimon](https://github.com/axelsimon)) -- Revert "fix link to save your first article" [\#1248](https://github.com/wallabag/wallabag/pull/1248) ([tcitworld](https://github.com/tcitworld)) -- fix link to save your first article [\#1247](https://github.com/wallabag/wallabag/pull/1247) ([axelsimon](https://github.com/axelsimon)) -- add site config for des-livres-pour-changer-de-vie.fr [\#1234](https://github.com/wallabag/wallabag/pull/1234) ([jmlrt](https://github.com/jmlrt)) -- add site\_config for cloudacademy.com and cyrille-borne.com [\#1228](https://github.com/wallabag/wallabag/pull/1228) ([jmlrt](https://github.com/jmlrt)) -- Enable base\_url for proxies [\#1226](https://github.com/wallabag/wallabag/pull/1226) ([tcitworld](https://github.com/tcitworld)) -- Fix \#1215 [\#1217](https://github.com/wallabag/wallabag/pull/1217) ([tcitworld](https://github.com/tcitworld)) -- Update fr\_FR.utf8.po [\#1211](https://github.com/wallabag/wallabag/pull/1211) ([goofy-bz](https://github.com/goofy-bz)) -- issue \#1203: fixing tag export [\#1207](https://github.com/wallabag/wallabag/pull/1207) ([vpmalley](https://github.com/vpmalley)) -- fix restart of import [\#1200](https://github.com/wallabag/wallabag/pull/1200) ([nicosomb](https://github.com/nicosomb)) -- double closing parentheses [\#1158](https://github.com/wallabag/wallabag/pull/1158) ([bohni](https://github.com/bohni)) -- composer: min PHP 5.3 added [\#1151](https://github.com/wallabag/wallabag/pull/1151) ([TomasVotruba](https://github.com/TomasVotruba)) -- Wallabag v2 api hypermedia pager [\#1148](https://github.com/wallabag/wallabag/pull/1148) ([willdurand](https://github.com/willdurand)) -- locale es\_ES.utf8 files fully translated → Translation to Spanish updated [\#1106](https://github.com/wallabag/wallabag/pull/1106) ([icaroperseo](https://github.com/icaroperseo)) -- Version 1.9.0 [\#1081](https://github.com/wallabag/wallabag/pull/1081) ([tcitworld](https://github.com/tcitworld)) -- added site config for github gists, jungle-world.com and toolinux.com [\#1067](https://github.com/wallabag/wallabag/pull/1067) ([vpmalley](https://github.com/vpmalley)) -- V2 api tests entry [\#1066](https://github.com/wallabag/wallabag/pull/1066) ([j0k3r](https://github.com/j0k3r)) -- Cleanup default assets symlinks [\#1065](https://github.com/wallabag/wallabag/pull/1065) ([FabienM](https://github.com/FabienM)) -- add a real relation between user and entry [\#1062](https://github.com/wallabag/wallabag/pull/1062) ([nicosomb](https://github.com/nicosomb)) -- Remove temporary entities [\#1061](https://github.com/wallabag/wallabag/pull/1061) ([j0k3r](https://github.com/j0k3r)) -- rename User entity [\#1060](https://github.com/wallabag/wallabag/pull/1060) ([nicosomb](https://github.com/nicosomb)) -- Rename entry [\#1059](https://github.com/wallabag/wallabag/pull/1059) ([nicosomb](https://github.com/nicosomb)) -- PATCH method, boolean for some parameters and change entity methods name [\#1055](https://github.com/wallabag/wallabag/pull/1055) ([nicosomb](https://github.com/nicosomb)) -- we can now set a title to the article when we use POST /api/entries [\#1054](https://github.com/wallabag/wallabag/pull/1054) ([nicosomb](https://github.com/nicosomb)) -- Fix fetched entries when localized [\#1053](https://github.com/wallabag/wallabag/pull/1053) ([erixtekila](https://github.com/erixtekila)) -- Added en-GB [\#1042](https://github.com/wallabag/wallabag/pull/1042) ([edent](https://github.com/edent)) -- CS [\#1037](https://github.com/wallabag/wallabag/pull/1037) ([j0k3r](https://github.com/j0k3r)) -- Update composer [\#1036](https://github.com/wallabag/wallabag/pull/1036) ([j0k3r](https://github.com/j0k3r)) -- Tests are working again [\#1035](https://github.com/wallabag/wallabag/pull/1035) ([j0k3r](https://github.com/j0k3r)) -- Update german localisation. [\#1031](https://github.com/wallabag/wallabag/pull/1031) ([jlnostr](https://github.com/jlnostr)) -- Revert "Update german localisation." [\#1030](https://github.com/wallabag/wallabag/pull/1030) ([tcitworld](https://github.com/tcitworld)) -- Update german localisation. [\#1028](https://github.com/wallabag/wallabag/pull/1028) ([jlnostr](https://github.com/jlnostr)) -- New installation process [\#1026](https://github.com/wallabag/wallabag/pull/1026) ([tcitworld](https://github.com/tcitworld)) -- Send email at registration [\#1022](https://github.com/wallabag/wallabag/pull/1022) ([tcitworld](https://github.com/tcitworld)) -- working on registration support [\#1021](https://github.com/wallabag/wallabag/pull/1021) ([tcitworld](https://github.com/tcitworld)) -- Revert "URL encode 'via @wallabagapp' email body" [\#1019](https://github.com/wallabag/wallabag/pull/1019) ([nicosomb](https://github.com/nicosomb)) -- URL encode 'via @wallabagapp' email body [\#1018](https://github.com/wallabag/wallabag/pull/1018) ([shtrom](https://github.com/shtrom)) -- Savewithtags [\#1015](https://github.com/wallabag/wallabag/pull/1015) ([tcitworld](https://github.com/tcitworld)) -- Importtags [\#1013](https://github.com/wallabag/wallabag/pull/1013) ([tcitworld](https://github.com/tcitworld)) -- Fixed \#993: add wallabag to packagist [\#1004](https://github.com/wallabag/wallabag/pull/1004) ([nicosomb](https://github.com/nicosomb)) -- \[RSS\] introducing query param 'limit' for max items in RSS feed [\#1003](https://github.com/wallabag/wallabag/pull/1003) ([vpmalley](https://github.com/vpmalley)) -- Miscellaneous additions [\#999](https://github.com/wallabag/wallabag/pull/999) ([moparisthebest](https://github.com/moparisthebest)) -- Update fr\_FR.utf8.po [\#986](https://github.com/wallabag/wallabag/pull/986) ([goofy-bz](https://github.com/goofy-bz)) -- don't call flattr if flattr is disabled [\#975](https://github.com/wallabag/wallabag/pull/975) ([tcitworld](https://github.com/tcitworld)) -- Make call to FTRSS silent to avoid warnings which can break import [\#974](https://github.com/wallabag/wallabag/pull/974) ([jbfavre](https://github.com/jbfavre)) -- Fix jquery installation [\#971](https://github.com/wallabag/wallabag/pull/971) ([nicosomb](https://github.com/nicosomb)) -- added reload function [\#968](https://github.com/wallabag/wallabag/pull/968) ([tcitworld](https://github.com/tcitworld)) -- implemented random button [\#964](https://github.com/wallabag/wallabag/pull/964) ([tcitworld](https://github.com/tcitworld)) -- Update wallabag\_compatibility\_test.php [\#958](https://github.com/wallabag/wallabag/pull/958) ([etiess](https://github.com/etiess)) -- remove courgette theme [\#953](https://github.com/wallabag/wallabag/pull/953) ([nicosomb](https://github.com/nicosomb)) -- Fixing icon text on unread page [\#945](https://github.com/wallabag/wallabag/pull/945) ([jsit](https://github.com/jsit)) -- Globalizing and creating two variants of Carrot.org icon [\#944](https://github.com/wallabag/wallabag/pull/944) ([jsit](https://github.com/jsit)) -- fix Flattrs [\#943](https://github.com/wallabag/wallabag/pull/943) ([tcitworld](https://github.com/tcitworld)) -- implementing carrot into wallabag [\#942](https://github.com/wallabag/wallabag/pull/942) ([tcitworld](https://github.com/tcitworld)) -- \_global-izing some more js & css [\#939](https://github.com/wallabag/wallabag/pull/939) ([jsit](https://github.com/jsit)) -- Fix for favicons in Firefox [\#938](https://github.com/wallabag/wallabag/pull/938) ([jsit](https://github.com/jsit)) -- Moving favicons to new \_global theme dir and adjusting \ tags [\#937](https://github.com/wallabag/wallabag/pull/937) ([jsit](https://github.com/jsit)) -- 1.8.1b [\#933](https://github.com/wallabag/wallabag/pull/933) ([tcitworld](https://github.com/tcitworld)) -- 1.8.1 [\#932](https://github.com/wallabag/wallabag/pull/932) ([nicosomb](https://github.com/nicosomb)) -- Fixing URL typo on about page [\#926](https://github.com/wallabag/wallabag/pull/926) ([jsit](https://github.com/jsit)) -- add HTML documentation [\#923](https://github.com/wallabag/wallabag/pull/923) ([nicosomb](https://github.com/nicosomb)) -- Fixing menu hiding behavior when switching from mobile width to desktop width [\#922](https://github.com/wallabag/wallabag/pull/922) ([jsit](https://github.com/jsit)) -- add about page [\#921](https://github.com/wallabag/wallabag/pull/921) ([nicosomb](https://github.com/nicosomb)) -- Many small UI changes/fixes to Baggy theme and English translation files [\#920](https://github.com/wallabag/wallabag/pull/920) ([jsit](https://github.com/jsit)) -- Improving JavaScript for popup forms [\#919](https://github.com/wallabag/wallabag/pull/919) ([jsit](https://github.com/jsit)) -- Fixing opacity issue when using mobile menu \(\#912\) [\#917](https://github.com/wallabag/wallabag/pull/917) ([jsit](https://github.com/jsit)) -- Fixing regression in popup close button styling [\#913](https://github.com/wallabag/wallabag/pull/913) ([jsit](https://github.com/jsit)) -- Standardizing style and code for menu popup forms [\#911](https://github.com/wallabag/wallabag/pull/911) ([jsit](https://github.com/jsit)) -- Moving search-form style out of messages css and into style.css [\#910](https://github.com/wallabag/wallabag/pull/910) ([jsit](https://github.com/jsit)) -- Standardizing class names and styles for close buttons [\#909](https://github.com/wallabag/wallabag/pull/909) ([jsit](https://github.com/jsit)) -- Changing close message button to use × instead of X [\#908](https://github.com/wallabag/wallabag/pull/908) ([jsit](https://github.com/jsit)) -- Some small design tweaks to the login page: Moving 'Stay signed in'... [\#907](https://github.com/wallabag/wallabag/pull/907) ([jsit](https://github.com/jsit)) -- Uppercasing 'tags' page title [\#906](https://github.com/wallabag/wallabag/pull/906) ([jsit](https://github.com/jsit)) -- Making the close button more visually consistent on the menu popup forms [\#905](https://github.com/wallabag/wallabag/pull/905) ([jsit](https://github.com/jsit)) -- Vagrantfile [\#904](https://github.com/wallabag/wallabag/pull/904) ([nicosomb](https://github.com/nicosomb)) -- Fixing some more text case issues [\#903](https://github.com/wallabag/wallabag/pull/903) ([jsit](https://github.com/jsit)) -- Adding 'en\_US' locale \(issue \#901\) [\#902](https://github.com/wallabag/wallabag/pull/902) ([jsit](https://github.com/jsit)) -- Fixing a bunch of English translation letter casing and syntax \(issue \#899\) [\#900](https://github.com/wallabag/wallabag/pull/900) ([jsit](https://github.com/jsit)) -- Fixing issue \#874, displaying preview text when in list mode [\#898](https://github.com/wallabag/wallabag/pull/898) ([jsit](https://github.com/jsit)) -- Fixing display mode switching in Baggy theme \(issue \#896\) [\#897](https://github.com/wallabag/wallabag/pull/897) ([jsit](https://github.com/jsit)) -- Fix \#891: change type for password field in installation [\#894](https://github.com/wallabag/wallabag/pull/894) ([nicosomb](https://github.com/nicosomb)) -- Fix\#871 [\#889](https://github.com/wallabag/wallabag/pull/889) ([tcitworld](https://github.com/tcitworld)) -- updated site\_config [\#888](https://github.com/wallabag/wallabag/pull/888) ([nicosomb](https://github.com/nicosomb)) -- fix \#882 [\#883](https://github.com/wallabag/wallabag/pull/883) ([tcitworld](https://github.com/tcitworld)) -- update zeit.de.txt for removal of inline ads [\#879](https://github.com/wallabag/wallabag/pull/879) ([Marmo](https://github.com/Marmo)) -- fix \#873 [\#878](https://github.com/wallabag/wallabag/pull/878) ([tcitworld](https://github.com/tcitworld)) -- fix for \#830 [\#868](https://github.com/wallabag/wallabag/pull/868) ([tcitworld](https://github.com/tcitworld)) -- fix z-index-menu mobile view bug \#834 [\#867](https://github.com/wallabag/wallabag/pull/867) ([tcitworld](https://github.com/tcitworld)) -- update heise.de.txt [\#865](https://github.com/wallabag/wallabag/pull/865) ([Marmo](https://github.com/Marmo)) -- 1.8.0 [\#863](https://github.com/wallabag/wallabag/pull/863) ([nicosomb](https://github.com/nicosomb)) -- query for populate mysql/postgres was called when we choosed sqlite [\#861](https://github.com/wallabag/wallabag/pull/861) ([nicosomb](https://github.com/nicosomb)) -- Move compatibility file \(fixes \#858\) [\#860](https://github.com/wallabag/wallabag/pull/860) ([nicosomb](https://github.com/nicosomb)) -- Fix \#826 [\#856](https://github.com/wallabag/wallabag/pull/856) ([tcitworld](https://github.com/tcitworld)) -- Fix \#828 [\#855](https://github.com/wallabag/wallabag/pull/855) ([tcitworld](https://github.com/tcitworld)) -- Saveclick2search \(fix for \#831\) [\#854](https://github.com/wallabag/wallabag/pull/854) ([tcitworld](https://github.com/tcitworld)) -- Fix for \#797 [\#853](https://github.com/wallabag/wallabag/pull/853) ([tcitworld](https://github.com/tcitworld)) -- Refactor [\#851](https://github.com/wallabag/wallabag/pull/851) ([tcitworld](https://github.com/tcitworld)) -- Add support for custom http port [\#848](https://github.com/wallabag/wallabag/pull/848) ([11mariom](https://github.com/11mariom)) -- Fix the PostgreSQL install errors [\#845](https://github.com/wallabag/wallabag/pull/845) ([rros](https://github.com/rros)) -- Convert the MySQL charset to utf8mb4 to support the full range of unicode [\#843](https://github.com/wallabag/wallabag/pull/843) ([rros](https://github.com/rros)) -- Fix \#766 - GD detection [\#841](https://github.com/wallabag/wallabag/pull/841) ([tcitworld](https://github.com/tcitworld)) -- fix pictures display when DOWNLOAD\_PICTURES is enabled [\#839](https://github.com/wallabag/wallabag/pull/839) ([tcitworld](https://github.com/tcitworld)) -- Implemented additional check for using the 'X-Forwarded-Port' header. [\#836](https://github.com/wallabag/wallabag/pull/836) ([akoenig](https://github.com/akoenig)) -- Fix downloading SQLite database from all users [\#819](https://github.com/wallabag/wallabag/pull/819) ([tcitworld](https://github.com/tcitworld)) -- Complete rework of faz.net-template [\#816](https://github.com/wallabag/wallabag/pull/816) ([zinnober](https://github.com/zinnober)) -- vendor dir is not accessible before install, sqlite db dir write check moved into db class [\#814](https://github.com/wallabag/wallabag/pull/814) ([mariroz](https://github.com/mariroz)) -- Adduseremail [\#808](https://github.com/wallabag/wallabag/pull/808) ([tcitworld](https://github.com/tcitworld)) -- Traductionfix [\#802](https://github.com/wallabag/wallabag/pull/802) ([tcitworld](https://github.com/tcitworld)) -- Ebook [\#801](https://github.com/wallabag/wallabag/pull/801) ([tcitworld](https://github.com/tcitworld)) -- security fix [\#791](https://github.com/wallabag/wallabag/pull/791) ([mariroz](https://github.com/mariroz)) -- security issue [\#790](https://github.com/wallabag/wallabag/pull/790) ([mariroz](https://github.com/mariroz)) -- config for habrahabr.ru to grab articles with comments [\#789](https://github.com/wallabag/wallabag/pull/789) ([mariroz](https://github.com/mariroz)) -- Add data for mysql installation, see \#624 [\#787](https://github.com/wallabag/wallabag/pull/787) ([nicosomb](https://github.com/nicosomb)) -- highlight.js library added to highlight programming code examples in article view [\#786](https://github.com/wallabag/wallabag/pull/786) ([mariroz](https://github.com/mariroz)) -- change default pagination, set it to 12, to have a nice baggy display [\#785](https://github.com/wallabag/wallabag/pull/785) ([nicosomb](https://github.com/nicosomb)) -- fix display of 'Done' message when we add a link from 'save a link' item [\#784](https://github.com/wallabag/wallabag/pull/784) ([nicosomb](https://github.com/nicosomb)) -- \#763 fix to display the login successful message with the translation [\#783](https://github.com/wallabag/wallabag/pull/783) ([nicosomb](https://github.com/nicosomb)) -- Fix \#776 [\#782](https://github.com/wallabag/wallabag/pull/782) ([nicosomb](https://github.com/nicosomb)) -- Proposed fix for \#773 [\#780](https://github.com/wallabag/wallabag/pull/780) ([anno1337](https://github.com/anno1337)) -- Updated polish translation [\#777](https://github.com/wallabag/wallabag/pull/777) ([skibbipl](https://github.com/skibbipl)) -- issue \#750 - config for dn.pt site added [\#775](https://github.com/wallabag/wallabag/pull/775) ([mariroz](https://github.com/mariroz)) -- fixed bug for epub export \#755 ; also better metadata title [\#771](https://github.com/wallabag/wallabag/pull/771) ([tcitworld](https://github.com/tcitworld)) -- Refactor [\#768](https://github.com/wallabag/wallabag/pull/768) ([nicosomb](https://github.com/nicosomb)) -- Refactor [\#764](https://github.com/wallabag/wallabag/pull/764) ([tcitworld](https://github.com/tcitworld)) -- 1.7.1 [\#761](https://github.com/wallabag/wallabag/pull/761) ([nicosomb](https://github.com/nicosomb)) -- Add support for \*.about.com [\#754](https://github.com/wallabag/wallabag/pull/754) ([sinisterstuf](https://github.com/sinisterstuf)) -- fix of issue \#650, \#619 and other similar, error in JSLikeHTMLElement: node no longer exists. [\#752](https://github.com/wallabag/wallabag/pull/752) ([mariroz](https://github.com/mariroz)) -- quick fix of issue \#750: mulipage content for politico.com/magazine articles [\#751](https://github.com/wallabag/wallabag/pull/751) ([mariroz](https://github.com/mariroz)) -- fix of issue \#677: When downloading images, wallabag doesnt respect html "base" tag, tnx to @fivefilters [\#737](https://github.com/wallabag/wallabag/pull/737) ([mariroz](https://github.com/mariroz)) -- fix of issue \#718: Error parsing file imported from Pocket \#718 [\#736](https://github.com/wallabag/wallabag/pull/736) ([mariroz](https://github.com/mariroz)) -- typo FR après vérif. [\#728](https://github.com/wallabag/wallabag/pull/728) ([Draky50110](https://github.com/Draky50110)) -- typo FR [\#724](https://github.com/wallabag/wallabag/pull/724) ([Draky50110](https://github.com/Draky50110)) -- do not output debug while generating epub [\#722](https://github.com/wallabag/wallabag/pull/722) ([tcitworld](https://github.com/tcitworld)) -- error reporting level set in E\_ALL & ~E\_NOTICE by default, can be overriden in config [\#716](https://github.com/wallabag/wallabag/pull/716) ([mariroz](https://github.com/mariroz)) -- fix of undefined ATOM constant warning in full-text-rss, will fix ios-app issue \#14 [\#715](https://github.com/wallabag/wallabag/pull/715) ([mariroz](https://github.com/mariroz)) -- small xss vulnerability and translation ability fix [\#713](https://github.com/wallabag/wallabag/pull/713) ([mariroz](https://github.com/mariroz)) -- 1.7, call me "Premium version" [\#712](https://github.com/wallabag/wallabag/pull/712) ([nicosomb](https://github.com/nicosomb)) -- fix of uninitialized object warning, issue \#710 [\#711](https://github.com/wallabag/wallabag/pull/711) ([mariroz](https://github.com/mariroz)) -- update to 3.2 version of full-text-rss, issue \#694 [\#707](https://github.com/wallabag/wallabag/pull/707) ([mariroz](https://github.com/mariroz)) -- Fixed Baggy theme CSS for Chrome Extension \(and \< 500px width layout\) [\#706](https://github.com/wallabag/wallabag/pull/706) ([gboudreau](https://github.com/gboudreau)) -- \[V2\] changed everything from Poche to Wallabag [\#705](https://github.com/wallabag/wallabag/pull/705) ([tcitworld](https://github.com/tcitworld)) -- Security fixes for downloaded images \(thanks @leblanc-simon\) [\#703](https://github.com/wallabag/wallabag/pull/703) ([tcitworld](https://github.com/tcitworld)) -- Up-to-date with me [\#697](https://github.com/wallabag/wallabag/pull/697) ([tcitworld](https://github.com/tcitworld)) -- better wallabag in wallabag button \(see \#685\) [\#693](https://github.com/wallabag/wallabag/pull/693) ([tcitworld](https://github.com/tcitworld)) -- Epub is here ! [\#691](https://github.com/wallabag/wallabag/pull/691) ([tcitworld](https://github.com/tcitworld)) -- Add message in web server log in case of authentication failure [\#690](https://github.com/wallabag/wallabag/pull/690) ([doc75](https://github.com/doc75)) -- Tag-related features [\#689](https://github.com/wallabag/wallabag/pull/689) ([tcitworld](https://github.com/tcitworld)) -- French translation update [\#680](https://github.com/wallabag/wallabag/pull/680) ([m-r-r](https://github.com/m-r-r)) -- fix of putenv warning under safe mode, issue \#646 [\#667](https://github.com/wallabag/wallabag/pull/667) ([mariroz](https://github.com/mariroz)) -- fix of rss headers problem [\#665](https://github.com/wallabag/wallabag/pull/665) ([mariroz](https://github.com/mariroz)) -- Multi-user system \(end\) [\#663](https://github.com/wallabag/wallabag/pull/663) ([tcitworld](https://github.com/tcitworld)) -- last error: config.inc.default.php missed [\#659](https://github.com/wallabag/wallabag/pull/659) ([mariroz](https://github.com/mariroz)) -- inc/poche/config.inc.php.new removed [\#658](https://github.com/wallabag/wallabag/pull/658) ([mariroz](https://github.com/mariroz)) -- parse mobile.lemondeinformatique.fr [\#655](https://github.com/wallabag/wallabag/pull/655) ([ghost](https://github.com/ghost)) -- print view fixed in baggy; print link added; read percent added in default theme; archive and favorite re-factored to be ajax action in article view [\#653](https://github.com/wallabag/wallabag/pull/653) ([mariroz](https://github.com/mariroz)) -- \[fix\] rss feed content type set to text/xml \#636 [\#643](https://github.com/wallabag/wallabag/pull/643) ([nicosomb](https://github.com/nicosomb)) -- Added IF NOT EXISTS [\#642](https://github.com/wallabag/wallabag/pull/642) ([jplock](https://github.com/jplock)) -- Improvements on french translation [\#637](https://github.com/wallabag/wallabag/pull/637) ([AmauryCarrade](https://github.com/AmauryCarrade)) -- added missing image to dmagenta theme [\#635](https://github.com/wallabag/wallabag/pull/635) ([DmitrySandalov](https://github.com/DmitrySandalov)) -- 1.6.1 [\#634](https://github.com/wallabag/wallabag/pull/634) ([nicosomb](https://github.com/nicosomb)) -- error with empty content by import fixed. Also youtube and vimeo videos are allowd in content now. [\#633](https://github.com/wallabag/wallabag/pull/633) ([mariroz](https://github.com/mariroz)) -- logging by import added; error by creation table if exists in postgresql... [\#632](https://github.com/wallabag/wallabag/pull/632) ([mariroz](https://github.com/mariroz)) -- Fix display problem with smartphone and Baggy \#610 [\#623](https://github.com/wallabag/wallabag/pull/623) ([nicosomb](https://github.com/nicosomb)) -- \[fix\] Escap key displays save a link form \#612 [\#622](https://github.com/wallabag/wallabag/pull/622) ([nicosomb](https://github.com/nicosomb)) -- can't close search popup with the cross picture \#613 [\#621](https://github.com/wallabag/wallabag/pull/621) ([nicosomb](https://github.com/nicosomb)) -- remove duplicates by import; code formatting changes: tabs replaced with spaces [\#618](https://github.com/wallabag/wallabag/pull/618) ([mariroz](https://github.com/mariroz)) -- \[fix\] with some config, http host is different [\#614](https://github.com/wallabag/wallabag/pull/614) ([nicosomb](https://github.com/nicosomb)) -- update french locale, thx to @goofy-bz and @Draky50110 \#596 [\#611](https://github.com/wallabag/wallabag/pull/611) ([nicosomb](https://github.com/nicosomb)) -- remove unnecessary variable declaration [\#609](https://github.com/wallabag/wallabag/pull/609) ([nicosomb](https://github.com/nicosomb)) -- in RSS feed, add link to wallabag URL \#556 [\#606](https://github.com/wallabag/wallabag/pull/606) ([nicosomb](https://github.com/nicosomb)) -- \[fix\] Use of undefined constant ATOM \#604 [\#605](https://github.com/wallabag/wallabag/pull/605) ([nicosomb](https://github.com/nicosomb)) -- postgres sequence error fix, issue \#602 [\#603](https://github.com/wallabag/wallabag/pull/603) ([mariroz](https://github.com/mariroz)) -- wallabag 1.6.0 [\#595](https://github.com/wallabag/wallabag/pull/595) ([nicosomb](https://github.com/nicosomb)) -- import into wallabag without cron and file type [\#594](https://github.com/wallabag/wallabag/pull/594) ([mariroz](https://github.com/mariroz)) -- fix of bug with default theme constant [\#588](https://github.com/wallabag/wallabag/pull/588) ([mariroz](https://github.com/mariroz)) -- problem with resources and localhost url fix [\#587](https://github.com/wallabag/wallabag/pull/587) ([mariroz](https://github.com/mariroz)) -- wallabag a link in wallabag now in default theme, issue \#505 [\#586](https://github.com/wallabag/wallabag/pull/586) ([mariroz](https://github.com/mariroz)) -- updated german localisation [\#585](https://github.com/wallabag/wallabag/pull/585) ([kevmeyer](https://github.com/kevmeyer)) -- fix of localhost cookie related to nginx binding to 0.0.0.0 [\#582](https://github.com/wallabag/wallabag/pull/582) ([mariroz](https://github.com/mariroz)) -- fix of issue under nginx and php-fpm [\#581](https://github.com/wallabag/wallabag/pull/581) ([mariroz](https://github.com/mariroz)) -- fix of \_SESSION - indefined variable [\#576](https://github.com/wallabag/wallabag/pull/576) ([mariroz](https://github.com/mariroz)) -- fix of \#115, server relater config value added [\#572](https://github.com/wallabag/wallabag/pull/572) ([mariroz](https://github.com/mariroz)) -- fix of \#115 - stay connected and session livetime [\#567](https://github.com/wallabag/wallabag/pull/567) ([mariroz](https://github.com/mariroz)) -- Update brazilian traslation title to "Português \(Brasil\)" [\#566](https://github.com/wallabag/wallabag/pull/566) ([brunelli](https://github.com/brunelli)) -- Update brazilian translation [\#563](https://github.com/wallabag/wallabag/pull/563) ([brunelli](https://github.com/brunelli)) -- saving link form now sends ajax request, article view is now justified \(issue \#554\) [\#557](https://github.com/wallabag/wallabag/pull/557) ([mariroz](https://github.com/mariroz)) -- feature \#505 - it is now possible to add link from bagged article \(TODO: redev it to ajax action\). Some enhancements to "save a link" popup div [\#551](https://github.com/wallabag/wallabag/pull/551) ([mariroz](https://github.com/mariroz)) -- fix of conflict of s shortcat and entering s in input fields [\#549](https://github.com/wallabag/wallabag/pull/549) ([mariroz](https://github.com/mariroz)) -- a lot of enhancements related to tags: tags list is now sorted, shows number of articles, autocomplete added according to \#477, \#542 [\#544](https://github.com/wallabag/wallabag/pull/544) ([mariroz](https://github.com/mariroz)) -- bagit link + overlay save link + listmode [\#540](https://github.com/wallabag/wallabag/pull/540) ([courgette](https://github.com/courgette)) -- Changed config section to clarify import process. [\#535](https://github.com/wallabag/wallabag/pull/535) ([bobmaerten](https://github.com/bobmaerten)) -- fix of \#530 - import fail from Poche [\#533](https://github.com/wallabag/wallabag/pull/533) ([mariroz](https://github.com/mariroz)) -- New import system [\#532](https://github.com/wallabag/wallabag/pull/532) ([nicosomb](https://github.com/nicosomb)) -- getPageContent moved to Tools, fix of \#426 [\#531](https://github.com/wallabag/wallabag/pull/531) ([mariroz](https://github.com/mariroz)) -- updated german localization [\#524](https://github.com/wallabag/wallabag/pull/524) ([kevmeyer](https://github.com/kevmeyer)) -- effect of block rebuilding on next page removed, issue \#479 [\#517](https://github.com/wallabag/wallabag/pull/517) ([mariroz](https://github.com/mariroz)) -- fix of \#509, related to php 5.3 [\#515](https://github.com/wallabag/wallabag/pull/515) ([mariroz](https://github.com/mariroz)) -- Brazilian portuguese translation [\#513](https://github.com/wallabag/wallabag/pull/513) ([brunelli](https://github.com/brunelli)) -- some baggy theme fixes and enhancement: issue \#479 [\#510](https://github.com/wallabag/wallabag/pull/510) ([mariroz](https://github.com/mariroz)) -- translation related: how-to md file added, script to generate php from all twig templates, polish mo file compiled [\#504](https://github.com/wallabag/wallabag/pull/504) ([mariroz](https://github.com/mariroz)) -- Update pl\_PL.utf8.po [\#502](https://github.com/wallabag/wallabag/pull/502) ([skibbipl](https://github.com/skibbipl)) -- fix of \#498, \#493, \#494 - because disappeared in last commit [\#501](https://github.com/wallabag/wallabag/pull/501) ([mariroz](https://github.com/mariroz)) -- French translation added by @Draky50110, issue \#488 [\#499](https://github.com/wallabag/wallabag/pull/499) ([mariroz](https://github.com/mariroz)) -- fix of global $http visibility, issues \#493, \#494 [\#495](https://github.com/wallabag/wallabag/pull/495) ([mariroz](https://github.com/mariroz)) -- 1.5.2 [\#481](https://github.com/wallabag/wallabag/pull/481) ([nicosomb](https://github.com/nicosomb)) -- a lot of refactoring: tag action is now handled by home view and uses sorting and pagination. Some small view enhacenments. Fix of \#476, \#461 for baggy and other themes [\#478](https://github.com/wallabag/wallabag/pull/478) ([mariroz](https://github.com/mariroz)) -- Baggy Theme - PtSans font is now local [\#473](https://github.com/wallabag/wallabag/pull/473) ([nsteinmetz](https://github.com/nsteinmetz)) -- Full-Text RSS included as a script instead of file\_get\_contents call. Tnx to @Faless. Fix issues \#366 and \#463 [\#472](https://github.com/wallabag/wallabag/pull/472) ([mariroz](https://github.com/mariroz)) -- version number 1.5.1 [\#469](https://github.com/wallabag/wallabag/pull/469) ([nicosomb](https://github.com/nicosomb)) -- 1.5.1 [\#468](https://github.com/wallabag/wallabag/pull/468) ([nicosomb](https://github.com/nicosomb)) -- "save a link" added to top menu \(default theme\) to toggle "save link" form, issue \#461 [\#467](https://github.com/wallabag/wallabag/pull/467) ([mariroz](https://github.com/mariroz)) -- duplicate check added. fix of issue \#400 [\#460](https://github.com/wallabag/wallabag/pull/460) ([mariroz](https://github.com/mariroz)) -- Feature \#457 : import from pocket now import tags too [\#459](https://github.com/wallabag/wallabag/pull/459) ([arnaudmm](https://github.com/arnaudmm)) -- 1.5.0 [\#450](https://github.com/wallabag/wallabag/pull/450) ([nicosomb](https://github.com/nicosomb)) -- Adding .htaccess files to prohibit access to critical directories, e.g., db/ [\#439](https://github.com/wallabag/wallabag/pull/439) ([flolauck](https://github.com/flolauck)) -- Polish and Ukrainian translations added. Russian - updated. Plust 2 smal... [\#435](https://github.com/wallabag/wallabag/pull/435) ([mariroz](https://github.com/mariroz)) -- Theme courgette [\#434](https://github.com/wallabag/wallabag/pull/434) ([courgette](https://github.com/courgette)) -- all locale files re-compiled: fix of \#416 Some language problems in the ... [\#428](https://github.com/wallabag/wallabag/pull/428) ([mariroz](https://github.com/mariroz)) -- changelog 1.4 [\#427](https://github.com/wallabag/wallabag/pull/427) ([nicosomb](https://github.com/nicosomb)) -- Courgette theme revision [\#425](https://github.com/wallabag/wallabag/pull/425) ([Lonnytunes](https://github.com/Lonnytunes)) -- fix of bug \#368 Endless redirects or user doesn't exist with basic authe... [\#419](https://github.com/wallabag/wallabag/pull/419) ([mariroz](https://github.com/mariroz)) -- Fix: stops multiplication, in database, of a same user config item [\#410](https://github.com/wallabag/wallabag/pull/410) ([Lonnytunes](https://github.com/Lonnytunes)) -- Page data extraction with basic auth [\#394](https://github.com/wallabag/wallabag/pull/394) ([aaa2000](https://github.com/aaa2000)) -- Correction de bugs dans le schema mysql [\#391](https://github.com/wallabag/wallabag/pull/391) ([Newinx](https://github.com/Newinx)) -- poche 1.3.1 [\#387](https://github.com/wallabag/wallabag/pull/387) ([nicosomb](https://github.com/nicosomb)) -- Create sqlite table tags\_entries only if not already exists [\#382](https://github.com/wallabag/wallabag/pull/382) ([aaa2000](https://github.com/aaa2000)) -- Flattr Class : Bug 359 [\#381](https://github.com/wallabag/wallabag/pull/381) ([tcitworld](https://github.com/tcitworld)) -- Change Permissions in pochePictures.php [\#380](https://github.com/wallabag/wallabag/pull/380) ([F1reF0x](https://github.com/F1reF0x)) -- Minor changes to tag edit and config pages [\#379](https://github.com/wallabag/wallabag/pull/379) ([williamtheaker](https://github.com/williamtheaker)) -- docs link, typos [\#370](https://github.com/wallabag/wallabag/pull/370) ([DmitrySandalov](https://github.com/DmitrySandalov)) -- poche 1.3.0 [\#363](https://github.com/wallabag/wallabag/pull/363) ([nicosomb](https://github.com/nicosomb)) -- fix for long lasting session [\#362](https://github.com/wallabag/wallabag/pull/362) ([DmitrySandalov](https://github.com/DmitrySandalov)) -- tags: mysql create tables if not exists [\#360](https://github.com/wallabag/wallabag/pull/360) ([DmitrySandalov](https://github.com/DmitrySandalov)) -- Edited English text [\#358](https://github.com/wallabag/wallabag/pull/358) ([williamtheaker](https://github.com/williamtheaker)) -- Tags feature [\#356](https://github.com/wallabag/wallabag/pull/356) ([nicosomb](https://github.com/nicosomb)) -- \[change\] we now use Full-Text RSS 3.1, thank you so much @fivefilters [\#353](https://github.com/wallabag/wallabag/pull/353) ([nicosomb](https://github.com/nicosomb)) -- updating the "es\_ES" locale [\#352](https://github.com/wallabag/wallabag/pull/352) ([versvs](https://github.com/versvs)) -- add atom feeds for unread / favs [\#350](https://github.com/wallabag/wallabag/pull/350) ([nicosomb](https://github.com/nicosomb)) -- Stackoverflow parsing and subdomain failover fix. [\#349](https://github.com/wallabag/wallabag/pull/349) ([JasonGhent](https://github.com/JasonGhent)) -- Fix links [\#347](https://github.com/wallabag/wallabag/pull/347) ([evgeni](https://github.com/evgeni)) -- \[add\] preparing to poche a new link [\#337](https://github.com/wallabag/wallabag/pull/337) ([nicosomb](https://github.com/nicosomb)) -- \[fix\] paths of assets fixed [\#336](https://github.com/wallabag/wallabag/pull/336) ([nicosomb](https://github.com/nicosomb)) -- \[add\] layout [\#331](https://github.com/wallabag/wallabag/pull/331) ([nicosomb](https://github.com/nicosomb)) -- Create fa\_IR.utf8.po [\#329](https://github.com/wallabag/wallabag/pull/329) ([mabkenar](https://github.com/mabkenar)) -- 1.2.0 [\#326](https://github.com/wallabag/wallabag/pull/326) ([nicosomb](https://github.com/nicosomb)) -- \[v2\] ru\_RU locale file [\#315](https://github.com/wallabag/wallabag/pull/315) ([DmitrySandalov](https://github.com/DmitrySandalov)) -- \[v2\] fix \#270 access from remote machine [\#313](https://github.com/wallabag/wallabag/pull/313) ([DmitrySandalov](https://github.com/DmitrySandalov)) -- dark theme images replaced to visible set, no executable bits for pictures [\#310](https://github.com/wallabag/wallabag/pull/310) ([jn0](https://github.com/jn0)) -- Added possibility to mark items as read/unread on the item page itself. [\#307](https://github.com/wallabag/wallabag/pull/307) ([baurmatt](https://github.com/baurmatt)) -- Autoclose [\#291](https://github.com/wallabag/wallabag/pull/291) ([banux](https://github.com/banux)) -- 1.1.0 [\#289](https://github.com/wallabag/wallabag/pull/289) ([nicosomb](https://github.com/nicosomb)) -- Adding support for http\_auth [\#285](https://github.com/wallabag/wallabag/pull/285) ([dsacchet](https://github.com/dsacchet)) -- Updated Screenshots URLs [\#278](https://github.com/wallabag/wallabag/pull/278) ([tcitworld](https://github.com/tcitworld)) -- Update select theme filter and sort names \(dev branch PR\) [\#274](https://github.com/wallabag/wallabag/pull/274) ([NumEricR](https://github.com/NumEricR)) -- Emdeded Roboto webfont [\#273](https://github.com/wallabag/wallabag/pull/273) ([jcsaaddupuy](https://github.com/jcsaaddupuy)) -- Custom ssl port [\#272](https://github.com/wallabag/wallabag/pull/272) ([jcsaaddupuy](https://github.com/jcsaaddupuy)) -- Embeding jquery [\#264](https://github.com/wallabag/wallabag/pull/264) ([jcsaaddupuy](https://github.com/jcsaaddupuy)) -- Fix \#255 : increase article toolbar height if necessary [\#261](https://github.com/wallabag/wallabag/pull/261) ([NumEricR](https://github.com/NumEricR)) -- merge 1.0.0 [\#256](https://github.com/wallabag/wallabag/pull/256) ([nicosomb](https://github.com/nicosomb)) -- Force download on poche export [\#250](https://github.com/wallabag/wallabag/pull/250) ([NumEricR](https://github.com/NumEricR)) -- Avoid ".git" option in themes list of config page [\#245](https://github.com/wallabag/wallabag/pull/245) ([NumEricR](https://github.com/NumEricR)) -- Changed Flattr Caching System [\#244](https://github.com/wallabag/wallabag/pull/244) ([tcitworld](https://github.com/tcitworld)) -- beta5 [\#226](https://github.com/wallabag/wallabag/pull/226) ([nicosomb](https://github.com/nicosomb)) -- Fix \#183: language declaration [\#221](https://github.com/wallabag/wallabag/pull/221) ([NumEricR](https://github.com/NumEricR)) -- Move icon's no-repeat to common code and clean CSS [\#216](https://github.com/wallabag/wallabag/pull/216) ([NumEricR](https://github.com/NumEricR)) -- Flattr [\#214](https://github.com/wallabag/wallabag/pull/214) ([tcitworld](https://github.com/tcitworld)) -- Add url directly [\#212](https://github.com/wallabag/wallabag/pull/212) ([tcitworld](https://github.com/tcitworld)) -- Less is more :-\) [\#205](https://github.com/wallabag/wallabag/pull/205) ([NumEricR](https://github.com/NumEricR)) -- Add the number of results next to pager [\#199](https://github.com/wallabag/wallabag/pull/199) ([NumEricR](https://github.com/NumEricR)) -- Display a message when there is no link [\#191](https://github.com/wallabag/wallabag/pull/191) ([NumEricR](https://github.com/NumEricR)) -- beta4 [\#181](https://github.com/wallabag/wallabag/pull/181) ([nicosomb](https://github.com/nicosomb)) -- Externalize some CSS code [\#180](https://github.com/wallabag/wallabag/pull/180) ([NumEricR](https://github.com/NumEricR)) -- Add support for URLS with digits [\#174](https://github.com/wallabag/wallabag/pull/174) ([nicofrand](https://github.com/nicofrand)) -- Graceful error-handling with imports and defining where import files are stored [\#173](https://github.com/wallabag/wallabag/pull/173) ([EliasZ](https://github.com/EliasZ)) -- Login button [\#170](https://github.com/wallabag/wallabag/pull/170) ([NumEricR](https://github.com/NumEricR)) -- Entries height with short description [\#169](https://github.com/wallabag/wallabag/pull/169) ([NumEricR](https://github.com/NumEricR)) -- Clean up the templates markup [\#168](https://github.com/wallabag/wallabag/pull/168) ([nicofrand](https://github.com/nicofrand)) -- Improve tools list code [\#163](https://github.com/wallabag/wallabag/pull/163) ([NumEricR](https://github.com/NumEricR)) -- Add a print stylesheet [\#160](https://github.com/wallabag/wallabag/pull/160) ([nicofrand](https://github.com/nicofrand)) -- CSS clean up on style.css file [\#159](https://github.com/wallabag/wallabag/pull/159) ([NumEricR](https://github.com/NumEricR)) -- Dev [\#154](https://github.com/wallabag/wallabag/pull/154) ([nicofrand](https://github.com/nicofrand)) -- beta3 [\#141](https://github.com/wallabag/wallabag/pull/141) ([nicosomb](https://github.com/nicosomb)) -- beta3 [\#140](https://github.com/wallabag/wallabag/pull/140) ([nicosomb](https://github.com/nicosomb)) -- merge with beta2 [\#132](https://github.com/wallabag/wallabag/pull/132) ([nicosomb](https://github.com/nicosomb)) -- merge dev into master [\#109](https://github.com/wallabag/wallabag/pull/109) ([nicosomb](https://github.com/nicosomb)) -- Twig [\#104](https://github.com/wallabag/wallabag/pull/104) ([nicosomb](https://github.com/nicosomb)) -- v0.2.1 [\#74](https://github.com/wallabag/wallabag/pull/74) ([nicosomb](https://github.com/nicosomb)) -- Style de l'écran de connexion [\#72](https://github.com/wallabag/wallabag/pull/72) ([Silvus](https://github.com/Silvus)) -- tag 0.2 [\#67](https://github.com/wallabag/wallabag/pull/67) ([nicosomb](https://github.com/nicosomb)) -- Thème dark [\#61](https://github.com/wallabag/wallabag/pull/61) ([Silvus](https://github.com/Silvus)) -- Ajout conf nginx pour la protection de la bdd [\#50](https://github.com/wallabag/wallabag/pull/50) ([Gregoire-M](https://github.com/Gregoire-M)) -- Modifications css [\#19](https://github.com/wallabag/wallabag/pull/19) ([tmos](https://github.com/tmos)) -- Some fixes and improvements [\#5](https://github.com/wallabag/wallabag/pull/5) ([fatihorhan](https://github.com/fatihorhan)) -- filter for entries with previewPicture [\#1418](https://github.com/wallabag/wallabag/pull/1418) ([nicosomb](https://github.com/nicosomb)) -- fix \#972: add preview pictures [\#1417](https://github.com/wallabag/wallabag/pull/1417) ([nicosomb](https://github.com/nicosomb)) -- filters view on side for baggy [\#1404](https://github.com/wallabag/wallabag/pull/1404) ([tcitworld](https://github.com/tcitworld)) -- Cleanup baggy [\#1401](https://github.com/wallabag/wallabag/pull/1401) ([j0k3r](https://github.com/j0k3r)) -- fix \#1357, truncate domain name if it's too loooong [\#1400](https://github.com/wallabag/wallabag/pull/1400) ([nicosomb](https://github.com/nicosomb)) -- Integrate graby [\#1397](https://github.com/wallabag/wallabag/pull/1397) ([j0k3r](https://github.com/j0k3r)) -- Apply margin only on settings page [\#1396](https://github.com/wallabag/wallabag/pull/1396) ([j0k3r](https://github.com/j0k3r)) -- fix \#1378: nice display for tags list [\#1395](https://github.com/wallabag/wallabag/pull/1395) ([nicosomb](https://github.com/nicosomb)) -- Fix date filter on same day [\#1393](https://github.com/wallabag/wallabag/pull/1393) ([j0k3r](https://github.com/j0k3r)) -- Fix redirect after deletion [\#1392](https://github.com/wallabag/wallabag/pull/1392) ([j0k3r](https://github.com/j0k3r)) -- remove dead code [\#1389](https://github.com/wallabag/wallabag/pull/1389) ([nicosomb](https://github.com/nicosomb)) -- WIP – Fixing things around :dash: [\#1386](https://github.com/wallabag/wallabag/pull/1386) ([j0k3r](https://github.com/j0k3r)) -- filters: implement status filter and a new view \(to display all entries\) [\#1385](https://github.com/wallabag/wallabag/pull/1385) ([nicosomb](https://github.com/nicosomb)) -- fix \#1371 config screen: display bug in RSS tab [\#1384](https://github.com/wallabag/wallabag/pull/1384) ([nicosomb](https://github.com/nicosomb)) -- CS [\#1383](https://github.com/wallabag/wallabag/pull/1383) ([j0k3r](https://github.com/j0k3r)) -- fix \#1368 config: redirect on correct tab in material theme [\#1375](https://github.com/wallabag/wallabag/pull/1375) ([nicosomb](https://github.com/nicosomb)) -- filters: enhance view for domain name [\#1374](https://github.com/wallabag/wallabag/pull/1374) ([nicosomb](https://github.com/nicosomb)) -- assign tags to an entry [\#1372](https://github.com/wallabag/wallabag/pull/1372) ([nicosomb](https://github.com/nicosomb)) -- fix 1356: diet for composer [\#1370](https://github.com/wallabag/wallabag/pull/1370) ([nicosomb](https://github.com/nicosomb)) -- fix \#1332: bottom bar to display message [\#1369](https://github.com/wallabag/wallabag/pull/1369) ([nicosomb](https://github.com/nicosomb)) -- action labels depend on status [\#1367](https://github.com/wallabag/wallabag/pull/1367) ([nicosomb](https://github.com/nicosomb)) -- fix tag view in material theme [\#1366](https://github.com/wallabag/wallabag/pull/1366) ([nicosomb](https://github.com/nicosomb)) -- change \ into \ [\#1365](https://github.com/wallabag/wallabag/pull/1365) ([nicosomb](https://github.com/nicosomb)) -- add creation date filter view [\#1363](https://github.com/wallabag/wallabag/pull/1363) ([nicosomb](https://github.com/nicosomb)) -- implement FosUser [\#1362](https://github.com/wallabag/wallabag/pull/1362) ([nicosomb](https://github.com/nicosomb)) -- clean -\> clear [\#1355](https://github.com/wallabag/wallabag/pull/1355) ([nicosomb](https://github.com/nicosomb)) -- some cleanup [\#1354](https://github.com/wallabag/wallabag/pull/1354) ([nicosomb](https://github.com/nicosomb)) -- check if one entry or not [\#1353](https://github.com/wallabag/wallabag/pull/1353) ([nicosomb](https://github.com/nicosomb)) -- fix \#1350: fix pagination with filters [\#1352](https://github.com/wallabag/wallabag/pull/1352) ([nicosomb](https://github.com/nicosomb)) -- add link to original article in material theme [\#1349](https://github.com/wallabag/wallabag/pull/1349) ([nicosomb](https://github.com/nicosomb)) -- \[WIP\] filter by creation date [\#1343](https://github.com/wallabag/wallabag/pull/1343) ([nicosomb](https://github.com/nicosomb)) -- fix \#981: add filter on domain name [\#1342](https://github.com/wallabag/wallabag/pull/1342) ([nicosomb](https://github.com/nicosomb)) -- capistrano config [\#1341](https://github.com/wallabag/wallabag/pull/1341) ([nicosomb](https://github.com/nicosomb)) -- change title for material pages / about page [\#1338](https://github.com/wallabag/wallabag/pull/1338) ([nicosomb](https://github.com/nicosomb)) -- store domainName in database [\#1334](https://github.com/wallabag/wallabag/pull/1334) ([nicosomb](https://github.com/nicosomb)) -- disable download links on entry view [\#1331](https://github.com/wallabag/wallabag/pull/1331) ([nicosomb](https://github.com/nicosomb)) -- fix \#1324: do not display pagination when only 1 page [\#1328](https://github.com/wallabag/wallabag/pull/1328) ([nicosomb](https://github.com/nicosomb)) -- fix \#1299: change send buttons on config page [\#1326](https://github.com/wallabag/wallabag/pull/1326) ([nicosomb](https://github.com/nicosomb)) -- fix \#1314: change max-width in material theme [\#1325](https://github.com/wallabag/wallabag/pull/1325) ([nicosomb](https://github.com/nicosomb)) -- fix \#1302: add 'stay connected' checkbox [\#1323](https://github.com/wallabag/wallabag/pull/1323) ([nicosomb](https://github.com/nicosomb)) -- fix \#1303, add link to homepage on forgot password page [\#1322](https://github.com/wallabag/wallabag/pull/1322) ([nicosomb](https://github.com/nicosomb)) -- add new post form in material header [\#1319](https://github.com/wallabag/wallabag/pull/1319) ([nicosomb](https://github.com/nicosomb)) -- fix link in howto page [\#1317](https://github.com/wallabag/wallabag/pull/1317) ([nicosomb](https://github.com/nicosomb)) -- fix \#1310 add focus to search form [\#1316](https://github.com/wallabag/wallabag/pull/1316) ([nicosomb](https://github.com/nicosomb)) -- fix \#1311, redirect after login [\#1312](https://github.com/wallabag/wallabag/pull/1312) ([nicosomb](https://github.com/nicosomb)) -- rename favorite in starred [\#1304](https://github.com/wallabag/wallabag/pull/1304) ([nicosomb](https://github.com/nicosomb)) -- store estimated reading time in database \(\#393\) [\#1297](https://github.com/wallabag/wallabag/pull/1297) ([nicosomb](https://github.com/nicosomb)) -- fix \#564: replace Untitled by the domain name [\#1296](https://github.com/wallabag/wallabag/pull/1296) ([nicosomb](https://github.com/nicosomb)) -- add howto page [\#1295](https://github.com/wallabag/wallabag/pull/1295) ([nicosomb](https://github.com/nicosomb)) -- fix \#1282: add title on wallabag logo [\#1294](https://github.com/wallabag/wallabag/pull/1294) ([nicosomb](https://github.com/nicosomb)) -- get itemsPerPage for unread/fav/archive views [\#1293](https://github.com/wallabag/wallabag/pull/1293) ([nicosomb](https://github.com/nicosomb)) -- Add tags list display [\#1292](https://github.com/wallabag/wallabag/pull/1292) ([nicosomb](https://github.com/nicosomb)) -- fix \#1283: display the good title for each category [\#1286](https://github.com/wallabag/wallabag/pull/1286) ([nicosomb](https://github.com/nicosomb)) -- set material to default theme \o/ [\#1279](https://github.com/wallabag/wallabag/pull/1279) ([nicosomb](https://github.com/nicosomb)) -- Added Material theme [\#1276](https://github.com/wallabag/wallabag/pull/1276) ([modos189](https://github.com/modos189)) -- Adds pagerfanta paginator everywhere, modifies article routing. [\#1250](https://github.com/wallabag/wallabag/pull/1250) ([frankoa](https://github.com/frankoa)) -- V2 Edit title [\#1208](https://github.com/wallabag/wallabag/pull/1208) ([j0k3r](https://github.com/j0k3r)) -- Upgrade to Symfony 2.7 [\#1206](https://github.com/wallabag/wallabag/pull/1206) ([j0k3r](https://github.com/j0k3r)) -- changed email fields with the email type and added required parameter on... [\#1180](https://github.com/wallabag/wallabag/pull/1180) ([tcitworld](https://github.com/tcitworld)) -- Move API stuff in ApiBundle [\#1167](https://github.com/wallabag/wallabag/pull/1167) ([j0k3r](https://github.com/j0k3r)) -- Add RSS feeds [\#1166](https://github.com/wallabag/wallabag/pull/1166) ([j0k3r](https://github.com/j0k3r)) -- Prefix table [\#1165](https://github.com/wallabag/wallabag/pull/1165) ([j0k3r](https://github.com/j0k3r)) -- Remove ability to change username [\#1164](https://github.com/wallabag/wallabag/pull/1164) ([j0k3r](https://github.com/j0k3r)) -- Speed up tests [\#1163](https://github.com/wallabag/wallabag/pull/1163) ([j0k3r](https://github.com/j0k3r)) -- Handle forgot password [\#1152](https://github.com/wallabag/wallabag/pull/1152) ([j0k3r](https://github.com/j0k3r)) -- Simplify build system [\#1144](https://github.com/wallabag/wallabag/pull/1144) ([j0k3r](https://github.com/j0k3r)) -- V2 theme [\#1132](https://github.com/wallabag/wallabag/pull/1132) ([j0k3r](https://github.com/j0k3r)) -- \[WIP\] API : hypermedia & tags [\#1110](https://github.com/wallabag/wallabag/pull/1110) ([nicosomb](https://github.com/nicosomb)) -- V2 config [\#1095](https://github.com/wallabag/wallabag/pull/1095) ([j0k3r](https://github.com/j0k3r)) -- Add more tests to Entry controller + security [\#1072](https://github.com/wallabag/wallabag/pull/1072) ([j0k3r](https://github.com/j0k3r)) -- 1st draft for testing API [\#1070](https://github.com/wallabag/wallabag/pull/1070) ([nicosomb](https://github.com/nicosomb)) -- GET /api/entries returns object, no more array [\#1069](https://github.com/wallabag/wallabag/pull/1069) ([nicosomb](https://github.com/nicosomb)) -- V2 api authentication [\#1068](https://github.com/wallabag/wallabag/pull/1068) ([nicosomb](https://github.com/nicosomb)) -- rename Tags entity [\#1063](https://github.com/wallabag/wallabag/pull/1063) ([nicosomb](https://github.com/nicosomb)) -- sort entries in repository [\#1048](https://github.com/wallabag/wallabag/pull/1048) ([nicosomb](https://github.com/nicosomb)) - - - -\* *This Change Log was automatically generated by [github_changelog_generator](https://github.com/skywinder/Github-Changelog-Generator)* \ No newline at end of file +### 2.0.0-alpha.1 2016/01/07 +- [#1493](https://github.com/wallabag/wallabag/pull/1493) v2 – 1st draft for Pocket import via API & Wallabag v1 import (@nicosomb, @j0k3r) +- [#1553](https://github.com/wallabag/wallabag/pull/1553) Hide export button if we are not on entries list (@nicosomb) +- [#1545](https://github.com/wallabag/wallabag/pull/1545) v2 – Remove user reference in tag (@j0k3r) +- [#1546](https://github.com/wallabag/wallabag/pull/1546) v2 – Ability to reload an entry (@j0k3r) +- [#1547](https://github.com/wallabag/wallabag/pull/1547) v2 – Fix wrong if when deleting an entry (@j0k3r) +- [#1544](https://github.com/wallabag/wallabag/pull/1544) v2 – Add custom email for 2FA (@j0k3r) +- [#1540](https://github.com/wallabag/wallabag/pull/1540) v2 – Don't redirect to the content page after deletion (@j0k3r) +- [#1542](https://github.com/wallabag/wallabag/pull/1542) v2 – Avoid multiple tag creation (@j0k3r) +- [#1488](https://github.com/wallabag/wallabag/pull/1488) Slug for tags (@wallabag) +- [#1537](https://github.com/wallabag/wallabag/pull/1537) Updated composer.lock (@bdunogier) +- [#1529](https://github.com/wallabag/wallabag/pull/1529) changed table name for tagging rule (@nicosomb) +- [#1478](https://github.com/wallabag/wallabag/pull/1478) Rule based tags (@K-Phoen) +- [#1523](https://github.com/wallabag/wallabag/pull/1523) Typo (@tcitworld) +- [#1518](https://github.com/wallabag/wallabag/pull/1518) Set SMTP from environment variables (@mathbruyen) +- [#1422](https://github.com/wallabag/wallabag/pull/1422) V2 – Export entries (@j0k3r, @tcitworld) +- [#1500](https://github.com/wallabag/wallabag/pull/1500) Fix quote strategy for reserved keyword in Postgres (@j0k3r) +- [#1510](https://github.com/wallabag/wallabag/pull/1510) v2 – Fix some deprecated for Symfony3 (@j0k3r) +- [#1505](https://github.com/wallabag/wallabag/pull/1505) Add graby log (@j0k3r) +- [#1495](https://github.com/wallabag/wallabag/pull/1495) add docs (@wallabag) +- [#1496](https://github.com/wallabag/wallabag/pull/1496) fix #1005 V2 redirect after deletion (@wallabag) +- [#1491](https://github.com/wallabag/wallabag/pull/1491) Add german translation. (@jlnostr) +- [#1446](https://github.com/wallabag/wallabag/pull/1446) [WIP] language selection on config screen (@j0k3r, @nicosomb) +- [#1484](https://github.com/wallabag/wallabag/pull/1484) 2factor authentication via email (@wallabag) +- [#1475](https://github.com/wallabag/wallabag/pull/1475) V2 material (@modos189) +- [#1472](https://github.com/wallabag/wallabag/pull/1472) fix #1470: clean material theme (@wallabag) +- [#1471](https://github.com/wallabag/wallabag/pull/1471) implement bookmarklet (@wallabag) +- [#1468](https://github.com/wallabag/wallabag/pull/1468) fix bug on detect active theme (@wallabag) +- [#1464](https://github.com/wallabag/wallabag/pull/1464) fix type hint for User (@wallabag) +- [#1436](https://github.com/wallabag/wallabag/pull/1436) Public registration & oAuth2 \o/ (@j0k3r, @nicosomb) +- [#1461](https://github.com/wallabag/wallabag/pull/1461) fix #1433: add test for removeWww Twig Extension (@wallabag) +- [#1459](https://github.com/wallabag/wallabag/pull/1459) fix #1457 & update materialize (@tcitworld) +- [#1447](https://github.com/wallabag/wallabag/pull/1447) typo (@tcitworld) +- [#1441](https://github.com/wallabag/wallabag/pull/1441) Add french translation (@nicosomb) +- [#1437](https://github.com/wallabag/wallabag/pull/1437) some cleanup on material theme (@nicosomb) +- [#1439](https://github.com/wallabag/wallabag/pull/1439) fix Capistrano configuration (@nicosomb) +- [#1440](https://github.com/wallabag/wallabag/pull/1440) fix #1433: remove www. on entries view (@nicosomb) +- [#1434](https://github.com/wallabag/wallabag/pull/1434) Add multiple database tests on Travis (@j0k3r) +- [#1435](https://github.com/wallabag/wallabag/pull/1435) Enabled created user from Config (@j0k3r) +- [#1429](https://github.com/wallabag/wallabag/pull/1429) V2 – Handle language in entry (@j0k3r) \ No newline at end of file diff --git a/Gruntfile.js b/Gruntfile.js index 72a407f92..72473b21c 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -189,8 +189,11 @@ module.exports = function (grunt) { }, stylelint: { target: ['<%= appDir %>/themes/material/css/*.css', '<%= appDir %>/themes/baggy/css/*.css'] + }, + watch: { + files: ['<%= appDir %>/**/*.css', '<%= appDir %>/**/*.js'], + tasks: ['css', 'js'] } - }); grunt.registerTask( @@ -221,5 +224,7 @@ module.exports = function (grunt) { 'tests', 'Test css and js style conformity', ['eslint', 'stylelint', 'default'] - ) + ), + + grunt.loadNpmTasks('grunt-contrib-watch'); }; diff --git a/RELEASE_PROCESS.md b/RELEASE_PROCESS.md index 34e9a36f2..51b9c4d0b 100644 --- a/RELEASE_PROCESS.md +++ b/RELEASE_PROCESS.md @@ -9,7 +9,7 @@ During this documentation, we assume the release is `$LAST_WALLABAG_RELEASE`. #### Files to edit - `app/config/config.yml` (`wallabag_core.version`) -- `CHANGELOG.md` (by using this command `github_changelog_generator --no-compare-link --header-label="# Changelog" --no-issues --no-pr-wo-labels --since-tag="1.9.2"`. [github-changelog-generator is available here](https://github.com/skywinder/github-changelog-generator)) +- `CHANGELOG.md` (by using this command `github-changes -o wallabag -r wallabag -k YOURGITHUBTOKEN --only-pulls --use-commit-body --title Changelog --date-format YYYY/MM/DD --between-tags 2.0.0-alpha.0...master -n 2.1.3`. [github-changes is available here](https://github.com/lalitkapoor/github-changes)) #### Create release on GitHub @@ -20,7 +20,20 @@ git checkout master git pull origin master git checkout -b release-$LAST_WALLABAG_RELEASE SYMFONY_ENV=prod composer up --no-dev -git add --force composer.lock +``` + +- Update `.travis.yml` file and replace the composer line with this one: + +```diff +script: +- - travis_wait bash composer install -o --no-interaction --no-progress --prefer-dist ++ - travis_wait composer update --no-interaction --no-progress +``` + +- Then continue with these commands: + +``` +git add --force composer.lock .travis.yml git commit -m "Release wallabag $LAST_WALLABAG_RELEASE" git push origin release-$LAST_WALLABAG_RELEASE ``` diff --git a/app/Resources/static/themes/baggy/css/main.css b/app/Resources/static/themes/baggy/css/main.css index 6cf49de1a..4f48f8cae 100755 --- a/app/Resources/static/themes/baggy/css/main.css +++ b/app/Resources/static/themes/baggy/css/main.css @@ -413,7 +413,8 @@ footer a { margin-bottom: 2em; } -.estimatedTime .reading-time { +.reading-time, +.created-at { color: #999; font-style: italic; font-weight: normal; @@ -581,7 +582,6 @@ img.preview { div.pagination ul { text-align: right; - margin-bottom: 50px; } .nb-results { diff --git a/app/Resources/static/themes/material/css/main.css b/app/Resources/static/themes/material/css/main.css index b165d45e0..df126fb47 100755 --- a/app/Resources/static/themes/material/css/main.css +++ b/app/Resources/static/themes/material/css/main.css @@ -17,12 +17,11 @@ 0 = Common ========================================================================== */ -@font-face { - font-family: icomoon; - src: url("../fonts/IcoMoon-Free.ttf"); - font-weight: normal; - font-style: normal; -} +/** + * + * Material icons + * + */ @font-face { font-family: 'Material Icons'; @@ -62,6 +61,33 @@ font-feature-settings: 'liga'; } +/* Rules for sizing the icon. */ +.material-icons.md-18 { font-size: 18px; } +.material-icons.md-24 { font-size: 24px; } +.material-icons.md-36 { font-size: 36px; } +.material-icons.md-48 { font-size: 48px; } + +/* Rules for using icons as black on a light background. */ +.material-icons.md-dark { color: rgba(0, 0, 0, 0.54); } +.material-icons.md-dark.md-inactive { color: rgba(0, 0, 0, 0.26); } + +/* Rules for using icons as white on a dark background. */ +.material-icons.md-light { color: rgba(255, 255, 255, 1); } +.material-icons.md-light.md-inactive { color: rgba(255, 255, 255, 0.3); } + +/** + * + * Icomoon icons + * + */ + +@font-face { + font-family: icomoon; + src: url("../fonts/IcoMoon-Free.ttf"); + font-weight: normal; + font-style: normal; +} + [class^="icon-"]::before, [class*=" icon-"]::before { font-family: icomoon; @@ -212,8 +238,17 @@ div.pagination ul .next.disabled { color: #fff; } +.page-footer .footer-copyright { + min-width: 50px; + height: auto !important; + line-height: 1em !important; +} + .page-footer .footer-copyright p { - display: inline; + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: block; } .hidden { @@ -402,13 +437,23 @@ main ul.row { } .data .card .card-body { - height: 22em; + height: 19em; overflow: hidden; } -.card .card-content .card-title { - line-height: 32px; - max-height: 64px; +.card .card-content .card-title, +.card .card-reveal .card-title { + line-height: 22.8px; + max-height: 80px; + font-size: 19px; + font-family: roberto, "Helvetica Neue", Helvetica, Arial, sans-serif; + color: #313131; +} + +.card .card-content .activator, +.card .card-reveal .activator { + cursor: pointer; + font-family: "Material Icons"; } .card .card-content i.right, @@ -416,6 +461,18 @@ main ul.row { margin-left: 0; } +.card .card-content .original { + line-height: 24px; + font-size: 15px; +} + +a.original { + text-overflow: ellipsis; + white-space: nowrap; + overflow: hidden; + display: block; +} + .card .card-entry-labels { position: absolute; top: 10px; @@ -438,7 +495,7 @@ main ul.row { } .card .card-entry-labels-hidden { - margin-top: 5px; + margin: 2.5px auto; } .card .card-entry-labels-hidden li { @@ -455,6 +512,10 @@ main ul.row { white-space: nowrap; } +.card .card-entry-labels-hidden li:first-child { + margin-left: 0; +} + .card-entry-tags a, .card-entry-labels a, .card-tag-labels a, @@ -469,8 +530,8 @@ main ul.row { margin-bottom: 10px; } -.card .card-action .original { - line-height: 24px; +.card .card-action { + padding: 10px 5px 10px 15px; } .card .card-action ul.links { @@ -488,6 +549,11 @@ main ul.row { color: #fff; } +.card .card-action .reading-time { + display: inline-flex; + vertical-align: middle; +} + .quickstart .card .card-action a, .quickstart .card .card-action a:hover { color: #fff !important; @@ -504,10 +570,15 @@ main ul.row { } .card .card-image { - height: 14em; + height: 10em; } -.card .card-image .preview { +.card .card-fullimage { + height: 13.5em; +} + +.card .card-image .preview, +.card .card-fullimage .preview { height: 14em; background-size: cover; background-repeat: no-repeat; @@ -531,7 +602,8 @@ main ul.row { } #article > header > h1 { - font-size: 1.6em; + font-size: 2em; + margin: 2.1rem 0 0.68rem; } .reader-mode { @@ -570,9 +642,20 @@ main ul.row { z-index: 9999; } -#article aside .link { - color: #000; +#article aside .tools { font-size: 0.8em; + display: flex; + flex-flow: row wrap; + margin: 0 auto; +} + +article aside .tools li { + display: inline-flex; + vertical-align: middle; +} + +#article aside .tools a { + color: #000; text-decoration: none; } @@ -583,10 +666,11 @@ main ul.row { #article aside .chip { background-color: rgba(0, 151, 167, 0.85); - color: #fff; padding: 0 15px 0 10px; + margin: auto 2px; } +#article aside .chip a, #article aside .chip i { color: #fff; } @@ -613,7 +697,6 @@ main ul.row { } #article { - padding: 15px; max-width: 35em; margin-left: auto; margin-right: auto; @@ -657,7 +740,14 @@ main ul.row { } } -@media only screen and (min-width: 993px) and (max-width: 1180px) { +@media only screen and (min-width: 1200px) and (max-width: 1650px) { + .row .col.l3 { + width: 33.33333%; + margin-left: 0; + } +} + +@media only screen and (min-width: 993px) and (max-width: 1200px) { .row .col.l1 { width: 25%; margin-left: 0; @@ -713,6 +803,14 @@ main ul.row { .nb-results { display: none; } + + main ul.row { + padding: 0; + } + + .row .col { + padding: 0; + } } /* ========================================================================== diff --git a/app/config/config.yml b/app/config/config.yml index e0e1ad973..48496bc2d 100644 --- a/app/config/config.yml +++ b/app/config/config.yml @@ -30,7 +30,7 @@ framework: assets: ~ wallabag_core: - version: 2.1.3-dev + version: 2.2.0-dev paypal_url: "https://www.paypal.com/cgi-bin/webscr?cmd=_s-xclick&hosted_button_id=9UBA65LG3FX9Y&lc=gb" languages: en: 'English' diff --git a/docs/de/developer/api.rst b/docs/de/developer/api.rst index bb21154d9..9d230e31c 100644 --- a/docs/de/developer/api.rst +++ b/docs/de/developer/api.rst @@ -1,4 +1,4 @@ -API DoKumentation +API Dokumentation ================= Dank dieser Dokumentation werden wir sehen, wie wir mit der wallabag API interagieren. diff --git a/docs/de/developer/asynchronous.rst b/docs/de/developer/asynchronous.rst new file mode 100644 index 000000000..1d241a72e --- /dev/null +++ b/docs/de/developer/asynchronous.rst @@ -0,0 +1,158 @@ +Asynchrone Aufgaben +=================== + +Um große asynchrone Aufgaben zu starten (etwa für große Importe), können wir RabbitMQ oder Redis nutzen. + +Installation von RabbitMQ für asynchrone Aufgaben +------------------------------------------------- + +Voraussetzungen +^^^^^^^^^^^^^^^ + +Du musst RabbitMQ auf deinem Server installiert haben. + +Installation +^^^^^^^^^^^^ + +.. code:: bash + + wget https://www.rabbitmq.com/rabbitmq-signing-key-public.asc + apt-key add rabbitmq-signing-key-public.asc + apt-get update + apt-get install rabbitmq-server + +Konfiguration und Start +^^^^^^^^^^^^^^^^^^^^^^^ + +.. code:: bash + + rabbitmq-plugins enable rabbitmq_management # (useful to have a web interface, available at http://localhost:15672/ (guest/guest) + rabbitmq-server -detached + +RabbitMQ stoppen +^^^^^^^^^^^^^^^^ + +.. code:: bash + + rabbitmqctl stop + +RabbitMQ für wallabag konfigurieren +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Bearbeite deine ``app/config/parameters.yml``-Datei, um die RabbitMQ-Parameter zu ändern. Die Standardwerte sollten in Ordnung sein: + +.. code:: yaml + + rabbitmq_host: localhost + rabbitmq_port: 5672 + rabbitmq_user: guest + rabbitmq_password: guest + +RabbitMQ in wallabag aktivieren +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +In den internen Einstellungen, aktiviere RabbitMQ im Import-Abschnitt mit dem Wert 1. + +Starte den RabbitMQ-Consumer +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Abhängig davon, über welchen Service du importieren möchtest, musst du den entsprechenden (oder mehrere) Cronjob aktivieren: + +.. code:: bash + + # für den Pocket-Import + bin/console rabbitmq:consumer -e=prod import_pocket -w + + # für den Readability-Import + bin/console rabbitmq:consumer -e=prod import_readability -w + + # für den Instapaper-Import + bin/console rabbitmq:consumer -e=prod import_instapaper -w + + # für den wallabag v1-Import + bin/console rabbitmq:consumer -e=prod import_wallabag_v1 -w + + # für den wallabag v2-Import + bin/console rabbitmq:consumer -e=prod import_wallabag_v2 -w + + # für den Firefox-Import + bin/console rabbitmq:consumer -e=prod import_firefox -w + + # für den Chrome-Import + bin/console rabbitmq:consumer -e=prod import_chrome -w + +Redis für asynchrone Aufgaben installieren +------------------------------------------ + +Um große asynchrone Aufgaben zu starten (etwa für große Importe), können wir auch Redis nutzen. + +Voraussetzungen +^^^^^^^^^^^^^^^ + +Du musst Redis auf deinem Server installiert haben. + +Installation +^^^^^^^^^^^^ + +.. code:: bash + + apt-get install redis-server + +Start +^^^^^ + +Der Server kann bereits nach der Installation laufen, falls nicht, kannst du ihn wie folgt starten: + +.. code:: bash + + redis-server + + +Redis für wallabag konfigurieren +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Bearbeite deine ``app/config/parameters.yml``-Datei, um die Redis-Parameter zu ändern. Die Standardwerte sollten in Ordnung sein: + +.. code:: yaml + + redis_host: localhost + redis_port: 6379 + +Redis in wallabag aktivieren +^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +In den internen Einstellungen, aktiviere Redis im Import-Abschnitt mit dem Wert 1. + +Starten des Redis-Consumer +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Abhängig davon, über welchen Service du importieren möchtest, musst du den entsprechenden (oder mehrere) Cronjob aktivieren: + +.. code:: bash + + # für den Pocket-Import + bin/console wallabag:import:redis-worker -e=prod pocket -vv >> /path/to/wallabag/var/logs/redis-pocket.log + + # für den Readability-Import + bin/console wallabag:import:redis-worker -e=prod readability -vv >> /path/to/wallabag/var/logs/redis-readability.log + + # für den Instapaper-Import + bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-instapaper.log + + # für den wallabag v1-Import + bin/console wallabag:import:redis-worker -e=prod wallabag_v1 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v1.log + + # für den wallabag v2-Import + bin/console wallabag:import:redis-worker -e=prod wallabag_v2 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v2.log + + # für den Firefox-Import + 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 + +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 diff --git a/docs/de/developer/rabbitmq.rst b/docs/de/developer/rabbitmq.rst deleted file mode 100644 index 143b64a1c..000000000 --- a/docs/de/developer/rabbitmq.rst +++ /dev/null @@ -1,81 +0,0 @@ -Installiere RabbitMQ für asynchrone Aufgaben -============================================ - -Um asynchrone Aufgaben zu starten (nützlich z.B. für große Imports), können wir RabbitMQ nutzen. - -Voraussetzungen ---------------- - -Du musst RabbitMQ auf deinem Server installiert haben. - -Installation -~~~~~~~~~~~~ - -.. code:: bash - - wget https://www.rabbitmq.com/rabbitmq-signing-key-public.asc - apt-key add rabbitmq-signing-key-public.asc - apt-get update - apt-get install rabbitmq-server - -Konfiguration und Starten -~~~~~~~~~~~~~~~~~~~~~~~~~ - -.. code:: bash - - rabbitmq-plugins enable rabbitmq_management # (useful to have a web interface, available at http://localhost:15672/ (guest/guest) - rabbitmq-server -detached - -RabbitMQ stoppen -~~~~~~~~~~~~~~~ - -.. code:: bash - - rabbitmqctl stop - - -Konfigure RabbitMQ in wallabag ------------------------------- - -Bearbeite die Datei ``app/config/parameters.yml``, um die RabbitMQ Konfiguration einzurichten. Die Standardkonfiguration sollte ok sein: - -.. code:: yaml - - rabbitmq_host: localhost - rabbitmq_port: 5672 - rabbitmq_user: guest - rabbitmq_password: guest - -Enable RabbitMQ in wallabag ---------------------------- - -In internal settings, in the **Import** section, enable RabbitMQ (with the value 1). - -Starte den RabbitMQ Consumer ----------------------------- - -Abhängig von welchem Service du importieren möchtest, solltest du einen Cron Job aktivieren (oder mehrere, wenn du viele unterstützen willst): - -.. code:: bash - - # for Pocket import - bin/console rabbitmq:consumer -e=prod import_pocket -w - - # for Readability import - bin/console rabbitmq:consumer -e=prod import_readability -w - - # for Instapaper import - bin/console rabbitmq:consumer -e=prod import_instapaper -w - - # for wallabag v1 import - bin/console rabbitmq:consumer -e=prod import_wallabag_v1 -w - - # for wallabag v2 import - bin/console rabbitmq:consumer -e=prod import_wallabag_v2 -w - - # for Firefox import - bin/console rabbitmq:consumer -e=prod import_firefox -w - - # for Chrome import - bin/console rabbitmq:consumer -e=prod import_chrome -w - diff --git a/docs/de/developer/redis.rst b/docs/de/developer/redis.rst deleted file mode 100644 index 2505bf24d..000000000 --- a/docs/de/developer/redis.rst +++ /dev/null @@ -1,75 +0,0 @@ -Installiere Redis für asynchrone Aufgaben -========================================= - -Um asynchrone Aufgaben zu starten (nützlich z.B. für große Imports), können wir Redis nutzen. - -Voraussetzungen ---------------- - -Du musst Redis auf deinem Server installiert haben. - -Installation -~~~~~~~~~~~~ - -.. code:: bash - - apt-get install redis-server - -Starten -~~~~~~ - -Der Redis Service läuft eventuell schon direkt nach der Installation. Falls nicht kannst du ihn wie folgt starten: - -.. code:: bash - - redis-server - - -Konfigure Redis in wallabag ---------------------------- - -Bearbeite die Datei ``app/config/parameters.yml``, um die RabbitMQ Konfiguration einzurichten. Die Standardkonfiguration sollte ok sein: - -.. code:: yaml - - redis_host: localhost - redis_port: 6379 - -Enable Redis in wallabag ------------------------- - -In internal settings, in the **Import** section, enable Redis (with the value 1). - -Starte den Redis Consumer -------------------------- - -Abhängig von welchem Service du importieren möchtest, solltest du einen Cron Job aktivieren (oder mehrere, wenn du viele unterstützen willst): - -.. code:: bash - - # for Pocket import - bin/console wallabag:import:redis-worker -e=prod pocket -vv >> /path/to/wallabag/var/logs/redis-pocket.log - - # for Readability import - bin/console wallabag:import:redis-worker -e=prod readability -vv >> /path/to/wallabag/var/logs/redis-readability.log - - # for Instapaper import - bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-instapaper.log - - # for wallabag v1 import - bin/console wallabag:import:redis-worker -e=prod wallabag_v1 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v1.log - - # for wallabag v2 import - bin/console wallabag:import:redis-worker -e=prod wallabag_v2 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v2.log - - # for Firefox import - bin/console wallabag:import:redis-worker -e=prod firefox -vv >> /path/to/wallabag/var/logs/redis-firefox.log - - # for Chrome import - bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-chrome.log - -Wenn du den Import nur für ein paar Nachrichten und nicht für alle starten willst, kannst du die Nummer (im folgenden Beispiel 12) angeben. Der Redis Worker wird dann nach der 12. Nachricht stoppen: - -.. code:: bash - - bin/console wallabag:import:redis-worker -e=prod pocket -vv --maxIterations=12 diff --git a/docs/de/index.rst b/docs/de/index.rst index 8f5b13618..c1ce7d4b4 100644 --- a/docs/de/index.rst +++ b/docs/de/index.rst @@ -8,10 +8,6 @@ wallabag Dokumentation **wallabag** ist eine Read-it-later Applikation: es speichert Websites, indem es nur den Inhalt behält. Elemente wie Navigation oder Werbung werden gelöscht. -.. tip:: - - Diese Dokumentation ist über wallabag v2. Wenn du die Dokumentation für wallabag v1 lesen willst, `siehe dir bitte das hier an `__. - Die Hauptdokumentation für diese Applikation ist in einigen Abschnitten organisiert: * :ref:`user-docs` @@ -28,24 +24,19 @@ Die Dokumentation ist in anderen Sprachen verfügbar : :maxdepth: 2 :caption: Nutzerdokumentation - user/faq user/installation - user/upgrade-2.0.x-2.1.1 - user/upgrade-2.0.x-2.1.1 - user/migration + user/upgrade + user/configuration user/import user/create_account - user/login - user/configuration - user/first_article + user/articles user/errors_during_fetching - user/annotations - user/download_articles user/filters user/tags user/android user/parameters user/backup + user/faq .. _dev-docs: @@ -57,5 +48,4 @@ Die Dokumentation ist in anderen Sprachen verfügbar : developer/docker developer/documentation developer/translate - developer/redis - developer/rabbitmq + developer/asynchronous diff --git a/docs/de/user/android.rst b/docs/de/user/android.rst index 8573bcb82..315094384 100644 --- a/docs/de/user/android.rst +++ b/docs/de/user/android.rst @@ -23,7 +23,7 @@ Bestätige nur diese Nachricht und du wirst zum Einstellungsbildschirm weitergel :alt: Einstellungsbildschirm :align: center -Trage deine Wallabagdaten ein. Du musst deine Wallabagadresse eintragen. Es ist wichtig, dass die URL nicht mit einem Schrägstrich endet. Füge auch deine Wallabagzugangsdaten in das Nutzer- und Passwortfeld ein. +Trage deine Wallabagdaten ein. Du musst deine Wallabagadresse eintragen. **Es ist wichtig, dass die URL nicht mit einem Schrägstrich endet.** Füge auch deine Wallabagzugangsdaten in das Nutzer- und Passwortfeld ein. .. image:: ../../img/user/android_configuration_filled_in.de.png :alt: Eingetragene Einstellungen @@ -76,8 +76,8 @@ Schließlich nach der ersten erfolgreichen Synchronisation, wird dir die Liste d Bekannte Limitierungen --------------------- -2FA -~~~ +Zwei-Faktor-Authentifizierung (2FA) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Zur Zeit unterstützt die App keine Zwei-Faktor Authentifizierung. Du solltest sie deaktivieren damit die App funktioniert. @@ -97,11 +97,6 @@ Wenn du deine Wallabaginstanz per HTTPS erreichen kannst, solltest du das so kon Referenzen ---------- -`Quellcode der Android Applikation `_ - -`Android Applikation auf F-Droid `_ - -`Android Applikation auf Google Play `_ - -`Support Chat auf English `_ - +- `Quellcode der Android-App `_ +- `Android-App auf F-Droid `_ +- `Android-App auf Google Play `_ \ No newline at end of file diff --git a/docs/de/user/annotations.rst b/docs/de/user/annotations.rst deleted file mode 100644 index 4b4d58b0f..000000000 --- a/docs/de/user/annotations.rst +++ /dev/null @@ -1,24 +0,0 @@ -Anmerkungen -=========== - -In jedem Artikel, den du liest, kannst du Anmerkungen hinzufügen. Es ist einfacher mit ein paar Bilder erklärt. - -Wähle den Teil des Artikels aus, den du kommentieren willst und klicke auf den Bleistift: - -.. image:: ../../img/user/annotations_1.png - :alt: Wähle den Text - :align: center - -Schreibe deinen Kommentar: - -.. image:: ../../img/user/annotations_2.png - :alt: Schreibe deinen Kommentar - :align: center - -Der Text ist nun hervorgehoben und du kannst deine Anmerkung lesen, wenn du den Mauspfeil darüber fährst. - -.. image:: ../../img/user/annotations_3.png - :alt: lese deine Anmerkung - :align: center - -Du kannst so viele Anmerkungen erstellen wie du möchtest. diff --git a/docs/de/user/articles.rst b/docs/de/user/articles.rst new file mode 100644 index 000000000..07cfa06c3 --- /dev/null +++ b/docs/de/user/articles.rst @@ -0,0 +1,112 @@ +Artikel +======= + +Speichere deinen ersten Artikel +------------------------------- + +Die Hauptzweck von wallabag ist es, Artikel aus dem Web zu speichern. Es gibt viele Wege, dieses Ziel zu erreichen. +Wenn du denkst, dass ein Artikel falsch angezeigt wird, kannst du `diese Dokumentation lesen `_. + +Über ein Bookmarklet +^^^^^^^^^^^^^^^^^^^^ + +Auf der ``Howto``-Seite hast du einen ``Bookmarklet``-Tab. Ziehe das ``bag it!`` in die Lesezeichenleiste deines Browsers. +Nun kannst du jedes Mal, wenn du einen Artikel speichern willst, auf den ``bag it!``-Link klicken, dann ist der Artikel gespeichert. + +Der klassische Weg +^^^^^^^^^^^^^^^^^^ + +In der oberen Leiste deines Fensters hast du auf der rechten Seite drei Symbole. Mit dem ersten Symbole, einem Plus-Zeichen, kannst du auf einfache Weise einen neuen Artikel speichern. + +.. image:: ../../img/user/topbar.png + :alt: Top bar + :align: center + +Klicke darauf, um ein neues Feld anzuzeigen, füge die Artikel-URL ein und drücke Enter. Dann wird der Artikel gespeichert. + +Über ein Browser-Addon +^^^^^^^^^^^^^^^^^^^^^^ + +Firefox +""""""" + +Du kannst das `Firefox-Addon hier herunterladen`_. + +Chrome +"""""" + +Du kannst das `Chrome-Addon hier herunterladen`_. + +Über das Smartphone +^^^^^^^^^^^^^^^^^^^ + +Android +""""""" + +Du kannst die `Android-App hier herunterladen`_. + +Windows 10 in general +""""""""""""""""""""" + +Du kannst die `Windows-App hier herunterladen`_. + +Artikel herunterladen +--------------------- + +Du kannst jeden Artikel in verschiedenen Formaten herunterladen: ePUB, MOBI, PDF, XML, JSON, CSV. + +Klicke in der Artikelansicht auf dieses Symbol in der Seitenleiste: + +.. image:: ../../img/user/download_article.png + :alt: Artikel herunterladen + :align: center + +Du kannst sogar eine ganze Kategorie (Ungelesen, Favoriten, Archiv) in diesen Formaten herunterladen: +Beispielsweise kannst du auf der **Ungelesen**-Ansicht auf dieses Symbol in der oberen Leiste klicken: + +.. image:: ../../img/user/download_articles.png + :alt: Artikel herunterladen + :align: center + +Artikel teilen +-------------- + +Wenn du einen Artikel liest, kannst du ihn auch teilen. Klicke dazu einfach auf den Teilen-Button: + +.. image:: ../../img/user/share.png + :alt: Artikel teilen + :align: center + +Nun kannst du den Artikel teilen: + +- über eine öffentliche URL (es wird eine reduzierte Ansicht des Artikels zurückgegeben) +- über einen Tweet +- in deine Shaarli +- mit einem Beitrag auf Diaspora* +- an Carrot +- mit einer E-Mail + +Artikel-Anmerkungen +------------------- + +In jedem Artikel, den du liest, kannst du Anmerkungen hinzufügen. Es ist einfacher mit ein paar Bilder erklärt. + +Wähle den Teil des Artikels aus, den du kommentieren willst und klicke auf den Bleistift: + +.. image:: ../../img/user/annotations_1.png + :alt: Wähle den Text + :align: center + +Schreibe deinen Kommentar: + +.. image:: ../../img/user/annotations_2.png + :alt: Schreibe deinen Kommentar + :align: center + +Der Text ist nun hervorgehoben und du kannst deine Anmerkung lesen, wenn du den Mauspfeil darüber fährst. + +.. image:: ../../img/user/annotations_3.png + :alt: lese deine Anmerkung + :align: center + +Du kannst so viele Anmerkungen erstellen wie du möchtest. diff --git a/docs/de/user/backup.rst b/docs/de/user/backup.rst index ffe3ce37a..521e17ad4 100644 --- a/docs/de/user/backup.rst +++ b/docs/de/user/backup.rst @@ -22,4 +22,4 @@ Um die SQLite-Datenbank zu sichern, ist es lediglich notwendig, das Verzeichnis Bilder ------ -Die Bilder, die von wallabag empfangen worden, sind unter `data/assets/images` gespeichert (der Bilder-Speicher wird in wallabag 2.2 implementiert). +Die Bilder, die von wallabag empfangen worden, sind unter `web/assets/images` gespeichert (der Bilder-Speicher wird in wallabag 2.2 implementiert). diff --git a/docs/de/user/configuration.rst b/docs/de/user/configuration.rst index 075a52909..c0a8cd67a 100644 --- a/docs/de/user/configuration.rst +++ b/docs/de/user/configuration.rst @@ -13,8 +13,7 @@ Einstellungen Theme ~~~~~ -wallabag ist anpassbar. Du kannst dein bevorzugtes Theme hier auswählen. Du kannst -auch ein neues erstellen, ein extra Kapitel wird dem gewidmet sein. Das Standardtheme +wallabag ist anpassbar. Du kannst dein bevorzugtes Theme hier auswählen. Das Standardtheme ist ``Material``, es ist das Theme, dass in den Dokumentationsbildschirmfotos genutzt wird. Artikel pro Seite @@ -39,8 +38,7 @@ Jedes Mal, wenn du eine Aktion ausführst (nach dem Markieren eines Artikels als Sprache ~~~~~~~ -Du kannst die Sprache von der wallabag Benutzeroberfläche ändern. Du musst die ausloggen, damit diese -Änderung Wirkung zeigt. +Du kannst die Sprache von der wallabag Benutzeroberfläche ändern. RSS --- @@ -59,8 +57,8 @@ Benutzer-Informationen Du kannst deinen Namen ändern, deine E-Mail-Adresse und die Zwei-Faktor-Authentifizierung aktivieren. -Zwei-Faktor-Authentifizierung -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ +Zwei-Faktor-Authentifizierung (2FA) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Die Zwei-Faktor-Authentifizierung (2FA) dient dem Identitätsnachweis eines Nutzers mittels der Kombination zweier verschiedener und insbesondere unabhängiger Komponenten (Faktoren). diff --git a/docs/de/user/create_account.rst b/docs/de/user/create_account.rst index ce1b02a4b..14a7d0067 100644 --- a/docs/de/user/create_account.rst +++ b/docs/de/user/create_account.rst @@ -1,6 +1,9 @@ Account erstellen ================= +Registrierungsformular +---------------------- + Klicke auf der Loginseite auf den ``Registrieren`` Button- .. image:: ../../img/user/registration_form.png @@ -23,3 +26,16 @@ Dein Account ist nun aktiviert. .. image:: ../../img/user/activated_account.png :alt: Willkommen! :align: center + +Anmeldung +--------- + +Glückwunsch, dein Account ist nun aktiviert! +Um dich auf wallabag anzumelden, fülle das Formular auf der Login-Seite aus. + +Wenn du auf einem persönlichen Computer bist und angemeldet bleiben möchtest, +kannst du ein Häkchen nach ``angemeldet bleiben`` setzen, wallabag wird sich ein Jahr an dich erinnern. + +.. image:: ../../img/user/login_form.png + :alt: Login form + :align: center \ No newline at end of file diff --git a/docs/de/user/download_articles.rst b/docs/de/user/download_articles.rst deleted file mode 100644 index 6f5384b25..000000000 --- a/docs/de/user/download_articles.rst +++ /dev/null @@ -1,17 +0,0 @@ -Artikel herunterladen -===================== - -Du kannst jeden Artikel in verschiedenen Formaten herunterladen: ePUB, MOBI, PDF, XML, JSON, CSV. - -In der Artikelansicht, klickst du auf dieses Icon in der Seitenleiste: - -.. image:: ../../img/user/download_article.png - :alt: Artikel herunterladen - :align: center - -Du kannst auch eine ganze Kategorie (ungelesen, Favoriten, Archiv) in diesen Formaten herunterladen. -Zum Beispiel, in der Ansicht **Ungelesen**, klickst du auf das Icon in der oberen Leiste: - -.. image:: ../../img/user/download_articles.png - :alt: Artikel herunterladen - :align: center diff --git a/docs/de/user/first_article.rst b/docs/de/user/first_article.rst deleted file mode 100644 index b8ceda07b..000000000 --- a/docs/de/user/first_article.rst +++ /dev/null @@ -1,68 +0,0 @@ -Speichere deinen ersten Artikel -=============================== - -Der Hauptzweck von wallabag ist es Webartikel zu speichern. Du hast viele Wege das zu tun. - -.. note:: - - Eine Schnellstartanleitung wird in der Anwendung angezeigt bis du deinen ersten - Artikel gespeichert hast. - -Durch Nutzung eines Bookmarklets --------------------------------- - -Auf der ``How-To`` Seite, hast du einen Reiter ``Bookmarklet``. Ziehe und lasse den -``bag it!`` Link in die Lesezeichenleiste deines Browser los. - -Jetzt kannst du immer wenn du einen Artikel im Web liest und ihn du ihn speichern -willst, klicke auf den ``bag it!`` Link in deiner Lesezeichenleiste. Der Artikel -wird gespeichert. - -Durch Nutzung des klassischen Formulars ---------------------------------------- - -In der oberen Leiste auf deinem Bildschirm, hast du drei Icons. Mit dem ersten, einem -Pluszeichen, kannst du einfach neue Artikel speichern. - -.. image:: ../../img/user/topbar.png - :alt: obere Leiste - :align: center - -Klick darauf, um ein neues Feld anzeigen zu lassen, füge deine Artikel URL ein und -drücke die ``Enter`` Taste. Der Artikel wird gespeichert. - -Durch Nutzung eines Browser Add-ons ------------------------------------ - -Firefox -~~~~~~~ - -*Dieses Addon ist noch nicht für wallbag v2 verfügbar*. - -Chrome -~~~~~~ - -*Dieses Addon ist noch nicht für wallbag v2 verfügbar*. - -Durch Nutzung deiner Smartphone App ------------------------------------ - -Android -~~~~~~~ - -*Diese Applikation ist noch nicht für wallbag v2 verfügbar*. - -Firefox OS -~~~~~~~~~~ - -*Diese Applikation ist noch nicht für wallbag v2 verfügbar*. - -Windows Phone -~~~~~~~~~~~~~ - -*Diese Applikation ist noch nicht für wallbag v2 verfügbar*. - -iOS -~~~ - -*Diese Applikation ist noch nicht für wallbag v2 verfügbar*. diff --git a/docs/de/user/import.rst b/docs/de/user/import.rst index aeedb0ddc..e657e3361 100644 --- a/docs/de/user/import.rst +++ b/docs/de/user/import.rst @@ -1,8 +1,20 @@ Migration von einem Drittanbieter ================================= -Von Pocket ------------ +In wallabag 2.x kannst du Daten von folgenden Anbietern importieren: + +- Pocket <#id1>`_ +- Readability <#id2>`_ +- Instapaper <#id4>`_ +- wallabag 1.x <#id6>`_ +- wallabag 2.x <#id7>`_ + +Wir haben zusätzlich `ein Skript für die Migration per Kommandozeile <#import-via-command-line-interface-cli>`_ geschrieben. + +Da Importe eine Menge Zeit in Anspruch nehmen können, haben wir auch ein asynchrones Aufgabensystem entwickelt. `Du kannst die Dokumentation hier lesen `_ (für Experten). + +Pocket +------ Erstelle eine neue Applikation in Pocket ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -23,13 +35,14 @@ Jetzt ist alles in Ordnung, um von Pocket zu migrieren. Importiere deine Daten in wallabag 2.x ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -Klicke auf den ``Importieren`` Link im menü, auf ``Inhalte importieren`` in dem Pocketabschnitt und +Klicke auf den ``Importieren`` Link im Menü, auf ``Inhalte importieren`` in dem Pocketabschnitt und dann auf ``Verbinde mit Pocket und importieren Daten``. 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 ---------------- @@ -75,8 +88,98 @@ 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 +----------- -Von einer HTML oder JSON Datei ------------------------------- +Exportiere deine Readability-Daten +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ -*Funktion noch nicht implementiert in wallabag v2.* +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 +------------ + +Wenn du in der Vergangenheit wallabag 1.x genutzt hast, musst du deine Daten exportieren, bevor du auf wallabag 2.x umsteigst, da sich viel an der Anwendung und der Datenbank geändert hast. In deiner alten wallabag-installation kannst du deine Daten exportieren, indem du die Konfigurationsseite auf der alten wallabag-Instanz öffnest. + +.. image:: ../../img/user/export_v1.png + :alt: Export aus wallabag 1.x + :align: center + +.. note:: + Wenn du mehrere Accounts auf der gleichen wallabag-Instanz hast, muss jeder Nutzer seine Daten aus 1.x exportieren und in 2.x importieren. + +.. note:: + Falls während des Exports oder des Imports Probleme auftreten sollten, scheue dich nicht, den `Support zu kontaktieren `__. + +Wenn du dann die JSON-Datei mit deinen Einträgen heruntergeladen hast, kannst du `wallabag 2 über die Standard-Prozedur installieren `__. + +Nach dem Erstellen des Benutzeraccounts auf deiner neuen "wallabag 2.x"-Instanz, navigiere auf den Import-Bereich und wähle `Aus wallabag v1 importieren`. Wähle deine JSON-Datei und lade sie hoch. + +.. image:: ../../img/user/import_wallabagv1.png + :alt: Import aus wallabag v1 + :align: center + +wallabag 2.x +------------ + +Gehe auf der alten wallabag-Instanz, die du vorher genutzt hast, auf `Alle Artikel` und exportiere diese dann als JSON. + +.. image:: ../../img/user/export_v2.png + :alt: Export aus wallabag v2 + :align: center + +Nach dem Erstellen des Benutzeraccounts auf deiner neuen "wallabag 2.x"-Instanz, navigiere auf den Import-Bereich und wähle `Aus wallabag v2 importieren`. Wähle deine JSON-Datei und lade sie hoch. + +.. note:: + Falls während des Exports oder des Imports Probleme auftreten sollten, scheue dich nicht, den `Support zu kontaktieren `__. + +Import über die Kommandozeile (CLI) +----------------------------------- + +Falls du auf deinem Server Zugriff auf die Kommandozeile hast, kannst du den folgenden Befehl ausführen, um deine Daten aus wallabag v1 zu importieren: + +:: + + bin/console wallabag:import 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod + +Bitte ersetze die Werte: + +* ``1`` ist die Benutzer-ID in der Datenbank (die ID des ersten Benutzers ist immer 1) +* ``~/Downloads/wallabag-export-1-2016-04-05.json`` ist der Pfad zu deiner wallabag v1-Exportdatei + +Wenn du alle Artikel als gelesen markieren möchtest, kannst du die ``--markAsRead``-Option hinzufügen. + +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 diff --git a/docs/de/user/installation.rst b/docs/de/user/installation.rst index 35a30f524..131aa1f87 100644 --- a/docs/de/user/installation.rst +++ b/docs/de/user/installation.rst @@ -187,6 +187,12 @@ Angenommen du willst wallabag in das Verzeichnis ``/var/www/wallabag`` installie internal; } + # return 404 for all other php files not matching the front controller + # this prevents access to other php files you don't want to be accessible. + location ~ \.php$ { + return 404; + } + error_log /var/log/nginx/wallabag_error.log; access_log /var/log/nginx/wallabag_access.log; } diff --git a/docs/de/user/login.rst b/docs/de/user/login.rst deleted file mode 100644 index cf1cdc4cb..000000000 --- a/docs/de/user/login.rst +++ /dev/null @@ -1,13 +0,0 @@ -Login -===== - -Dein Account ist nun aktiviert, Glückwünsch! - -Um dich bei wallabag einzuloggen, fülle das Formular auf der Loginseite aus. - -Wenn du an deinem persönlichen Computer arbeitest und verbunden bleiben willst, -kannst du die Checkbox ``Angemeldet bleiben`` anhaken: wallabag wird sich für ein Jahr an deinen Login erinnern. - -.. image:: ../../img/user/login_form.png - :alt: Loginformular - :align: center diff --git a/docs/de/user/migration.rst b/docs/de/user/migration.rst deleted file mode 100644 index bc8a61b0b..000000000 --- a/docs/de/user/migration.rst +++ /dev/null @@ -1,62 +0,0 @@ -Migration von v1 oder v2 -======================== - -Von wallabag 1.x ------------------ - -Wenn du bisher wallabag v1.x genutzt hast, musst du deine Daten exportieren bevor du zu wallabag v2.x migrierst, weil die Applikation und ihre Datenbank sich stark geändert haben. In deiner alten wallabag Installation kannst du deine Daten auf der Konfigurationsseite exportieren. - -.. image:: ../../img/user/export_v1.png - :alt: Export von wallabag v1 - :align: center - -.. note:: - Wenn du mehrere Accounts auf der gleichen Instanz von wallabag hast, muss jeder Nutzer von v1 exportieren und in v2 seine Daten importieren. - -.. note:: - Wenn du Probleme während des Exports oder Imports hast, scheue dich nicht davor `nach Hilfe zu fragen `__. - -Wenn du eine JSON Datei mit deinen Artikeln erhalten hast, kannst du wallabag v2 installieren falls benötigt durch Befolgen `der Standardprozedur `__. - -Nachdem du einen Nutzerkonto auf deiner neuen wallabag v2 Instanz eingerichtet hast, kannst du zu dem Abschnitt `Import` springen und `Import von wallabag v1` auswählen. Wähle deine JSON Datei aus und lade sie hoch. - -.. image:: ../../img/user/import_wallabagv1.png - :alt: Import von wallabag v1 - :align: center - -Import via command-line interface (CLI) -~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ - -Wenn du CLI Zugang zu deinem Webserver hast, kannst du dieses Kommando ausführen, um deine Aritkel vom wallabag v1 Export zu importieren: - -:: - - bin/console wallabag:import-v1 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod - -Bitte ersetze folgende Werte: - -* ``1`` ist die Nutzer ID in der Databank (Die ID von dem ersten erstellten Nutzer in wallabag ist 1) -* ``~/Downloads/wallabag-export-1-2016-04-05.json`` ist der Pfad zu deinem wallabag v1 Export - -Du wirst eine solche Ausgabe erhalten: - -:: - - Start : 05-04-2016 11:36:07 --- - 403 imported - 0 already saved - End : 05-04-2016 11:36:09 --- - -Von wallabag 2.x ----------------- - -In der vorherigen wallabag Instanz, gehe zu `Alle Artikel` und exportiere diese Artikel als JSON. - -.. image:: ../../img/user/export_v2.png - :alt: Export von wallabag v2 - :align: center - -In deiner neuen wallabag Instanz erstellst du ein Nutzerkonto und klickst auf den Link im Menü, um den Import fortzusetzen. Wähle Import von wallabag v2 aus und lade deine JSON Datei hoch. - -.. note:: - Wenn du Probleme während des Exports oder Imports hast, scheue dich nicht davor `nach Hilfe zu fragen `__. diff --git a/docs/de/user/parameters.rst b/docs/de/user/parameters.rst index 4c68fe9e6..a5a4e4f2a 100644 --- a/docs/de/user/parameters.rst +++ b/docs/de/user/parameters.rst @@ -1,5 +1,48 @@ Was bedeuten die Parameter? =========================== + +Standardeinstellungen der `parameters.yml` +------------------------------------------ + +Dies ist die letzte standardisierte Version der `app/config/parameters.yml`-Datei. Stelle sicher, dass sich deine mit dieser ähnelt. +Wenn du nicht weißt, welchen Wert du setzen sollst, belasse es bei dem Standardwert. + +.. code-block:: yml + + parameters: + database_driver: pdo_sqlite + database_host: 127.0.0.1 + database_port: null + database_name: symfony + database_user: root + database_password: null + database_path: '%kernel.root_dir%/../data/db/wallabag.sqlite' + database_table_prefix: wallabag_ + database_socket: null + mailer_transport: smtp + mailer_host: 127.0.0.1 + mailer_user: null + mailer_password: null + locale: en + secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv + twofactor_auth: true + twofactor_sender: no-reply@wallabag.org + fosuser_registration: true + fosuser_confirmation: true + from_email: no-reply@wallabag.org + rss_limit: 50 + rabbitmq_host: localhost + rabbitmq_port: 5672 + rabbitmq_user: guest + rabbitmq_password: guest + redis_scheme: tcp + redis_host: localhost + redis_port: 6379 + redis_path: null + +Bedeutung von jedem Parameter +----------------------------- + .. csv-table:: Datenbankparameter :header: "Name", "Standardwert", "Beschreibung" diff --git a/docs/de/user/upgrade-2.0.x-2.1.1.rst b/docs/de/user/upgrade-2.0.x-2.1.1.rst deleted file mode 100644 index db81a1bec..000000000 --- a/docs/de/user/upgrade-2.0.x-2.1.1.rst +++ /dev/null @@ -1,85 +0,0 @@ -Wallabag von 2.0.x auf 2.1.1 updaten -==================================== - -.. warning:: -Wenn du den Import von Pocket durch das Hinzufügen des Consumer Key in den internen Einstellungen konfiguriert hast, fertige bitte ein Backup deines Keys an, bevor du auf das neue Release migrierst: Du wirst den Key nach dem Update in der Konfiguration erneut eintragen müssen. - -Update auf einem dedizierten Webserver --------------------------------------- - -Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag-Installation auf die neueste Version zu aktualisieren, führe die folgenden Kommandos in deinem wallabag-Ordner aus (ersetze ``2.1.1`` mit der neuesten Releasenummer): - -:: - - 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 - -Update auf einem Shared Webhosting ----------------------------------- - -Sichere deine ``app/config/parameters.yml`` Datei. - -Lade das neueste Release von wallabag herunter: - -.. code-block:: bash - - wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package - -(2.1.1 md5 Hashsumme: ``9584a3b60a2b2a4de87f536548caac93``) - -Entpacke das Archiv in deinen wallabag-Ordner und ersetze ``app/config/parameters.yml`` mit deiner Datei. - -Bitte beachte, dass wir in dieser Version neue Parameter hinzugefügt haben. Du musst die Datei ``app/config/parameters.yml`` bearbeiten und die folgenden Zeilen hinzufügen (ersetze die Werte mit deiner Konfiguration): - -.. code-block:: yml - - parameters: - database_driver: pdo_sqlite - database_host: 127.0.0.1 - database_port: null - database_name: symfony - database_user: root - database_password: null - database_path: '%kernel.root_dir%/../data/db/wallabag.sqlite' - database_table_prefix: wallabag_ - mailer_transport: smtp - mailer_host: 127.0.0.1 - mailer_user: null - mailer_password: null - locale: en - secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv - twofactor_auth: true - twofactor_sender: no-reply@wallabag.org - fosuser_registration: true - fosuser_confirmation: true - from_email: no-reply@wallabag.org - rss_limit: 50 - rabbitmq_host: localhost - rabbitmq_port: 5672 - rabbitmq_user: guest - rabbitmq_password: guest - redis_host: localhost - redis_port: 6379 - -Du kannst `hier eine Dokumentation über die Parameter finden `_. - -Wenn du SQLite nutzt, musst auch das ``data/`` Verzeichnis in die neue Installation kopieren. - -Leere den ``var/cache`` Ordner. - -Du musst einige SQL-Abfragen ausführen, um die Datenbank zu aktualisieren. Wir nehmen in diesem Fall an, dass das Tabellenpräfix ``wallabag_`` ist und eine MySQL-Datenbank genutzt 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'; diff --git a/docs/de/user/upgrade-2.1.x-2.1.y.rst b/docs/de/user/upgrade-2.1.x-2.1.y.rst deleted file mode 100644 index 2f9b7791b..000000000 --- a/docs/de/user/upgrade-2.1.x-2.1.y.rst +++ /dev/null @@ -1,35 +0,0 @@ -Wallabag von 2.1.x auf 2.1.y updaten -==================================== - -Update auf einem dedizierten Webserver --------------------------------------- - -Das neueste Release ist auf https://www.wallabag.org/pages/download-wallabag.html veröffentlicht. Um deine wallabag Installation auf die neueste Version upzudaten, führe die folgenden Kommandos in deinem wallabag Ordner aus (ersetze ``2.1.2`` mit der neuesten Releasenummer): - -:: - - rm -rf var/cache/* - git fetch origin - git fetch --tags - git checkout 2.1.2 --force - SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist - php bin/console cache:clear --env=prod - -Update auf einem Shared Webhosting ----------------------------------- - -Sichere deine ``app/config/parameters.yml`` Datei. - -Lade das neueste Release von wallabag herunter: - -.. code-block:: bash - - wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package - -Du findest die `md5 Hashsumme des neuesten Pakets auf unserer Website `_. - -Entpacke das Archiv in deinen wallabag Ordner und ersetze ``app/config/parameters.yml`` mit deiner Datei. - -Wenn du SQLite nutzt, musst auch das ``data/`` Verzeichnis in die neue Installation kopieren. - -Leere den ``var/cache`` Ordner. diff --git a/docs/de/user/upgrade.rst b/docs/de/user/upgrade.rst new file mode 100644 index 000000000..ad020dd85 --- /dev/null +++ b/docs/de/user/upgrade.rst @@ -0,0 +1,103 @@ +wallabag-Installation aktualisieren +=================================== + +Du wirst hier mehrere Wege finden, um deine wallabag zu aktualisieren: + +- `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 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 + +Upgrade auf einem Shared Hosting +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Sichere deine ``app/config/parameters.yml``-Datei. + +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 + +(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. + +Bitte überprüfe, dass deine ``app/config/parameters.yml`` alle notwendigen Parameter enthält. Eine Dokumentation darüber `findest du hier `_. + +Falls du SQLite nutzt, musst du außerdem deinen ``data/``-Ordner in die neue Installation kopieren. + +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 2.1.x zu 2.1.y +----------------------------- + +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 + +Upgrade auf einem Shared Hosting +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Sichere deine ``app/config/parameters.yml``-Datei. + +Lade das letzte Release von wallabag herunter: + +.. code-block:: bash + + wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package + +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. + +Bitte überprüfe, dass deine ``app/config/parameters.yml`` alle notwendigen Parameter enthält. Eine Dokumentation darüber `findest du hier `_. + +Falls du SQLite nutzt, musst du außerdem deinen ``data/``-Ordner in die neue Installation kopieren. + +Leere den ``var/cache``-Ordner. + +Upgrade von 1.x +--------------- + +Es gibt kein automatisiertes Skript, um wallabag 1.x auf wallabag 2.x zu aktualisieren. Du musst: + +- deine Daten exportieren +- wallabag 2.x installieren (Dokumentation `_ ) +- die Daten in die neue Installation importieren (`Dokumentation `_ ) \ No newline at end of file diff --git a/docs/en/developer/asynchronous.rst b/docs/en/developer/asynchronous.rst new file mode 100644 index 000000000..6a991cf64 --- /dev/null +++ b/docs/en/developer/asynchronous.rst @@ -0,0 +1,159 @@ +Asynchronous tasks +================== + +In order to launch asynchronous tasks (useful for huge imports for example), we can use RabbitMQ or Redis. + +Install RabbitMQ for asynchronous tasks +--------------------------------------- + +Requirements +^^^^^^^^^^^^ + +You need to have RabbitMQ installed on your server. + +Installation +^^^^^^^^^^^^ + +.. code:: bash + + wget https://www.rabbitmq.com/rabbitmq-signing-key-public.asc + apt-key add rabbitmq-signing-key-public.asc + apt-get update + apt-get install rabbitmq-server + +Configuration and launch +^^^^^^^^^^^^^^^^^^^^^^^^ + +.. code:: bash + + rabbitmq-plugins enable rabbitmq_management # (useful to have a web interface, available at http://localhost:15672/ (guest/guest) + rabbitmq-server -detached + +Stop RabbitMQ +^^^^^^^^^^^^^ + +.. code:: bash + + rabbitmqctl stop + + +Configure RabbitMQ in wallabag +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Edit your ``app/config/parameters.yml`` file to edit RabbitMQ configuration. The default one should be ok: + +.. code:: yaml + + rabbitmq_host: localhost + rabbitmq_port: 5672 + rabbitmq_user: guest + rabbitmq_password: guest + +Enable RabbitMQ in wallabag +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +In internal settings, in the **Import** section, enable RabbitMQ (with the value 1). + +Launch RabbitMQ consumer +^^^^^^^^^^^^^^^^^^^^^^^^ + +Depending on which service you want to import from you need to enable one (or many if you want to support many) cron job: + +.. code:: bash + + # for Pocket import + bin/console rabbitmq:consumer -e=prod import_pocket -w + + # for Readability import + bin/console rabbitmq:consumer -e=prod import_readability -w + + # for Instapaper import + bin/console rabbitmq:consumer -e=prod import_instapaper -w + + # for wallabag v1 import + bin/console rabbitmq:consumer -e=prod import_wallabag_v1 -w + + # for wallabag v2 import + bin/console rabbitmq:consumer -e=prod import_wallabag_v2 -w + + # for Firefox import + bin/console rabbitmq:consumer -e=prod import_firefox -w + + # for Chrome import + bin/console rabbitmq:consumer -e=prod import_chrome -w + +Install Redis for asynchronous tasks +------------------------------------ + +In order to launch asynchronous tasks (useful for huge imports for example), we can use Redis. + +Requirements +^^^^^^^^^^^^ + +You need to have Redis installed on your server. + +Installation +^^^^^^^^^^^^ + +.. code:: bash + + apt-get install redis-server + +Launch +^^^^^^ + +The server might be already running after installing, if not you can launch it using: + +.. code:: bash + + redis-server + + +Configure Redis in wallabag +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Edit your ``app/config/parameters.yml`` file to edit Redis configuration. The default one should be ok: + +.. code:: yaml + + redis_host: localhost + redis_port: 6379 + +Enable Redis in wallabag +^^^^^^^^^^^^^^^^^^^^^^^^ + +In internal settings, in the **Import** section, enable Redis (with the value 1). + +Launch Redis consumer +^^^^^^^^^^^^^^^^^^^^^ + +Depending on which service you want to import from you need to enable one (or many if you want to support many) cron job: + +.. code:: bash + + # for Pocket import + bin/console wallabag:import:redis-worker -e=prod pocket -vv >> /path/to/wallabag/var/logs/redis-pocket.log + + # for Readability import + bin/console wallabag:import:redis-worker -e=prod readability -vv >> /path/to/wallabag/var/logs/redis-readability.log + + # for Instapaper import + bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-instapaper.log + + # for wallabag v1 import + bin/console wallabag:import:redis-worker -e=prod wallabag_v1 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v1.log + + # for wallabag v2 import + bin/console wallabag:import:redis-worker -e=prod wallabag_v2 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v2.log + + # for Firefox import + bin/console wallabag:import:redis-worker -e=prod firefox -vv >> /path/to/wallabag/var/logs/redis-firefox.log + + # for Chrome import + bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-chrome.log + +If you want to launch the import only for some messages and not all, you can specify this number (here 12) and the worker will stop right after the 12th message : + +.. code:: bash + + bin/console wallabag:import:redis-worker -e=prod pocket -vv --maxIterations=12 diff --git a/docs/en/developer/rabbitmq.rst b/docs/en/developer/rabbitmq.rst deleted file mode 100644 index 7ee8a5ce2..000000000 --- a/docs/en/developer/rabbitmq.rst +++ /dev/null @@ -1,80 +0,0 @@ -Install RabbitMQ for asynchronous tasks -======================================= - -In order to launch asynchronous tasks (useful for huge imports for example), we can use RabbitMQ. - -Requirements ------------- - -You need to have RabbitMQ installed on your server. - -Installation -~~~~~~~~~~~~ - -.. code:: bash - - wget https://www.rabbitmq.com/rabbitmq-signing-key-public.asc - apt-key add rabbitmq-signing-key-public.asc - apt-get update - apt-get install rabbitmq-server - -Configuration and launch -~~~~~~~~~~~~~~~~~~~~~~~~ - -.. code:: bash - - rabbitmq-plugins enable rabbitmq_management # (useful to have a web interface, available at http://localhost:15672/ (guest/guest) - rabbitmq-server -detached - -Stop RabbitMQ -~~~~~~~~~~~~~ - -.. code:: bash - - rabbitmqctl stop - - -Configure RabbitMQ in wallabag ------------------------------- - -Edit your ``app/config/parameters.yml`` file to edit RabbitMQ configuration. The default one should be ok: - -.. code:: yaml - - rabbitmq_host: localhost - rabbitmq_port: 5672 - rabbitmq_user: guest - rabbitmq_password: guest - -Enable RabbitMQ in wallabag ---------------------------- - -In internal settings, in the **Import** section, enable RabbitMQ (with the value 1). - -Launch RabbitMQ consumer ------------------------- - -Depending on which service you want to import from you need to enable one (or many if you want to support many) cron job: - -.. code:: bash - - # for Pocket import - bin/console rabbitmq:consumer -e=prod import_pocket -w - - # for Readability import - bin/console rabbitmq:consumer -e=prod import_readability -w - - # for Instapaper import - bin/console rabbitmq:consumer -e=prod import_instapaper -w - - # for wallabag v1 import - bin/console rabbitmq:consumer -e=prod import_wallabag_v1 -w - - # for wallabag v2 import - bin/console rabbitmq:consumer -e=prod import_wallabag_v2 -w - - # for Firefox import - bin/console rabbitmq:consumer -e=prod import_firefox -w - - # for Chrome import - bin/console rabbitmq:consumer -e=prod import_chrome -w diff --git a/docs/en/developer/redis.rst b/docs/en/developer/redis.rst deleted file mode 100644 index ea084e667..000000000 --- a/docs/en/developer/redis.rst +++ /dev/null @@ -1,75 +0,0 @@ -Install Redis for asynchronous tasks -==================================== - -In order to launch asynchronous tasks (useful for huge imports for example), we can use Redis. - -Requirements ------------- - -You need to have Redis installed on your server. - -Installation -~~~~~~~~~~~~ - -.. code:: bash - - apt-get install redis-server - -Launch -~~~~~~ - -The server might be already running after installing, if not you can launch it using: - -.. code:: bash - - redis-server - - -Configure Redis in wallabag ---------------------------- - -Edit your ``app/config/parameters.yml`` file to edit Redis configuration. The default one should be ok: - -.. code:: yaml - - redis_host: localhost - redis_port: 6379 - -Enable Redis in wallabag ------------------------- - -In internal settings, in the **Import** section, enable Redis (with the value 1). - -Launch Redis consumer ---------------------- - -Depending on which service you want to import from you need to enable one (or many if you want to support many) cron job: - -.. code:: bash - - # for Pocket import - bin/console wallabag:import:redis-worker -e=prod pocket -vv >> /path/to/wallabag/var/logs/redis-pocket.log - - # for Readability import - bin/console wallabag:import:redis-worker -e=prod readability -vv >> /path/to/wallabag/var/logs/redis-readability.log - - # for Instapaper import - bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-instapaper.log - - # for wallabag v1 import - bin/console wallabag:import:redis-worker -e=prod wallabag_v1 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v1.log - - # for wallabag v2 import - bin/console wallabag:import:redis-worker -e=prod wallabag_v2 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v2.log - - # for Firefox import - bin/console wallabag:import:redis-worker -e=prod firefox -vv >> /path/to/wallabag/var/logs/redis-firefox.log - - # for Chrome import - bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-chrome.log - -If you want to launch the import only for some messages and not all, you can specify this number (here 12) and the worker will stop right after the 12th message : - -.. code:: bash - - bin/console wallabag:import:redis-worker -e=prod pocket -vv --maxIterations=12 diff --git a/docs/en/index.rst b/docs/en/index.rst index 6fe33c76e..54a1eef88 100644 --- a/docs/en/index.rst +++ b/docs/en/index.rst @@ -8,10 +8,6 @@ wallabag documentation **wallabag** is a read-it-later application: it saves a web page by keeping content only. Elements like navigation or ads are deleted. -.. tip:: - - This documentation is about wallabag v2. If you want to read documentation for wallabag v1, `please have a look here `__. - The main documentation for this application is organized into a couple sections: * :ref:`user-docs` @@ -20,7 +16,7 @@ The main documentation for this application is organized into a couple sections: The documentation is available in other languages: * `Documentation en français `_ -* `Deutsch Dokumentation `_ +* `Dokumentation in Deutsch `_ .. _user-docs: @@ -28,25 +24,19 @@ The documentation is available in other languages: :maxdepth: 2 :caption: User documentation - user/faq user/installation - user/upgrade-2.0.x-2.1.1 - user/upgrade-2.1.x-2.1.y - user/migration + user/upgrade + user/configuration user/import user/create_account - user/login - user/configuration - user/first_article + user/articles user/errors_during_fetching - user/annotations - user/download_articles - user/share user/filters user/tags user/android user/parameters user/backup + user/faq .. _dev-docs: @@ -58,5 +48,4 @@ The documentation is available in other languages: developer/docker developer/documentation developer/translate - developer/redis - developer/rabbitmq + developer/asynchronous diff --git a/docs/en/user/android.rst b/docs/en/user/android.rst index 91dcb2fc0..e286bb3b2 100644 --- a/docs/en/user/android.rst +++ b/docs/en/user/android.rst @@ -1,13 +1,11 @@ -Android App -=========== - +Android application +=================== Purpose of this document ------------------------ This document describes how you can setup your Android application to work with your wallabag instance. There is no difference in this procedure for wallabag v1 or v2. - Steps to configure your app --------------------------- @@ -23,7 +21,7 @@ Just confirm that message and you get redirected to the settings screen. :alt: Settings screen :align: center -Fill in your wallabag data. You need to enter your wallabag address. It is important that this URL does not end with a slash. Also add your wallabag credentials to the user name and password field. +Fill in your wallabag data. You need to enter your wallabag address. **It is important that this URL does not end with a slash**. Also add your wallabag credentials to the user name and password field. .. image:: ../../img/user/android_configuration_filled_in.en.png :alt: Filled in settings @@ -59,49 +57,39 @@ Now you need to scroll to the bottom of the settings menu. Of course you can adj :alt: Bottom of the settings screen :align: center -After hitting the save button, you get the following screen. The app proposes to initiate a syncronisation process to update your feeds of articles. It is recommended to acknowledge this action and press Yes. +After hitting the save button, you get the following screen. The app proposes to initiate a synchronization process to update your feeds of articles. It is recommended to acknowledge this action and press Yes. .. image:: ../../img/user/android_configuration_saved_feed_update.en.png :alt: Settings saved the first time :align: center -Finally after the synchronisation finished successfully, you are presented to the list of unread articles. +Finally after the synchronization finished successfully, you are presented to the list of unread articles. .. image:: ../../img/user/android_unread_feed_synced.en.png :alt: Filled article list cause feeds successfully synchronized :align: center - - Known limitations ----------------- -2FA -~~~ +Two factor authentication (2FA) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Currently the Android application does not support two-factor authentication. You should disable that to get the application working. - Limited amount of articles with wallabag v2 ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ In your wallabag web instance you can configure how many items are part of the RSS feed. This option did not exist in wallabag v1, where all articles were part of the feed. So if you set the amount of articles being displayed greater than the number of items being content of your RSS feed, you will only see the number of items in your RSS feed. - SSL/TLS encryption ~~~~~~~~~~~~~~~~~~ If you can reach your wallabag web instance via HTTPS, you should use that. Especially if your HTTP URL redirects you to the HTTPS one. Currently, the app cannot handle that redirect properly. - References ---------- -`Source code of the Android application `_ - -`Android Application on F-Droid `_ - -`Android Application on Google Play `_ - -`Support chat `_ - +- `Source code of the Android application `_ +- `Android Application on F-Droid `_ +- `Android Application on Google Play `_ diff --git a/docs/en/user/annotations.rst b/docs/en/user/annotations.rst deleted file mode 100644 index fab854aae..000000000 --- a/docs/en/user/annotations.rst +++ /dev/null @@ -1,24 +0,0 @@ -Annotations -=========== - -In each article you read, you can write annotations. It's easier to understand with some pictures. - -Select the part of the article that you want to annotate and click on the pencil: - -.. image:: ../../img/user/annotations_1.png - :alt: Select your text - :align: center - -Then, write your annotation: - -.. image:: ../../img/user/annotations_2.png - :alt: Write your annotation - :align: center - -The text is now highlighted and you can read your annotation if you move the mouse cursor over it. - -.. image:: ../../img/user/annotations_3.png - :alt: Read your annotation - :align: center - -You can create as many annotations as you wish. diff --git a/docs/en/user/articles.rst b/docs/en/user/articles.rst new file mode 100644 index 000000000..16b3b0d28 --- /dev/null +++ b/docs/en/user/articles.rst @@ -0,0 +1,116 @@ +Articles +======== + +Save your first article +----------------------- + +The main purpose of wallabag is to save web articles. You have many ways to do it. If you think that the article is wrong displayed, `you can read this documentation `_. + +By using a bookmarklet +^^^^^^^^^^^^^^^^^^^^^^ + +On the ``Howto`` page, you have a ``Bookmarklet`` tab. Drag and drop the ``bag it!`` +link to your bookmarks bar of your browser. + +Now, each time you're reading an article on the web and you want to save it, +click on the ``bag it!`` link in your bookmarks bar. The article is saved. + +By using the classic form +^^^^^^^^^^^^^^^^^^^^^^^^^ + +In the top bar of your screen, you have 3 icons. With the first one, a plus sign, +you can easily save a new article. + +.. image:: ../../img/user/topbar.png + :alt: Top bar + :align: center + +Click on it to display a new field, paste the article URL inside and press your +``Return`` key. The article is saved. + +By using a browser add-on +^^^^^^^^^^^^^^^^^^^^^^^^^ + +Firefox +""""""" + +You can download the `Firefox addon here `_. + +Chrome +"""""" + +You can download the `Chrome addon here `_. + +By using your smarphone application +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Android +""""""" + +You can download the `Android application here `_. + +Windows Phone +""""""""""""" + +You can downlaod the `Windows Phone application here `_. + +Download your articles +---------------------- + +You can download each article in several formats: ePUB, MOBI, PDF, XML, JSON, CSV. + +On the article view, click on this icon, in the sidebar: + +.. image:: ../../img/user/download_article.png + :alt: download article + :align: center + +You can also download a full category (unread, starred, archive) in these formats. +For example, on **Unread** view, click on this icon in the top bar: + +.. image:: ../../img/user/download_articles.png + :alt: download articles + :align: center + +Share your articles +------------------- + +When you're reading an article, you can share it. Just click on the share button: + +.. image:: ../../img/user/share.png + :alt: share article + :align: center + +Now, you can share the article: + +- with a public URL (you'll have a light view of the article) +- with a tweet +- into your Shaarli +- with a post in Diaspora* +- to Carrot +- with an email + +Annotate your articles +---------------------- + +In each article you read, you can write annotations. It's easier to understand with some pictures. + +Select the part of the article that you want to annotate and click on the pencil: + +.. image:: ../../img/user/annotations_1.png + :alt: Select your text + :align: center + +Then, write your annotation: + +.. image:: ../../img/user/annotations_2.png + :alt: Write your annotation + :align: center + +The text is now highlighted and you can read your annotation if you move the mouse cursor over it. + +.. image:: ../../img/user/annotations_3.png + :alt: Read your annotation + :align: center + +You can create as many annotations as you wish. diff --git a/docs/en/user/backup.rst b/docs/en/user/backup.rst index 51721000f..f8b480a3f 100644 --- a/docs/en/user/backup.rst +++ b/docs/en/user/backup.rst @@ -1,5 +1,6 @@ Backup wallabag =============== + Because sometimes you may do a mistake with your wallabag and lose data or in case you need to move your wallabag to another server you want to backup your data. This articles describes what you need to backup. @@ -22,4 +23,4 @@ To backup the SQLite database, you just need to copy the directory `data/db` fro Images ------ -The images retrieved by wallabag are stored under `data/assets/images` (the images storage will be implemented in wallabag 2.2). +The images retrieved by wallabag are stored under `web/assets/images` (the images storage will be implemented in wallabag 2.2). diff --git a/docs/en/user/configuration.rst b/docs/en/user/configuration.rst index e16af12c3..a52d3ddd9 100644 --- a/docs/en/user/configuration.rst +++ b/docs/en/user/configuration.rst @@ -12,8 +12,7 @@ Settings Theme ~~~~~ -wallabag is customizable. You can choose your prefered theme here. You can also -create a new one, a chapter will be dedicated for this. The default theme is +wallabag is customizable. You can choose your prefered theme here. The default theme is ``Material``, it's the theme used in the documentation screenshots. Items per page @@ -39,8 +38,7 @@ after deleting an article, after removing a tag from an entry), you can be redir Language ~~~~~~~~ -You can change the language of wallabag interface. You need to logout for this change -to take effect. +You can change the language of wallabag interface. RSS --- @@ -61,8 +59,8 @@ You can change your name, your email address and enable ``Two factor authenticat If the wallabag instance has more than one enabled user, you can delete your account here. **Take care, we delete all your data**. -Two factor authentication -~~~~~~~~~~~~~~~~~~~~~~~~~ +Two factor authentication (2FA) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ Two-factor authentication (also known as 2FA) is a technology patented in 1984 that provides identification of users by means of the combination of two different components. diff --git a/docs/en/user/create_account.rst b/docs/en/user/create_account.rst index 2e883c88e..8c43867d9 100644 --- a/docs/en/user/create_account.rst +++ b/docs/en/user/create_account.rst @@ -1,5 +1,8 @@ -Create an account -================= +Create an account and authentication +==================================== + +Register +-------- On the login page, click on ``Register`` button. @@ -23,3 +26,17 @@ Your account is now activated. .. image:: ../../img/user/activated_account.png :alt: Welcome on board! :align: center + +Login +----- + +Your account is now enabled, congratulations! + +To login to wallabag, fill the form on login page. + +If you are on your personal computer and you want to stay connected, +you can check the ``Keep me logged in`` checkbox: wallabag will remember you for one year. + +.. image:: ../../img/user/login_form.png + :alt: Login form + :align: center diff --git a/docs/en/user/download_articles.rst b/docs/en/user/download_articles.rst deleted file mode 100644 index 4813776d1..000000000 --- a/docs/en/user/download_articles.rst +++ /dev/null @@ -1,17 +0,0 @@ -Download articles -================= - -You can download each article in several formats: ePUB, MOBI, PDF, XML, JSON, CSV. - -On the article view, click on this icon, in the sidebar: - -.. image:: ../../img/user/download_article.png - :alt: download article - :align: center - -You can also download a full category (unread, starred, archive) in these formats. -For example, on **Unread** view, click on this icon in the top bar: - -.. image:: ../../img/user/download_articles.png - :alt: download articles - :align: center diff --git a/docs/en/user/errors_during_fetching.rst b/docs/en/user/errors_during_fetching.rst index 6684563ad..c5e18d3bd 100644 --- a/docs/en/user/errors_during_fetching.rst +++ b/docs/en/user/errors_during_fetching.rst @@ -12,9 +12,7 @@ There may be several reasons: How can I help to fix that? --------------------------- -You can `sending us an email with the article's URL `_. - -Or you can also try to fix this problem by yourself (so we can be focused on improving wallabag internally instead of writing siteconfig :) ). +You can try to fix this problem by yourself (so we can be focused on improving wallabag internally instead of writing siteconfig :) ). You can try to see if it works here: `http://f43.me/feed/test `_ (it uses almost the same system as wallabag to retrieve content). diff --git a/docs/en/user/filters.rst b/docs/en/user/filters.rst index de0da0166..aae8a749b 100644 --- a/docs/en/user/filters.rst +++ b/docs/en/user/filters.rst @@ -1,7 +1,7 @@ -Filters -======= +Retrieve your articles thanks to filters +======================================== -To retrieve articles easier, you can use filters. +To retrieve articles easily, you can use filters. Click on the third icon in the top bar. .. image:: ../../img/user/topbar.png diff --git a/docs/en/user/import.rst b/docs/en/user/import.rst index cde2ecd68..f420a1318 100644 --- a/docs/en/user/import.rst +++ b/docs/en/user/import.rst @@ -1,8 +1,20 @@ -Migrate from a third service -============================ +Migrate from ... +================ -From Pocket ------------ +In wallabag 2.x, you can import data from: + +- `Pocket <#id1>`_ +- `Readability <#id2>`_ +- `Instapaper <#id4>`_ +- `wallabag 1.x <#id6>`_ +- `wallabag 2.x <#id7>`_ + +We also developed `a script to execute migrations via command-line interface <#import-via-command-line-interface-cli>`_. + +Because imports can take ages, we developed an asynchronous tasks system. `You can read the documentation here `_ (for experts). + +Pocket +------ Create a new application on Pocket ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -16,7 +28,7 @@ a new application on their developer website to continue. and submit your new application Pocket will give you a **Consumer Key** (for example, `49961-985e4b92fe21fe4c78d682c1`). -You need to configure the ``pocket_consumer_key`` into the ``Import`` section in the ``Internal settings`` menu. +You need to configure the ``pocket_consumer_key`` in the ``Config`` menu. Now, all is fine to migrate from Pocket. @@ -29,8 +41,8 @@ and then on ``Connect to Pocket and import data``. You need to authorize wallabag to interact with your Pocket account. Your data will be imported. Data import can be a demanding process for your server. -From Readability ----------------- +Readability +----------- Export your Readability data ~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -77,7 +89,66 @@ and then select your CSV file and upload it. Your data will be imported. Data import can be a demanding process for your server. -From HTML or JSON file ----------------------- +wallabag 1.x +------------ -*Feature not yet implemented in wallabag v2.* +If you were using wallabag v1.x, you need to export your data before migrating to wallabag v2.x, because the application and its database changed a lot. In your old wallabag installation, you can export your data, which can be done on the Config page of your old wallabag installation. + +.. image:: ../../img/user/export_v1.png + :alt: Exporting from wallabag v1 + :align: center + +.. note:: + If you have multiple accounts on the same instance of wallabag, each user must export from v1 and import into v2 its data. + +.. note:: + If you encounter issues during the export or the import, don't hesitate to `ask for support `__. + +When you have retrieved the json file containing your entries, you can install wallabag v2 if needed by following `the standard procedure `__. + +After creating an user account on your new wallabag v2 instance, you must head over to the `Import` section and select `Import from wallabag v1`. Select your json file and upload it. + +.. image:: ../../img/user/import_wallabagv1.png + :alt: Import from wallabag v1 + :align: center + +wallabag 2.x +------------ + +From the previous wallabag instance on which you were before, go to `All articles`, then export these articles as json. + +.. image:: ../../img/user/export_v2.png + :alt: Export depuis wallabag v2 + :align: center + +From your new wallabag instance, create your user account and click on the link in the menu to proceed to import. Choose import from wallabag v2 and select your json file to upload it. + +.. note:: + If you encounter issues during the export or the import, don't hesitate to `ask for support `__. + +Import via command-line interface (CLI) +--------------------------------------- + +If you have a CLI access on your web server, you can execute this command to import your wallabag v1 export: + +:: + + bin/console wallabag:import 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod + +Please replace values: + +* ``1`` is the user identifier in database (The ID of the first user created on wallabag is 1) +* ``~/Downloads/wallabag-export-1-2016-04-05.json`` is the path of your wallabag v1 export + +If you want to mark all these entries as read, you can add the ``--markAsRead`` option. + +To import a wallabag v2 file, you need to add the option ``--importer=v2``. + +You'll have this in return: + +:: + + Start : 05-04-2016 11:36:07 --- + 403 imported + 0 already saved + End : 05-04-2016 11:36:09 --- diff --git a/docs/en/user/installation.rst b/docs/en/user/installation.rst index 45e146164..77ef60a82 100644 --- a/docs/en/user/installation.rst +++ b/docs/en/user/installation.rst @@ -186,6 +186,12 @@ Assuming you installed wallabag in the ``/var/www/wallabag`` folder, here's the internal; } + # return 404 for all other php files not matching the front controller + # this prevents access to other php files you don't want to be accessible. + location ~ \.php$ { + return 404; + } + error_log /var/log/nginx/wallabag_error.log; access_log /var/log/nginx/wallabag_access.log; } diff --git a/docs/en/user/login.rst b/docs/en/user/login.rst deleted file mode 100644 index e66089bdc..000000000 --- a/docs/en/user/login.rst +++ /dev/null @@ -1,13 +0,0 @@ -Login -===== - -Your account is now enabled, congratulations! - -To login to wallabag, fill the form on login page. - -If you are on your personal computer and you want to stay connected, -you can check the ``Keep me logged in`` checkbox: wallabag will remember you for one year. - -.. image:: ../../img/user/login_form.png - :alt: Login form - :align: center diff --git a/docs/en/user/migration.rst b/docs/en/user/migration.rst deleted file mode 100644 index 420627969..000000000 --- a/docs/en/user/migration.rst +++ /dev/null @@ -1,66 +0,0 @@ -Migrate from v1 or v2 -===================== - -From wallabag 1.x ------------------ - -If you were using wallabag v1.x, you need to export your data before migrating to wallabag v2.x, because the application and its database changed a lot. In your old wallabag installation, you can export your data, which can be done on the Config page of your old wallabag installation. - -.. image:: ../../img/user/export_v1.png - :alt: Exporting from wallabag v1 - :align: center - -.. note:: - If you have multiple accounts on the same instance of wallabag, each user must export from v1 and import into v2 its data. - -.. note:: - If you encounter issues during the export or the import, don't hesitate to `ask for support `__. - -When you have retrieved the json file containing your entries, you can install wallabag v2 if needed by following `the standard procedure `__. - -After creating an user account on your new wallabag v2 instance, you must head over to the `Import` section and select `Import from wallabag v1`. Select your json file and upload it. - -.. image:: ../../img/user/import_wallabagv1.png - :alt: Import from wallabag v1 - :align: center - -From wallabag 2.x ------------------ - -From the previous wallabag instance on which you were before, go to `All articles`, then export these articles as json. - -.. image:: ../../img/user/export_v2.png - :alt: Export depuis wallabag v2 - :align: center - -From your new wallabag instance, create your user account and click on the link in the menu to proceed to import. Choose import from wallabag v2 and select your json file to upload it. - -.. note:: - If you encounter issues during the export or the import, don't hesitate to `ask for support `__. - -Import via command-line interface (CLI) ---------------------------------------- - -If you have a CLI access on your web server, you can execute this command to import your wallabag v1 export: - -:: - - bin/console wallabag:import 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod - -Please replace values: - -* ``1`` is the user identifier in database (The ID of the first user created on wallabag is 1) -* ``~/Downloads/wallabag-export-1-2016-04-05.json`` is the path of your wallabag v1 export - -If you want to mark all these entries as read, you can add the ``--markAsRead`` option. - -To import a wallabag v2 file, you need to add the option ``--importer=v2``. - -You'll have this in return: - -:: - - Start : 05-04-2016 11:36:07 --- - 403 imported - 0 already saved - End : 05-04-2016 11:36:09 --- diff --git a/docs/en/user/parameters.rst b/docs/en/user/parameters.rst index c35cf3b8a..eb312f7ea 100644 --- a/docs/en/user/parameters.rst +++ b/docs/en/user/parameters.rst @@ -1,5 +1,48 @@ What is the meaning of the parameters? ====================================== + +Default `parameters.yml` file +----------------------------- + +Here is the last version of the default `app/config/parameters.yml` file. Be sure that yours respects this one. +If you don't know which value you need to set, please leave the default one. + +.. code-block:: yml + + parameters: + database_driver: pdo_sqlite + database_host: 127.0.0.1 + database_port: null + database_name: symfony + database_user: root + database_password: null + database_path: '%kernel.root_dir%/../data/db/wallabag.sqlite' + database_table_prefix: wallabag_ + database_socket: null + mailer_transport: smtp + mailer_host: 127.0.0.1 + mailer_user: null + mailer_password: null + locale: en + secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv + twofactor_auth: true + twofactor_sender: no-reply@wallabag.org + fosuser_registration: true + fosuser_confirmation: true + from_email: no-reply@wallabag.org + rss_limit: 50 + rabbitmq_host: localhost + rabbitmq_port: 5672 + rabbitmq_user: guest + rabbitmq_password: guest + redis_scheme: tcp + redis_host: localhost + redis_port: 6379 + redis_path: null + +Meaning of each parameter +------------------------- + .. csv-table:: Database parameters :header: "name", "default", "description" diff --git a/docs/en/user/upgrade-2.1.x-2.1.y.rst b/docs/en/user/upgrade-2.1.x-2.1.y.rst deleted file mode 100644 index 62cb7dc0a..000000000 --- a/docs/en/user/upgrade-2.1.x-2.1.y.rst +++ /dev/null @@ -1,35 +0,0 @@ -Upgrading from 2.1.x to 2.1.y -============================= - -Upgrade on a dedicated web server ---------------------------------- - -The last release is published on https://www.wallabag.org/pages/download-wallabag.html. In order to upgrade your wallabag installation and get the last version, run the following commands in you wallabag folder (replace ``2.1.2`` by the last release number): - -:: - - rm -rf var/cache/* - git fetch origin - git fetch --tags - git checkout 2.1.2 --force - SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist - php bin/console cache:clear --env=prod - -Upgrade on a shared hosting ---------------------------- - -Backup your ``app/config/parameters.yml`` file. - -Download the last release of wallabag: - -.. code-block:: bash - - wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package - -You will find the `md5 hash of the latest package on our website `_. - -Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. - -If you use SQLite, you must also copy your ``data/`` folder inside the new installation. - -Empty ``var/cache`` folder. diff --git a/docs/en/user/upgrade-2.0.x-2.1.1.rst b/docs/en/user/upgrade.rst similarity index 51% rename from docs/en/user/upgrade-2.0.x-2.1.1.rst rename to docs/en/user/upgrade.rst index 4f9b9ceeb..544d57ebe 100644 --- a/docs/en/user/upgrade-2.0.x-2.1.1.rst +++ b/docs/en/user/upgrade.rst @@ -1,12 +1,21 @@ +Upgrade your wallabag installation +================================== + +You will find here different ways to upgrade your wallabag: + +- `from 2.0.x to 2.1.1 <#upgrade-from-2-0-x-to-2-1-1>`_ +- `from 2.1.x to 2.1.y <#upgrading-from-2-1-x-to-2-1-y>`_ +- `from 1.x to 2.x <#from-wallabag-1-x>`_ + Upgrade from 2.0.x to 2.1.1 -=========================== +--------------------------- .. warning:: Before this migration, if you configured the Pocket import by adding your consumer key in Internal settings, please do a backup of it: you'll have to add it into the Config page after the upgrade. Upgrade on a dedicated web server ---------------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ :: @@ -19,11 +28,11 @@ Upgrade on a dedicated web server php bin/console cache:clear --env=prod Upgrade on a shared hosting ---------------------------- +^^^^^^^^^^^^^^^^^^^^^^^^^^^ Backup your ``app/config/parameters.yml`` file. -Download the last release of wallabag: +Download the 2.1.1 release of wallabag: .. code-block:: bash @@ -33,39 +42,7 @@ Download the last release of wallabag: Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. -Please check that your ``app/config/parameters.yml`` contains all the required parameters. Here is a default ``parameters.yml`` file. If you don't know which parameter you need to set, please leave the default one. - -.. code-block:: yml - - parameters: - database_driver: pdo_sqlite - database_host: 127.0.0.1 - database_port: null - database_name: symfony - database_user: root - database_password: null - database_path: '%kernel.root_dir%/../data/db/wallabag.sqlite' - database_table_prefix: wallabag_ - mailer_transport: smtp - mailer_host: 127.0.0.1 - mailer_user: null - mailer_password: null - locale: en - secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv - twofactor_auth: true - twofactor_sender: no-reply@wallabag.org - fosuser_registration: true - fosuser_confirmation: true - from_email: no-reply@wallabag.org - rss_limit: 50 - rabbitmq_host: localhost - rabbitmq_port: 5672 - rabbitmq_user: guest - rabbitmq_password: guest - redis_host: localhost - redis_port: 6379 - -You can find `here a documentation about parameters `_. +Please check that your ``app/config/parameters.yml`` contains all the required parameters. You can find `here a documentation about parameters `_. If you use SQLite, you must also copy your ``data/`` folder inside the new installation. @@ -82,3 +59,45 @@ You must run some SQL queries to upgrade your database. We assume that the table 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'; + +Upgrading from 2.1.x to 2.1.y +----------------------------- + +Upgrade on a dedicated web server +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +In order to upgrade your wallabag installation and get the last version, run the following command in you wallabag folder: + +:: + + make update + +Upgrade on a shared hosting +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Backup your ``app/config/parameters.yml`` file. + +Download the last release of wallabag: + +.. code-block:: bash + + wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package + +You will find the `md5 hash of the latest package on our website `_. + +Extract the archive in your wallabag folder and replace ``app/config/parameters.yml`` with yours. + +Please check that your ``app/config/parameters.yml`` contains all the required parameters. You can find `here a documentation about parameters `_. + +If you use SQLite, you must also copy your ``data/`` folder inside the new installation. + +Empty ``var/cache`` folder. + +From wallabag 1.x +----------------- + +There is no automatic script to update from wallabag 1.x to wallabag 2.x. You need to: + +- export your data +- install wallabag 2.x (`read the installation documentation `_ ) +- import data in this fresh installation (`read the import documentation `_ ) diff --git a/docs/fr/developer/asynchronous.rst b/docs/fr/developer/asynchronous.rst new file mode 100644 index 000000000..c54892282 --- /dev/null +++ b/docs/fr/developer/asynchronous.rst @@ -0,0 +1,159 @@ +Tâches asynchrones +================== + +Pour lancer des tâches asynchrones (utile pour des imports importants par exemple), nous pouvons utiliser RabbitMQ ou Redis. + +Installer RabbitMQ pour des tâches asynchrones +---------------------------------------------- + +Pour lancer des tâches asynchrones (utile pour des imports importants par exemple), nous pouvons utiliser RabbitMQ. + +Pré-requis +^^^^^^^^^^ + +Vous devez installer RabbitMQ sur votre serveur. + +Installation +^^^^^^^^^^^^ + +.. code:: bash + + wget https://www.rabbitmq.com/rabbitmq-signing-key-public.asc + apt-key add rabbitmq-signing-key-public.asc + apt-get update + apt-get install rabbitmq-server + +Configuration et démarrage +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +.. code:: bash + + rabbitmq-plugins enable rabbitmq_management # (useful to have a web interface, available at http://localhost:15672/ (guest/guest) + rabbitmq-server -detached + +Arrêter RabbitMQ +^^^^^^^^^^^^^^^^ + +.. code:: bash + + rabbitmqctl stop + +Configurer RabbitMQ dans wallabag +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Modifiez votre fichier ``app/config/parameters.yml`` pour éditer la configuration RabbitMQ. Celle par défaut devrait convenir : + +.. code:: yaml + + rabbitmq_host: localhost + rabbitmq_port: 5672 + rabbitmq_user: guest + rabbitmq_password: guest + +Activer RabbitMQ dans wallabag +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Dans les paramètres internes, section **Import**, activez RabbitMQ (avec la valeur 1). + +Démarrer les clients RabbitMQ +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +En fonction du service dont vous souhaitez importer vos données, vous devez activer un (ou plusieurs si vous souhaitez en supporter plusieurs) cron job : + +.. code:: bash + + # for Pocket import + bin/console rabbitmq:consumer -e=prod import_pocket -w + + # for Readability import + bin/console rabbitmq:consumer -e=prod import_readability -w + + # for Instapaper import + bin/console rabbitmq:consumer -e=prod import_instapaper -w + + # for wallabag v1 import + bin/console rabbitmq:consumer -e=prod import_wallabag_v1 -w + + # for wallabag v2 import + bin/console rabbitmq:consumer -e=prod import_wallabag_v2 -w + + # for Firefox import + bin/console rabbitmq:consumer -e=prod import_firefox -w + + # for Chrome import + bin/console rabbitmq:consumer -e=prod import_chrome -w + +Installer Redis pour des tâches asynchrones +------------------------------------------- + +Pour lancer des tâches asynchrones (utile pour des imports importants par exemple), nous pouvons utiliser Redis. + +Pré-requis +^^^^^^^^^^ + +Vous devez installer Redis sur votre serveur. + +Installation +^^^^^^^^^^^^ + +.. code:: bash + + apt-get install redis-server + +Démarrage +^^^^^^^^^ + +Le serveur devrait déjà être démarré après l'installation. Si ce n'est pas le cas, vous pouvez le démarrer ainsi : + +.. code:: bash + + redis-server + +Configurer Redis dans wallabag +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Modifiez votre fichier ``app/config/parameters.yml`` pour éditer la configuration Redis. Celle par défaut devrait convenir : + +.. code:: yaml + + redis_host: localhost + redis_port: 6379 + +Activer Redis dans wallabag +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Dans les paramètres internes, section **Import**, activez Redis (avec la valeur 1). + +Démarrer les clients Redis +^^^^^^^^^^^^^^^^^^^^^^^^^^ + +En fonction du service dont vous souhaitez importer vos données, vous devez activer un (ou plusieurs si vous souhaitez en supporter plusieurs) cron job : + +.. code:: bash + + # for Pocket import + bin/console wallabag:import:redis-worker -e=prod pocket -vv >> /path/to/wallabag/var/logs/redis-pocket.log + + # for Readability import + bin/console wallabag:import:redis-worker -e=prod readability -vv >> /path/to/wallabag/var/logs/redis-readability.log + + # for Instapaper import + bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-instapaper.log + + # for wallabag v1 import + bin/console wallabag:import:redis-worker -e=prod wallabag_v1 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v1.log + + # for wallabag v2 import + bin/console wallabag:import:redis-worker -e=prod wallabag_v2 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v2.log + + # for Firefox import + bin/console wallabag:import:redis-worker -e=prod firefox -vv >> /path/to/wallabag/var/logs/redis-firefox.log + + # for Chrome import + bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-chrome.log + +Si vous souhaitez démarrer l'import pour quelques messages uniquement, vous pouvez spécifier cette valeur en paramètre (ici 12) et le client va s'arrêter après le 12ème message : + +.. code:: bash + + bin/console wallabag:import:redis-worker -e=prod pocket -vv --maxIterations=12 diff --git a/docs/fr/developer/rabbitmq.rst b/docs/fr/developer/rabbitmq.rst deleted file mode 100644 index b534a48b8..000000000 --- a/docs/fr/developer/rabbitmq.rst +++ /dev/null @@ -1,80 +0,0 @@ -Installer RabbitMQ pour des tâches asynchrones -============================================== - -Pour lancer des tâches asynchrones (utile pour des imports importants par exemple), nous pouvons utiliser RabbitMQ. - -Pré-requis ----------- - -Vous devez installer RabbitMQ sur votre serveur. - -Installation -~~~~~~~~~~~~ - -.. code:: bash - - wget https://www.rabbitmq.com/rabbitmq-signing-key-public.asc - apt-key add rabbitmq-signing-key-public.asc - apt-get update - apt-get install rabbitmq-server - -Configuration et démarrage -~~~~~~~~~~~~~~~~~~~~~~~~~~ - -.. code:: bash - - rabbitmq-plugins enable rabbitmq_management # (useful to have a web interface, available at http://localhost:15672/ (guest/guest) - rabbitmq-server -detached - -Arrêter RabbitMQ -~~~~~~~~~~~~~~~~ - -.. code:: bash - - rabbitmqctl stop - - -Configurer RabbitMQ dans wallabag ---------------------------------- - -Modifiez votre fichier ``app/config/parameters.yml`` pour éditer la configuration RabbitMQ. Celle par défaut devrait convenir : - -.. code:: yaml - - rabbitmq_host: localhost - rabbitmq_port: 5672 - rabbitmq_user: guest - rabbitmq_password: guest - -Activer RabbitMQ dans wallabag ------------------------------- - -Dans les paramètres internes, section **Import**, activez RabbitMQ (avec la valeur 1). - -Démarrer les clients RabbitMQ ------------------------------ - -En fonction du service dont vous souhaitez importer vos données, vous devez activer un (ou plusieurs si vous souhaitez en supporter plusieurs) cron job : - -.. code:: bash - - # for Pocket import - bin/console rabbitmq:consumer -e=prod import_pocket -w - - # for Readability import - bin/console rabbitmq:consumer -e=prod import_readability -w - - # for Instapaper import - bin/console rabbitmq:consumer -e=prod import_instapaper -w - - # for wallabag v1 import - bin/console rabbitmq:consumer -e=prod import_wallabag_v1 -w - - # for wallabag v2 import - bin/console rabbitmq:consumer -e=prod import_wallabag_v2 -w - - # for Firefox import - bin/console rabbitmq:consumer -e=prod import_firefox -w - - # for Chrome import - bin/console rabbitmq:consumer -e=prod import_chrome -w diff --git a/docs/fr/developer/redis.rst b/docs/fr/developer/redis.rst deleted file mode 100644 index 58204d571..000000000 --- a/docs/fr/developer/redis.rst +++ /dev/null @@ -1,75 +0,0 @@ -Installer Redis pour des tâches asynchrones -=========================================== - -Pour lancer des tâches asynchrones (utile pour des imports importants par exemple), nous pouvons utiliser Redis. - -Pré-requis ----------- - -Vous devez installer Redis sur votre serveur. - -Installation -~~~~~~~~~~~~ - -.. code:: bash - - apt-get install redis-server - -Démarrage -~~~~~~~~~ - -Le serveur devrait déjà être démarré après l'installation. Si ce n'est pas le cas, vous pouvez le démarrer ainsi : - -.. code:: bash - - redis-server - - -Configurer Redis dans wallabag -------------------------------- - -Modifiez votre fichier ``app/config/parameters.yml`` pour éditer la configuration Redis. Celle par défaut devrait convenir : - -.. code:: yaml - - redis_host: localhost - redis_port: 6379 - -Activer Redis dans wallabag ---------------------------- - -Dans les paramètres internes, section **Import**, activez Redis (avec la valeur 1). - -Démarrer les clients Redis --------------------------- - -En fonction du service dont vous souhaitez importer vos données, vous devez activer un (ou plusieurs si vous souhaitez en supporter plusieurs) cron job : - -.. code:: bash - - # for Pocket import - bin/console wallabag:import:redis-worker -e=prod pocket -vv >> /path/to/wallabag/var/logs/redis-pocket.log - - # for Readability import - bin/console wallabag:import:redis-worker -e=prod readability -vv >> /path/to/wallabag/var/logs/redis-readability.log - - # for Instapaper import - bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-instapaper.log - - # for wallabag v1 import - bin/console wallabag:import:redis-worker -e=prod wallabag_v1 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v1.log - - # for wallabag v2 import - bin/console wallabag:import:redis-worker -e=prod wallabag_v2 -vv >> /path/to/wallabag/var/logs/redis-wallabag_v2.log - - # for Firefox import - bin/console wallabag:import:redis-worker -e=prod firefox -vv >> /path/to/wallabag/var/logs/redis-firefox.log - - # for Chrome import - bin/console wallabag:import:redis-worker -e=prod instapaper -vv >> /path/to/wallabag/var/logs/redis-chrome.log - -Si vous souhaitez démarrer l'import pour quelques messages uniquement, vous pouvez spécifier cette valeur en paramètre (ici 12) et le client va s'arrêter après le 12ème message : - -.. code:: bash - - bin/console wallabag:import:redis-worker -e=prod pocket -vv --maxIterations=12 diff --git a/docs/fr/index.rst b/docs/fr/index.rst index dae62f437..8a4c600a9 100644 --- a/docs/fr/index.rst +++ b/docs/fr/index.rst @@ -9,10 +9,6 @@ Documentation de wallabag simplement d’archiver une page web en ne conservant que le contenu. Les éléments superflus (menu, publicité, etc.) sont supprimés. -.. tip:: - - Vous vous trouvez sur la documentation de wallabag v2. Si vous voulez lire la documentation de wallabag v1, `vous pouvez jeter un œil ici `__. - La documentation principale de cette application est découpée en plusieurs sections : * :ref:`user-docs` @@ -29,24 +25,19 @@ La documentation est disponible dans d'autres langues : :maxdepth: 2 :caption: Documentation utilisateur - user/faq user/installation - user/upgrade-2.0.x-2.1.1 - user/upgrade-2.0.x-2.1.1 - user/migration + user/upgrade + user/configuration user/import user/create_account - user/login - user/configuration - user/first_article + user/articles user/errors_during_fetching - user/annotations - user/download_articles - user/share user/filters user/tags + user/android user/parameters user/backup + user/faq .. _dev-docs: @@ -58,5 +49,4 @@ La documentation est disponible dans d'autres langues : developer/docker developer/documentation developer/translate - developer/redis - developer/rabbitmq + developer/asynchronous diff --git a/docs/fr/user/android.rst b/docs/fr/user/android.rst new file mode 100644 index 000000000..91501eea9 --- /dev/null +++ b/docs/fr/user/android.rst @@ -0,0 +1,96 @@ +Application Android +=================== + +But de ce document +------------------ + +Ce document explique comment configurer votre application Android pour qu'elle fonctionne avec votre instance de wallabag. Il n'y a pas de différence dans cette procédure entre wallabag v1 et wallabag v2. + +Étapes pour configurer votre application +---------------------------------------- + +Quand vous démarrez l'application pour la première fois, vous voyez le message de bienvenue, où il vous est d'abord conseillé de configurer l'application avec votre instance de wallabag. + +.. image:: ../../img/user/android_welcome_screen.en.png + :alt: Écran de bienvenue + :align: center + +Vous devez confirmer le message et vous serez redirigé vers l'écran de configuration. + +.. image:: ../../img/user/android_configuration_screen.en.png + :alt: Écran de configuration + :align: center + +Saisissez vos données wallabag. Vous devez entrer l'adresse de votre instance de wallabag. **Il ne faut pas que cette adresse se termine par un slash**. Ajoutez également vos identifiants wallabag dans les champs correspondants. + +.. image:: ../../img/user/android_configuration_filled_in.en.png + :alt: Paramètres remplis + :align: center + +Après cet écran, appuyez sur le bouton de test de connexion et attendez que le test se termine. + +.. image:: ../../img/user/android_configuration_connection_test.en.png + :alt: Test de connexion + :align: center + +Le test de connexion devrait se terminer avec succès. Si ce n'est pas le cas, vous devez résoudre ça avant de continuer. + +.. image:: ../../img/user/android_configuration_connection_test_success.en.png + :alt: Test de connexion réussi + :align: center + +Après le test de connexion réussi, vous pouvez cliquer sur le bouton pour récupérer vos informations de flux (feed credentials). L'application essaie maintenant de se connecter à wallabag pour récupérer votre identifiant et votre jeton pour les flux RSS. + +.. image:: ../../img/user/android_configuration_get_feed_credentials.en.png + :alt: Récupération des informations de flux + :align: center + +Quand le processus est terminé avec succès, vous verrez une notification comme quoi l'identifiant et le jeton ont été remplis correctement. + +.. image:: ../../img/user/android_configuration_feed_credentials_automatically_filled_in.en.png + :alt: Récupération des informations correcte + :align: center + +Maintenant, vous devez naviguer jusqu'en bas de l'écran des paramètres. Bien sur, vous pouvez régler les paramètres comme vous le souhaitez. Enregistrez la configuration. + +.. image:: ../../img/user/android_configuration_scroll_bottom.en.png + :alt: Bottom of the settings screen + :align: center + +Après avoir enregistré les paramètres, vous vous retrouvez face à l'écran suivant. L'application vous propose de démarrer une synchronisation pour récupérer vos articles. Il est recommandé de confirmer cette action. + +.. image:: ../../img/user/android_configuration_saved_feed_update.en.png + :alt: Settings saved the first time + :align: center + +Une fois la synchronisation terminée avec succès, vous pouvez lire vos articles. + +.. image:: ../../img/user/android_unread_feed_synced.en.png + :alt: Filled article list cause feeds successfully synchronized + :align: center + +Limitations connues +------------------- + +Double authentification (2FA) +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Actuellement, l'application Android ne supporte la double authentification. Vous devez la désactiver pour que l'application fonctionne correctement. + +Limiter le nombre d'articles avec wallabag v2 +~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ + +Dans votre instance de wallabag, vous pouvez configurer combien d'articles se trouvent dans les flux RSS. Cette option n'existe pas dans wallabag v1, où tous les articles se retrouvent donc dans le flux RSS. So if you set the amount of articles being displayed greater than the number of items being content of your RSS feed, you will only see the number of items in your RSS feed. + +Cryptage SSL/TLS +~~~~~~~~~~~~~~~~ + +Si vous souhaitez accéder à votre instance de wallabag via HTTPS, vous devez le définir dans les paramètres. Surtout si votre URL HTTP redirige vers l'URL HTTPS. Actuellement, l'application ne gère pas cette redirection correctement. + +Références +---------- + +- `Code source de l'application Android `_ +- `Télécharger l'application Android sur F-Droid `_ +- `Télécharger l'application Android sur Google Play `_ + diff --git a/docs/fr/user/annotations.rst b/docs/fr/user/annotations.rst deleted file mode 100644 index 245859618..000000000 --- a/docs/fr/user/annotations.rst +++ /dev/null @@ -1,25 +0,0 @@ -Annotations -=========== - -Sur chaque article que vous lisez, vous pouvez écrire des annotations. Puisqu'une image vaut mieux qu'un long discours, -voici ce que ça donne. - -Sélectionnez la zone du texte que vous souhaitez annoter et cliquez sur le crayon : - -.. image:: ../../img/user/annotations_1.png - :alt: Sélectionnez votre texte - :align: center - -Ensuite, écrivez votre annotation : - -.. image:: ../../img/user/annotations_2.png - :alt: Écrivez votre annotation - :align: center - -Le texte est maintenant surligné et vous pouvez lire le annotation en le survolant avec votre souris. - -.. image:: ../../img/user/annotations_3.png - :alt: Lisez votre annotation - :align: center - -Vous pouvez créer autant de annotations que vous le souhaitez. diff --git a/docs/fr/user/articles.rst b/docs/fr/user/articles.rst new file mode 100644 index 000000000..fb5b38376 --- /dev/null +++ b/docs/fr/user/articles.rst @@ -0,0 +1,123 @@ +Articles +======== + +Sauvegardez votre premier article +--------------------------------- + +La fonctionnalité principale de wallabag est de sauvegarder des articles. +Vous avez plusieurs manières de le faire. + +.. note:: + + Un guide de démarrage s'affichera dans l'application jusqu'à ce que vous + enregistriez votre premier article. + +En utilisant le bookmarklet +^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Sur la page ``Aide``, vous avez un onglet ``Bookmarklet``. Glissez/déposez le lien ``bag it!`` +dans votre barre de favoris de votre navigateur. + +Maintennat, à chaque fois que vous lisez un article et que vous souhaitez le sauvegarder, +cliquez sur le lien ``bag it!`` dans votre barre de favoris. L'article est enregistré. + +En utilisant le formulaire classique +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Dans la barre haut de wallabag, vous avez trois icônes. Avec la première icône, +un signe plus, vous pouvez facilement ajouter un nouvel article. + +.. image:: ../../img/user/topbar.png + :alt: Barre supérieure + :align: center + +Cliquez dessus pour afficher un nouveau champ, collez-y l'URL de l'article et appuyez +sur la touche ``Entrée``. L'article est enregistré. + +En utilisant l'extension de votre navigateur +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Firefox +""""""" + +Vous pouvez télécharger `l'extension Firefox ici `_. + +Chrome +"""""" + +Vous pouvez télécharger `l'extension Chrome ici `_. + +En utilisant l'application de votre smartphone +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Android +""""""" + +Vous pouvez télécharger `l'application Android ici `_. + +Windows Phone +~~~~~~~~~~~~~ + +Vous pouvez télécharger `l'application Windows Phone ici `_. + +Téléchargez vos articles +------------------------ + +Vous pouvez télécharger chaque article dans plusieurs formats : ePUB, MOBI, PDF, XML, JSON, CSV. + +Lorsque vous lisez un article, cliquez sur cette icône dans la barre latérale : + +.. image:: ../../img/user/download_article.png + :alt: Télécharger l'article + :align: center + +Vous pouvez aussi télécharger une catégorie (non lus, favoris, lus) dans ces formats. +Par exemple, dans la vue **Non lus**, cliquez sur cette icône dans la barre supérieure : + +.. image:: ../../img/user/download_articles.png + :alt: Télécharger l'article + :align: center + +Partagez vos articles +--------------------- + +Quand vous lisez un article, vous pouvez le partager. Cliquez sur le bouton de partage : + +.. image:: ../../img/user/share.png + :alt: partager un article + :align: center + +Vous pouvez maintenant le partager : + +- avec une URL publique (vous obtiendrez une vue allégée de l'article) +- avec un tweet +- dans votre Shaarli +- avec un message dans Diaspora* +- sur Carrot +- avec un email + +Annotez vos articles +-------------------- + +Sur chaque article que vous lisez, vous pouvez écrire des annotations. Puisqu'une image vaut mieux qu'un long discours, +voici ce que ça donne. + +Sélectionnez la zone du texte que vous souhaitez annoter et cliquez sur le crayon : + +.. image:: ../../img/user/annotations_1.png + :alt: Sélectionnez votre texte + :align: center + +Ensuite, écrivez votre annotation : + +.. image:: ../../img/user/annotations_2.png + :alt: Écrivez votre annotation + :align: center + +Le texte est maintenant surligné et vous pouvez lire le annotation en le survolant avec votre souris. + +.. image:: ../../img/user/annotations_3.png + :alt: Lisez votre annotation + :align: center + +Vous pouvez créer autant de annotations que vous le souhaitez. diff --git a/docs/fr/user/backup.rst b/docs/fr/user/backup.rst index ec4b1f4d9..f8cf87ee6 100644 --- a/docs/fr/user/backup.rst +++ b/docs/fr/user/backup.rst @@ -23,4 +23,4 @@ Pour sauvegarder une base SQLite, vous devez juste copier le répertoire `data/d Images ------ -Les images sauvegardées par wallabag sont stockées dans `data/assets/images` (le stockage des images sera implémenté dans wallabag 2.2). +Les images sauvegardées par wallabag sont stockées dans `web/assets/images` (le stockage des images sera implémenté dans wallabag 2.2). diff --git a/docs/fr/user/configuration.rst b/docs/fr/user/configuration.rst index c533b5c5d..5ce80f58a 100644 --- a/docs/fr/user/configuration.rst +++ b/docs/fr/user/configuration.rst @@ -13,8 +13,7 @@ Thème ~~~~~ L'affichage de wallabag est personnalisable. C'est ici que vous choisissez le thème -que vous préférez. Vous pouvez aussi en créer un nouveau, une documentation sera -disponible pour guider. Le thème par défaut est ``Material``, c'est celui +que vous préférez. Le thème par défaut est ``Material``, c'est celui qui est utilisé dans les captures d'écran de la documentation. Nombre d'articles par page @@ -39,8 +38,7 @@ après avoir supprimé un article, après avoir retiré un tag d'un article), vo Langue ~~~~~~ -Vous pouvez définir la langue de l'interface de wallabag. Vous devrez vous déconnecter -pour que la nouvelle langue soit prise en compte. +Vous pouvez définir la langue de l'interface de wallabag. RSS --- diff --git a/docs/fr/user/create_account.rst b/docs/fr/user/create_account.rst index 6e188ab3c..9c18e0944 100644 --- a/docs/fr/user/create_account.rst +++ b/docs/fr/user/create_account.rst @@ -1,5 +1,8 @@ +Se créer un compte et se connecter +================================== + Se créer un compte -================== +------------------ Sur la page de connexion, cliquez sur le bouton ``Créer un compte``. @@ -23,3 +26,17 @@ Votre compte est maintenant actif. .. image:: ../../img/user/activated_account.png :alt: Bienvenue à bord ! :align: center + +Se connecter +------------ + +Votre compte est maintenant actif, félicitations ! + +Pour vous connecter à wallabag, remplissez le formulaire de connexion. + +Si vous êtes sur un ordinateur de confiance et que vous souhaitez rester connecté +vous pouvez cocher la case ``Restez connecté`` : wallabag se souviendra de vous pour un an. + +.. image:: ../../img/user/login_form.png + :alt: Formulaire de connexion + :align: center diff --git a/docs/fr/user/download_articles.rst b/docs/fr/user/download_articles.rst deleted file mode 100644 index 39c98206a..000000000 --- a/docs/fr/user/download_articles.rst +++ /dev/null @@ -1,17 +0,0 @@ -Télécharger des articles -======================== - -Vous pouvez télécharger chaque article dans plusieurs formats : ePUB, MOBI, PDF, XML, JSON, CSV. - -Lorsque vous lisez un article, cliquez sur cette icône dans la barre latérale : - -.. image:: ../../img/user/download_article.png - :alt: Télécharger l'article - :align: center - -Vous pouvez aussi télécharger une catégorie (non lus, favoris, lus) dans ces formats. -Par exemple, dans la vue **Non lus**, cliquez sur cette icône dans la barre supérieure : - -.. image:: ../../img/user/download_articles.png - :alt: Télécharger l'article - :align: center diff --git a/docs/fr/user/errors_during_fetching.rst b/docs/fr/user/errors_during_fetching.rst index 1a60e4bdb..13cbde1d3 100644 --- a/docs/fr/user/errors_during_fetching.rst +++ b/docs/fr/user/errors_during_fetching.rst @@ -12,9 +12,7 @@ Il peut y avoir plusieurs raisons : Comment puis-je aider pour réparer ça ? --------------------------------------- -Vous pouvez `nous envoyer un email avec l'URL de l'article `_. - -Ou vous pouvez aussi essayer de résoudre ce problème vous même (comme ça, nous restons concentrés pour améliorer wallabag au lieu d'écrire ces fichiers de configuration :) ). +Vous pouvez essayer de résoudre ce problème vous même (comme ça, nous restons concentrés pour améliorer wallabag au lieu d'écrire ces fichiers de configuration :) ). Vous pouvez essayer de voir si ça fonctionne ici : `http://f43.me/feed/test `_ (ce site utilise principalement la même manière de fonctionner que wallabag pour récupérer les articles). diff --git a/docs/fr/user/filters.rst b/docs/fr/user/filters.rst index b20d0d863..5807bdbd9 100644 --- a/docs/fr/user/filters.rst +++ b/docs/fr/user/filters.rst @@ -1,5 +1,5 @@ -Filtres -======= +Retrouver des articles grâce aux filtres +======================================== Pour retrouver plus facilement vos articles, vous pouvez utiliser les filtres. Cliquez sur la troisième icône de la barre supérieure. diff --git a/docs/fr/user/first_article.rst b/docs/fr/user/first_article.rst deleted file mode 100644 index f482badc9..000000000 --- a/docs/fr/user/first_article.rst +++ /dev/null @@ -1,68 +0,0 @@ -Sauvegardez votre premier article -================================= - -La fonctionnalité principale de wallabag est de sauvegarder des articles. -Vous avez plusieurs manières de le faire. - -.. note:: - - Un guide de démarrage s'affichera dans l'application jusqu'à ce que vous - enregistriez votre premier article. - -En utilisant le bookmarklet ---------------------------- - -Sur la page ``Aide``, vous avez un onglet ``Bookmarklet``. Glissez/déposez le lien ``bag it!`` -dans votre barre de favoris de votre navigateur. - -Maintennat, à chaque fois que vous lisez un article et que vous souhaitez le sauvegarder, -cliquez sur le lien ``bag it!`` dans votre barre de favoris. L'article est enregistré. - -En utilisant le formulaire classique ------------------------------------- - -Dans la barre haut de wallabag, vous avez trois icônes. Avec la première icône, -un signe plus, vous pouvez facilement ajouter un nouvel article. - -.. image:: ../../img/user/topbar.png - :alt: Barre supérieure - :align: center - -Cliquez dessus pour afficher un nouveau champ, collez-y l'URL de l'article et appuyez -sur la touche ``Entrée``. L'article est enregistré. - -En utilisant l'extension de votre navigateur --------------------------------------------- - -Firefox -~~~~~~~ - -*Cette extension n'est pas encore disponible pour wallabag v2*. - -Chrome -~~~~~~ - -*Cette extension n'est pas encore disponible pour wallabag v2*. - -En utilisant l'application de votre smartphone ----------------------------------------------- - -Android -~~~~~~~ - -*Cette application n'est pas encore disponible pour wallabag v2*. - -Firefox OS -~~~~~~~~~~ - -*Cette application n'est pas encore disponible pour wallabag v2*. - -Windows Phone -~~~~~~~~~~~~~ - -*Cette application n'est pas encore disponible pour wallabag v2*. - -iOS -~~~ - -*Cette application n'est pas encore disponible pour wallabag v2*. diff --git a/docs/fr/user/import.rst b/docs/fr/user/import.rst index d0663cf62..9a2dda8f8 100644 --- a/docs/fr/user/import.rst +++ b/docs/fr/user/import.rst @@ -1,8 +1,20 @@ -Migrer depuis un service externe -================================ +Migrer depuis ... +================= -Depuis Pocket -------------- +Dans wallabag 2.x, vous pouvez importer des données depuis : + +- `Pocket <#id1>`_ +- `Readability <#id2>`_ +- `Instapaper <#id4>`_ +- `wallabag 1.x <#id6>`_ +- `wallabag 2.x <#id7>`_ + +Nous avons aussi développé `un script pour exécuter des migrations via la ligne de commande <#import-via-la-ligne-de-commande-cli>`_. + +Puisque les imports peuvent gourmands en ressource, nous avons mis en place un système de tâche asynchrone. `Vous trouverez la documentation ici `_ (niveau expert). + +Pocket +------ Créer une nouvelle application dans Pocket ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -16,7 +28,7 @@ Vous devez créer une nouvelle application sur leur site dédié aux développeu termes d'utilisation du service et soumettez votre application Pocket vous fournira une **Consumer Key** (par exemple, `49961-985e4b92fe21fe4c78d682c1`). -Vous devez configurer la ``pocket_consumer_key`` dans la section ``Import`` du menu ``Configuration interne``. +Vous devez configurer la ``pocket_consumer_key`` dans le menu ``Configuration``. Maintenant, tout est bien configuré pour migrer depuis Pocket. @@ -30,8 +42,8 @@ Vous devez autoriser wallabag à se connecter à votre compte Pocket. Vos données vont être importées. L'import de données est une action qui peut être couteuse pour votre serveur. -Depuis Readability ------------------- +Readability +----------- Exportez vos données de Readability ~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~ @@ -78,8 +90,66 @@ la section Instapaper et ensuite sélectionnez votre fichier CSV pour l'uploader Vos données vont être importées. L'import de données est une action qui peut être couteuse pour votre serveur. +wallabag 1.x +------------ -Depuis un fichier HTML ou JSON ------------------------------- +Si vous utilisiez wallabag v1.x, vous devez exporter vos données avant de migrer à wallabag v2.x, à cause du changement complet de l'application et de sa base de données. Sur votre ancienne instance de wallabag v1, vous pouvez exporter vos données en allant sur la page de configuration de l'application. -*Fonctionnalité pas encore implémentée dans wallabag v2.* +.. image:: ../../img/user/export_v1.png + :alt: Export depuis wallabag v1 + :align: center + +.. note:: + Si vous avez plusieurs comptes sur la même instance de wallabag, chaque utilisateur doit exporter ses données depuis wallabag v1 et les importer dans la v2. + +.. note:: + S'il vous arrive des problèmes durant l'export ou l'import, n'hésitez pas à `demander de l'aide `_. + +Une fois que vous avez récupéré le fichier json contenant vos données, vous pouvez installer wallabag v2 si c'est nécessaire en suivant `la procédure standard `_. + +Une fois que vous avez créé un compte utilisateur sur votre nouvelle instance de wallabag v2, rendez-vous dans la section `Import`. Vous devez choisir l'import depuis wallabag v1 puis sélectionner votre fichier json récupéré précédemment. + +.. image:: ../../img/user/import_wallabagv1.png + :alt: Import depuis wallabag v1 + :align: center + +wallabag 2.x +------------ + +Depuis l'instance sur laquelle vous étiez, rendez-vous dans la section `Tous les articles`, puis exportez ces articles au format json. + +.. image:: ../../img/user/export_v2.png + :alt: Export depuis wallabag v2 + :align: center + +Depuis votre nouvelle instance de wallabag, créez votre compte utilisateur puis cliquez sur le lien dans le menu pour accéder à l'import. Choisissez l'import depuis wallabag v2 puis sélectionnez votre fichier json pour l'uploader. + +.. note:: + S'il vous arrive des problèmes durant l'export ou l'import, n'hésitez pas à `demander de l'aide `_. + +Import via la ligne de commande (CLI) +-------------------------------------`__. - -Une fois que vous avez récupéré le fichier json contenant vos données, vous pouvez installer wallabag v2 si c'est nécessaire en suivant `la procédure standard `__. - -Une fois que vous avez créé un compte utilisateur sur votre nouvelle instance de wallabag v2, rendez-vous dans la section `Import`. Vous devez choisir l'import depuis wallabag v1 puis sélectionner votre fichier json récupéré précédemment. - -.. image:: ../../img/user/import_wallabagv1.png - :alt: Import depuis wallabag v1 - :align: center - -Depuis wallabag 2.x -------------------- - -Depuis l'instance sur laquelle vous étiez, rendez-vous dans la section `Tous les articles`, puis exportez ces articles au format json. - -.. image:: ../../img/user/export_v2.png - :alt: Export depuis wallabag v2 - :align: center - -Depuis votre nouvelle instance de wallabag, créez votre compte utilisateur puis cliquez sur le lien dans le menu pour accéder à l'import. Choisissez l'import depuis wallabag v2 puis sélectionnez votre fichier json pour l'uploader. - -.. note:: - S'il vous arrive des problèmes durant l'export ou l'import, n'hésitez pas à `demander de l'aide `__. - -Import via la ligne de commande (CLI) -------------------------------------- - -Si vous avez accès à la ligne de commandes de votre serveur web, vous pouvez exécuter cette commande pour import votre fichier wallabag v1 : - -:: - - bin/console wallabag:import 1 ~/Downloads/wallabag-export-1-2016-04-05.json --env=prod - -Remplacez les valeurs : - -* ``1`` est l'identifiant de votre utilisateur en base (l'ID de votre premier utilisateur créé sur wallabag est 1) -* ``~/Downloads/wallabag-export-1-2016-04-05.json`` est le chemin de votre export wallabag v1 - -Si vous voulez marquer tous ces articles comme lus, vous pouvez ajouter l'option ``--markAsRead``. - -Pour importer un fichier wallabag v2, vous devez ajouter l'option ``--importer=v2``. - -Vous obtiendrez : - -:: - - Start : 05-04-2016 11:36:07 --- - 403 imported - 0 already saved - End : 05-04-2016 11:36:09 --- diff --git a/docs/fr/user/parameters.rst b/docs/fr/user/parameters.rst index ec8c8995d..d1c20ceb5 100644 --- a/docs/fr/user/parameters.rst +++ b/docs/fr/user/parameters.rst @@ -1,5 +1,48 @@ À quoi servent les paramètres ? =============================== + +Fichier `parameters.yml` par défaut +----------------------------------- + +Voici la dernière version par défaut du fichier `app/config/parameters.yml`. Soyez sur que le votre respecte celui-ci. +Si vous ne savez pas quelle valeur vous devez mettre, laissez celle par défaut. + +.. code-block:: yml + + parameters: + database_driver: pdo_sqlite + database_host: 127.0.0.1 + database_port: null + database_name: symfony + database_user: root + database_password: null + database_path: '%kernel.root_dir%/../data/db/wallabag.sqlite' + database_table_prefix: wallabag_ + database_socket: null + mailer_transport: smtp + mailer_host: 127.0.0.1 + mailer_user: null + mailer_password: null + locale: en + secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv + twofactor_auth: true + twofactor_sender: no-reply@wallabag.org + fosuser_registration: true + fosuser_confirmation: true + from_email: no-reply@wallabag.org + rss_limit: 50 + rabbitmq_host: localhost + rabbitmq_port: 5672 + rabbitmq_user: guest + rabbitmq_password: guest + redis_scheme: tcp + redis_host: localhost + redis_port: 6379 + redis_path: null + +Meaning of each parameter +------------------------- + .. csv-table:: Paramètres de base de données :header: "name", "default", "description" diff --git a/docs/fr/user/share.rst b/docs/fr/user/share.rst deleted file mode 100644 index b5faa5ba6..000000000 --- a/docs/fr/user/share.rst +++ /dev/null @@ -1,17 +0,0 @@ -Partager des articles -===================== - -Quand vous lisez un article, vous pouvez le partager. Cliquez sur le bouton de partage : - -.. image:: ../../img/user/share.png - :alt: partager un article - :align: center - -Vous pouvez maintenant le partager : - -- avec une URL publique (vous obtiendrez une vue allégée de l'article) -- avec un tweet -- dans votre Shaarli -- avec un message dans Diaspora* -- sur Carrot -- avec un email diff --git a/docs/fr/user/upgrade-2.0.x-2.1.1.rst b/docs/fr/user/upgrade-2.0.x-2.1.1.rst deleted file mode 100644 index ec883d10e..000000000 --- a/docs/fr/user/upgrade-2.0.x-2.1.1.rst +++ /dev/null @@ -1,84 +0,0 @@ -Mettre à jour de la 2.0.x à la 2.1.1 -==================================== - -.. warning:: -Avant cette migration, si vous aviez configuré l'import depuis Pocket en ajoutant votre consumer key dans les paramètres internes, pensez à effectuer une sauvegarde de celle-ci : vous devrez l'ajouter dans la configuration de wallabag après la mise à jour. - -Mise à jour sur un serveur dédié --------------------------------- - -:: - - 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 - -Mise à jour sur un hébergement mutualisé ----------------------------------------- - -Effectuez une sauvegarde du fichier ``app/config/parameters.yml``. - -Téléchargez la dernière version de wallabag : - -.. code-block:: bash - - wget http://framabag.org/wallabag-release-2.1.1.tar.gz && tar xvf wallabag-release-2.1.1.tar.gz - -(hash md5 de l'archive 2.1.1 : ``9584a3b60a2b2a4de87f536548caac93``) - -Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. - -Vérifiez que votre fichier ``app/config/parameters.yml`` contient tous les paramètres requis. Voici un fichier ``parameters.yml`` par défaut. Si vous ne savez pas quelle valeur mettre à un paramètre, laissez la valeur par défaut. - -.. code-block:: yml - - parameters: - database_driver: pdo_sqlite - database_host: 127.0.0.1 - database_port: null - database_name: symfony - database_user: root - database_password: null - database_path: '%kernel.root_dir%/../data/db/wallabag.sqlite' - database_table_prefix: wallabag_ - mailer_transport: smtp - mailer_host: 127.0.0.1 - mailer_user: null - mailer_password: null - locale: en - secret: ovmpmAWXRCabNlMgzlzFXDYmCFfzGv - twofactor_auth: true - twofactor_sender: no-reply@wallabag.org - fosuser_registration: true - fosuser_confirmation: true - from_email: no-reply@wallabag.org - rss_limit: 50 - rabbitmq_host: localhost - rabbitmq_port: 5672 - rabbitmq_user: guest - rabbitmq_password: guest - redis_host: localhost - redis_port: 6379 - -Vous trouverez `ici une documentation détaillée concernant les paramètres `_. - -Si vous utilisez SQLite, vous devez également conserver le contenu du répertoire ``data/``. - -Videz le répertoire ``var/cache``. - -Vous allez devoir également exécuter des requêtes SQL pour mettre à jour votre base de données. Nous partons du principe que le préfixe de vos tables est ``wallabag_`` et que le serveur SQL est un serveur MySQL : - -.. 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'; - diff --git a/docs/fr/user/upgrade-2.1.x-2.1.y.rst b/docs/fr/user/upgrade-2.1.x-2.1.y.rst deleted file mode 100644 index b6f1a2d09..000000000 --- a/docs/fr/user/upgrade-2.1.x-2.1.y.rst +++ /dev/null @@ -1,35 +0,0 @@ -Mettre à jour de la 2.1.x à la 2.1.y -==================================== - -Mise à jour sur un serveur dédié --------------------------------- - -La dernière version de wallabag est publiée à cette adresse : https://www.wallabag.org/pages/download-wallabag.html. Pour mettre à jour votre installation de wallabag, exécutez les commandes suivantes dans votre répertoire d'installation (remplacez ``2.1.2`` par le numéro de la dernière version) : - -:: - - rm -rf var/cache/* - git fetch origin - git fetch --tags - git checkout 2.1.2 --force - SYMFONY_ENV=prod composer install --no-dev -o --prefer-dist - php bin/console cache:clear --env=prod - -Mise à jour sur un hébergement mutualisé ----------------------------------------- - -Effectuez une sauvegarde du fichier ``app/config/parameters.yml``. - -Téléchargez la dernière version de wallabag : - -.. code-block:: bash - - wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package - -Vous trouverez `le hash md5 du dernier package sur notre site `_. - -Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. - -Si vous utilisez SQLite, vous devez également conserver le contenu du répertoire ``data/``. - -Videz le répertoire ``var/cache``. diff --git a/docs/fr/user/upgrade.rst b/docs/fr/user/upgrade.rst new file mode 100644 index 000000000..c3d33904e --- /dev/null +++ b/docs/fr/user/upgrade.rst @@ -0,0 +1,102 @@ +Mettre à jour votre installation de wallabag +============================================ + +Vous trouverez ici différentes manières de mettre à jour wallabag : + +- `de la 2.0.x à la 2.1.1 <#mettre-a-jour-de-la-2-0-x-a-la-2-1-1>`_ +- `de la 2.1.x à la 2.1.y <#mettre-a-jour-de-la-2-1-x-a-la-2-1-y>`_ +- `de la 1.x à la 2.x <#depuis-wallabag-1-x>`_ + +Mettre à jour de la 2.0.x à la 2.1.1 +------------------------------------ + +.. warning:: +Avant cette migration, si vous aviez configuré l'import depuis Pocket en ajoutant votre consumer key dans les paramètres internes, pensez à effectuer une sauvegarde de celle-ci : vous devrez l'ajouter dans la configuration de wallabag après la mise à jour. + +Mise à jour sur un serveur dédié +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +:: + + 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 + +Mise à jour sur un hébergement mutualisé +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Effectuez une sauvegarde du fichier ``app/config/parameters.yml``. + +Téléchargez la version 2.1.1 de wallabag : + +.. code-block:: bash + + wget http://framabag.org/wallabag-release-2.1.1.tar.gz && tar xvf wallabag-release-2.1.1.tar.gz + +(hash md5 de l'archive 2.1.1 : ``9584a3b60a2b2a4de87f536548caac93``) + +Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. + +Merci de vérifier que votre fichier ``app/config/parameters.yml`` contient tous les paramètres requis. Vous trouverez `ici une documentation détaillée concernant les paramètres `_. + +Si vous utilisez SQLite, vous devez également conserver le contenu du répertoire ``data/``. + +Videz le répertoire ``var/cache``. + +Vous allez devoir également exécuter des requêtes SQL pour mettre à jour votre base de données. Nous partons du principe que le préfixe de vos tables est ``wallabag_`` et que le serveur SQL est un serveur MySQL : + +.. 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'; + +Mettre à jour de la 2.1.x à la 2.1.y +------------------------------------ + +Mise à jour sur un serveur dédié +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Pour mettre à jour votre installation de wallabag et récupérer la dernière version, exécutez la commande suivante dans votre répertoire d'installation : + +:: + + make update + +Mise à jour sur un hébergement mutualisé +^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^ + +Effectuez une sauvegarde du fichier ``app/config/parameters.yml``. + +Téléchargez la dernière version de wallabag : + +.. code-block:: bash + + wget http://wllbg.org/latest-v2-package && tar xvf latest-v2-package + +Vous trouverez `le hash md5 du dernier package sur notre site `_. + +Décompressez l'archive dans votre répertoire d'installation et remplacez le fichier ``app/config/parameters.yml`` avec le votre. + +Merci de vérifier que votre fichier ``app/config/parameters.yml`` contient tous les paramètres requis. Vous trouverez `ici une documentation détaillée concernant les paramètres `_. + +Si vous utilisez SQLite, vous devez également conserver le contenu du répertoire ``data/``. + +Videz le répertoire ``var/cache``. + +Depuis wallabag 1.x +------------------- + +Il n'y a pas de script automatique pour mettre à jour wallabag 1.x en wallabag 2.x. Vous devez : + +- exportez vos données +- installer wallabag 2.x (`lisez la documentation d'installation `_ ) +- importer vos données dans votre installation toute propre (`lisez la documentation d'import `_ ) diff --git a/package.json b/package.json index 1c6459508..209c46c6c 100644 --- a/package.json +++ b/package.json @@ -77,6 +77,7 @@ "grunt-contrib-copy": "^1.0.0", "grunt-contrib-symlink": "^1.0.0", "grunt-contrib-uglify": "^1.0.0", + "grunt-contrib-watch": "^1.0.0", "grunt-eslint": "^19.0.0", "grunt-postcss": "^0.8.0", "grunt-stylelint": "^0.6.0", diff --git a/scripts/update.sh b/scripts/update.sh index f43c4f24c..a29e0168f 100644 --- a/scripts/update.sh +++ b/scripts/update.sh @@ -9,11 +9,11 @@ if [ ! -d "$DIR" ]; then DIR="$PWD/scripts"; fi . "$DIR/require.sh" ENV=$1 -TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) rm -rf var/cache/* git fetch origin git fetch --tags +TAG=$(git describe --tags $(git rev-list --tags --max-count=1)) git checkout $TAG --force SYMFONY_ENV=$ENV $COMPOSER_COMMAND install --no-dev -o --prefer-dist php bin/console cache:clear --env=$ENV diff --git a/src/Wallabag/CoreBundle/Command/InstallCommand.php b/src/Wallabag/CoreBundle/Command/InstallCommand.php index c7e714af2..e95c3a7b2 100644 --- a/src/Wallabag/CoreBundle/Command/InstallCommand.php +++ b/src/Wallabag/CoreBundle/Command/InstallCommand.php @@ -72,6 +72,7 @@ class InstallCommand extends ContainerAwareCommand protected function checkRequirements() { $this->defaultOutput->writeln('Step 1 of 4. Checking system requirements.'); + $doctrineManager = $this->getContainer()->get('doctrine')->getManager(); $rows = []; @@ -108,21 +109,39 @@ class InstallCommand extends ContainerAwareCommand $rows[] = [$label, $status, $help]; + // check MySQL & PostgreSQL version + $label = 'Database version'; + $status = 'OK!'; + $help = ''; + // now check if MySQL isn't too old to handle utf8mb4 - if ($conn->isConnected() && $conn->getDatabasePlatform() instanceof \Doctrine\DBAL\Platforms\MySqlPlatform) { + if ($conn->isConnected() && 'mysql' === $conn->getDatabasePlatform()->getName()) { $version = $conn->query('select version()')->fetchColumn(); $minimalVersion = '5.5.4'; if (false === version_compare($version, $minimalVersion, '>')) { $fulfilled = false; - $rows[] = [ - 'Database version', - 'ERROR!', - 'Your MySQL version ('.$version.') is too old, consider upgrading ('.$minimalVersion.'+).', - ]; + $status = 'ERROR!'; + $help = 'Your MySQL version ('.$version.') is too old, consider upgrading ('.$minimalVersion.'+).'; } } + // testing if PostgreSQL > 9.1 + if ($conn->isConnected() && 'postgresql' === $conn->getDatabasePlatform()->getName()) { + // return version should be like "PostgreSQL 9.5.4 on x86_64-apple-darwin15.6.0, compiled by Apple LLVM version 8.0.0 (clang-800.0.38), 64-bit" + $version = $doctrineManager->getConnection()->query('SELECT version();')->fetchColumn(); + + preg_match('/PostgreSQL ([0-9\.]+)/i', $version, $matches); + + if (isset($matches[1]) & version_compare($matches[1], '9.2.0', '<')) { + $fulfilled = false; + $status = 'ERROR!'; + $help = 'PostgreSQL should be greater than 9.1 (actual version: '.$matches[1].')'; + } + } + + $rows[] = [$label, $status, $help]; + foreach ($this->functionExists as $functionRequired) { $label = ''.$functionRequired.''; $status = 'OK!'; diff --git a/src/Wallabag/CoreBundle/Controller/ConfigController.php b/src/Wallabag/CoreBundle/Controller/ConfigController.php index fe8177111..52a030701 100644 --- a/src/Wallabag/CoreBundle/Controller/ConfigController.php +++ b/src/Wallabag/CoreBundle/Controller/ConfigController.php @@ -39,6 +39,8 @@ class ConfigController extends Controller $em->persist($config); $em->flush(); + $request->getSession()->set('_locale', $config->getLanguage()); + // switch active theme $activeTheme = $this->get('liip_theme.active_theme'); $activeTheme->setName($config->getTheme()); diff --git a/src/Wallabag/CoreBundle/Entity/Config.php b/src/Wallabag/CoreBundle/Entity/Config.php index bfc2fff87..e04f0a7b5 100644 --- a/src/Wallabag/CoreBundle/Entity/Config.php +++ b/src/Wallabag/CoreBundle/Entity/Config.php @@ -71,7 +71,7 @@ class Config * @Assert\Range( * min = 1, * max = 100000, - * maxMessage = "validator.rss_limit_too_hight" + * maxMessage = "validator.rss_limit_too_high" * ) */ private $rssLimit; diff --git a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php index 8e2883f76..7b02f85c3 100644 --- a/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php +++ b/src/Wallabag/CoreBundle/Form/Type/EntryFilterType.php @@ -13,7 +13,7 @@ use Symfony\Component\Form\AbstractType; use Symfony\Component\Form\FormBuilderInterface; use Symfony\Component\HttpFoundation\Response; use Symfony\Component\OptionsResolver\OptionsResolver; -use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; +use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; class EntryFilterType extends AbstractType { @@ -23,13 +23,18 @@ class EntryFilterType extends AbstractType /** * Repository & user are used to get a list of language entries for this user. * - * @param EntityRepository $entryRepository - * @param TokenStorage $token + * @param EntityRepository $entryRepository + * @param TokenStorageInterface $tokenStorage */ - public function __construct(EntityRepository $entryRepository, TokenStorage $token) + public function __construct(EntityRepository $entryRepository, TokenStorageInterface $tokenStorage) { $this->repository = $entryRepository; - $this->user = $token->getToken()->getUser(); + + $this->user = $tokenStorage->getToken() ? $tokenStorage->getToken()->getUser() : null; + + if (null === $this->user || !is_object($this->user)) { + return null; + } } public function buildForm(FormBuilderInterface $builder, array $options) diff --git a/src/Wallabag/CoreBundle/Helper/ContentProxy.php b/src/Wallabag/CoreBundle/Helper/ContentProxy.php index 178910abb..fd0593254 100644 --- a/src/Wallabag/CoreBundle/Helper/ContentProxy.php +++ b/src/Wallabag/CoreBundle/Helper/ContentProxy.php @@ -8,6 +8,7 @@ use Wallabag\CoreBundle\Entity\Entry; use Wallabag\CoreBundle\Entity\Tag; use Wallabag\CoreBundle\Tools\Utils; use Wallabag\CoreBundle\Repository\TagRepository; +use Symfony\Component\HttpFoundation\File\MimeType\MimeTypeExtensionGuesser; /** * This kind of proxy class take care of getting the content from an url @@ -19,6 +20,7 @@ class ContentProxy protected $tagger; protected $logger; protected $tagRepository; + protected $mimeGuesser; public function __construct(Graby $graby, RuleBasedTagger $tagger, TagRepository $tagRepository, LoggerInterface $logger) { @@ -26,6 +28,7 @@ class ContentProxy $this->tagger = $tagger; $this->logger = $logger; $this->tagRepository = $tagRepository; + $this->mimeGuesser = new MimeTypeExtensionGuesser(); } /** @@ -81,6 +84,11 @@ class ContentProxy $entry->setPreviewPicture($content['open_graph']['og_image']); } + // if content is an image define as a preview too + if (in_array($this->mimeGuesser->guess($content['content_type']), ['jpeg', 'jpg', 'gif', 'png'], true)) { + $entry->setPreviewPicture($content['url']); + } + try { $this->tagger->tag($entry); } catch (\Exception $e) { diff --git a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php index f9066bee7..7d3798b95 100644 --- a/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php +++ b/src/Wallabag/CoreBundle/Helper/PreparePagerForEntries.php @@ -5,16 +5,16 @@ namespace Wallabag\CoreBundle\Helper; use Pagerfanta\Adapter\AdapterInterface; use Pagerfanta\Pagerfanta; use Symfony\Component\Routing\Router; -use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorage; +use Symfony\Component\Security\Core\Authentication\Token\Storage\TokenStorageInterface; class PreparePagerForEntries { - private $user; private $router; + private $tokenStorage; - public function __construct(TokenStorage $token, Router $router) + public function __construct(TokenStorageInterface $tokenStorage, Router $router) { - $this->user = $token->getToken()->getUser(); + $this->tokenStorage = $tokenStorage; $this->router = $router; } @@ -26,8 +26,14 @@ class PreparePagerForEntries */ public function prepare(AdapterInterface $adapter, $page = 1) { + $user = $this->tokenStorage->getToken() ? $this->tokenStorage->getToken()->getUser() : null; + + if (null === $user || !is_object($user)) { + return null; + } + $entries = new Pagerfanta($adapter); - $entries->setMaxPerPage($this->user->getConfig()->getItemsPerPage()); + $entries->setMaxPerPage($user->getConfig()->getItemsPerPage()); return $entries; } diff --git a/src/Wallabag/CoreBundle/Resources/config/services.yml b/src/Wallabag/CoreBundle/Resources/config/services.yml index dad9bd421..0036f45ee 100644 --- a/src/Wallabag/CoreBundle/Resources/config/services.yml +++ b/src/Wallabag/CoreBundle/Resources/config/services.yml @@ -41,21 +41,6 @@ services: arguments: - error_message: '%wallabag_core.fetching_error_message%' - http_client: - user_agents: - 'lifehacker.com': 'PHP/5.2' - 'gawker.com': 'PHP/5.2' - 'deadspin.com': 'PHP/5.2' - 'kotaku.com': 'PHP/5.2' - 'jezebel.com': 'PHP/5.2' - 'io9.com': 'PHP/5.2' - 'jalopnik.com': 'PHP/5.2' - 'gizmodo.com': 'PHP/5.2' - '.wikipedia.org': 'Mozilla/5.2' - '.fok.nl': 'Googlebot/2.1' - 'getpocket.com': 'PHP/5.2' - 'iansommerville.com': 'PHP/5.2' - '.slashdot.org': 'PHP/5.2' calls: - [ setLogger, [ "@logger" ] ] tags: diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml index c41a2b1a8..b456fff0f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.da.yml @@ -76,6 +76,11 @@ config: # redirect_current_page: 'To the current page' pocket_consumer_key_label: Brugers nøgle til Pocket for at importere materialer # android_configuration: Configure your Android application + # help_theme: "wallabag is customizable. You can choose your prefered theme here." + # help_items_per_page: "You can change the number of articles displayed on each page." + # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." + # help_language: "You can change the language of wallabag interface." + # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." form_rss: description: 'RSS-feeds fra wallabag gør det muligt at læse de artikler, der gemmes i wallabag, med din RSS-læser. Det kræver, at du genererer et token først.' token_label: 'RSS-Token' @@ -93,6 +98,7 @@ config: name_label: 'Navn' email_label: 'Emailadresse' # twoFactorAuthentication_label: 'Two factor authentication' + # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." delete: # title: Delete my account (a.k.a danger zone) # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. @@ -106,6 +112,7 @@ config: # entries: Remove ALL entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: + # description: "You can change your password here. Your new password should by at least 8 characters long." old_password_label: 'Gammel adgangskode' new_password_label: 'Ny adgangskode' repeat_new_password_label: 'Gentag adgangskode' @@ -247,7 +254,7 @@ about: getting_help: documentation: 'Dokumentation' bug_reports: 'Bugs' - support: 'På vor support-side eller på GitHub' + support: 'på GitHub' helping: description: 'wallabag er gratis og Open source. Du kan hjælpe os:' by_contributing: 'ved at bidrage til projektet:' @@ -477,7 +484,7 @@ error: flashes: config: notice: - config_saved: 'Opsætning gemt. Visse ændringer vil først fremgå ved næste login.' + config_saved: 'Opsætning gemt.' password_updated: 'Adgangskode opdateret' # password_not_updated_demo: "In demonstration mode, you can't change password for this user." user_updated: 'Oplysninger opdateret' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml index c0d815ad4..08ed1a116 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.de.yml @@ -76,6 +76,11 @@ config: redirect_current_page: 'Zur aktuellen Seite' pocket_consumer_key_label: Consumer-Key für Pocket, um Inhalte zu importieren android_configuration: Konfiguriere deine Android Application + # help_theme: "wallabag is customizable. You can choose your prefered theme here." + # help_items_per_page: "You can change the number of articles displayed on each page." + # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." + # help_language: "You can change the language of wallabag interface." + # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." form_rss: description: 'Die RSS-Feeds von wallabag erlauben es dir, deine gespeicherten Artikel mit deinem bevorzugten RSS-Reader zu lesen. Vorher musst du jedoch einen Token erstellen.' token_label: 'RSS-Token' @@ -93,6 +98,7 @@ config: name_label: 'Name' email_label: 'E-Mail-Adresse' twoFactorAuthentication_label: 'Zwei-Faktor-Authentifizierung' + # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." delete: title: Lösche mein Konto (a.k.a Gefahrenzone) description: Wenn du dein Konto löschst, werden ALL deine Artikel, ALL deine Tags, ALL deine Anmerkungen und dein Konto dauerhaft gelöscht (kann NICHT RÜCKGÄNGIG gemacht werden). Du wirst anschließend ausgeloggt. @@ -106,6 +112,7 @@ config: entries: Entferne ALLE Einträge confirm: Bist du wirklich sicher? (DIES KANN NICHT RÜCKGÄNGIG GEMACHT WERDEN) form_password: + # description: "You can change your password here. Your new password should by at least 8 characters long." old_password_label: 'Altes Kennwort' new_password_label: 'Neues Kennwort' repeat_new_password_label: 'Neues Kennwort wiederholen' @@ -247,7 +254,7 @@ about: getting_help: documentation: 'Dokumentation' bug_reports: 'Fehlerberichte' - support: 'Auf unserer Support-Webseite oder auf GitHub' + support: 'auf GitHub' helping: description: 'wallabag ist frei und Open Source. Du kannst uns helfen:' by_contributing: 'indem du zu dem Projekt beiträgst:' @@ -477,7 +484,7 @@ error: flashes: config: notice: - config_saved: 'Konfiguration gespeichert. Einige Einstellungen werden erst nach einer erneuten Anmeldung übernommen.' + config_saved: 'Konfiguration gespeichert.' password_updated: 'Kennwort aktualisiert' password_not_updated_demo: "Im Testmodus kannst du das Kennwort nicht ändern." user_updated: 'Information aktualisiert' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml index cceff5c7f..20e83a072 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.en.yml @@ -76,6 +76,11 @@ config: redirect_current_page: 'To the current page' pocket_consumer_key_label: Consumer key for Pocket to import contents android_configuration: Configure your Android application + help_theme: "wallabag is customizable. You can choose your prefered theme here." + help_items_per_page: "You can change the number of articles displayed on each page." + help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." + help_language: "You can change the language of wallabag interface." + help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." form_rss: description: 'RSS feeds provided by wallabag allow you to read your saved articles with your favourite RSS reader. You need to generate a token first.' token_label: 'RSS token' @@ -93,6 +98,7 @@ config: name_label: 'Name' email_label: 'Email' twoFactorAuthentication_label: 'Two factor authentication' + help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." delete: title: Delete my account (a.k.a danger zone) description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. @@ -106,6 +112,7 @@ config: entries: Remove ALL entries confirm: Are you really sure? (THIS CAN'T BE UNDONE) form_password: + description: "You can change your password here. Your new password should by at least 8 characters long." old_password_label: 'Current password' new_password_label: 'New password' repeat_new_password_label: 'Repeat new password' @@ -247,7 +254,7 @@ about: getting_help: documentation: 'Documentation' bug_reports: 'Bug reports' - support: 'On our support website or on GitHub' + support: 'on GitHub' helping: description: 'wallabag is free and open source. You can help us:' by_contributing: 'by contributing to the project:' @@ -477,7 +484,7 @@ error: flashes: config: notice: - config_saved: 'Config saved. Some parameters will be considered after disconnection.' + config_saved: 'Config saved.' password_updated: 'Password updated' password_not_updated_demo: "In demonstration mode, you can't change password for this user." user_updated: 'Information updated' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml index 358c1999e..5507ccaef 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.es.yml @@ -76,6 +76,11 @@ config: # redirect_current_page: 'To the current page' # pocket_consumer_key_label: Consumer key for Pocket to import contents # android_configuration: Configure your Android application + # help_theme: "wallabag is customizable. You can choose your prefered theme here." + # help_items_per_page: "You can change the number of articles displayed on each page." + # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." + # help_language: "You can change the language of wallabag interface." + # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." form_rss: description: 'Los feeds RSS de wallabag permiten leer los artículos guardados con su lector RSS favorito. Necesita generar un token primero' token_label: 'RSS token' @@ -93,6 +98,7 @@ config: name_label: 'Nombre' email_label: 'Direccion e-mail' twoFactorAuthentication_label: 'Autentificación de dos factores' + # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." delete: # title: Delete my account (a.k.a danger zone) # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. @@ -106,6 +112,7 @@ config: # entries: Remove ALL entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: + # description: "You can change your password here. Your new password should by at least 8 characters long." old_password_label: 'Contraseña actual' new_password_label: 'Nueva contraseña' repeat_new_password_label: 'Confirmar la nueva contraseña' @@ -247,7 +254,7 @@ about: getting_help: documentation: 'Documentación' bug_reports: 'Reporte de errores' - support: 'En nuestra web de apoyo website o en GitHub' + support: 'en GitHub' helping: description: 'wallabag es libre y gratuito. Usted puede ayudarnos :' by_contributing: 'contribuyendo al proyecto :' @@ -477,7 +484,7 @@ error: flashes: config: notice: - config_saved: 'Configuración guardada. Algunos parámetros serán recargados cuando se vuelva a conectar.' + config_saved: 'Configuración guardada.' password_updated: 'Contraseña actualizada' password_not_updated_demo: "En modo demo, no puede cambiar la contraseña del usuario." user_updated: 'Su información personal ha sido actualizada' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml index 0546815ea..ba8a9c35f 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml @@ -76,6 +76,11 @@ config: # redirect_current_page: 'To the current page' pocket_consumer_key_label: کلید کاربری Pocket برای درون‌ریزی مطالب # android_configuration: Configure your Android application + # help_theme: "wallabag is customizable. You can choose your prefered theme here." + # help_items_per_page: "You can change the number of articles displayed on each page." + # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." + # help_language: "You can change the language of wallabag interface." + # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." form_rss: description: 'با خوراک آر-اس-اس که wallabag در اختیارتان می‌گذارد، می‌توانید مقاله‌های ذخیره‌شده را در نرم‌افزار آر-اس-اس دلخواه خود بخوانید. برای این کار نخست باید یک کد بسازید.' token_label: 'کد آر-اس-اس' @@ -93,6 +98,7 @@ config: name_label: 'نام' email_label: 'نشانی ایمیل' twoFactorAuthentication_label: 'تأیید ۲مرحله‌ای' + # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." delete: # title: Delete my account (a.k.a danger zone) # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. @@ -106,6 +112,7 @@ config: # entries: Remove ALL entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: + # description: "You can change your password here. Your new password should by at least 8 characters long." old_password_label: 'رمز قدیمی' new_password_label: 'رمز تازه' repeat_new_password_label: 'رمز تازه را دوباره بنویسید' @@ -247,7 +254,7 @@ about: getting_help: documentation: 'راهنما' bug_reports: 'گزارش اشکال‌ها' - support: 'در وب‌گاه پشتیبانی یا روی GitHub' + support: 'روی GitHub' helping: description: 'wallabag رایگان، آزاد، و متن‌باز است. شما می‌توانید به ما کمک کنید:' by_contributing: 'با مشارکت در پروژه:' @@ -477,7 +484,7 @@ error: flashes: config: notice: - config_saved: 'پیکربندی ذخیره شد. برخی از تنظیمات پس از این که قطع شدید اعمال می‌شود.' + config_saved: 'پیکربندی ذخیره شد.' password_updated: 'رمز به‌روز شد' password_not_updated_demo: "در حالت نمایشی نمی‌توانید رمز کاربر را عوض کنید." user_updated: 'اطلاعات به‌روز شد' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml index ec90f9af7..2932f2fd2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml @@ -76,6 +76,11 @@ config: redirect_current_page: 'À la page courante' pocket_consumer_key_label: Clé d’authentification Pocket pour importer les données android_configuration: Configurez votre application Android + help_theme: "L'affichage de wallabag est personnalisable. C'est ici que vous choisissez le thème que vous préférez." + help_items_per_page: "Vous pouvez définir le nombre d'articles affichés sur chaque page." + help_reading_speed: "wallabag calcule une durée de lecture pour chaque article. Vous pouvez définir ici, grâce à cette liste déroulante, si vous lisez plus ou moins vite. wallabag recalculera la durée de lecture de chaque article." + help_language: "Vous pouvez définir la langue de l'interface de wallabag." + help_pocket_consumer_key: "Nécessaire pour l'import depuis Pocket. Vous pouvez le créer depuis votre compte Pocket." form_rss: description: "Les flux RSS fournis par wallabag vous permettent de lire vos articles sauvegardés dans votre lecteur de flux préféré. Pour pouvoir les utiliser, vous devez d’abord créer un jeton." token_label: "Jeton RSS" @@ -93,6 +98,7 @@ config: name_label: "Nom" email_label: "Adresse courriel" twoFactorAuthentication_label: "Double authentification" + help_twoFactorAuthentication: "Si vous activez 2FA, à chaque tentative de connexion à wallabag, vous recevrez un code par email." delete: title: Supprimer mon compte (attention danger !) description: Si vous confirmez la suppression de votre compte, TOUS les articles, TOUS les tags, TOUTES les annotations et votre compte seront DÉFINITIVEMENT supprimé (c'est IRRÉVERSIBLE). Vous serez ensuite déconnecté. @@ -106,6 +112,7 @@ config: entries: Supprimer TOUS les articles confirm: Êtes-vous vraiment vraiment sûr ? (C'EST IRRÉVERSIBLE) form_password: + description: "Vous pouvez changer ici votre mot de passe. Le mot de passe doit contenir au moins 8 caractères." old_password_label: "Mot de passe actuel" new_password_label: "Nouveau mot de passe" repeat_new_password_label: "Confirmez votre nouveau mot de passe" @@ -247,7 +254,7 @@ about: getting_help: documentation: "Documentation" bug_reports: "Rapport de bogue" - support: "Sur notre site de support ou sur GitHub" + support: "sur GitHub" helping: description: "wallabag est gratuit et opensource. Vous pouvez nous aider :" by_contributing: "en contribuant au projet :" @@ -477,7 +484,7 @@ error: flashes: config: notice: - config_saved: "Les paramètres ont bien été mis à jour. Certains seront pris en compte après déconnexion." + config_saved: "Les paramètres ont bien été mis à jour." password_updated: "Votre mot de passe a bien été mis à jour" password_not_updated_demo: "En démo, vous ne pouvez pas changer le mot de passe de cet utilisateur." user_updated: "Vos informations personnelles ont bien été mises à jour" @@ -490,7 +497,7 @@ flashes: entries_reset: Articles supprimés entry: notice: - entry_already_saved: "Article déjà sauvergardé le %date%" + entry_already_saved: "Article déjà sauvegardé le %date%" entry_saved: "Article enregistré" entry_saved_failed: "Article enregistré mais impossible de récupérer le contenu" entry_updated: "Article mis à jour" diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml index 2c9924aa1..538e25a67 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.it.yml @@ -76,6 +76,11 @@ config: # redirect_current_page: 'To the current page' pocket_consumer_key_label: Consumer key per Pocket per importare i contenuti # android_configuration: Configure your Android application + # help_theme: "wallabag is customizable. You can choose your prefered theme here." + # help_items_per_page: "You can change the number of articles displayed on each page." + # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." + # help_language: "You can change the language of wallabag interface." + # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." form_rss: description: 'I feed RSS generati da wallabag ti permettono di leggere i tuoi contenuti salvati con il tuo lettore di RSS preferito. Prima, devi generare un token.' token_label: 'RSS token' @@ -93,6 +98,7 @@ config: name_label: 'Nome' email_label: 'E-mail' twoFactorAuthentication_label: 'Two factor authentication' + # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." delete: # title: Delete my account (a.k.a danger zone) # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. @@ -106,6 +112,7 @@ config: # entries: Remove ALL entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: + # description: "You can change your password here. Your new password should by at least 8 characters long." old_password_label: 'Password corrente' new_password_label: 'Nuova password' repeat_new_password_label: 'Ripeti la nuova password' @@ -247,7 +254,7 @@ about: getting_help: documentation: 'Documentazione' bug_reports: 'Bug reports' - support: 'Sul nostro sito di supporto o su GitHub' + support: 'su GitHub' helping: description: 'wallabag è gratuito opensource. Puoi aiutarci:' by_contributing: 'per contribuire al progetto:' @@ -477,7 +484,7 @@ error: flashes: config: notice: - config_saved: 'Configurazione salvata. Alcuni parametri verranno utilizzati dopo il logout/login.' + config_saved: 'Configurazione salvata.' password_updated: 'Password aggiornata' password_not_updated_demo: "In modalità demo, non puoi cambiare la password dell'utente." user_updated: 'Informazioni aggiornate' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml index 4af8b8fcc..6f415c3bf 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml @@ -76,6 +76,11 @@ config: # redirect_current_page: 'To the current page' pocket_consumer_key_label: Clau d'autentificacion Pocket per importar las donadas android_configuration: Configuratz vòstra aplicacion Android + # help_theme: "wallabag is customizable. You can choose your prefered theme here." + # help_items_per_page: "You can change the number of articles displayed on each page." + # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." + # help_language: "You can change the language of wallabag interface." + # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." form_rss: description: "Los fluxes RSS fornits per wallabag vos permeton de legir vòstres articles salvagardats dins vòstre lector de fluxes preferit. Per los poder emplegar, vos cal, d'en primièr crear un geton." token_label: 'Geton RSS' @@ -93,6 +98,7 @@ config: name_label: 'Nom' email_label: 'Adreça de corrièl' twoFactorAuthentication_label: 'Dobla autentificacion' + # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." delete: title: Suprimir mon compte (Mèfi zòna perilhosa) description: Se confirmatz la supression de vòstre compte, TOTES vòstres articles, TOTAS vòstras etiquetas, TOTAS vòstras anotacions e vòstre compte seràn suprimits per totjorn. E aquò es IRREVERSIBLE. Puèi seretz desconnectat. @@ -106,6 +112,7 @@ config: entries: Levar TOTES los articles confirm: Sètz vertadièrament segur ? (ES IRREVERSIBLE) form_password: + # description: "You can change your password here. Your new password should by at least 8 characters long." old_password_label: 'Senhal actual' new_password_label: 'Senhal novèl' repeat_new_password_label: 'Confirmatz vòstre novèl senhal' @@ -247,7 +254,7 @@ about: getting_help: documentation: 'Documentacion' bug_reports: 'Rapòrt de bugs' - support: "Sus nòstre site d'assisténcia ou sur GitHub" + support: "sur GitHub" helping: description: 'wallabag es a gratuit e opensource. Nos podètz ajudar :' by_contributing: 'en ajudant lo projècte :' @@ -477,7 +484,7 @@ error: flashes: config: notice: - config_saved: 'Los paramètres son ben estats meses a jorn. Certans seràn aplicats aprèp desconnexion.' + config_saved: 'Los paramètres son ben estats meses a jorn.' password_updated: 'Vòstre senhal es ben estat mes a jorn' password_not_updated_demo: "En demostration, podètz pas cambiar lo senhal d'aqueste utilizaire." user_updated: 'Vòstres informacions personnelas son ben estadas mesas a jorn' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml index 53c60ad2f..df5ab7e55 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml @@ -76,6 +76,11 @@ config: redirect_current_page: 'do bieżącej strony' pocket_consumer_key_label: 'Klucz klienta Pocket do importu zawartości' android_configuration: Skonfiguruj swoją androidową aplikację + # help_theme: "wallabag is customizable. You can choose your prefered theme here." + # help_items_per_page: "You can change the number of articles displayed on each page." + # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." + # help_language: "You can change the language of wallabag interface." + # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." form_rss: description: 'Kanały RSS prowadzone przez wallabag pozwalają Ci na czytanie twoich zapisanych artykułów w twoium ulubionym czytniku RSS. Musisz najpierw wynegenerować tokena.‌' token_label: 'Token RSS' @@ -93,6 +98,7 @@ config: name_label: 'Nazwa' email_label: 'Adres email' twoFactorAuthentication_label: 'Autoryzacja dwuetapowa' + # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." delete: title: Usuń moje konto (niebezpieczna strefa !) description: Jeżeli usuniesz swoje konto, wszystkie twoje artykuły, tagi, adnotacje, oraz konto zostaną trwale usunięte (operacja jest NIEODWRACALNA). Następnie zostaniesz wylogowany. @@ -106,6 +112,7 @@ config: entries: usuń WSZYTSTKIE wpisy confirm: Jesteś pewien? (tej operacji NIE MOŻNA cofnąć) form_password: + # description: "You can change your password here. Your new password should by at least 8 characters long." old_password_label: 'Stare hasło' new_password_label: 'Nowe hasło' repeat_new_password_label: 'Powtórz nowe hasło' @@ -247,7 +254,7 @@ about: getting_help: documentation: 'Dokumentacja' bug_reports: 'Raportuj błędy' - support: 'Na naszej stronie wsparcia technicznego lub na GitHubie' + support: 'na GitHubie' helping: description: 'wallabag jest darmowy i otwartoźródłowy. Możesz nam pomóc:' by_contributing: 'przez przyłączenie się do projektu:' @@ -477,7 +484,7 @@ error: flashes: config: notice: - config_saved: 'Konfiguracja zapisana. Niektóre parametry zostaną uznane po rozłączeniu' + config_saved: 'Konfiguracja zapisana.' password_updated: 'Hasło zaktualizowane' password_not_updated_demo: "In demonstration mode, you can't change password for this user." user_updated: 'Informacje zaktualizowane' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml index 4b02cf360..1c1c9a78b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml @@ -76,6 +76,11 @@ config: # redirect_current_page: 'To the current page' pocket_consumer_key_label: 'Chave do consumidor do Pocket para importar conteúdo' # android_configuration: Configure your Android application + # help_theme: "wallabag is customizable. You can choose your prefered theme here." + # help_items_per_page: "You can change the number of articles displayed on each page." + # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." + # help_language: "You can change the language of wallabag interface." + # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." form_rss: description: 'Feeds RSS providos pelo wallabag permitem que você leia seus artigos salvos em seu leitor de RSS favorito. Você precisa gerar um token primeiro.' token_label: 'Token RSS' @@ -93,6 +98,7 @@ config: name_label: 'Nome' email_label: 'E-mail' twoFactorAuthentication_label: 'Autenticação de dois passos' + # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." delete: # title: Delete my account (a.k.a danger zone) # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. @@ -106,6 +112,7 @@ config: # entries: Remove ALL entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: + # description: "You can change your password here. Your new password should by at least 8 characters long." old_password_label: 'Senha atual' new_password_label: 'Nova senha' repeat_new_password_label: 'Repita a nova senha' @@ -247,7 +254,7 @@ about: getting_help: documentation: 'Documentação' bug_reports: 'Informar bugs' - support: 'Em nosso site de suporte ou no GitHub' + support: 'no GitHub' helping: description: 'wallabag é livre e software livre. Você pode nos ajudar:' by_contributing: 'contribuindo com o projeto:' @@ -477,7 +484,7 @@ error: flashes: config: notice: - config_saved: 'Configiração salva. Alguns parâmetros podem ser considerados depois da desconexão.' + config_saved: 'Configiração salva.' password_updated: 'Senha atualizada' password_not_updated_demo: 'Em modo de demonstração, você não pode alterar a senha deste usuário.' # user_updated: 'Information updated' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml index a8f5aad3c..8da04d951 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml @@ -76,6 +76,11 @@ config: # redirect_current_page: 'To the current page' pocket_consumer_key_label: Cheie consumator pentru importarea contentului din Pocket # android_configuration: Configure your Android application + # help_theme: "wallabag is customizable. You can choose your prefered theme here." + # help_items_per_page: "You can change the number of articles displayed on each page." + # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." + # help_language: "You can change the language of wallabag interface." + # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." form_rss: description: 'Feed-urile RSS oferite de wallabag îți permit să-ți citești articolele salvate în reader-ul tău preferat RSS.' token_label: 'RSS-Token' @@ -93,6 +98,7 @@ config: name_label: 'Nume' email_label: 'E-mail' # twoFactorAuthentication_label: 'Two factor authentication' + # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." delete: # title: Delete my account (a.k.a danger zone) # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. @@ -106,6 +112,7 @@ config: # entries: Remove ALL entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: + # description: "You can change your password here. Your new password should by at least 8 characters long." old_password_label: 'Parola veche' new_password_label: 'Parola nouă' repeat_new_password_label: 'Repeat new password' @@ -247,7 +254,7 @@ about: getting_help: documentation: 'Documentație' bug_reports: 'Bug-uri' - support: 'Pe site-ul nostru de suport sau pe GitHub' + support: 'pe GitHub' helping: description: 'wallabag este gratis și Open-Source. Cum ne poți ajuta:' by_contributing: 'contribuind la proiect:' @@ -477,7 +484,7 @@ error: flashes: config: notice: - config_saved: 'Configurație salvată. Unii parametrii vor fi considerați după deconectare.' + config_saved: 'Configurație salvată.' password_updated: 'Parolă actualizată' password_not_updated_demo: "In demonstration mode, you can't change password for this user." user_updated: 'Informație actualizată' diff --git a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml index 7cc0a54ee..8d94044c7 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml @@ -76,6 +76,11 @@ config: # redirect_current_page: 'To the current page' # pocket_consumer_key_label: Consumer key for Pocket to import contents # android_configuration: Configure your Android application + # help_theme: "wallabag is customizable. You can choose your prefered theme here." + # help_items_per_page: "You can change the number of articles displayed on each page." + # help_reading_speed: "wallabag calculates a reading time for each article. You can define here, thanks to this list, if you are a fast or a slow reader. wallabag will recalculate the reading time for each article." + # help_language: "You can change the language of wallabag interface." + # help_pocket_consumer_key: "Required for Pocket import. You can create it in your Pocket account." form_rss: description: 'wallabag RSS akışı kaydetmiş olduğunuz makalelerini favori RSS okuyucunuzda görüntülemenizi sağlar. Bunu yapabilmek için öncelikle belirteç (token) oluşturmalısınız.' token_label: 'RSS belirteci (token)' @@ -93,6 +98,7 @@ config: name_label: 'İsim' email_label: 'E-posta' twoFactorAuthentication_label: 'İki adımlı doğrulama' + # help_twoFactorAuthentication: "If you enable 2FA, each time you want to login to wallabag, you'll receive a code by email." delete: # title: Delete my account (a.k.a danger zone) # description: If you remove your account, ALL your articles, ALL your tags, ALL your annotations and your account will be PERMANENTLY removed (it can't be UNDONE). You'll then be logged out. @@ -106,6 +112,7 @@ config: # entries: Remove ALL entries # confirm: Are you really really sure? (THIS CAN'T BE UNDONE) form_password: + # description: "You can change your password here. Your new password should by at least 8 characters long." old_password_label: 'Eski şifre' new_password_label: 'Yeni şifre' repeat_new_password_label: 'Yeni şifrenin tekrarı' @@ -247,7 +254,7 @@ about: getting_help: documentation: 'Dokümantasyon' bug_reports: 'Sorun bildir' - support: 'Destek internet sitesinde ya da GitHub üzerinde' + support: 'GitHub üzerinde' helping: description: 'wallabag açık kaynak kodlu ve ücretsizdir. Bize destek ol :' by_contributing: 'projemize katkıda bulunun :' @@ -477,7 +484,7 @@ error: flashes: config: notice: - config_saved: 'Yapılandırma ayarları kaydedildi. Bazı yapılandırmalar tekrar giriş yaptığınızda aktif olacaktır.' + config_saved: 'Yapılandırma ayarları kaydedildi.' password_updated: 'Şifre güncellendi' password_not_updated_demo: "In demonstration mode, you can't change password for this user." user_updated: 'Bilgiler güncellendi' diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml index 313339ed0..32a8b4a86 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.da.yml @@ -3,4 +3,4 @@ validator: password_too_short: 'Adgangskoden skal være mindst 8 tegn' # password_wrong_value: 'Wrong value for your current password' # item_per_page_too_high: 'This will certainly kill the app' - # rss_limit_too_hight: 'This will certainly kill the app' + # rss_limit_too_high: 'This will certainly kill the app' diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml index 486cc3e49..37b9888f9 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.de.yml @@ -3,4 +3,4 @@ validator: password_too_short: 'Kennwort-Mindestlänge von acht Zeichen nicht erfüllt' password_wrong_value: 'Falscher Wert für dein aktuelles Kennwort' item_per_page_too_high: 'Dies wird die Anwendung möglicherweise beenden' - rss_limit_too_hight: 'Dies wird die Anwendung möglicherweise beenden' + rss_limit_too_high: 'Dies wird die Anwendung möglicherweise beenden' diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml index cdfa46a6d..292174972 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.en.yml @@ -3,4 +3,4 @@ validator: password_too_short: 'Password should by at least 8 chars long' password_wrong_value: 'Wrong value for your current password' item_per_page_too_high: 'This will certainly kill the app' - rss_limit_too_hight: 'This will certainly kill the app' + rss_limit_too_high: 'This will certainly kill the app' diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml index ebbff7cf3..57ddaa5a5 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.es.yml @@ -3,4 +3,4 @@ validator: password_too_short: 'La contraseña debe tener al menos 8 carácteres' password_wrong_value: 'Entrada equivocada para su contraseña actual' item_per_page_too_high: 'Esto matará la aplicación' - rss_limit_too_hight: 'Esto matará la aplicación' + rss_limit_too_high: 'Esto matará la aplicación' diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml index 01c62ae08..e0536d18c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fa.yml @@ -3,4 +3,4 @@ validator: password_too_short: 'رمز شما باید ۸ حرف یا بیشتر باشد' password_wrong_value: 'رمز فعلی را اشتباه وارد کرده‌اید' item_per_page_too_high: 'با این تعداد برنامه به فنا می‌رود' - rss_limit_too_hight: 'با این تعداد برنامه به فنا می‌رود' + rss_limit_too_high: 'با این تعداد برنامه به فنا می‌رود' diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml index 2d5eca295..64574709c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.fr.yml @@ -3,4 +3,4 @@ validator: password_too_short: "Le mot de passe doit contenir au moins 8 caractères" password_wrong_value: "Votre mot de passe actuel est faux" item_per_page_too_high: "Ça ne va pas plaire à l’application" - rss_limit_too_hight: "Ça ne va pas plaire à l’application" + rss_limit_too_high: "Ça ne va pas plaire à l’application" diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml index 826206f4e..d9beb54f2 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.it.yml @@ -3,4 +3,4 @@ validator: password_too_short: 'La password deve essere lunga almeno 8 caratteri' password_wrong_value: 'Valore inserito per la password corrente errato' item_per_page_too_high: 'Questo valore è troppo alto' - rss_limit_too_hight: 'Questo valore è troppo alto' + rss_limit_too_high: 'Questo valore è troppo alto' diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml index 71b675754..f92c2708e 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.oc.yml @@ -3,4 +3,4 @@ validator: password_too_short: 'Lo senhal deu aver almens 8 caractèrs' password_wrong_value: 'Vòstre senhal actual es pas bon' item_per_page_too_high: "Aquò li agradarà pas a l'aplicacion" - rss_limit_too_hight: "Aquò li agradarà pas a l'aplicacion" + rss_limit_too_high: "Aquò li agradarà pas a l'aplicacion" diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml index 4f5a3caf6..ffcd5e7f0 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pl.yml @@ -3,4 +3,4 @@ validator: password_too_short: 'Hasło powinno mieć minimum 8 znaków długości' password_wrong_value: 'Twoje obecne hasło jest błędne' item_per_page_too_high: 'To może spowodować problemy z aplikacją' - rss_limit_too_hight: 'To może spowodować problemy z aplikacją' + rss_limit_too_high: 'To może spowodować problemy z aplikacją' diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml index 498908306..4eddff107 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.pt.yml @@ -3,4 +3,4 @@ validator: password_too_short: 'A senha deve ter pelo menos 8 caracteres' password_wrong_value: 'A senha atual informada está errada' item_per_page_too_high: 'Certamente isso pode matar a aplicação' - rss_limit_too_hight: 'Certamente isso pode matar a aplicação' + rss_limit_too_high: 'Certamente isso pode matar a aplicação' diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml index 2ffbbd4df..59a8cdd8c 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.ro.yml @@ -3,4 +3,4 @@ validator: password_too_short: 'Parola ar trebui să conțină cel puțin 8 caractere' # password_wrong_value: 'Wrong value for your current password' # item_per_page_too_high: 'This will certainly kill the app' - # rss_limit_too_hight: 'This will certainly kill the app' + # rss_limit_too_high: 'This will certainly kill the app' diff --git a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml index 1b358965d..01388771b 100644 --- a/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml +++ b/src/Wallabag/CoreBundle/Resources/translations/validators.tr.yml @@ -3,4 +3,4 @@ validator: # password_too_short: 'Password should by at least 8 chars long' # password_wrong_value: 'Wrong value for your current password' # item_per_page_too_high: 'This will certainly kill the app' - # rss_limit_too_hight: 'This will certainly kill the app' + # rss_limit_too_high: 'This will certainly kill the app' diff --git a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig index 4c01b128d..3548f5901 100644 --- a/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig +++ b/src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig @@ -14,6 +14,9 @@ {{ form_errors(form.config.theme) }} {{ form_widget(form.config.theme) }} + + live_help +
@@ -22,6 +25,9 @@ {{ form_errors(form.config.items_per_page) }} {{ form_widget(form.config.items_per_page) }} + + live_help +
@@ -34,6 +40,9 @@ myreadspeed

+ + live_help +
@@ -50,6 +59,9 @@ {{ form_errors(form.config.language) }} {{ form_widget(form.config.language) }} + + live_help +
@@ -62,10 +74,16 @@ https://getpocket.com/developer/docs/authentication

+ + live_help + +
+

{{ 'config.form_settings.android_configuration'|trans }}

Touch here to prefill your Android application +