Commit Graph

3232 Commits

Author SHA1 Message Date
f9cded7dd2 Added new shortcuts 2016-11-15 21:54:34 +01:00
49c5d0ad6e Changed FOSJSRouting format in config 2016-11-15 21:54:20 +01:00
3cc78f0679 Added shortcuts 2016-11-15 21:54:20 +01:00
644b340178 Merge pull request #2566 from wallabag/add-unmarkit
Added unmark.it sharing
2016-11-09 18:19:08 +01:00
8a9604aafe Added unmark.it sharing
Fix #668
2016-11-09 18:18:49 +01:00
1e8c7fa5f9 Merge pull request #2564 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-09 09:02:33 +01:00
a9740448cf Update messages.pl.yml
translate Pinboard importer section to polish
2016-11-08 23:11:03 +01:00
89e167a45a Merge pull request #2553 from wallabag/add-tagform-mobile
Added new tag form in mobile view for Material theme
2016-11-08 15:42:05 +01:00
df30af69d2 Added new tag form in mobile view for Material theme
Fix #2376
2016-11-08 14:24:00 +01:00
41c2178685 Merge pull request #2548 from wallabag/pinboard
Add Pinboard import
2016-11-08 14:19:40 +01:00
82f9a52078 docs: update german import.rst 2016-11-07 21:00:57 +01:00
94060509b8 Use more explicit check 2016-11-07 08:36:52 +01:00
2e4efb5965 Add english doc into german one 2016-11-06 23:27:55 +01:00
56e6216485 Update messages.en.yml
Instapaper->Pinboard
2016-11-06 22:29:49 +01:00
e8e72daaa6 Update messages.de.yml 2016-11-06 22:29:08 +01:00
01ad4d6a89 Merge pull request #2551 from wallabag/remove-maintenance-bundle
Removed Maintenance bundle
2016-11-06 21:47:16 +01:00
31151d70f2 Add doc 2016-11-06 21:23:38 +01:00
db3838545c Removed Maintenance bundle 2016-11-06 15:34:08 +01:00
e92fbdc852 Fix tests 2016-11-06 09:58:07 +01:00
9ab024b4f5 Add Pinboard import 2016-11-04 22:44:31 +01:00
b5571b52cc Merge pull request #2541 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-11-04 21:49:42 +01:00
cbdbd9d683 Merge pull request #2540 from wallabag/Quent-in-patch-1
Update of the OC version
2016-11-04 19:29:27 +01:00
ff7f551f5a Update messages.pl.yml
missing polish translation added
2016-11-04 19:26:06 +01:00
eaa0bf00a6 Update of the OC version 2016-11-04 18:13:11 +01:00
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
7e9c1d65b1 Add index into Table definition 2016-11-04 08:02:02 +01:00
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
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