aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #1493 from wallabag/v2-pocket-import2.0.0-alpha.1Jeremy Benoist2016-01-0751-35/+1770
|\
| * updated testsNicolas Lœuillet2016-01-079-17/+10
| * Added french translationsNicolas Lœuillet2016-01-057-8/+28
| * Few phpDoc fixJeremy Benoist2016-01-036-16/+27
| * Fix tag related test for PocketJeremy Benoist2016-01-032-3/+6
| * Update depsJeremy Benoist2016-01-021-17/+17
| * Remove real consumer keyJeremy Benoist2016-01-024-4/+4
| * Add tagged services for importJeremy Benoist2016-01-0225-43/+394
| * Rewrote Wallabag v1 importJeremy Benoist2016-01-0214-94/+405
| * Rewrote Pocket ImportJeremy Benoist2016-01-029-210/+357
| * Fix the way to check for an existing entryJeremy Benoist2016-01-021-2/+2
| * Update after previous mergeJeremy Benoist2016-01-0211-114/+86
| * First test on PocketImportJeremy Benoist2016-01-024-84/+209
| * Update url & service nameJeremy Benoist2016-01-026-13/+56
| * Change the way to check for an existing entryJeremy Benoist2016-01-024-12/+20
| * Update depsJeremy Benoist2016-01-021-41/+39
| * - remove importers configurationNicolas Lœuillet2016-01-027-45/+31
| * fix #1502 avoid duplicate entry and store pocket url in configNicolas Lœuillet2016-01-027-36/+87
| * assign tags to entries and add lastPocketImport attribute to userNicolas Lœuillet2016-01-023-12/+89
| * create ImportController to list importersNicolas Lœuillet2016-01-025-5/+49
| * service callNicolas Lœuillet2016-01-021-2/+2
| * forgot test parametersNicolas Lœuillet2016-01-023-0/+9
| * refactor pocket importNicolas Lœuillet2016-01-027-105/+202
| * 1st draft for Pocket import via APINicolas Lœuillet2016-01-029-34/+219
| * add docs for Import featureNicolas Lœuillet2016-01-025-13/+60
| * form to upload fileNicolas Lœuillet2016-01-027-17/+110
| * create controller to launch import commandNicolas Lœuillet2016-01-023-8/+52
| * userId is now set in parametersNicolas Lœuillet2016-01-021-2/+10
| * first draft for json import, needed for wallabag v1 migrationNicolas Lœuillet2016-01-021-0/+112
* | Merge pull request #1553 from wallabag/v2-hide-export-buttonJeremy Benoist2016-01-061-0/+3
|\ \ | |/ |/|
| * Hide export button if we are not on entries listNicolas Lœuillet2016-01-061-0/+3
|/
* Merge pull request #1545 from wallabag/v2-user-tagNicolas Lœuillet2016-01-0213-103/+159
|\
| * Removed commentJeremy Benoist2015-12-291-9/+3
| * Fix the way to remove a tag from all user entriesJeremy Benoist2015-12-293-10/+53
| * Cleanup testsJeremy Benoist2015-12-292-6/+1
| * Fix parameters regarding documentationJeremy Benoist2015-12-291-2/+2
| * Remove user reference in tagJeremy Benoist2015-12-2913-99/+123
* | Merge pull request #1546 from wallabag/v2-reload-contentNicolas Lœuillet2016-01-029-36/+109
|\ \
| * | Backport all icomoon from v1Jeremy Benoist2015-12-306-37/+42
| * | Ability to reload an entryJeremy Benoist2015-12-304-0/+68
* | | Merge pull request #1547 from wallabag/v2-mistakesNicolas Lœuillet2016-01-021-1/+1
|\ \ \ | |/ / |/| |
| * | Fix wrong if when deleting an entryJeremy Benoist2015-12-301-1/+1
|/ /
* | Merge pull request #1544 from wallabag/2fa-emailNicolas Lœuillet2015-12-2917-6/+266
|\ \ | |/ |/|
| * PHP 7.0 must not failJeremy Benoist2015-12-291-1/+0
| * Add custom email for 2FAJeremy Benoist2015-12-2916-5/+266
|/
* Merge pull request #1540 from wallabag/v2-fix-deleteNicolas Lœuillet2015-12-283-8/+64
|\
| * Don't redirect to the content page after deletionJeremy Benoist2015-12-282-2/+58
| * Entry data should have unique urlJeremy Benoist2015-12-281-6/+6
|/
* Merge pull request #1542 from wallabag/v2-avoid-duplicate-tagNicolas Lœuillet2015-12-284-1/+95
|\
| * Add test on tagAllForUserJeremy Benoist2015-12-282-1/+26
generated by cgit v1.2.3 (git 2.25.1) at 2024-05-25 02:56:13 +0000