Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Update bundle & stock file | Jeremy Benoist | 2016-01-15 | 10 | -38/+35 |
* | Symfony Upgrade Fixer FTW | Jeremy Benoist | 2016-01-15 | 34 | -100/+124 |
* | Merge pull request #1563 from wallabag/v2-fix-1394 | Jeremy Benoist | 2016-01-10 | 2 | -2/+2 |
|\ | |||||
| * | 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 | 9 | -10/+66 |
|\ | |||||
| * | updated tests | Nicolas Lœuillet | 2016-01-07 | 1 | -1/+1 |
| * | Added french translations | Nicolas Lœuillet | 2016-01-05 | 1 | -0/+12 |
| * | Few phpDoc fix | Jeremy Benoist | 2016-01-03 | 3 | -9/+9 |
| * | Add tagged services for import | Jeremy Benoist | 2016-01-02 | 1 | -1/+5 |
| * | Rewrote Pocket Import | Jeremy Benoist | 2016-01-02 | 1 | -11/+1 |
| * | Fix the way to check for an existing entry | Jeremy Benoist | 2016-01-02 | 1 | -2/+2 |
| * | Update after previous merge | Jeremy Benoist | 2016-01-02 | 6 | -261/+0 |
| * | Change the way to check for an existing entry | Jeremy Benoist | 2016-01-02 | 3 | -10/+18 |
| * | - remove importers configuration | Nicolas Lœuillet | 2016-01-02 | 2 | -4/+21 |
| * | fix #1502 avoid duplicate entry and store pocket url in config | Nicolas Lœuillet | 2016-01-02 | 1 | -0/+14 |
| * | refactor pocket import | Nicolas Lœuillet | 2016-01-02 | 1 | -0/+1 |
| * | 1st draft for Pocket import via API | Nicolas Lœuillet | 2016-01-02 | 1 | -1/+10 |
| * | 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 | 9 | -63/+130 |
|\ | |||||
| * | Removed comment | Jeremy Benoist | 2015-12-29 | 1 | -9/+3 |
| * | Fix the way to remove a tag from all user entries | Jeremy Benoist | 2015-12-29 | 1 | -8/+39 |
| * | Cleanup tests | Jeremy Benoist | 2015-12-29 | 1 | -2/+1 |
| * | Remove user reference in tag | Jeremy Benoist | 2015-12-29 | 10 | -66/+109 |
* | | Merge pull request #1546 from wallabag/v2-reload-content | Nicolas Lœuillet | 2016-01-02 | 9 | -36/+109 |
|\ \ | |||||
| * | | Backport all icomoon from v1 | Jeremy Benoist | 2015-12-30 | 6 | -37/+42 |
| * | | Ability to reload an entry | Jeremy Benoist | 2015-12-30 | 4 | -0/+68 |
* | | | Fix wrong if when deleting an entry | Jeremy Benoist | 2015-12-30 | 1 | -1/+1 |
|/ / | |||||
* / | Add custom email for 2FA | Jeremy Benoist | 2015-12-29 | 4 | -4/+18 |
|/ | |||||
* | Don't redirect to the content page after deletion | Jeremy Benoist | 2015-12-28 | 2 | -2/+58 |
* | 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 |
* | Avoid multiple tag creation | Jeremy Benoist | 2015-12-28 | 3 | -0/+69 |
* | 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 | 21 | -7/+1118 |
|\ | |||||
| * | 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 | 4 | -1/+37 |
| * | Improve the tagging rules documentation | Kévin Gomez | 2015-11-11 | 1 | -3/+47 |