]> git.immae.eu Git - github/wallabag/wallabag.git/log
github/wallabag/wallabag.git
7 years agoMerge remote-tracking branch 'origin/master' into 2.2
Jeremy Benoist [Thu, 3 Nov 2016 15:41:29 +0000 (16:41 +0100)] 
Merge remote-tracking branch 'origin/master' into 2.2

7 years agoMerge pull request #2180 from wallabag/download-pictures
Jeremy Benoist [Thu, 3 Nov 2016 15:22:07 +0000 (16:22 +0100)] 
Merge pull request #2180 from wallabag/download-pictures

Download pictures

7 years agoAdd warning message for import + download images 2180/head
Jeremy Benoist [Thu, 3 Nov 2016 14:59:18 +0000 (15:59 +0100)] 
Add warning message for import + download images

When import isn't async and downloading images is enabled, we warn the user that import can fail.
Also, added missing translations

7 years agoMerge pull request #2523 from wallabag/qrcode-android-app
Nicolas Lœuillet [Thu, 3 Nov 2016 13:55:24 +0000 (14:55 +0100)] 
Merge pull request #2523 from wallabag/qrcode-android-app

Added QRCode and link to configure android application

7 years agoavoid eslint warning by disabling line 2523/head
Thomas Citharel [Thu, 3 Nov 2016 13:23:09 +0000 (14:23 +0100)] 
avoid eslint warning by disabling line

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
7 years agoMerge pull request #2530 from wallabag/add-doc-failed-load-external-entity
Nicolas Lœuillet [Wed, 2 Nov 2016 19:07:10 +0000 (20:07 +0100)] 
Merge pull request #2530 from wallabag/add-doc-failed-load-external-entity

Added documentation about failed to load external entity error

7 years agoUpdate faq.rst 2530/head
Jeremy Benoist [Wed, 2 Nov 2016 17:08:25 +0000 (18:08 +0100)] 
Update faq.rst

7 years agoupdate German faq.rst
Strubbl [Wed, 2 Nov 2016 16:16:57 +0000 (17:16 +0100)] 
update German faq.rst

7 years agoupdate German faq.rst
Strubbl [Wed, 2 Nov 2016 16:15:32 +0000 (17:15 +0100)] 
update German faq.rst

7 years agoAdded more info about Doctrine / PHP bug
Nicolas Lœuillet [Wed, 2 Nov 2016 16:02:48 +0000 (17:02 +0100)] 
Added more info about Doctrine / PHP bug

7 years agoAdded documentation about failed to load external entity error
Nicolas Lœuillet [Wed, 2 Nov 2016 15:58:20 +0000 (16:58 +0100)] 
Added documentation about failed to load external entity error
Fix #2529

7 years agoMerge pull request #2519 from Jibec/master
Jeremy Benoist [Wed, 2 Nov 2016 06:48:10 +0000 (07:48 +0100)] 
Merge pull request #2519 from Jibec/master

Translation update - French

7 years agoCS
Jeremy Benoist [Wed, 2 Nov 2016 06:26:14 +0000 (07:26 +0100)] 
CS

7 years agowallabag is full lowercase 2519/head
Jeremy Benoist [Wed, 2 Nov 2016 06:15:24 +0000 (07:15 +0100)] 
wallabag is full lowercase

7 years agoAdd more importer to wallabag:import command
Jeremy Benoist [Wed, 2 Nov 2016 06:10:57 +0000 (07:10 +0100)] 
Add more importer to wallabag:import command

All importer available expect Pocket which require an oAuth login.

7 years agoAdd entry.saved event to import & rest
Jeremy Benoist [Wed, 2 Nov 2016 06:10:23 +0000 (07:10 +0100)] 
Add entry.saved event to import & rest

7 years agoMerge pull request #2528 from Kdecherf/slashdot-cookie
Jeremy Benoist [Tue, 1 Nov 2016 21:29:43 +0000 (22:29 +0100)] 
Merge pull request #2528 from Kdecherf/slashdot-cookie

Force user-agent for .slashdot.org

7 years agoForce user-agent for .slashdot.org 2528/head
Kevin Decherf [Tue, 1 Nov 2016 18:51:45 +0000 (19:51 +0100)] 
Force user-agent for .slashdot.org

Slashdot replaces actual content with a form regarding cookies when
requests originate from France. By forcing the user-agent, the warning
seems to go away.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
7 years agoUse custom event instead of Doctrine ones
Jeremy Benoist [Tue, 1 Nov 2016 13:49:02 +0000 (14:49 +0100)] 
Use custom event instead of Doctrine ones

This give us ability to use Entry ID to determine where to store images and it’s then more easy to remove them when we remove the entry.

7 years agoMerge pull request #2524 from lologhi/instapaper-cli-import
Nicolas Lœuillet [Tue, 1 Nov 2016 13:26:57 +0000 (14:26 +0100)] 
Merge pull request #2524 from lologhi/instapaper-cli-import

Add Instapaper to CLI import

7 years agoAdd Instapaper to CLI import 2524/head
Laurent [Tue, 1 Nov 2016 10:33:32 +0000 (18:33 +0800)] 
Add Instapaper to CLI import

7 years agoTranslation - French - tiny typo
Jean-Baptiste [Mon, 31 Oct 2016 19:16:36 +0000 (20:16 +0100)] 
Translation - French - tiny typo

7 years agoTranslation - French - tiny escape correction
Jean-Baptiste [Mon, 31 Oct 2016 19:12:29 +0000 (20:12 +0100)] 
Translation - French - tiny escape correction

7 years agoTranslation - French - tiny escape correction
Jean-Baptiste [Mon, 31 Oct 2016 19:01:07 +0000 (20:01 +0100)] 
Translation - French - tiny escape correction

7 years agoFixed review
Nicolas Lœuillet [Mon, 31 Oct 2016 16:20:27 +0000 (17:20 +0100)] 
Fixed review

7 years agoAdded translations and baggy part
Nicolas Lœuillet [Mon, 31 Oct 2016 15:48:34 +0000 (16:48 +0100)] 
Added translations and baggy part

7 years agoAdded QRCode and link to configure android application
Nicolas Lœuillet [Mon, 31 Oct 2016 15:16:41 +0000 (16:16 +0100)] 
Added QRCode and link to configure android application

7 years agoAdd translations & migration
Jeremy Benoist [Mon, 31 Oct 2016 12:29:33 +0000 (13:29 +0100)] 
Add translations & migration

7 years agoMerge pull request #2521 from foxmask/master
Nicolas Lœuillet [Mon, 31 Oct 2016 08:56:07 +0000 (09:56 +0100)] 
Merge pull request #2521 from foxmask/master

fix path for  the install scripts

7 years agoMerge pull request #2520 from wallabag/config
Nicolas Lœuillet [Mon, 31 Oct 2016 08:39:53 +0000 (09:39 +0100)] 
Merge pull request #2520 from wallabag/config

Inject parameter instead of service

7 years agofix path for in install scripts 2521/head
FoxMaSk [Sun, 30 Oct 2016 21:46:09 +0000 (22:46 +0100)] 
fix path for  in install scripts

7 years agofix path for in install scripts
FoxMaSk [Sun, 30 Oct 2016 21:38:38 +0000 (22:38 +0100)] 
fix path for  in install scripts

7 years agoAbility to enable/disable downloading images
Jeremy Benoist [Sun, 30 Oct 2016 20:30:45 +0000 (21:30 +0100)] 
Ability to enable/disable downloading images

This will speed up the test suite because it won’t download everything when we add new entry…
Add a custom test with downloading image enabled

7 years agoFix tests 2520/head
Jeremy Benoist [Sun, 30 Oct 2016 19:43:37 +0000 (20:43 +0100)] 
Fix tests

7 years agoInject parameter instead of service
Jeremy Benoist [Sun, 30 Oct 2016 19:27:41 +0000 (20:27 +0100)] 
Inject parameter instead of service

We are injecting CraueConfig service when we only need to retrieve one or two values from it.
Instead I discovered we can directly inject a value from a service in the service definition!

7 years agoMove settings before Entry
Jeremy Benoist [Sun, 30 Oct 2016 19:12:34 +0000 (20:12 +0100)] 
Move settings before Entry

Because we need wallabag_url to be defined when we’ll insert entries

7 years agoAdd instance url to the downloaded images
Jeremy Benoist [Sun, 30 Oct 2016 18:50:00 +0000 (19:50 +0100)] 
Add instance url to the downloaded images

7 years agoMerge pull request #2518 from wallabag/docs-dev-3rd-party-by-strubbl
Thomas Citharel [Sun, 30 Oct 2016 11:27:25 +0000 (12:27 +0100)] 
Merge pull request #2518 from wallabag/docs-dev-3rd-party-by-strubbl

docs: fix link to wallabag-stats project

7 years agoTranslation update - French
Jean-Baptiste [Sun, 30 Oct 2016 11:11:24 +0000 (12:11 +0100)] 
Translation update - French

7 years agoTranslation update - French
Jean-Baptiste [Sun, 30 Oct 2016 11:10:59 +0000 (12:10 +0100)] 
Translation update - French

7 years agoTranslation update - French
Jean-Baptiste [Sun, 30 Oct 2016 11:10:14 +0000 (12:10 +0100)] 
Translation update - French

7 years agoTranslation update - French
Jean-Baptiste [Sun, 30 Oct 2016 11:09:08 +0000 (12:09 +0100)] 
Translation update - French

7 years agodocs: fix link to wallabag-stats project 2518/head
Sven Fischer [Sun, 30 Oct 2016 11:01:24 +0000 (12:01 +0100)] 
docs: fix link to wallabag-stats project

7 years agoFixing tests
Jeremy Benoist [Sun, 30 Oct 2016 10:27:09 +0000 (11:27 +0100)] 
Fixing tests

7 years agoUse doctrine event to download images
Jeremy Benoist [Sun, 30 Oct 2016 09:48:29 +0000 (10:48 +0100)] 
Use doctrine event to download images

7 years agoCleanup
Jeremy Benoist [Sun, 30 Oct 2016 08:58:53 +0000 (09:58 +0100)] 
Cleanup

7 years agoMove related event things in Event folder
Jeremy Benoist [Sun, 30 Oct 2016 08:58:39 +0000 (09:58 +0100)] 
Move related event things in Event folder

7 years agoMerge pull request #2514 from wallabag/docs-dev-3rd-party-by-strubbl
Nicolas Lœuillet [Sun, 30 Oct 2016 06:04:11 +0000 (07:04 +0100)] 
Merge pull request #2514 from wallabag/docs-dev-3rd-party-by-strubbl

docs: update 3rd party projects by Strubbl

7 years agodocs: update 3rd party projects by Strubbl 2514/head
Sven Fischer [Sat, 29 Oct 2016 17:59:05 +0000 (19:59 +0200)] 
docs: update 3rd party projects by Strubbl

7 years agoCS
Jeremy Benoist [Sat, 22 Oct 2016 07:22:30 +0000 (09:22 +0200)] 
CS

7 years agoWorking
Thomas Citharel [Tue, 28 Jun 2016 20:06:00 +0000 (22:06 +0200)] 
Working

7 years agoDownload pictures successfully
Thomas Citharel [Tue, 28 Jun 2016 17:07:55 +0000 (19:07 +0200)] 
Download pictures successfully

Needs to rewrite them properly (get base url)

7 years agofirst draft (from v1)
Thomas Citharel [Sun, 26 Jun 2016 08:27:31 +0000 (10:27 +0200)] 
first draft (from v1)

7 years agoMerge pull request #2513 from wallabag/update-capistrano-config
Jeremy Benoist [Sat, 29 Oct 2016 13:36:58 +0000 (15:36 +0200)] 
Merge pull request #2513 from wallabag/update-capistrano-config

Updated Capistrano configuration

7 years agoUpdated Capistrano configuration 2513/head
Nicolas Lœuillet [Sat, 29 Oct 2016 12:14:20 +0000 (14:14 +0200)] 
Updated Capistrano configuration

7 years agoMerge pull request #2506 from wallabag/fix-export-with-tags
Nicolas Lœuillet [Sat, 29 Oct 2016 12:27:46 +0000 (14:27 +0200)] 
Merge pull request #2506 from wallabag/fix-export-with-tags

Fixed entries export filtered with a tag

7 years agoAdded test for export by filtering with tag 2506/head
Nicolas Lœuillet [Sat, 29 Oct 2016 12:03:55 +0000 (14:03 +0200)] 
Added test for export by filtering with tag

7 years agoFixed entries export filtered with a tag
Nicolas Lœuillet [Thu, 27 Oct 2016 07:41:19 +0000 (09:41 +0200)] 
Fixed entries export filtered with a tag
Fix #2505

7 years agoMerge pull request #2499 from wallabag/add-relation-client-user
Jeremy Benoist [Sat, 29 Oct 2016 11:20:55 +0000 (13:20 +0200)] 
Merge pull request #2499 from wallabag/add-relation-client-user

Added relation between API Client and User

7 years agoMerge pull request #2509 from wallabag/explode-api-controller
Jeremy Benoist [Sat, 29 Oct 2016 11:20:01 +0000 (13:20 +0200)] 
Merge pull request #2509 from wallabag/explode-api-controller

Exploded WallabagRestController into many controllers

7 years agoRemoved useless route 2509/head
Nicolas Lœuillet [Fri, 28 Oct 2016 13:24:58 +0000 (15:24 +0200)] 
Removed useless route

7 years agoExploded WallabagRestController into many controllers
Nicolas Lœuillet [Fri, 28 Oct 2016 12:46:30 +0000 (14:46 +0200)] 
Exploded WallabagRestController into many controllers
Fix #2503

7 years agoRemove backquote in query 2499/head
Nicolas Lœuillet [Fri, 28 Oct 2016 09:11:32 +0000 (11:11 +0200)] 
Remove backquote in query

7 years agoFixed migration and added tests
Nicolas Lœuillet [Fri, 28 Oct 2016 08:55:39 +0000 (10:55 +0200)] 
Fixed migration and added tests

7 years agoMerge pull request #2508 from wallabag/fix-redis-rabbit-doc
Nicolas Lœuillet [Thu, 27 Oct 2016 14:53:57 +0000 (16:53 +0200)] 
Merge pull request #2508 from wallabag/fix-redis-rabbit-doc

Added the whole path to parameters.yml file

7 years agoAdded the whole path to parameters.yml file 2508/head
Nicolas Lœuillet [Thu, 27 Oct 2016 12:46:21 +0000 (14:46 +0200)] 
Added the whole path to parameters.yml file

7 years agoMerge pull request #2507 from wallabag/add-check-makefile
Nicolas Lœuillet [Thu, 27 Oct 2016 11:55:17 +0000 (13:55 +0200)] 
Merge pull request #2507 from wallabag/add-check-makefile

Added require.sh to check if composer is installed

7 years agoUsage of composer.phar if it's found 2507/head
Nicolas Lœuillet [Thu, 27 Oct 2016 08:09:43 +0000 (10:09 +0200)] 
Usage of composer.phar if it's found

7 years agoAdded require.sh to check if composer is installed
Nicolas Lœuillet [Thu, 27 Oct 2016 07:53:09 +0000 (09:53 +0200)] 
Added require.sh to check if composer is installed

7 years agoMerge pull request #2500 from wallabag/add-check-composer
Jeremy Benoist [Thu, 27 Oct 2016 05:30:50 +0000 (07:30 +0200)] 
Merge pull request #2500 from wallabag/add-check-composer

Added a check in Makefile to see if composer is installed

7 years agoMerge pull request #2504 from wallabag/change-page-title-filter-tags
Nicolas Lœuillet [Wed, 26 Oct 2016 14:09:37 +0000 (16:09 +0200)] 
Merge pull request #2504 from wallabag/change-page-title-filter-tags

Added tag label in the page title

7 years agoRenamed variable for page title 2504/head
Nicolas Lœuillet [Wed, 26 Oct 2016 13:49:44 +0000 (15:49 +0200)] 
Renamed variable for page title

7 years agoAdded tag label in the page title
Nicolas Lœuillet [Wed, 26 Oct 2016 11:53:23 +0000 (13:53 +0200)] 
Added tag label in the page title
Fix #2472

7 years agoMerge pull request #2473 from pmichelazzo/master
Jeremy Benoist [Tue, 25 Oct 2016 09:41:24 +0000 (11:41 +0200)] 
Merge pull request #2473 from pmichelazzo/master

Portuguese (Brazilian) translation

7 years agoTranslated missed line 147 2473/head
Paulino Michelazzo [Tue, 25 Oct 2016 09:25:08 +0000 (07:25 -0200)] 
Translated missed line 147

7 years agoAdded a check in Makefile to see if composer is installed 2500/head
Nicolas Lœuillet [Mon, 24 Oct 2016 20:28:44 +0000 (22:28 +0200)] 
Added a check in Makefile to see if composer is installed
Fix #2498

7 years agoAdded relation between API Client and User
Nicolas Lœuillet [Mon, 24 Oct 2016 19:56:28 +0000 (21:56 +0200)] 
Added relation between API Client and User
Fix #2062

7 years agoMerge pull request #2493 from bmillemathias/add_link_content_fetch_problem
Nicolas Lœuillet [Mon, 24 Oct 2016 19:44:22 +0000 (21:44 +0200)] 
Merge pull request #2493 from bmillemathias/add_link_content_fetch_problem

Add relevant links to fetch content error page

7 years agoRemoved the email part 2493/head
Nicolas Lœuillet [Mon, 24 Oct 2016 19:01:13 +0000 (21:01 +0200)] 
Removed the email part

7 years agoMerge pull request #2496 from wallabag/mruminski-patch-1
Nicolas Lœuillet [Mon, 24 Oct 2016 18:19:53 +0000 (20:19 +0200)] 
Merge pull request #2496 from wallabag/mruminski-patch-1

Update messages.pl.yml

7 years agoUpdate messages.pl.yml 2496/head
Mateusz Rumiński [Mon, 24 Oct 2016 17:49:33 +0000 (19:49 +0200)] 
Update messages.pl.yml

translate reset section to polish

7 years agoMerge remote-tracking branch 'origin/master' into 2.2
Jeremy Benoist [Mon, 24 Oct 2016 10:03:17 +0000 (12:03 +0200)] 
Merge remote-tracking branch 'origin/master' into 2.2

7 years agoMerge pull request #2401 from wallabag/reset-account
Jeremy Benoist [Mon, 24 Oct 2016 09:57:51 +0000 (11:57 +0200)] 
Merge pull request #2401 from wallabag/reset-account

Reset account

7 years agoSQLite should use utf8, not utf8mb4 2401/head
Jeremy Benoist [Mon, 24 Oct 2016 08:10:38 +0000 (10:10 +0200)] 
SQLite should use utf8, not utf8mb4

7 years agoMerge pull request #1890 from wallabag/v2-api-annotation-switched
Nicolas Lœuillet [Mon, 24 Oct 2016 08:06:12 +0000 (10:06 +0200)] 
Merge pull request #1890 from wallabag/v2-api-annotation-switched

bring annotations to API

7 years agoAdd relevant links to fetch content error pages.
Baptiste Mille-Mathias [Sun, 23 Oct 2016 13:34:52 +0000 (15:34 +0200)] 
Add relevant links to fetch content error pages.

We link to the troubleshooting guide and give the mail link.

7 years agoFix migrations
Jeremy Benoist [Sun, 23 Oct 2016 10:35:57 +0000 (12:35 +0200)] 
Fix migrations

7 years agoMerge pull request #2486 from wallabag/translate-backup-doc
Jeremy Benoist [Sat, 22 Oct 2016 20:23:15 +0000 (22:23 +0200)] 
Merge pull request #2486 from wallabag/translate-backup-doc

Added :fr: documentation for wallabag backup

7 years agoTranslate backup.rst to German 2486/head
Julian Oster [Sat, 22 Oct 2016 19:11:20 +0000 (21:11 +0200)] 
Translate backup.rst to German

7 years agoAdded :fr: documentation for wallabag backup
Nicolas Lœuillet [Sat, 22 Oct 2016 12:16:17 +0000 (14:16 +0200)] 
Added :fr: documentation for wallabag backup

7 years agoLowercase wallabag
Jeremy Benoist [Sat, 22 Oct 2016 12:05:59 +0000 (14:05 +0200)] 
Lowercase wallabag

7 years agoAdd migration for MySQL utf8mb4
Jeremy Benoist [Sat, 22 Oct 2016 12:01:58 +0000 (14:01 +0200)] 
Add migration for MySQL utf8mb4

7 years agoMerge pull request #2484 from bmillemathias/fix_2479
Nicolas Lœuillet [Sat, 22 Oct 2016 11:55:46 +0000 (13:55 +0200)] 
Merge pull request #2484 from bmillemathias/fix_2479

Document what to backup in Wallabag

7 years agoAdd verification check for MySQL version
Jeremy Benoist [Sat, 22 Oct 2016 11:41:03 +0000 (13:41 +0200)] 
Add verification check for MySQL version

Must now be >= 5.5.4

7 years agoMerge pull request #2485 from bmillemathias/fix_android_documentation
Jeremy Benoist [Sat, 22 Oct 2016 11:31:14 +0000 (13:31 +0200)] 
Merge pull request #2485 from bmillemathias/fix_android_documentation

Fix missing words in Android application documentation

7 years agoMerge pull request #2456 from wallabag/use-new-pdf
Jeremy Benoist [Sat, 22 Oct 2016 11:29:58 +0000 (13:29 +0200)] 
Merge pull request #2456 from wallabag/use-new-pdf

use new tcpdf library version

7 years agoAdd missing words in the documentation 2485/head
Baptiste Mille-Mathias [Sat, 22 Oct 2016 11:21:53 +0000 (13:21 +0200)] 
Add missing words in the documentation

7 years agoUse statements & update translation
Jeremy Benoist [Tue, 11 Oct 2016 19:45:43 +0000 (21:45 +0200)] 
Use statements & update translation

7 years agoCS
Jeremy Benoist [Sat, 8 Oct 2016 09:14:09 +0000 (11:14 +0200)] 
CS

7 years agoAdd baggy reset part
Jeremy Benoist [Sat, 8 Oct 2016 09:13:55 +0000 (11:13 +0200)] 
Add baggy reset part