mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-25 16:40:39 +00:00
Code Issues Projects Releases Wiki Activity
1822 commits 13 branches 99 tags 147 MiB
Commit graph

419 commits

Author SHA1 Message Date
Jeremy Benoist 4aa2997106 Merge pull request #1563 from wallabag/v2-fix-1394 
#1394 Fixed 'mark as read' and 'mark as unread' links
 2016-01-10 10:20:16 +01:00
Nicolas Lœuillet 6c9bad13e1 Fixed 'mark as read' and 'mark as unread' links 2016-01-09 22:20:19 +01:00
Nicolas Lœuillet da82839bf8 add import link on baggy theme 2016-01-09 20:33:09 +01:00
Jeremy Benoist 39643c6b76 Merge pull request #1493 from wallabag/v2-pocket-import 
v2 – 1st draft for Pocket import via API & Wallabag v1 import
 2016-01-07 22:15:08 +01:00
Nicolas Lœuillet b88cf91fc8 updated tests 2016-01-07 21:00:04 +01:00
Nicolas Lœuillet 10b2411c10 Hide export button if we are not on entries list 2016-01-06 07:47:09 +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 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 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 b4b592a0c0 Fix the way to check for an existing entry 
Instead of requiring more than 1 entry (> 1) we have to check for at least one entry (> 0)
 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 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 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
Nicolas Lœuillet 10b40f85d6 add docs for Import feature 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet d275bdf4d3 form to upload file 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 8c3c77c1bd create controller to launch import command 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet a1bb1b3c2a userId is now set in parameters 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet 56ea1de99b first draft for json import, needed for wallabag v1 migration 2016-01-02 23:24:17 +01:00
Nicolas Lœuillet dad1c546a5 Merge pull request #1545 from wallabag/v2-user-tag 
v2 – Remove user reference in tag
 2016-01-02 12:46:52 +01:00
Nicolas Lœuillet 5432f61509 Merge pull request #1546 from wallabag/v2-reload-content 
v2 – Ability to reload an entry
 2016-01-02 12:46:09 +01:00
Jeremy Benoist e82160e5e9 Fix wrong if when deleting an entry 
Bad condition when deleting an entry returned `true` instead of the referer url
 2015-12-30 11:32:53 +01:00
Jeremy Benoist 0cf434c00f Backport all icomoon from v1 
And add a reload icon
 2015-12-30 09:53:52 +01:00
Jeremy Benoist 831b02aaf2 Ability to reload an entry 
Could be useful when we want to update the content or when the content failed to be fetched.

Fix #1503
 2015-12-30 09:41:17 +01:00
Jeremy Benoist 6be9750155 Removed comment 
And move the SQL query inside the php doc
 2015-12-29 21:59:34 +01:00
Jeremy Benoist 4059a061c0 Fix the way to remove a tag from all user entries 2015-12-29 15:43:32 +01:00
Jeremy Benoist 1bb1939ab7 Cleanup tests 
- 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)
 2015-12-29 15:04:46 +01:00
Jeremy Benoist fc73222723 Remove user reference in tag 
Fix #1543
 2015-12-29 14:50:52 +01:00
Jeremy Benoist 23ff8d3619 Add custom email for 2FA 
Related #1490
 2015-12-29 11:17:06 +01:00
Jeremy Benoist 2863bf2ab5 Don't redirect to the content page after deletion 
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.
 2015-12-28 13:42:50 +01:00
Jeremy Benoist 71eff67f8b Entry data should have unique url 2015-12-28 13:42:50 +01:00
Jeremy Benoist e9fa8c40aa Add test on tagAllForUser 
And fix multiplication of entries returned by `tagAllForUser`.
 2015-12-28 13:20:48 +01:00
Jeremy Benoist fc031e5706 Avoid multiple tag creation 
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
 2015-12-28 13:20:48 +01:00
Nicolas Lœuillet 3c65dfb735 add slug for tags 2015-12-28 12:49:45 +01:00
Nicolas Lœuillet 347fa6beb0 php cs 2015-12-08 09:20:03 +01:00
Nicolas Lœuillet c5d0db8b71 changed table name for tagging rule 2015-12-08 09:05:56 +01:00
Jeremy Benoist a7f1921f7d Merge pull request #1478 from K-Phoen/rule-based-tags 
Rule based tags
 2015-12-06 14:31:26 +01:00
Thomas Citharel a24c1ee30a Typo 2015-12-04 00:17:07 +01:00
Kévin Gomez 752b90d1f2 Fix tagging rules ordering 2015-11-29 16:19:02 +01:00
Kévin Gomez c13eda461f Clean the tagging rule creation form 2015-11-16 14:01:43 +01:00
Kévin Gomez 69edb774eb Assert that the tag has is the good one 2015-11-16 13:34:00 +01:00
Kévin Gomez 958671a7ae Add a quick test 2015-11-13 22:53:28 +01:00
Kévin Gomez aeff8aa765 Document the matches operator in the FAQ 2015-11-13 20:57:46 +01:00
Kévin Gomez f27aca26f6 Add phpdoc for all Matches implementations 2015-11-13 20:50:09 +01:00
Kévin Gomez a6e27f7466 Add matches operator 2015-11-13 14:37:58 +01:00
Kévin Gomez 5c514b0be3 Improve the tagging rules documentation 2015-11-11 17:06:36 +01:00
Kévin Gomez b7b2005494 Fix the creation of the repository services 2015-11-11 16:44:57 +01:00