aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Update depsJeremy Benoist2016-01-021-41/+39
|
* - remove importers configurationNicolas Lœuillet2016-01-027-45/+31
| | | | - add check on userId for findOneByURL for entries
* 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 #1545 from wallabag/v2-user-tagNicolas Lœuillet2016-01-0213-103/+159
|\ | | | | v2 – Remove user reference in tag
| * Removed commentJeremy Benoist2015-12-291-9/+3
| | | | | | | | And move the SQL query inside the php doc
| * Fix the way to remove a tag from all user entriesJeremy Benoist2015-12-293-10/+53
| |
| * Cleanup testsJeremy Benoist2015-12-292-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 documentationJeremy Benoist2015-12-291-2/+2
| | | | | | | | Parameters are `star` & `archived`, not `is_starred` & `is_archived`
| * Remove user reference in tagJeremy Benoist2015-12-2913-99/+123
| | | | | | | | Fix #1543
* | Merge pull request #1546 from wallabag/v2-reload-contentNicolas Lœuillet2016-01-029-36/+109
|\ \ | | | | | | v2 – Ability to reload an entry
| * | Backport all icomoon from v1Jeremy Benoist2015-12-306-37/+42
| | | | | | | | | | | | And add a reload icon
| * | Ability to reload an entryJeremy Benoist2015-12-304-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-mistakesNicolas Lœuillet2016-01-021-1/+1
|\ \ \ | |/ / |/| | v2 – Fix wrong if when deleting an entry
| * | Fix wrong if when deleting an entryJeremy Benoist2015-12-301-1/+1
|/ / | | | | | | Bad condition when deleting an entry returned `true` instead of the referer url
* | Merge pull request #1544 from wallabag/2fa-emailNicolas Lœuillet2015-12-2917-6/+266
|\ \ | |/ |/| v2 – Add custom email for 2FA
| * PHP 7.0 must not failJeremy Benoist2015-12-291-1/+0
| |
| * Add custom email for 2FAJeremy Benoist2015-12-2916-5/+266
|/ | | | Related #1490
* Merge pull request #1540 from wallabag/v2-fix-deleteNicolas Lœuillet2015-12-283-8/+64
|\ | | | | v2 – Don't redirect to the content page after deletion
| * Don't redirect to the content page after deletionJeremy Benoist2015-12-282-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 urlJeremy Benoist2015-12-281-6/+6
|/
* Merge pull request #1542 from wallabag/v2-avoid-duplicate-tagNicolas Lœuillet2015-12-284-1/+95
|\ | | | | v2 – Avoid multiple tag creation
| * Add test on tagAllForUserJeremy Benoist2015-12-282-1/+26
| | | | | | | | And fix multiplication of entries returned by `tagAllForUser`.
| * Avoid multiple tag creationJeremy Benoist2015-12-283-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-tagsJeremy Benoist2015-12-285-60/+262
|\ | | | | Slug for tags
| * add slug for tagsNicolas Lœuillet2015-12-285-60/+262
|/
* Merge pull request #1537 from bdunogier/update_lockJeremy Benoist2015-12-243-239/+262
|\ | | | | Updated composer.lock
| * Updated composer.lockBertrand Dunogier2015-12-233-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-tablenameJeremy Benoist2015-12-089-38/+32
|\ | | | | changed table name for tagging rule
| * php csNicolas Lœuillet2015-12-088-37/+31
| |
| * changed table name for tagging ruleNicolas Lœuillet2015-12-081-1/+1
|/
* Merge pull request #1478 from K-Phoen/rule-based-tagsJeremy Benoist2015-12-0626-34/+1888
|\ | | | | Rule based tags
| * Fix tagging rules orderingKévin Gomez2015-11-291-0/+1
| |
| * Clean the tagging rule creation formKévin Gomez2015-11-162-3/+3
| |
| * Assert that the tag has is the good oneKévin Gomez2015-11-161-1/+4
| |
| * Add a quick testKévin Gomez2015-11-133-1/+44
| |
| * Document the matches operator in the FAQKévin Gomez2015-11-131-2/+7
| |
| * Add phpdoc for all Matches implementationsKévin Gomez2015-11-132-0/+20
| |
| * Add matches operatorKévin Gomez2015-11-136-11/+47
| |
| * Improve the tagging rules documentationKévin Gomez2015-11-111-3/+47
| |
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-25 17:38:52 +0000