mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-18 05:36:30 +00:00
Code Issues Projects Releases Wiki Activity
2105 commits 13 branches 100 tags 173 MiB
Commit graph

594 commits

Author SHA1 Message Date
Thomas Citharel
3a2ada0be0 fix tests 2016-02-04 20:31:26 +01:00
Thomas Citharel
365a38984e better display for txt 2016-02-04 20:31:26 +01:00
Thomas Citharel
6c08fb68b8 add txt export 2016-02-04 20:30:51 +01:00
Jeremy Benoist
27c837dcd1 Merge pull request #1642 from wallabag/v2-escape-preview 
Unescape content for Material card
 2016-02-04 17:46:02 +01:00
Nicolas Lœuillet
855a4c680f Fix #1643: fix the way to load the HTML template in 2factor auth 2016-02-04 17:29:14 +01:00
Nicolas Lœuillet
e008c037f5 Merge pull request #1612 from wallabag/v2-settings-page 
Settings page
 2016-02-04 15:59:57 +01:00
Jeremy Benoist
0796532460 Unescape content for Material card 
Using slice & striptags, the content is automatically escaped.
If some html character need to be displayed, they'll be escape too, sth like `&`.
Using |raw, the content isn't escape twice and is well displayed.
 2016-02-03 20:45:15 +01:00
Jeremy Benoist
85ad629a3c Merge pull request #1601 from wallabag/v2-import-from-v2 
[#1590] Add JSON import from wallabag v2
 2016-02-01 14:17:20 +01:00
Jeremy Benoist
e43d27f845 Merge pull request #1605 from wallabag/v2-fix-sensiolabsinsight 
[#1604] First draft to fix SensioLabsInsight report
 2016-02-01 13:51:35 +01:00
Nicolas Lœuillet
c7eef67291 Fix fos_user 2016-02-01 13:38:33 +01:00
Jeremy Benoist
48e3007b7f Fix from_email & fos_user 2016-01-31 15:31:34 +01:00
Jeremy Benoist
a74a6ca2b1 Add new export config 2016-01-31 15:31:30 +01:00
Jeremy Benoist
07c9b1c98a Fix permission to settings page 2016-01-31 14:48:26 +01:00
Jeremy Benoist
1c7d66645b CS 2016-01-31 14:48:26 +01:00
Jeremy Benoist
2a58606983 Fix tests 2016-01-31 14:48:26 +01:00
Jeremy Benoist
67c99849ae Use alias to get container parameters 2016-01-31 14:48:26 +01:00
Jeremy Benoist
d6ba77e888 Create internal setting on install & fixtures 2016-01-31 14:48:26 +01:00
Jeremy Benoist
1e3ed71470 Add warning message for PocketImport 
Warn user if pocket_consumer_key isn't defined
 2016-01-31 14:48:26 +01:00
Jeremy Benoist
63e40f2d7c Add CraueConfig for internal settings 2016-01-31 14:48:26 +01:00
Jeremy Benoist
26975877d7 Always include warning message 
We'll remove it later, on the stable release
 2016-01-31 14:37:19 +01:00
Jeremy Benoist
bc78968764 Move default configuration out of parameters 
These default configuration value shouldn't be in parameters.yml.
 2016-01-31 14:37:19 +01:00
Nicolas Lœuillet
143869525f Merge pull request #1629 from wallabag/fixexportformats 
fix #1620 and introduce new parameters to export
 2016-01-24 18:48:28 +01:00
Thomas Citharel
b89444ad8b fix #1620 and introduce new parameters to export 2016-01-24 18:21:09 +01:00
Ogün Karakuş
f47101e0c4
Add Turkish translation 
Signed-off-by: Ogün Karakuş <kirk5bucuk@gmail.com>
 2016-01-24 17:27:26 +02:00
Nicolas Lœuillet
5f8a785719 SensioLabsInsight fixes 2016-01-22 21:12:11 +01:00
Nicolas Lœuillet
b0b893eafd [#1604] First draft to fix SensioLabsInsight report 2016-01-22 21:12:11 +01:00
Jeremy Benoist
30d81a47c6 Move public assets for themes 
So they can be installed using the `assets:install` command and there'll no longer symlink in the repo
They moved from `web/themes/...` to `bundles/wallabagcore/themes/...`
 2016-01-22 13:45:14 +01:00
Jeremy Benoist
23afdf3a70 CS 2016-01-22 08:01:32 +01:00
Jeremy Benoist
a3cac44c78 Add for deleting rule from an other user 2016-01-22 08:01:17 +01:00
Jeremy Benoist
0f0e8eb82a Use FOSUserEvents instead of c/p a controller 
The `resetAction` was overriden to redirect user to the homepage instead of `fos_user_profile_show`.
Instead of copying the whole method we can simply use FOSUserEvents to handle that.
 2016-01-21 16:39:13 +01:00
Jeremy Benoist
a0d6ccc5ca Fix bad type after using findByUrlAndUserId 
It returns an object since few commits this part of (untested) code still use an array.
Also add test for that part of code.
 2016-01-21 16:37:25 +01:00
Jeremy Benoist
e56983af1f Fix bad redirection when adding a new user 2016-01-21 16:36:30 +01:00
Jeremy Benoist
27ea492cf7 Add tests on TagAllCommand 
Some simple tests
 2016-01-21 16:36:17 +01:00
Jeremy Benoist
7a0e6970b4 Use PHP7 random_bytes to generate RSS Token 
random_bytes is a PHP 7 function wich has been ported to PHP 5 using paragonie/random_compat
 2016-01-21 16:35:41 +01:00
Jeremy Benoist
abd454c456 Update HTML 2FA template 
Split paragraph in translation
Inject wallabag_url for image in HTML template
Remove username & password from config_dev.yml (null are already the default value)
 2016-01-21 11:03:27 +01:00
Alexandr Danilov
5f736213af #1490 HTML in E-Mails 2016-01-21 11:03:27 +01:00
Jeremy Benoist
d1f1333f48 CS 2016-01-21 11:03:27 +01:00
Jeremy Benoist
7ce895bf5e Use HTML email for 2FA 
Related to #1490
 2016-01-21 11:03:27 +01:00
Jeremy Benoist
7e80861588 Remove tag relation when removing an entry 
Fix #1453
 2016-01-20 18:35:57 +01:00
Nicolas Lœuillet
6785f4aa74 [#1590] Add JSON import from wallabag v2 2016-01-20 14:37:01 +01:00
Jeremy Benoist
e678c4752a Use translator interface instead of final class 
Symfony use a different class when in dev mode and prod mode.

Prod loads `Symfony\Bundle\FrameworkBundle\Translation\Translator`.
Dev loads `Symfony\Component\Translation\DataCollectorTranslator` to gather information for the debug bar.

Fix #1585
 2016-01-17 12:56:04 +01:00
Jeremy Benoist
f902d78153 Merge pull request #1564 from wallabag/v2-remove-flattr 
Remove Flattr references
 2016-01-15 16:01:13 +01:00
Nicolas Lœuillet
86719c63bf Merge pull request #1583 from wallabag/v2-fix-delete 
Fix `findOneByUrl` side effect in tests
 2016-01-15 15:47:13 +01:00
Nicolas Lœuillet
b91465c067 remove flattr on about page 2016-01-15 15:46:46 +01:00
Nicolas Lœuillet
1930c19d82 Merge pull request #1524 from wallabag/sf2.8 
Upgrade to Symfony 3.0
 2016-01-15 15:38:31 +01:00
Jeremy Benoist
7883367246 Fix findOneByUrl side effect in tests 
Fix #1566
 2016-01-15 15:28:32 +01:00
Nicolas Lœuillet
5c072d2b57 Quickstart for beginners 2016-01-15 15:01:30 +01:00
Jeremy Benoist
c7f622d369 Update readme & fix console permission 2016-01-15 09:36:32 +01:00
Jeremy Benoist
27e475a941 Fix Pocket generateUrl parameters 2016-01-15 09:35:38 +01:00
Jeremy Benoist
1d76102a24 Fix recent update 
- some missing url parameters from WallabagRestController & EntryController
- use a service for `EntryFilterType` to use fully qualified name instead (so changing class signature)
- update ImportBundle (url & form)
 2016-01-15 09:35:38 +01:00
Jeremy Benoist
5c895a7fd1 Update bundle & stock file 
- update stock file (AppKernel, app.php, etc ..) from SymfonyStandard edition)
- update bundle to latest release
- remove security on profiler
 2016-01-15 09:35:38 +01:00
Jeremy Benoist
619cc45359 Symfony Upgrade Fixer FTW 
symfony-upgrade-fixer fix src/Wallabag/
 2016-01-15 09:35:38 +01:00
Jeremy Benoist
4aa2997106 Merge pull request #1563 from wallabag/v2-fix-1394 
#1394 Fixed 'mark as read' and 'mark as unread' links
 2016-01-10 10:20:16 +01:00
Nicolas Lœuillet
6c9bad13e1 Fixed 'mark as read' and 'mark as unread' links 2016-01-09 22:20:19 +01:00
Nicolas Lœuillet
da82839bf8 add import link on baggy theme 2016-01-09 20:33:09 +01:00
Jeremy Benoist
39643c6b76 Merge pull request #1493 from wallabag/v2-pocket-import 
v2 – 1st draft for Pocket import via API & Wallabag v1 import
 2016-01-07 22:15:08 +01:00
Nicolas Lœuillet
b88cf91fc8 updated tests 2016-01-07 21:00:04 +01:00
Nicolas Lœuillet
10b2411c10 Hide export button if we are not on entries list 2016-01-06 07:47:09 +01:00
Nicolas Lœuillet
d1af8ad4db Added french translations 2016-01-05 22:38:09 +01:00
Jeremy Benoist
8eedc8cfac Few phpDoc fix 
And some little mistakes
 2016-01-03 11:15:44 +01:00
Jeremy Benoist
c5c7f90a81 Fix tag related test for Pocket 2016-01-03 10:32:56 +01:00
Jeremy Benoist
7019c7cf6c 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
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
b1d05721cf Rewrote Wallabag v1 import 2016-01-02 23:27:41 +01:00
Jeremy Benoist
252ebd6071 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).
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
b4b592a0c0 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)
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
77a7752a59 Update after previous merge 
PR #1443 was merged into this branch to handle all import type in the same place.
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
7ec2897ee0 First test on PocketImport 
Giving ability to define the Client add abitliy to easliy test the import.
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
0aa344dc24 Update url & service name 
Prefix ur with service namel: [service]_[route name]
Add comment in Interface
 2016-01-02 23:27:41 +01:00
Jeremy Benoist
5a4bbcc9a7 Change the way to check for an existing entry 
The repository method return the entry found or false if nothing exists.
 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
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
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
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
23ff8d3619 Add custom email for 2FA 
Related #1490
 2015-12-29 11:17:06 +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
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
Nicolas Lœuillet
3c65dfb735 add slug for tags 2015-12-28 12:49:45 +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
Thomas Citharel
a24c1ee30a Typo 2015-12-04 00:17:07 +01:00
Kévin Gomez
752b90d1f2 Fix tagging rules ordering 2015-11-29 16:19:02 +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
Kévin Gomez
aeff8aa765 Document the matches operator in the FAQ 2015-11-13 20:57:46 +01:00
Kévin Gomez
f27aca26f6 Add phpdoc for all Matches implementations 2015-11-13 20:50:09 +01:00
Kévin Gomez
a6e27f7466 Add matches operator 2015-11-13 14:37:58 +01:00
Kévin Gomez
5c514b0be3 Improve the tagging rules documentation 2015-11-11 17:06:36 +01:00
Kévin Gomez
b7b2005494 Fix the creation of the repository services 2015-11-11 16:44:57 +01:00
Kévin Gomez
0c5bcd82ba Use Psr\Log\NullLogger instead of creating a mock 2015-11-11 16:27:53 +01:00
Kévin Gomez
7b1648961d Fix incorrect comment. 2015-11-11 16:27:19 +01:00
Kévin Gomez
8a99c7a86b Add a few functional tests for the tagging rules creation form 2015-11-11 16:27:19 +01:00
Kévin Gomez
9b88658c04 Update baggy theme 2015-11-11 16:27:19 +01:00
Kévin Gomez
52e423f307 Provide a way to delete tagging rules 2015-11-11 16:27:19 +01:00
Kévin Gomez
625acf3352 Add a command to automatically tag all entries for a user 2015-11-11 16:27:19 +01:00
Kévin Gomez
c23fc05df8 Validate used operators when creating tagging rules 2015-11-11 16:23:49 +01:00
Kévin Gomez
5a166c5c1a Add tests for the RuleBasedTagger class 2015-11-11 16:23:49 +01:00
Kévin Gomez
1c9cd2a7f0 Errors in the automatic tagging do not prevent the entry from being added 2015-11-11 16:23:49 +01:00
Kévin Gomez
1dc4e5da2e Also validate used variables when creating tagging rules 2015-11-11 16:23:49 +01:00
Kévin Gomez
3447d1ee07 Add naïve validation for tagging rules (only checks the syntax) 2015-11-11 16:23:49 +01:00
Kévin Gomez
71ef0ed254 Rename the « Tags » tab to « Tagging rules » 2015-11-11 16:23:49 +01:00
Kévin Gomez
003fa77438 Add tests for the StringToListTransformer class 2015-11-11 16:23:49 +01:00
Kévin Gomez
f530f7f5e1 Fix ContentProxyTest 2015-11-11 16:23:49 +01:00
Kévin Gomez
1d7b350b25 Add missing use statement 2015-11-11 16:23:49 +01:00
Kévin Gomez
e9fbd2d12e Add a table explaining the available variables 2015-11-11 16:23:49 +01:00
Kévin Gomez
981cacf7b9 Display the tagging rules in the config 2015-11-11 16:23:49 +01:00
Kévin Gomez
9cbb404b4a Add missing tagging rule repository 2015-11-11 16:23:49 +01:00
Kévin Gomez
f19f9f62d1 Add a form to create tagging rules 2015-11-11 16:23:49 +01:00
Kévin Gomez
ac9fec610a Add TaggingRule entity 2015-11-11 16:23:49 +01:00
Kévin Gomez
c3510620ad PoC of rule-based tagging 2015-11-11 16:23:49 +01:00
Jeremy Benoist
fba3f536a5 Fix tests 2015-11-09 16:32:48 +01:00
Jeremy Benoist
cceca9ea1d Fix route parameters 
Improve export tests
Improve CSV export
 2015-11-09 16:32:48 +01:00
Thomas Citharel
268e9e7277 use JMS Serializer 2015-11-09 16:32:48 +01:00
Thomas Citharel
5b7da07620 use the groups annotation instead of setIgnoredAttributes 2015-11-09 16:32:48 +01:00
Thomas Citharel
8ac95cbfcc improved function 2015-11-09 16:32:48 +01:00
Thomas Citharel
b3cc1a14e7 add json & xml 2015-11-09 16:32:48 +01:00
Jeremy Benoist
33c36f6b48 Fix tests on pgsql 2015-11-09 16:32:48 +01:00
Jeremy Benoist
add597bad9 Rework on export 
- all export now return a `HttpFoundation\Response`
- return a 404 on unsupported format
- add tests
 2015-11-09 16:32:48 +01:00
Thomas Citharel
03690d1387 Start work on export 
For now:
 - ebook
 - mobi
 - pdf
 - csv
 2015-11-09 16:32:48 +01:00
Jeremy Benoist
970e0e994f Remove duplicate comments 2015-11-07 14:18:38 +01:00
Jeremy Benoist
75c48e3ae0 CS 2015-11-07 14:16:13 +01:00
Jeremy Benoist
d502762598 Skipping PostgreSQL test that drop database 
For a not-clear reason, I can't properly drop the current database. Even if Doctrine made a special case for that (https://github.com/doctrine/dbal/pull/849).

So instead of trying crazy things to achieve the test, better way is to skip test (too much wasted days ..)
 2015-11-07 14:16:13 +01:00
Jeremy Benoist
8a493541fa Re-enable test on doctrine command 
It will slow down the whole test suite (because it'll use doctrine command).
Remove unecessary `KernelTestCase`.
Also rename `AbstractControllerTest` to `WallabagApiTestCase` for consistency.
 2015-11-07 14:16:13 +01:00
Jeremy Benoist
735068d181 Add tests on TablePrefixSubscriber 2015-11-07 14:15:33 +01:00
Jeremy Benoist
bd0f3d32c9 Quoted entity to avoid reserved keyword 
Should fix #1498
 2015-11-07 14:15:33 +01:00
Jeremy Benoist
54a2241e13 Fix database already exist detection 
This is not the same message exception from MySQL & SQLite with Postgres.
 2015-11-07 14:15:33 +01:00
Jeremy Benoist
164d260c49 CS 
Also force SYMFONY_DEPRECATIONS_HELPER for travis
 2015-11-07 00:27:41 +01:00
Jeremy Benoist
33fe61f92f Fix form_enctype deprecation 
Use form_start instead
 2015-11-07 00:18:06 +01:00
Jeremy Benoist
18f8f32f70 Fix security.context deprecation 2015-11-07 00:17:37 +01:00