]>
git.immae.eu Git - github/wallabag/wallabag.git/log
Nicolas Lœuillet [Sat, 9 Jan 2016 19:33:09 +0000 (20:33 +0100)]
add import link on baggy theme
Nicolas Lœuillet [Sat, 9 Jan 2016 16:33:27 +0000 (17:33 +0100)]
Merge pull request #1558 from wallabag/v2-documentation
[v2] documentation cleaning
Jeremy Benoist [Sat, 9 Jan 2016 13:43:06 +0000 (14:43 +0100)]
Merge pull request #1559 from wallabag/v2-doctrine-migrations
Installation & configuration of Doctrine Migrations
Jeremy Benoist [Sat, 9 Jan 2016 13:24:09 +0000 (14:24 +0100)]
Update deps
Changelogs summary:
- doctrine/dbal updated from v2.5.3 to v2.5.4
See changes: https://github.com/doctrine/dbal/compare/v2.5.3...v2.5.4
Release notes: https://github.com/doctrine/dbal/releases/tag/v2.5.4
- doctrine/orm updated from v2.5.3 to v2.5.4
See changes: https://github.com/doctrine/doctrine2/compare/v2.5.3...v2.5.4
Release notes: https://github.com/doctrine/doctrine2/releases/tag/v2.5.4
- nelmio/api-doc-bundle updated from 2.11.1 to 2.11.2
See changes: https://github.com/nelmio/NelmioApiDocBundle/compare/2.11.1...2.11.2
Release notes: https://github.com/nelmio/NelmioApiDocBundle/releases/tag/2.11.2
- friendsofsymfony/user-bundle updated from dev-master to dev-master
See changes: https://github.com/FriendsOfSymfony/FOSUserBundle/compare/
e5e7a2b ...
6ccff96
Nicolas Lœuillet [Fri, 8 Jan 2016 14:02:51 +0000 (15:02 +0100)]
documentation cleaning
Nicolas Lœuillet [Fri, 8 Jan 2016 15:27:29 +0000 (16:27 +0100)]
Installation & configuration of Doctrine Migrations
Jeremy Benoist [Thu, 7 Jan 2016 21:15:08 +0000 (22:15 +0100)]
Merge pull request #1493 from wallabag/v2-pocket-import
v2 – 1st draft for Pocket import via API & Wallabag v1 import
Nicolas Lœuillet [Wed, 6 Jan 2016 05:34:57 +0000 (06:34 +0100)]
updated tests
Jeremy Benoist [Wed, 6 Jan 2016 20:25:41 +0000 (21:25 +0100)]
Merge pull request #1553 from wallabag/v2-hide-export-button
Hide export button if we are not on entries list
Nicolas Lœuillet [Wed, 6 Jan 2016 06:47:09 +0000 (07:47 +0100)]
Hide export button if we are not on entries list
Nicolas Lœuillet [Tue, 5 Jan 2016 21:38:09 +0000 (22:38 +0100)]
Added french translations
Jeremy Benoist [Sun, 3 Jan 2016 09:59:55 +0000 (10:59 +0100)]
Few phpDoc fix
And some little mistakes
Jeremy Benoist [Sun, 3 Jan 2016 09:32:56 +0000 (10:32 +0100)]
Fix tag related test for Pocket
Jeremy Benoist [Sat, 2 Jan 2016 22:31:41 +0000 (23:31 +0100)]
Update deps
Jeremy Benoist [Thu, 31 Dec 2015 10:25:04 +0000 (11:25 +0100)]
Remove real consumer key
We should never commit them :)
Jeremy Benoist [Thu, 31 Dec 2015 10:24:46 +0000 (11:24 +0100)]
Add tagged services for import
- list services in /import
- add url to import service
- ImportBundle routing are now prefixed by /import
- optimize flush in each import (flushing each 20 contents)
- improve design of each import
- add more tests
Jeremy Benoist [Wed, 30 Dec 2015 12:26:30 +0000 (13:26 +0100)]
Rewrote Wallabag v1 import
Jeremy Benoist [Wed, 30 Dec 2015 11:23:51 +0000 (12:23 +0100)]
Rewrote Pocket Import
For the moment, we won't do a queue system, just a plain synchronous import.
We also use ContentProxy to grab content for each article from Pocket.
Error from Pocket are now logged using the logger.
The ImportInterface need to be simple and not related to oAuth (not all import will use that method).
Jeremy Benoist [Wed, 30 Dec 2015 11:19:15 +0000 (12:19 +0100)]
Fix the way to check for an existing entry
Instead of requiring more than 1 entry (> 1) we have to check for at least one entry (> 0)
Jeremy Benoist [Wed, 30 Dec 2015 09:06:45 +0000 (10:06 +0100)]
Update after previous merge
PR #1443 was merged into this branch to handle all import type in the same place.
Jeremy Benoist [Thu, 24 Dec 2015 14:24:18 +0000 (15:24 +0100)]
First test on PocketImport
Giving ability to define the Client add abitliy to easliy test the import.
Jeremy Benoist [Thu, 24 Dec 2015 14:22:56 +0000 (15:22 +0100)]
Update url & service name
Prefix ur with service namel: [service]_[route name]
Add comment in Interface
Jeremy Benoist [Thu, 24 Dec 2015 14:19:50 +0000 (15:19 +0100)]
Change the way to check for an existing entry
The repository method return the entry found or false if nothing exists.
Jeremy Benoist [Thu, 24 Dec 2015 13:06:55 +0000 (14:06 +0100)]
Update deps
Nicolas Lœuillet [Mon, 26 Oct 2015 14:49:44 +0000 (15:49 +0100)]
- remove importers configuration
- add check on userId for findOneByURL for entries
Nicolas Lœuillet [Mon, 26 Oct 2015 13:38:24 +0000 (14:38 +0100)]
fix #1502 avoid duplicate entry and store pocket url in config
Nicolas Lœuillet [Mon, 26 Oct 2015 09:55:35 +0000 (10:55 +0100)]
assign tags to entries and add lastPocketImport attribute to user
Nicolas Lœuillet [Fri, 23 Oct 2015 12:45:50 +0000 (14:45 +0200)]
create ImportController to list importers
Nicolas Lœuillet [Fri, 23 Oct 2015 12:09:19 +0000 (14:09 +0200)]
service call
Nicolas Lœuillet [Fri, 23 Oct 2015 12:04:43 +0000 (14:04 +0200)]
forgot test parameters
Nicolas Lœuillet [Fri, 23 Oct 2015 12:01:27 +0000 (14:01 +0200)]
refactor pocket import
Nicolas Lœuillet [Tue, 20 Oct 2015 11:58:13 +0000 (13:58 +0200)]
1st draft for Pocket import via API
Nicolas Lœuillet [Fri, 23 Oct 2015 08:14:22 +0000 (10:14 +0200)]
add docs for Import feature
Nicolas Lœuillet [Thu, 22 Oct 2015 14:57:56 +0000 (16:57 +0200)]
form to upload file
Nicolas Lœuillet [Wed, 30 Sep 2015 13:10:46 +0000 (15:10 +0200)]
create controller to launch import command
Nicolas Lœuillet [Wed, 30 Sep 2015 12:22:38 +0000 (14:22 +0200)]
userId is now set in parameters
Nicolas Lœuillet [Wed, 30 Sep 2015 09:43:25 +0000 (11:43 +0200)]
first draft for json import, needed for wallabag v1 migration
Nicolas Lœuillet [Sat, 2 Jan 2016 11:46:52 +0000 (12:46 +0100)]
Merge pull request #1545 from wallabag/v2-user-tag
v2 – Remove user reference in tag
Nicolas Lœuillet [Sat, 2 Jan 2016 11:46:09 +0000 (12:46 +0100)]
Merge pull request #1546 from wallabag/v2-reload-content
v2 – Ability to reload an entry
Nicolas Lœuillet [Sat, 2 Jan 2016 11:45:08 +0000 (12:45 +0100)]
Merge pull request #1547 from wallabag/v2-mistakes
v2 – Fix wrong if when deleting an entry
Jeremy Benoist [Wed, 30 Dec 2015 10:32:20 +0000 (11:32 +0100)]
Fix wrong if when deleting an entry
Bad condition when deleting an entry returned `true` instead of the referer url
Jeremy Benoist [Wed, 30 Dec 2015 08:53:52 +0000 (09:53 +0100)]
Backport all icomoon from v1
And add a reload icon
Jeremy Benoist [Wed, 30 Dec 2015 08:41:17 +0000 (09:41 +0100)]
Ability to reload an entry
Could be useful when we want to update the content or when the content failed to be fetched.
Fix #1503
Jeremy Benoist [Tue, 29 Dec 2015 20:59:34 +0000 (21:59 +0100)]
Removed comment
And move the SQL query inside the php doc
Nicolas Lœuillet [Tue, 29 Dec 2015 19:32:58 +0000 (20:32 +0100)]
Merge pull request #1544 from wallabag/2fa-email
v2 – Add custom email for 2FA
Jeremy Benoist [Tue, 29 Dec 2015 14:08:33 +0000 (15:08 +0100)]
Fix the way to remove a tag from all user entries
Jeremy Benoist [Tue, 29 Dec 2015 14:04:46 +0000 (15:04 +0100)]
Cleanup tests
- 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)
Jeremy Benoist [Tue, 29 Dec 2015 13:54:55 +0000 (14:54 +0100)]
Fix parameters regarding documentation
Parameters are `star` & `archived`, not `is_starred` & `is_archived`
Jeremy Benoist [Tue, 29 Dec 2015 13:50:52 +0000 (14:50 +0100)]
Remove user reference in tag
Fix #1543
Jeremy Benoist [Tue, 29 Dec 2015 10:41:35 +0000 (11:41 +0100)]
PHP 7.0 must not fail
Jeremy Benoist [Tue, 29 Dec 2015 08:59:46 +0000 (09:59 +0100)]
Add custom email for 2FA
Related #1490
Nicolas Lœuillet [Mon, 28 Dec 2015 12:51:48 +0000 (13:51 +0100)]
Merge pull request #1540 from wallabag/v2-fix-delete
v2 – Don't redirect to the content page after deletion
Jeremy Benoist [Sun, 27 Dec 2015 20:28:48 +0000 (21:28 +0100)]
Don't redirect to the content page after deletion
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.
Jeremy Benoist [Sun, 27 Dec 2015 20:25:37 +0000 (21:25 +0100)]
Entry data should have unique url
Nicolas Lœuillet [Mon, 28 Dec 2015 12:37:13 +0000 (13:37 +0100)]
Merge pull request #1542 from wallabag/v2-avoid-duplicate-tag
v2 – Avoid multiple tag creation
Jeremy Benoist [Sun, 27 Dec 2015 22:48:57 +0000 (23:48 +0100)]
Add test on tagAllForUser
And fix multiplication of entries returned by `tagAllForUser`.
Jeremy Benoist [Sun, 27 Dec 2015 21:26:49 +0000 (22:26 +0100)]
Avoid multiple tag creation
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
Jeremy Benoist [Mon, 28 Dec 2015 12:12:30 +0000 (13:12 +0100)]
Merge pull request #1488 from wallabag/v2-slug-tags
Slug for tags
Nicolas Lœuillet [Wed, 14 Oct 2015 19:30:25 +0000 (21:30 +0200)]
add slug for tags
Jeremy Benoist [Thu, 24 Dec 2015 07:37:27 +0000 (08:37 +0100)]
Merge pull request #1537 from bdunogier/update_lock
Updated composer.lock
Bertrand Dunogier [Wed, 23 Dec 2015 15:45:24 +0000 (16:45 +0100)]
Updated composer.lock
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.
Jeremy Benoist [Tue, 8 Dec 2015 08:35:27 +0000 (09:35 +0100)]
Merge pull request #1529 from wallabag/v2-taggingrule-tablename
changed table name for tagging rule
Nicolas Lœuillet [Tue, 8 Dec 2015 08:20:03 +0000 (09:20 +0100)]
php cs
Nicolas Lœuillet [Tue, 8 Dec 2015 07:57:19 +0000 (08:57 +0100)]
changed table name for tagging rule
Jeremy Benoist [Sun, 6 Dec 2015 13:31:26 +0000 (14:31 +0100)]
Merge pull request #1478 from K-Phoen/rule-based-tags
Rule based tags
Jeremy Benoist [Fri, 4 Dec 2015 05:43:40 +0000 (06:43 +0100)]
Merge pull request #1523 from wallabag/tcitworld-patch-1
Typo
Thomas Citharel [Thu, 3 Dec 2015 23:17:07 +0000 (00:17 +0100)]
Typo
Jeremy Benoist [Thu, 3 Dec 2015 07:43:40 +0000 (08:43 +0100)]
Merge pull request #1518 from mathbruyen/smtp-from-env
Set SMTP from environment variables
Kévin Gomez [Sun, 29 Nov 2015 15:19:02 +0000 (16:19 +0100)]
Fix tagging rules ordering
Mathieu Bruyen [Thu, 26 Nov 2015 08:20:23 +0000 (09:20 +0100)]
SMTP configuration through environment
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.
Kévin Gomez [Mon, 16 Nov 2015 13:01:43 +0000 (14:01 +0100)]
Clean the tagging rule creation form
Kévin Gomez [Mon, 16 Nov 2015 12:34:00 +0000 (13:34 +0100)]
Assert that the tag has is the good one
Kévin Gomez [Fri, 13 Nov 2015 20:23:39 +0000 (21:23 +0100)]
Add a quick test
Kévin Gomez [Fri, 13 Nov 2015 19:57:46 +0000 (20:57 +0100)]
Document the matches operator in the FAQ
Kévin Gomez [Fri, 13 Nov 2015 19:48:51 +0000 (20:48 +0100)]
Add phpdoc for all Matches implementations
Kévin Gomez [Fri, 13 Nov 2015 13:37:58 +0000 (14:37 +0100)]
Add matches operator
Kévin Gomez [Wed, 11 Nov 2015 16:06:36 +0000 (17:06 +0100)]
Improve the tagging rules documentation
Kévin Gomez [Wed, 11 Nov 2015 15:44:57 +0000 (16:44 +0100)]
Fix the creation of the repository services
Kévin Gomez [Wed, 11 Nov 2015 15:39:28 +0000 (16:39 +0100)]
Update rulerz-bundle
Kévin Gomez [Sat, 31 Oct 2015 15:38:49 +0000 (16:38 +0100)]
Use Psr\Log\NullLogger instead of creating a mock
Kévin Gomez [Sat, 31 Oct 2015 15:29:38 +0000 (16:29 +0100)]
Fix incorrect comment.
Kévin Gomez [Sat, 31 Oct 2015 15:21:56 +0000 (16:21 +0100)]
Add a few functional tests for the tagging rules creation form
Kévin Gomez [Sun, 25 Oct 2015 13:34:43 +0000 (14:34 +0100)]
Update baggy theme
Kévin Gomez [Sun, 25 Oct 2015 09:45:15 +0000 (10:45 +0100)]
Provide a way to delete tagging rules
Kévin Gomez [Sat, 24 Oct 2015 13:11:06 +0000 (15:11 +0200)]
Add a command to automatically tag all entries for a user
Kévin Gomez [Sun, 18 Oct 2015 13:18:12 +0000 (15:18 +0200)]
Use a tagged version of kphoen/rulerz-bundle
Kévin Gomez [Sun, 18 Oct 2015 12:32:58 +0000 (14:32 +0200)]
Validate used operators when creating tagging rules
Kévin Gomez [Sat, 17 Oct 2015 16:34:18 +0000 (18:34 +0200)]
Add tests for the RuleBasedTagger class
Kévin Gomez [Sat, 17 Oct 2015 15:45:51 +0000 (17:45 +0200)]
Errors in the automatic tagging do not prevent the entry from being added
Kévin Gomez [Sat, 17 Oct 2015 14:57:41 +0000 (16:57 +0200)]
Also validate used variables when creating tagging rules
Kévin Gomez [Wed, 14 Oct 2015 20:48:58 +0000 (22:48 +0200)]
Add naïve validation for tagging rules (only checks the syntax)
Kévin Gomez [Wed, 14 Oct 2015 18:24:02 +0000 (20:24 +0200)]
Rename the « Tags » tab to « Tagging rules »
Kévin Gomez [Mon, 12 Oct 2015 19:43:24 +0000 (21:43 +0200)]
Add tests for the StringToListTransformer class
Kévin Gomez [Sun, 11 Oct 2015 20:27:47 +0000 (22:27 +0200)]
Fix ContentProxyTest
Kévin Gomez [Sun, 11 Oct 2015 20:22:24 +0000 (22:22 +0200)]
Add missing use statement
Kévin Gomez [Sun, 11 Oct 2015 15:46:53 +0000 (17:46 +0200)]
Add a table explaining the available variables
Kévin Gomez [Sun, 11 Oct 2015 15:37:19 +0000 (17:37 +0200)]
Display the tagging rules in the config
Kévin Gomez [Sun, 11 Oct 2015 15:37:05 +0000 (17:37 +0200)]
Add missing tagging rule repository
Kévin Gomez [Sun, 11 Oct 2015 15:30:58 +0000 (17:30 +0200)]
Add a form to create tagging rules
Kévin Gomez [Sun, 11 Oct 2015 15:14:50 +0000 (17:14 +0200)]
Add TaggingRule entity