001cc7168a
Cleanup
2016-11-03 18:01:25 +01:00
864c1dd23a
Fix rest controller merge
2016-11-03 17:29:16 +01:00
5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2
2016-11-03 16:41:29 +01:00
da41365579
Merge pull request #2180 from wallabag/download-pictures
...
Download pictures
2016-11-03 16:22:07 +01:00
ca08d02f2f
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
2016-11-03 15:59:20 +01:00
816c0940d1
Merge pull request #2523 from wallabag/qrcode-android-app
...
Added QRCode and link to configure android application
2016-11-03 14:55:24 +01:00
32508ef07a
avoid eslint warning by disabling line
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr >
2016-11-03 14:23:09 +01:00
84795d015b
Merge pull request #2530 from wallabag/add-doc-failed-load-external-entity
...
Added documentation about failed to load external entity error
2016-11-02 20:07:10 +01:00
a49159e9eb
Update faq.rst
2016-11-02 18:08:25 +01:00
b1057c6a5e
update German faq.rst
2016-11-02 17:16:57 +01:00
cce77ebc2d
update German faq.rst
2016-11-02 17:15:32 +01:00
4b5e95c0e5
Added more info about Doctrine / PHP bug
2016-11-02 17:02:48 +01:00
585fd2a4ad
Added documentation about failed to load external entity error
...
Fix #2529
2016-11-02 16:58:20 +01:00
3be554c78f
Merge pull request #2519 from Jibec/master
...
Translation update - French
2016-11-02 07:48:10 +01:00
e46fdf3096
CS
2016-11-02 07:26:14 +01:00
9c15470691
wallabag is full lowercase
2016-11-02 07:15:24 +01:00
1f66d79e6b
Add more importer to wallabag:import command
...
All importer available expect Pocket which require an oAuth login.
2016-11-02 07:10:57 +01:00
7816eb622d
Add entry.saved event to import & rest
2016-11-02 07:10:23 +01:00
be4f6bb4f3
Merge pull request #2528 from Kdecherf/slashdot-cookie
...
Force user-agent for .slashdot.org
2016-11-01 22:29:43 +01:00
22ef6f96e2
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 >
2016-11-01 19:51:45 +01:00
e0597476d1
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.
2016-11-01 14:49:02 +01:00
db1d962f7b
Merge pull request #2524 from lologhi/instapaper-cli-import
...
Add Instapaper to CLI import
2016-11-01 14:26:57 +01:00
995d909d0f
Add Instapaper to CLI import
2016-11-01 18:33:32 +08:00
303b3c61a7
Translation - French - tiny typo
2016-10-31 20:16:36 +01:00
31dd328df4
Translation - French - tiny escape correction
2016-10-31 20:12:29 +01:00
337b47c216
Translation - French - tiny escape correction
2016-10-31 20:01:07 +01:00
68e0efffb8
Fixed review
2016-10-31 17:20:27 +01:00
3b81212674
Added translations and baggy part
2016-10-31 16:48:34 +01:00
e61ee56031
Added QRCode and link to configure android application
2016-10-31 16:18:52 +01:00
aedd6ca0fd
Add translations & migration
2016-10-31 13:29:33 +01:00
e52ee565f7
Merge pull request #2521 from foxmask/master
...
fix path for the install scripts
2016-10-31 09:56:07 +01:00
7d9abd1ab5
Merge pull request #2520 from wallabag/config
...
Inject parameter instead of service
2016-10-31 09:39:53 +01:00
99692e8c33
fix path for in install scripts
2016-10-30 22:46:09 +01:00
038469e73f
fix path for in install scripts
2016-10-30 22:38:38 +01:00
d1495dd0a4
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
2016-10-30 21:30:45 +01:00
e1632cea0e
Fix tests
2016-10-30 20:43:37 +01:00
4b3c983ab8
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!
2016-10-30 20:27:41 +01:00
309e13c11b
Move settings before Entry
...
Because we need wallabag_url to be defined when we’ll insert entries
2016-10-30 20:12:34 +01:00
41ada277f0
Add instance url to the downloaded images
2016-10-30 19:50:00 +01:00
f74061f1e1
Merge pull request #2518 from wallabag/docs-dev-3rd-party-by-strubbl
...
docs: fix link to wallabag-stats project
2016-10-30 12:27:25 +01:00
2087e499b4
Translation update - French
2016-10-30 12:11:24 +01:00
f6aff9a7a8
Translation update - French
2016-10-30 12:10:59 +01:00
431d038aa7
Translation update - French
2016-10-30 12:10:14 +01:00
a0eddc598e
Translation update - French
2016-10-30 12:09:08 +01:00
90ec78f05a
docs: fix link to wallabag-stats project
2016-10-30 12:01:24 +01:00
48656e0eaa
Fixing tests
2016-10-30 11:27:09 +01:00
7f55941856
Use doctrine event to download images
2016-10-30 10:48:29 +01:00
45fd7e09d7
Cleanup
2016-10-30 09:58:53 +01:00
535bfcbe80
Move related event things in Event folder
2016-10-30 09:58:39 +01:00
2a2ceceaa4
Merge pull request #2514 from wallabag/docs-dev-3rd-party-by-strubbl
...
docs: update 3rd party projects by Strubbl
2016-10-30 07:04:11 +01:00
