Commit graph

145 commits

Author SHA1 Message Date
Nicolas Lœuillet cebb42234c Added 'wallabag' in page title 2016-03-08 15:22:35 +01:00
Jeremy Benoist 79d0e38e7f Adding test
Reformat json file (thanks pro.jsonlint.com)
2016-03-04 10:04:51 +01:00
Thomas Citharel c32ae320fe cs & tests for wllbg v1 import 2016-03-03 10:03:40 +01:00
Thomas Citharel c10fcb3bbb french translation & pocket 2016-03-03 10:03:40 +01:00
Thomas Citharel fe8b37c137 Mark all imported articles as read 2016-03-03 10:03:28 +01:00
Olivier Mehani ef186de38a Make English welcome message more natural
sed -i "s/Welcome on wallabag/Welcome to wallabag/"

Signed-off-by: Olivier Mehani <shtrom@ssji.net>
2016-02-25 11:32:40 +11:00
Jeremy Benoist c2656f96d4 Move assignTagsToEntry in ContentProxy helper 2016-02-19 14:22:20 +01:00
Thomas Citharel fca2b05200 import tags from v1 (#1657) 2016-02-12 14:49:41 +01:00
Jeremy Benoist 5db084e05b Merge pull request #1665 from wallabag/v2-translations
lots of diverse translation stuff & some typos
2016-02-11 16:48:46 +01:00
Thomas Citharel eaf9dad777 add tests 2016-02-11 15:48:20 +01:00
Thomas Citharel da0a9e01e9 CS 2016-02-11 13:39:21 +01:00
Thomas Citharel 0783c99a19 reimport v1 entries if they were not fetched 2016-02-11 13:27:17 +01:00
Thomas Citharel 4c07a83b69 lots of diverse translation stuff & some typos 2016-02-11 01:42:37 +01:00
Nicolas Lœuillet 4c46e2609f an other test for non empty fields 2016-02-05 14:52:35 +01:00
Nicolas Lœuillet f21a5388f9 add test to check empty fields 2016-02-05 14:39:52 +01:00
Nicolas Lœuillet a0e6a6eb67 updated fixtures 2016-02-05 14:03:58 +01:00
Nicolas Lœuillet de3b19b2ce Test if some keys are missing in v2 import 2016-02-05 13:50:16 +01:00
Nicolas Lœuillet e008c037f5 Merge pull request #1612 from wallabag/v2-settings-page
Settings page
2016-02-04 15:59:57 +01:00
Jeremy Benoist 85ad629a3c Merge pull request #1601 from wallabag/v2-import-from-v2
[#1590] Add JSON import from wallabag v2
2016-02-01 14:17:20 +01:00
Jeremy Benoist 1e3ed71470 Add warning message for PocketImport
Warn user if pocket_consumer_key isn't defined
2016-01-31 14:48:26 +01:00
Jeremy Benoist 63e40f2d7c Add CraueConfig for internal settings 2016-01-31 14:48:26 +01:00
Nicolas Lœuillet b0b893eafd [#1604] First draft to fix SensioLabsInsight report 2016-01-22 21:12:11 +01:00
Nicolas Lœuillet 6785f4aa74 [#1590] Add JSON import from wallabag v2 2016-01-20 14:37:01 +01:00
Nicolas Lœuillet 86719c63bf Merge pull request #1583 from wallabag/v2-fix-delete
Fix `findOneByUrl` side effect in tests
2016-01-15 15:47:13 +01:00
Jeremy Benoist 7883367246 Fix findOneByUrl side effect in tests
Fix #1566
2016-01-15 15:28:32 +01:00
Jeremy Benoist 27e475a941 Fix Pocket generateUrl parameters 2016-01-15 09:35:38 +01:00
Jeremy Benoist 1d76102a24 Fix recent update
- some missing url parameters from WallabagRestController & EntryController
- use a service for `EntryFilterType` to use fully qualified name instead (so changing class signature)
- update ImportBundle (url & form)
2016-01-15 09:35:38 +01:00
Nicolas Lœuillet b88cf91fc8 updated tests 2016-01-07 21:00:04 +01:00
Nicolas Lœuillet d1af8ad4db Added french translations 2016-01-05 22:38:09 +01:00
Jeremy Benoist 8eedc8cfac Few phpDoc fix
And some little mistakes
2016-01-03 11:15:44 +01:00
Jeremy Benoist c5c7f90a81 Fix tag related test for Pocket 2016-01-03 10:32:56 +01:00
Jeremy Benoist 7019c7cf6c Add tagged services for import
- list services in /import
- add url to import service
- ImportBundle routing are now prefixed by /import
- optimize flush in each import (flushing each 20 contents)
- improve design of each import
- add more tests
2016-01-02 23:27:41 +01:00
Jeremy Benoist b1d05721cf Rewrote Wallabag v1 import 2016-01-02 23:27:41 +01:00
Jeremy Benoist 252ebd6071 Rewrote Pocket Import
For the moment, we won't do a queue system, just a plain synchronous import.
We also use ContentProxy to grab content for each article from Pocket.
Error from Pocket are now logged using the logger.
The ImportInterface need to be simple and not related to oAuth (not all import will use that method).
2016-01-02 23:27:41 +01:00
Jeremy Benoist 77a7752a59 Update after previous merge
PR #1443 was merged into this branch to handle all import type in the same place.
2016-01-02 23:27:41 +01:00
Jeremy Benoist 7ec2897ee0 First test on PocketImport
Giving ability to define the Client add abitliy to easliy test the import.
2016-01-02 23:27:41 +01:00
Jeremy Benoist 0aa344dc24 Update url & service name
Prefix ur with service namel: [service]_[route name]
Add comment in Interface
2016-01-02 23:27:41 +01:00
Jeremy Benoist 5a4bbcc9a7 Change the way to check for an existing entry
The repository method return the entry found or false if nothing exists.
2016-01-02 23:27:41 +01:00
Nicolas Lœuillet 303768dfe9 - remove importers configuration
- add check on userId for findOneByURL for entries
2016-01-02 23:27:41 +01:00
Nicolas Lœuillet dda57bb944 fix #1502 avoid duplicate entry and store pocket url in config 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 87f23b005c assign tags to entries and add lastPocketImport attribute to user 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet d51b38ed30 create ImportController to list importers 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 557e549db7 service call 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet ff7b031d57 refactor pocket import 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 1f4408de9e 1st draft for Pocket import via API 2016-01-02 23:24:17 +01:00