Jeremy Benoist
27a8708b67
Update deps
2016-01-02 23:27:41 +01:00
Nicolas Lœuillet
303768dfe9
- remove importers configuration
...
- add check on userId for findOneByURL for entries
2016-01-02 23:27:41 +01:00
Nicolas Lœuillet
dda57bb944
fix #1502 avoid duplicate entry and store pocket url in config
2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
87f23b005c
assign tags to entries and add lastPocketImport attribute to user
2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
d51b38ed30
create ImportController to list importers
2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
557e549db7
service call
2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
9c9c23cf08
forgot test parameters
2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
ff7b031d57
refactor pocket import
2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
1f4408de9e
1st draft for Pocket import via API
2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
10b40f85d6
add docs for Import feature
2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
d275bdf4d3
form to upload file
2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
8c3c77c1bd
create controller to launch import command
2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
a1bb1b3c2a
userId is now set in parameters
2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
56ea1de99b
first draft for json import, needed for wallabag v1 migration
2016-01-02 23:24:17 +01:00
Nicolas Lœuillet
dad1c546a5
Merge pull request #1545 from wallabag/v2-user-tag
...
v2 – Remove user reference in tag
2016-01-02 12:46:52 +01:00
Nicolas Lœuillet
5432f61509
Merge pull request #1546 from wallabag/v2-reload-content
...
v2 – Ability to reload an entry
2016-01-02 12:46:09 +01:00
Nicolas Lœuillet
00a051add4
Merge pull request #1547 from wallabag/v2-mistakes
...
v2 – Fix wrong if when deleting an entry
2016-01-02 12:45:08 +01:00
Jeremy Benoist
e82160e5e9
Fix wrong if when deleting an entry
...
Bad condition when deleting an entry returned `true` instead of the referer url
2015-12-30 11:32:53 +01:00
Jeremy Benoist
0cf434c00f
Backport all icomoon from v1
...
And add a reload icon
2015-12-30 09:53:52 +01:00
Jeremy Benoist
831b02aaf2
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
2015-12-30 09:41:17 +01:00
Jeremy Benoist
6be9750155
Removed comment
...
And move the SQL query inside the php doc
2015-12-29 21:59:34 +01:00
Nicolas Lœuillet
e6a228c43b
Merge pull request #1544 from wallabag/2fa-email
...
v2 – Add custom email for 2FA
2015-12-29 20:32:58 +01:00
Jeremy Benoist
4059a061c0
Fix the way to remove a tag from all user entries
2015-12-29 15:43:32 +01:00
Jeremy Benoist
1bb1939ab7
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)
2015-12-29 15:04:46 +01:00
Jeremy Benoist
01fddd0cb2
Fix parameters regarding documentation
...
Parameters are `star` & `archived`, not `is_starred` & `is_archived`
2015-12-29 14:54:55 +01:00
Jeremy Benoist
fc73222723
Remove user reference in tag
...
Fix #1543
2015-12-29 14:50:52 +01:00
Jeremy Benoist
ab64c3d9ac
PHP 7.0 must not fail
2015-12-29 11:41:35 +01:00
Jeremy Benoist
23ff8d3619
Add custom email for 2FA
...
Related #1490
2015-12-29 11:17:06 +01:00
Nicolas Lœuillet
c997cfcc9c
Merge pull request #1540 from wallabag/v2-fix-delete
...
v2 – Don't redirect to the content page after deletion
2015-12-28 13:51:48 +01:00
Jeremy Benoist
2863bf2ab5
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.
2015-12-28 13:42:50 +01:00
Jeremy Benoist
71eff67f8b
Entry data should have unique url
2015-12-28 13:42:50 +01:00
Nicolas Lœuillet
d25b828821
Merge pull request #1542 from wallabag/v2-avoid-duplicate-tag
...
v2 – Avoid multiple tag creation
2015-12-28 13:37:13 +01:00
Jeremy Benoist
e9fa8c40aa
Add test on tagAllForUser
...
And fix multiplication of entries returned by `tagAllForUser`.
2015-12-28 13:20:48 +01:00
Jeremy Benoist
fc031e5706
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
2015-12-28 13:20:48 +01:00
Jeremy Benoist
82899c0402
Merge pull request #1488 from wallabag/v2-slug-tags
...
Slug for tags
2015-12-28 13:12:30 +01:00
Nicolas Lœuillet
3c65dfb735
add slug for tags
2015-12-28 12:49:45 +01:00
Jeremy Benoist
22c1d29b89
Merge pull request #1537 from bdunogier/update_lock
...
Updated composer.lock
2015-12-24 08:37:27 +01:00
Bertrand Dunogier
d4aa174367
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.
2015-12-23 22:49:03 +01:00
Jeremy Benoist
da2240f9d4
Merge pull request #1529 from wallabag/v2-taggingrule-tablename
...
changed table name for tagging rule
2015-12-08 09:35:27 +01:00
Nicolas Lœuillet
347fa6beb0
php cs
2015-12-08 09:20:03 +01:00
Nicolas Lœuillet
c5d0db8b71
changed table name for tagging rule
2015-12-08 09:05:56 +01:00
Jeremy Benoist
a7f1921f7d
Merge pull request #1478 from K-Phoen/rule-based-tags
...
Rule based tags
2015-12-06 14:31:26 +01:00
Jeremy Benoist
2e15e30bf0
Merge pull request #1523 from wallabag/tcitworld-patch-1
...
Typo
2015-12-04 06:43:40 +01:00
Thomas Citharel
a24c1ee30a
Typo
2015-12-04 00:17:07 +01:00
Jeremy Benoist
f4b617f2ff
Merge pull request #1518 from mathbruyen/smtp-from-env
...
Set SMTP from environment variables
2015-12-03 08:43:40 +01:00
Kévin Gomez
752b90d1f2
Fix tagging rules ordering
2015-11-29 16:19:02 +01:00
Mathieu Bruyen
59507c5b24
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.
2015-11-26 10:44:03 +01:00
Kévin Gomez
c13eda461f
Clean the tagging rule creation form
2015-11-16 14:01:43 +01:00
Kévin Gomez
69edb774eb
Assert that the tag has is the good one
2015-11-16 13:34:00 +01:00
Kévin Gomez
958671a7ae
Add a quick test
2015-11-13 22:53:28 +01:00
