Commit Graph

4672 Commits

Author SHA1 Message Date
Thomas Citharel cbdbd9d683 Merge pull request #2540 from wallabag/Quent-in-patch-1
Update of the OC version
2016-11-04 19:29:27 +01:00
Mateusz Rumiński ff7f551f5a Update messages.pl.yml
missing polish translation added
2016-11-04 19:26:06 +01:00
Quent-in eaa0bf00a6 Update of the OC version 2016-11-04 18:13:11 +01:00
Nicolas Lœuillet 4ec9f5c334 Merge pull request #2536 from wallabag/prepare-213
Prepare wallabag 2.1.3 🚀
2016-11-04 13:32:47 +01:00
Nicolas Lœuillet 505e8acd46 Update CHANGELOG
Usage of github-changes from @lalitkapoor
2016-11-04 13:32:30 +01:00
Jeremy Benoist 4775fed6a7 Merge pull request #2535 from wallabag/default-sort-2.2
Use created_at as default sort
2016-11-04 09:38:03 +01:00
Nicolas Lœuillet a3f7d8a870
Prepare wallabag 2.1.3 🚀 2016-11-04 09:10:15 +01:00
Nicolas Lœuillet 2db9142bfc Merge pull request #2460 from wallabag/ui-changes
UI Changes
2016-11-04 08:49:52 +01:00
Nicolas Lœuillet f53f542fa5 Merge pull request #2534 from wallabag/default-sort
Use created_at as default sort
2016-11-04 08:48:42 +01:00
Jeremy Benoist 7e9c1d65b1
Add index into Table definition 2016-11-04 08:02:02 +01:00
Jeremy Benoist 1e7b04d4ea
Use created_at as default sort
With index (following https://github.com/wallabag/wallabag/pull/2534)
2016-11-04 07:56:04 +01:00
Jeremy Benoist ce11952447
Use created_at as default sort
Imported content use the real creation date. If we sort by id, it'll
display contents in reverse order.
2016-11-04 07:34:38 +01:00
Jeremy Benoist 001cc7168a
Cleanup 2016-11-03 18:01:25 +01:00
Jeremy Benoist 864c1dd23a
Fix rest controller merge 2016-11-03 17:29:16 +01:00
Jeremy Benoist 5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
Jeremy Benoist da41365579 Merge pull request #2180 from wallabag/download-pictures
Download pictures
2016-11-03 16:22:07 +01:00
Jeremy Benoist 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
Nicolas Lœuillet 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
Thomas Citharel 32508ef07a
avoid eslint warning by disabling line
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 14:23:09 +01:00
Thomas Citharel d56d416d9b
Deal with more resolution issues
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 12:49:57 +01:00
Thomas Citharel 3221b2e413
Fix resolution issues and 'title' issues
Also, modify editorconfig for css files.

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-11-03 11:28:40 +01:00
Nicolas Lœuillet 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
Jeremy Benoist a49159e9eb Update faq.rst 2016-11-02 18:08:25 +01:00
Strubbl b1057c6a5e update German faq.rst 2016-11-02 17:16:57 +01:00
Strubbl cce77ebc2d update German faq.rst 2016-11-02 17:15:32 +01:00
Nicolas Lœuillet 4b5e95c0e5
Added more info about Doctrine / PHP bug 2016-11-02 17:02:48 +01:00
Nicolas Lœuillet 585fd2a4ad
Added documentation about failed to load external entity error
Fix #2529
2016-11-02 16:58:20 +01:00
Jeremy Benoist 3be554c78f Merge pull request #2519 from Jibec/master
Translation update - French
2016-11-02 07:48:10 +01:00
Jeremy Benoist e46fdf3096
CS 2016-11-02 07:26:14 +01:00
Jeremy Benoist 9c15470691 wallabag is full lowercase 2016-11-02 07:15:24 +01:00
Jeremy Benoist 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
Jeremy Benoist 7816eb622d
Add entry.saved event to import & rest 2016-11-02 07:10:23 +01:00
Jeremy Benoist be4f6bb4f3 Merge pull request #2528 from Kdecherf/slashdot-cookie
Force user-agent for .slashdot.org
2016-11-01 22:29:43 +01:00
Kevin Decherf 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
Jeremy Benoist 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
Nicolas Lœuillet db1d962f7b Merge pull request #2524 from lologhi/instapaper-cli-import
Add Instapaper to CLI import
2016-11-01 14:26:57 +01:00
Laurent 995d909d0f Add Instapaper to CLI import 2016-11-01 18:33:32 +08:00
Jean-Baptiste 303b3c61a7 Translation - French - tiny typo 2016-10-31 20:16:36 +01:00
Jean-Baptiste 31dd328df4 Translation - French - tiny escape correction 2016-10-31 20:12:29 +01:00
Jean-Baptiste 337b47c216 Translation - French - tiny escape correction 2016-10-31 20:01:07 +01:00
Nicolas Lœuillet 68e0efffb8
Fixed review 2016-10-31 17:20:27 +01:00
Nicolas Lœuillet 3b81212674
Added translations and baggy part 2016-10-31 16:48:34 +01:00
Nicolas Lœuillet e61ee56031 Added QRCode and link to configure android application 2016-10-31 16:18:52 +01:00
Jeremy Benoist aedd6ca0fd
Add translations & migration 2016-10-31 13:29:33 +01:00
Nicolas Lœuillet e52ee565f7 Merge pull request #2521 from foxmask/master
fix path for  the install scripts
2016-10-31 09:56:07 +01:00
Nicolas Lœuillet 7d9abd1ab5 Merge pull request #2520 from wallabag/config
Inject parameter instead of service
2016-10-31 09:39:53 +01:00
FoxMaSk 99692e8c33 fix path for in install scripts 2016-10-30 22:46:09 +01:00
FoxMaSk 038469e73f fix path for in install scripts 2016-10-30 22:38:38 +01:00
Jeremy Benoist 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
Jeremy Benoist e1632cea0e
Fix tests 2016-10-30 20:43:37 +01:00