aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* 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
| |
| * Fix the creation of the repository servicesKévin Gomez2015-11-111-4/+2
| |
| * Update rulerz-bundleKévin Gomez2015-11-112-8/+8
| |
| * Use Psr\Log\NullLogger instead of creating a mockKévin Gomez2015-11-111-5/+8
| |
| * Fix incorrect comment.Kévin Gomez2015-11-111-1/+1
| |
| * Add a few functional tests for the tagging rules creation formKévin Gomez2015-11-111-0/+55
| |
| * Update baggy themeKévin Gomez2015-11-112-2/+35
| |
| * Provide a way to delete tagging rulesKévin Gomez2015-11-112-0/+30
| |
| * Add a command to automatically tag all entries for a userKévin Gomez2015-11-119-11/+149
| |
| * Use a tagged version of kphoen/rulerz-bundleKévin Gomez2015-11-112-10/+9
| |
| * Validate used operators when creating tagging rulesKévin Gomez2015-11-111-1/+4
| |
| * Add tests for the RuleBasedTagger classKévin Gomez2015-11-111-0/+158
| |
| * Errors in the automatic tagging do not prevent the entry from being addedKévin Gomez2015-11-113-5/+21
| |
| * Also validate used variables when creating tagging rulesKévin Gomez2015-11-111-1/+1
| |
| * Add naïve validation for tagging rules (only checks the syntax)Kévin Gomez2015-11-111-0/+2
| |
| * Rename the « Tags » tab to « Tagging rules »Kévin Gomez2015-11-111-1/+1
| |
| * Add tests for the StringToListTransformer classKévin Gomez2015-11-112-2/+62
| |
| * Fix ContentProxyTestKévin Gomez2015-11-111-3/+23
| |
| * Add missing use statementKévin Gomez2015-11-111-0/+1
| |
| * Add a table explaining the available variablesKévin Gomez2015-11-111-1/+56
| |
| * Display the tagging rules in the configKévin Gomez2015-11-111-0/+12
| |
| * Add missing tagging rule repositoryKévin Gomez2015-11-111-0/+9
| |
| * Add a form to create tagging rulesKévin Gomez2015-11-114-1/+138
| |
| * Add TaggingRule entityKévin Gomez2015-11-113-16/+164
| |
| * PoC of rule-based taggingKévin Gomez2015-11-116-30/+855
| |
* | Merge pull request #1523 from wallabag/tcitworld-patch-1Jeremy Benoist2015-12-041-1/+1
|\ \ | | | | | | Typo
| * | TypoThomas Citharel2015-12-041-1/+1
|/ /
* | Merge pull request #1518 from mathbruyen/smtp-from-envJeremy Benoist2015-12-031-1/+10
|\ \ | |/ |/| Set SMTP from environment variables
| * SMTP configuration through environmentMathieu Bruyen2015-11-261-1/+10
|/ | | | | | | | | | Configuring SMTP parameters required to be written in files which is not convenient when using docker containers as the credentials need to be in the filesystem. Created environment parameters override for those parameters. A new build script created in order to generate those parameters right before launching the application.