Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | Fixed 'mark as read' and 'mark as unread' links | Nicolas Lœuillet | 2016-01-09 | 2 | -2/+2 | |
| | | ||||||
* | | add import link on baggy theme | Nicolas Lœuillet | 2016-01-09 | 1 | -0/+1 | |
|/ | ||||||
* | Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1 | Jeremy Benoist | 2016-01-07 | 37 | -15/+1687 | |
|\ | | | | | v2 – 1st draft for Pocket import via API & Wallabag v1 import | |||||
| * | updated tests | Nicolas Lœuillet | 2016-01-07 | 9 | -17/+10 | |
| | | ||||||
| * | Added french translations | Nicolas Lœuillet | 2016-01-05 | 7 | -8/+28 | |
| | | ||||||
| * | Few phpDoc fix | Jeremy Benoist | 2016-01-03 | 6 | -16/+27 | |
| | | | | | | | | And some little mistakes | |||||
| * | Fix tag related test for Pocket | Jeremy Benoist | 2016-01-03 | 2 | -3/+6 | |
| | | ||||||
| * | Add tagged services for import | Jeremy Benoist | 2016-01-02 | 24 | -42/+393 | |
| | | | | | | | | | | | | | | | | | | - 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 | |||||
| * | Rewrote Wallabag v1 import | Jeremy Benoist | 2016-01-02 | 12 | -94/+404 | |
| | | ||||||
| * | Rewrote Pocket Import | Jeremy Benoist | 2016-01-02 | 9 | -210/+357 | |
| | | | | | | | | | | | | | | 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). | |||||
| * | Fix the way to check for an existing entry | Jeremy Benoist | 2016-01-02 | 1 | -2/+2 | |
| | | | | | | | | Instead of requiring more than 1 entry (> 1) we have to check for at least one entry (> 0) | |||||
| * | Update after previous merge | Jeremy Benoist | 2016-01-02 | 10 | -112/+83 | |
| | | | | | | | | PR #1443 was merged into this branch to handle all import type in the same place. | |||||
| * | First test on PocketImport | Jeremy Benoist | 2016-01-02 | 3 | -77/+202 | |
| | | | | | | | | Giving ability to define the Client add abitliy to easliy test the import. | |||||
| * | Update url & service name | Jeremy Benoist | 2016-01-02 | 6 | -13/+56 | |
| | | | | | | | | | | Prefix ur with service namel: [service]_[route name] Add comment in Interface | |||||
| * | Change the way to check for an existing entry | Jeremy Benoist | 2016-01-02 | 4 | -12/+20 | |
| | | | | | | | | The repository method return the entry found or false if nothing exists. | |||||
| * | - remove importers configuration | Nicolas Lœuillet | 2016-01-02 | 6 | -37/+31 | |
| | | | | | | | | - add check on userId for findOneByURL for entries | |||||
| * | fix #1502 avoid duplicate entry and store pocket url in config | Nicolas Lœuillet | 2016-01-02 | 6 | -36/+79 | |
| | | ||||||
| * | assign tags to entries and add lastPocketImport attribute to user | Nicolas Lœuillet | 2016-01-02 | 3 | -12/+89 | |
| | | ||||||
| * | create ImportController to list importers | Nicolas Lœuillet | 2016-01-02 | 5 | -5/+49 | |
| | | ||||||
| * | service call | Nicolas Lœuillet | 2016-01-02 | 1 | -2/+2 | |
| | | ||||||
| * | refactor pocket import | Nicolas Lœuillet | 2016-01-02 | 7 | -105/+202 | |
| | | ||||||
| * | 1st draft for Pocket import via API | Nicolas Lœuillet | 2016-01-02 | 4 | -1/+174 | |
| | | ||||||
| * | add docs for Import feature | Nicolas Lœuillet | 2016-01-02 | 1 | -13/+20 | |
| | | ||||||
| * | form to upload file | Nicolas Lœuillet | 2016-01-02 | 6 | -17/+108 | |
| | | ||||||
| * | create controller to launch import command | Nicolas Lœuillet | 2016-01-02 | 3 | -8/+52 | |
| | | ||||||
| * | userId is now set in parameters | Nicolas Lœuillet | 2016-01-02 | 1 | -2/+10 | |
| | | ||||||
| * | first draft for json import, needed for wallabag v1 migration | Nicolas Lœuillet | 2016-01-02 | 1 | -0/+112 | |
| | | ||||||
* | | Hide export button if we are not on entries list | Nicolas Lœuillet | 2016-01-06 | 1 | -0/+3 | |
|/ | ||||||
* | Merge pull request #1545 from wallabag/v2-user-tag | Nicolas Lœuillet | 2016-01-02 | 13 | -103/+159 | |
|\ | | | | | v2 – Remove user reference in tag | |||||
| * | Removed comment | Jeremy Benoist | 2015-12-29 | 1 | -9/+3 | |
| | | | | | | | | And move the SQL query inside the php doc | |||||
| * | Fix the way to remove a tag from all user entries | Jeremy Benoist | 2015-12-29 | 3 | -10/+53 | |
| | | ||||||
| * | Cleanup tests | Jeremy Benoist | 2015-12-29 | 2 | -6/+1 | |
| | | | | | | | | | | - WallabagRestController: remove the tag deletion from the API since we can't remove a tag now, we only remove reference to entries - RuleBasedTaggerTest: remove workaround for asserting tag are equal since problem was related to mock expects (_call instead of findOneByLabel which was removed from the tag repository) | |||||
| * | Fix parameters regarding documentation | Jeremy Benoist | 2015-12-29 | 1 | -2/+2 | |
| | | | | | | | | Parameters are `star` & `archived`, not `is_starred` & `is_archived` | |||||
| * | Remove user reference in tag | Jeremy Benoist | 2015-12-29 | 13 | -99/+123 | |
| | | | | | | | | Fix #1543 | |||||
* | | Merge pull request #1546 from wallabag/v2-reload-content | Nicolas Lœuillet | 2016-01-02 | 9 | -36/+109 | |
|\ \ | | | | | | | v2 – Ability to reload an entry | |||||
| * | | Backport all icomoon from v1 | Jeremy Benoist | 2015-12-30 | 6 | -37/+42 | |
| | | | | | | | | | | | | And add a reload icon | |||||
| * | | Ability to reload an entry | Jeremy Benoist | 2015-12-30 | 4 | -0/+68 | |
| | | | | | | | | | | | | | | | | | | Could be useful when we want to update the content or when the content failed to be fetched. Fix #1503 | |||||
* | | | Fix wrong if when deleting an entry | Jeremy Benoist | 2015-12-30 | 1 | -1/+1 | |
|/ / | | | | | | | Bad condition when deleting an entry returned `true` instead of the referer url | |||||
* / | Add custom email for 2FA | Jeremy Benoist | 2015-12-29 | 11 | -4/+260 | |
|/ | | | | Related #1490 | |||||
* | Don't redirect to the content page after deletion | Jeremy Benoist | 2015-12-28 | 2 | -2/+58 | |
| | | | | | | Fix #1512 We generate the url of the removed content and compare it to the referer url. If they matche, we redirect user to the homepage otherwise to the referer url. | |||||
* | Entry data should have unique url | Jeremy Benoist | 2015-12-28 | 1 | -6/+6 | |
| | ||||||
* | Add test on tagAllForUser | Jeremy Benoist | 2015-12-28 | 2 | -1/+26 | |
| | | | | And fix multiplication of entries returned by `tagAllForUser`. | |||||
* | Avoid multiple tag creation | Jeremy Benoist | 2015-12-28 | 3 | -0/+69 | |
| | | | | | | | When a new tag is created but not yet persisted, it can be duplicated. It could happen when multiple rules match the content and at least 2 of them should attach same new tag. Fix #1528 | |||||
* | add slug for tags | Nicolas Lœuillet | 2015-12-28 | 1 | -0/+12 | |
| | ||||||
* | php cs | Nicolas Lœuillet | 2015-12-08 | 8 | -37/+31 | |
| | ||||||
* | changed table name for tagging rule | Nicolas Lœuillet | 2015-12-08 | 1 | -1/+1 | |
| | ||||||
* | Merge pull request #1478 from K-Phoen/rule-based-tags | Jeremy Benoist | 2015-12-06 | 22 | -7/+1133 | |
|\ | | | | | Rule based tags | |||||
| * | Fix tagging rules ordering | Kévin Gomez | 2015-11-29 | 1 | -0/+1 | |
| | | ||||||
| * | Clean the tagging rule creation form | Kévin Gomez | 2015-11-16 | 2 | -3/+3 | |
| | | ||||||
| * | Assert that the tag has is the good one | Kévin Gomez | 2015-11-16 | 1 | -1/+4 | |
| | |