Commit graph

64 commits

Author SHA1 Message Date
Jeremy Benoist a1a1077059
Add tests on ReadabilityImport 2016-09-01 13:39:41 +02:00
Jeremy Benoist 03e3753f6b
Add Readability import
Based on the JSON export instead of the API (which will be shutting down by the September 30, 2016)
2016-09-01 08:00:30 +02:00
Jeremy Benoist 79efca1e6f
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02:00
Jeremy Benoist 4e4e8e9899 Merge pull request #2221 from wallabag/replace-favorite-star
Replaced favorite word/icon with star one
2016-08-21 22:11:20 +02:00
Jeremy Benoist 19d9efab32
Avoid breaking import when fetching fail
graby will throw an Exception in some case (like a bad url, a restricted url or a secured pdf).

Import doesn't handle that case and break the whole import.
With that commit the import isn't stopped but the entry is just skipped.

Also, as a  bonus, I've added extra test on WallabagImportV2 when the json is empty.
2016-08-20 01:17:26 +02:00
Nicolas Lœuillet 519ba0b5e7 Replaced favorite word/icon with star one
Fix #2041
2016-08-18 14:27:17 +02:00
Jeremy Benoist f49d9ca383 Merge branch 'master' into 2.1 2016-06-23 11:47:46 +02:00
Jeremy Benoist 23634d5d84 Jump to Symfony 3.1 2016-06-22 17:59:35 +02:00
Nicolas Lœuillet 235026e2c7 Enhance option in command 2016-05-27 09:43:49 +02:00
Nicolas Lœuillet 3fad6c74fe Add CLI import for wallabag v2 files 2016-05-27 09:43:48 +02:00
Nicolas Lœuillet 23d24b1750
Add tests 2016-04-18 15:29:57 +02:00
Nicolas Lœuillet dc12084d93 Add doctrine clear after flush, thanks to @BitOne talk at Symfony Live 2016-04-18 14:48:18 +02:00
Jeremy Benoist 4094ea4771 Convert array + phpDoc
Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter
2016-04-12 12:25:29 +02:00
Jeremy Benoist b787a7757e Refacto wallabag import
Use an abstract class to store all common action from wallabag vX import.
Move specificity in v1 & v2 import.
2016-03-28 16:43:33 +02:00
Jeremy Benoist 8f336fda64 Tags were not imported in wallabag v2 import
Also, simplify exportAs matching format
2016-03-27 23:58:37 +02:00
Jeremy Benoist 4d0ec0e721 Fix some Scrutinizer issues 2016-03-27 20:54:57 +02:00
Jeremy Benoist 4204a06b77 Add flashes messages 2016-03-20 21:12:22 +01:00
Jeremy Benoist 0d42217e4e Convert english translation file
- convert english translation to translate key
- remove baggy template for login (never used since user isn't logged in and it'll use the default theme: material)
- fix tests about text in response (now checking translation key instead of translated text)
- remove all ugly `<div class="hidden">{{ form_rest(form) }}</div>`
2016-03-20 21:12:22 +01:00
Jeremy Benoist 09d8bb6fa2 Improve tests
- add more tests for coverage
- add a test on annotation deletion
- fix post annontation with ranges
2016-03-11 17:59:42 +01:00
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