| Commit message (Expand) | Author | Age | Files | Lines |
* | Add Docker configuration for Postgres and MariaDB | Fabien MEURILLON | 2016-01-10 | 6 | -1/+62 |
* | Add basic docker-compose configuration | Fabien MEURILLON | 2016-01-10 | 4 | -0/+119 |
* | Merge pull request #1558 from wallabag/v2-documentation | Nicolas Lœuillet | 2016-01-09 | 52 | -2262/+106 |
|\ |
|
| * | documentation cleaning | Nicolas Lœuillet | 2016-01-09 | 52 | -2262/+106 |
* | | Merge pull request #1559 from wallabag/v2-doctrine-migrations | Jeremy Benoist | 2016-01-09 | 4 | -23/+156 |
|\ \
| |/
|/| |
|
| * | Update deps | Jeremy Benoist | 2016-01-09 | 1 | -19/+18 |
| * | Installation & configuration of Doctrine Migrations | Nicolas Lœuillet | 2016-01-08 | 4 | -4/+138 |
|/ |
|
* | Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1 | Jeremy Benoist | 2016-01-07 | 51 | -35/+1770 |
|\ |
|
| * | 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 |
| * | Fix tag related test for Pocket | Jeremy Benoist | 2016-01-03 | 2 | -3/+6 |
| * | Update deps | Jeremy Benoist | 2016-01-02 | 1 | -17/+17 |
| * | Remove real consumer key | Jeremy Benoist | 2016-01-02 | 4 | -4/+4 |
| * | Add tagged services for import | Jeremy Benoist | 2016-01-02 | 25 | -43/+394 |
| * | Rewrote Wallabag v1 import | Jeremy Benoist | 2016-01-02 | 14 | -94/+405 |
| * | Rewrote Pocket Import | Jeremy Benoist | 2016-01-02 | 9 | -210/+357 |
| * | 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 | 11 | -114/+86 |
| * | First test on PocketImport | Jeremy Benoist | 2016-01-02 | 4 | -84/+209 |
| * | Update url & service name | Jeremy Benoist | 2016-01-02 | 6 | -13/+56 |
| * | Change the way to check for an existing entry | Jeremy Benoist | 2016-01-02 | 4 | -12/+20 |
| * | Update deps | Jeremy Benoist | 2016-01-02 | 1 | -41/+39 |
| * | - remove importers configuration | Nicolas Lœuillet | 2016-01-02 | 7 | -45/+31 |
| * | fix #1502 avoid duplicate entry and store pocket url in config | Nicolas Lœuillet | 2016-01-02 | 7 | -36/+87 |
| * | 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 |
| * | 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 | 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 |
|\ |
|
| * | 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 | 3 | -10/+53 |
| * | Cleanup tests | Jeremy Benoist | 2015-12-29 | 2 | -6/+1 |
| * | Fix parameters regarding documentation | Jeremy Benoist | 2015-12-29 | 1 | -2/+2 |
| * | Remove user reference in tag | Jeremy Benoist | 2015-12-29 | 13 | -99/+123 |
* | | 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 |
* | | | Merge pull request #1547 from wallabag/v2-mistakes | Nicolas Lœuillet | 2016-01-02 | 1 | -1/+1 |
|\ \ \
| |/ /
|/| | |
|
| * | | Fix wrong if when deleting an entry | Jeremy Benoist | 2015-12-30 | 1 | -1/+1 |
|/ / |
|
* | | Merge pull request #1544 from wallabag/2fa-email | Nicolas Lœuillet | 2015-12-29 | 17 | -6/+266 |
|\ \
| |/
|/| |
|