Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | forgot test parameters | Nicolas Lœuillet | 2016-01-02 | 3 | -0/+9 | |
| | | ||||||
| * | 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 | 9 | -34/+219 | |
| | | ||||||
| * | add docs for Import feature | Nicolas Lœuillet | 2016-01-02 | 5 | -13/+60 | |
| | | ||||||
| * | form to upload file | Nicolas Lœuillet | 2016-01-02 | 7 | -17/+110 | |
| | | ||||||
| * | 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 | |
| | | ||||||
* | | Merge pull request #1553 from wallabag/v2-hide-export-button | Jeremy Benoist | 2016-01-06 | 1 | -0/+3 | |
|\ \ | |/ |/| | Hide export button if we are not on entries list | |||||
| * | 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 | |||||
* | | | Merge pull request #1547 from wallabag/v2-mistakes | Nicolas Lœuillet | 2016-01-02 | 1 | -1/+1 | |
|\ \ \ | |/ / |/| | | v2 – Fix wrong if when deleting an entry | |||||
| * | | 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 | |||||
* | | Merge pull request #1544 from wallabag/2fa-email | Nicolas Lœuillet | 2015-12-29 | 17 | -6/+266 | |
|\ \ | |/ |/| | v2 – Add custom email for 2FA | |||||
| * | PHP 7.0 must not fail | Jeremy Benoist | 2015-12-29 | 1 | -1/+0 | |
| | | ||||||
| * | Add custom email for 2FA | Jeremy Benoist | 2015-12-29 | 16 | -5/+266 | |
|/ | | | | Related #1490 | |||||
* | Merge pull request #1540 from wallabag/v2-fix-delete | Nicolas Lœuillet | 2015-12-28 | 3 | -8/+64 | |
|\ | | | | | v2 – Don't redirect to the content page after deletion | |||||
| * | 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 | |
|/ | ||||||
* | Merge pull request #1542 from wallabag/v2-avoid-duplicate-tag | Nicolas Lœuillet | 2015-12-28 | 4 | -1/+95 | |
|\ | | | | | v2 – Avoid multiple tag creation | |||||
| * | 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 | |||||
* | Merge pull request #1488 from wallabag/v2-slug-tags | Jeremy Benoist | 2015-12-28 | 5 | -60/+262 | |
|\ | | | | | Slug for tags | |||||
| * | add slug for tags | Nicolas Lœuillet | 2015-12-28 | 5 | -60/+262 | |
|/ | ||||||
* | Merge pull request #1537 from bdunogier/update_lock | Jeremy Benoist | 2015-12-24 | 3 | -239/+262 | |
|\ | | | | | Updated composer.lock | |||||
| * | Updated composer.lock | Bertrand Dunogier | 2015-12-23 | 3 | -239/+262 | |
|/ | | | | | | | Had to restrict scheb/two-factor-bundle to ~1.4.0 because of a circular service reference. See https://github.com/scheb/two-factor-bundle/issues/33. Also updated php version requirement to 5.5.0. | |||||
* | Merge pull request #1529 from wallabag/v2-taggingrule-tablename | Jeremy Benoist | 2015-12-08 | 9 | -38/+32 | |
|\ | | | | | changed table name for tagging rule | |||||
| * | 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 | 26 | -34/+1888 | |
|\ | | | | | 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 | |
| | | ||||||
| * | Add a quick test | Kévin Gomez | 2015-11-13 | 3 | -1/+44 | |
| | | ||||||
| * | Document the matches operator in the FAQ | Kévin Gomez | 2015-11-13 | 1 | -2/+7 | |
| | | ||||||
| * | Add phpdoc for all Matches implementations | Kévin Gomez | 2015-11-13 | 2 | -0/+20 | |
| | | ||||||
| * | Add matches operator | Kévin Gomez | 2015-11-13 | 6 | -11/+47 | |
| | | ||||||
| * | Improve the tagging rules documentation | Kévin Gomez | 2015-11-11 | 1 | -3/+47 | |
| | | ||||||
| * | Fix the creation of the repository services | Kévin Gomez | 2015-11-11 | 1 | -4/+2 | |
| | | ||||||
| * | Update rulerz-bundle | Kévin Gomez | 2015-11-11 | 2 | -8/+8 | |
| | | ||||||
| * | Use Psr\Log\NullLogger instead of creating a mock | Kévin Gomez | 2015-11-11 | 1 | -5/+8 | |
| | | ||||||
| * | Fix incorrect comment. | Kévin Gomez | 2015-11-11 | 1 | -1/+1 | |
| | |