mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-15 21:41:06 +00:00
Code Issues Projects Releases Wiki Activity
4258 commits 12 branches 100 tags 168 MiB
Commit graph

1667 commits

Author SHA1 Message Date
Quent-in
efeaadcf9d Correction indent. L538 
Correction indentation suite rapport Travis
 2017-08-05 19:48:45 +02:00
Quent-in
162740b798 Update 
2FA : choix des occitanophones interrogés : autentificacion en dos temps.
+ fautes de frappes
 2017-08-05 15:19:34 +02:00
Quent-in
86de3eb766 Update OC: correction fautes de frappe 2017-08-05 15:14:34 +02:00
Quent-in
5942d358b7 Update with new strings 
L538 : not quite sure about the number of space.
 2017-08-05 14:58:15 +02:00
Nicolas Hart
f7a4b44136 add search argument and limit option to list users command 2017-07-31 23:20:41 +02:00
Nicolas Hart
af31cfed76 Add list user command 2017-07-30 22:04:29 +02:00
Jérémy Benoist
882da5c5eb Merge pull request #3297 from nclsHart/commands-better-rendering 
Better rendering for all core commands
 2017-07-30 08:31:04 +02:00
Jérémy Benoist
4fc7eba349 Merge pull request #3298 from nclsHart/fix-namespace-phpdoc 
Fix some namespaces and phpdoc
 2017-07-30 08:27:39 +02:00
Nicolas Hart
fe312015d2 Add missing abstract method prepareEntry in BrowserImport 2017-07-29 22:59:11 +02:00
Nicolas Hart
52b84c11a5 Fix some namespaces and phpdoc 2017-07-29 22:51:50 +02:00
Nicolas Hart
e1b33efb3d Better rendering for all core commands 2017-07-29 11:09:02 +02:00
Jérémy Benoist
d69a66a58e Merge pull request #3290 from nclsHart/fix-3019 
Add a dedicated title for all entries page
 2017-07-29 09:34:29 +02:00
Jeremy Benoist
bde23a44f8
Empty currentTag should be null 
And when a parameter is null, it won't appear in the url like `?tag=`.
 2017-07-28 08:07:11 +02:00
Jérémy Benoist
233eb91be4 Merge pull request #3291 from nclsHart/show-user-io 
Better rendering for show user command using symfony style
 2017-07-28 07:38:15 +02:00
Jérémy Benoist
e56f82142a Merge pull request #3292 from nclsHart/remove-getdoctrine 
Remove unused method getDoctrine in several commands
 2017-07-28 07:36:27 +02:00
Jérémy Benoist
6f9aba78a7 Merge pull request #3293 from nclsHart/remove-unused-use 
Remove unused use statement in install command
 2017-07-28 07:35:48 +02:00
Nicolas Hart
04f19537e7 Remove unused use statement in install command 2017-07-27 23:51:01 +02:00
Nicolas Hart
a19e212f43 Remove unused method getDoctrine in several commands 2017-07-27 23:44:12 +02:00
Nicolas Hart
d58199f362 Better rendering for show user command using symfony style 2017-07-27 23:34:57 +02:00
Nicolas Hart
383215866f add a dedicated title for all entries page 2017-07-27 23:08:08 +02:00
Jeremy Benoist
ff9f89fd23
Add a test for updatePublishedAt 
To avoid error when a content is re-submitted and it previously add a
published date.

Also, fix the `testPostSameEntry`
 2017-07-24 17:07:47 +02:00
Simounet
b236d3f627
Fix updatePublishedAt on already parsed article's date 2017-07-24 16:39:07 +02:00
Jeremy Benoist
459374022f
CS 2017-07-24 11:52:43 +02:00
Jérémy Benoist
f39152ad6e Merge pull request #3266 from egilli/export-domain-as-author 
Use the article publisher as author for exported files
 2017-07-11 09:21:49 +02:00
Jérémy Benoist
9aa11176b8 Merge pull request #3264 from wallabag/trait-timestamps 
Add EntityTimestampsTrait to handle dates
 2017-07-11 07:30:08 +02:00
Étienne Gilli
eeabca8090 Make updateAuthor code simpler to read 2017-07-10 10:08:20 +02:00
Étienne Gilli
c57f69d967 Use the article publisher as author for export 
When exporting an entry, use the publishedBy field as author name for
epub, mobi and pdf formats. Fallback to domain name if empty.
 2017-07-09 18:33:14 +02:00
Étienne Gilli
07320a2bd2 Use the article domain as author for export files 
When exporting an entry, use the domain name as author name for epub,
mobi and pdf formats, instead of 'wallabag'.
Change the author from array to string, because for now, there is always
only one author.
 2017-07-08 19:53:43 +02:00
Jeremy Benoist
2e5b2fa808
Revert client_credentials grant types 2017-07-08 19:28:12 +02:00
Jeremy Benoist
927c9e796f
Add EntityTimestampsTrait to handle dates 
Refactorize timestamps() method to avoid re-writing it on each entity
 2017-07-06 09:01:51 +02:00
Jérémy Benoist
b5d7eb148c Merge pull request #3256 from wallabag/fix-patch 
Fix PATCH method
 2017-07-05 15:00:24 +02:00
Jeremy Benoist
c18a2476b6
CS 2017-07-03 13:56:39 +02:00
Jeremy Benoist
d0ec2ddd23
Fix validateAndSetPreviewPicture 
Which wasn't covered by a test!
 2017-07-03 13:45:04 +02:00
Jeremy Benoist
a05b61159e
Fix PATCH method 
The PATCH method for the entry should only update what user sent to us and not the whole entry as it was before.
Also, sending tags when patching an entry will now remove all current tags & assocatied new ones.
 2017-07-03 13:45:04 +02:00
Jeremy Benoist
e50d7d31c0
CS 2017-07-03 13:40:47 +02:00
Jeremy Benoist
9114615adc
Fixed mapping entities 
There were this error in the console:

> The association Wallabag\CoreBundle\Entity\SiteCredential#user refers to the inverse side field Wallabag\UserBundle\Entity\User#site_credentials which does not exist.
 2017-07-03 13:40:47 +02:00
Jeremy Benoist
38520658ad
Fix tests 2017-07-03 07:30:54 +02:00
Jeremy Benoist
f808b01692
Add a real configuration for CS-Fixer 2017-07-01 09:52:38 +02:00
Jérémy Benoist
822c877949 Merge pull request #3245 from wallabag/fix-bc 
Avoid BC on exists endpoint
 2017-06-29 11:17:58 +02:00
Jérémy Benoist
331e5b0261 CS 2017-06-28 09:18:22 +02:00
Jeremy Benoist
39ffaba323
Return null instead of false 2017-06-28 08:15:06 +02:00
Jeremy Benoist
42708d1121
Merge remote-tracking branch 'origin/master' into 2.3 2017-06-26 10:05:48 +02:00
matteocoder
559cbfdc2f Fixed broken lines and added new lines 
In addition to fixing broken lines, I've also added a couple of lines from recent PRs.
 2017-06-24 11:06:09 +02:00
Jeremy Benoist
18696f77fd
Avoid BC on exists endpoint 2017-06-23 08:30:23 +02:00
Thomas Citharel
151f45db0e Don't load js for nothing in prod 2017-06-22 14:55:49 +02:00
Thomas Citharel
77255d6688 Add css on share public page 2017-06-22 12:15:24 +02:00
Jeremy Benoist
6b1b148d65 Add share.scss file 
Still needs to include it in the twig template
 2017-06-22 12:13:22 +02:00
Sven Fischer
38dd2def20 add 🇮🇹 shared_by_wallabag string translated by @matteocoder 2017-06-22 12:13:22 +02:00
Sven Fischer
5642d1a150 adjust 🇩🇪 shared_by_wallabag string to include user info 2017-06-22 12:13:22 +02:00
Jeremy Benoist
77c5140bed Better export page 
I’ve increase the width of the page 900px, 600px looks too small for me. Should we use something like 90% instead?
 2017-06-22 12:13:22 +02:00
Nicolas Lœuillet
9416053bfc Merge pull request #3241 from wallabag/fix-qr-code-trans 
Fix translations on QR code instructions
 2017-06-22 10:26:41 +02:00
Nicolas Lœuillet
d0702f9fbd Merge pull request #3227 from wallabag/oauth-client-credentials 
Add client_credentials oAuth2 auth method
 2017-06-22 10:00:23 +02:00
Jérémy Benoist
1adab57426
Add 🇮🇹 translation 2017-06-22 09:12:57 +02:00
Mateusz Rumiński
8c3d7875b2
Update polish 
add missing translation
 2017-06-22 09:12:57 +02:00
Thomas Citharel
e2a038d653
Fix translations on QR code instructions 2017-06-22 09:12:57 +02:00
Thomas Citharel
bd40f1af88
Add all entries RSS feed and put links on tag page itself and baggy too 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-21 12:02:04 +02:00
Jeremy Benoist
ebf2d92327
Fix typo 2017-06-21 11:44:36 +02:00
Thomas Citharel
8c59809432
add rss icon 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-21 11:44:36 +02:00
Jeremy Benoist
03ce43d466
Fix getContainer in command 2017-06-21 11:44:35 +02:00
Jeremy Benoist
18c38dffc6
Add RSS tags feeds 2017-06-21 11:44:35 +02:00
Jeremy Benoist
25203e5081
User existing service instead of getDoctrine 2017-06-21 11:44:35 +02:00
Jérémy Benoist
80784b782b Merge pull request #2683 from wallabag/credentials-in-db 
Store credentials in DB
 2017-06-20 16:40:48 +02:00
Jeremy Benoist
f44dba22fc
Get rid of masked value in listing 2017-06-20 16:03:39 +02:00
Thomas Citharel
bead8b42da
Fix reviews 
Encrypt username too
Redirect to list after saving credentials
Fix typos

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-20 16:03:39 +02:00
Jeremy Benoist
906424c1b6
Crypt site credential password 2017-06-20 16:03:35 +02:00
Jeremy Benoist
9de9f1e5ce
Add a live test for restricted article 
It is not aimed to test if we can get the full article (since we aren't using real login/password)
but mostly to test the full work (with authentication, etc.)

Do not clean fixtured to avoid SQLite to re-use id for entry tag relation 😓
 2017-06-20 16:03:20 +02:00
Jeremy Benoist
b8427f22f0
Add menu access to site credentials CRUD 2017-06-20 16:03:14 +02:00
Jeremy Benoist
5a9bc00726
Retrieve username/password from database 
Inject the current user & the repo to retrieve username/password from the database
 2017-06-20 16:03:13 +02:00
Jeremy Benoist
fc6d92c63d
Update route & user verification 2017-06-20 16:03:13 +02:00
Jeremy Benoist
f92fcb53ca
Add CRUD for site credentials 2017-06-20 16:03:08 +02:00
matteocoder
508f248676 revised messages.it 2017-06-17 13:42:28 +02:00
Thomas Citharel
caa0b1765b Add client_credentials oAuth2 auth method 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-14 17:30:12 +02:00
Thomas Citharel
41d45c6122 Fix empty language and preview pics 2017-06-12 16:46:33 +02:00
Jeremy Benoist
d9da186fb8
CS 2017-06-10 16:08:24 +02:00
Jeremy Benoist
a9c6577f0c
Few fixes 2017-06-10 15:37:25 +02:00
Jeremy Benoist
1112e54772
Add public filter/field in the API 
Listing entries can now be filtered by “public”.
Creating or patching an entry can now set is to public or remove the public.
Entry response now include “is_public” boolean field
 2017-06-10 15:31:57 +02:00
Jeremy Benoist
e8911f7c09
Add isPublic filter on entries 2017-06-10 15:00:52 +02:00
Jeremy Benoist
873f6b8e03
Merge remote-tracking branch 'origin/master' into 2.3 2017-06-10 14:41:30 +02:00
Jérémy Benoist
f6d45eca76 Merge pull request #3206 from wallabag/mruminski-patch-1 
Update validators.pl.yml
 2017-06-10 13:17:20 +02:00
Jérémy Benoist
de9445cd25 Merge pull request #3203 from wallabag/fix-tag-count-baggy 
Fix tags count in tags list on baggy
 2017-06-10 13:16:10 +02:00
Mateusz Rumiński
8da86b3f93 Update validators.pl.yml 
add "quote_length_too_high" translation
 2017-06-10 12:40:40 +02:00
Jérémy Benoist
679aaf0836 Merge pull request #3173 from wallabag/domain-name-param 
remove craueconfig domain name setting and add a proper one in parame…
 2017-06-10 11:36:03 +02:00
Jeremy Benoist
3fd6790893
Update translations 2017-06-10 11:29:56 +02:00
Jeremy Benoist
a9b984feee
Fix tags count in tags list on baggy 2017-06-10 11:21:47 +02:00
Jérémy Benoist
a899399989 Merge pull request #3192 from wallabag/validate-content-fields 
Validate language & preview picture fields
 2017-06-09 13:51:26 +02:00
Pierre de Vésian
491371a051 Config label improvement #3199 2017-06-09 12:11:48 +02:00
Jeremy Benoist
80e49ba7b0
Convert - to _ in language 
Mostly to increase language supports
 2017-06-09 11:42:09 +02:00
Jeremy Benoist
42f3bb2c63
Use Locale instead of Language 2017-06-09 11:28:04 +02:00
Jeremy Benoist
f81a34e379
Use a listener to catch auth failure 2017-06-09 09:45:43 +02:00
Jeremy Benoist
fa1c9d7cc7
CS 2017-06-08 22:52:26 +02:00
Jeremy Benoist
63f9f22fa3
Log an error level message when user auth fail 
When a user login using the form we know log an error level information with information about the user:
- username used
- IP
- User agent

For example:

> Authentication failure for user "eza", from IP "127.0.0.1", with UA: "Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_6) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/58.0.3029.110 Safari/537.36".

It’ll allows server admin using fail2ban to configure it to block these people if they generate too much failure authentication.
 2017-06-08 22:24:49 +02:00
Jeremy Benoist
be54dfe4e6
CS 2017-06-08 21:56:20 +02:00
Jeremy Benoist
0d349ea670
Validate language & preview picture fields 
Instead of saving the value of each field right into the content without any validation, it seems better to validate them.
This might sounds obvious now we say that.
 2017-06-08 21:51:46 +02:00
Jeremy Benoist
80f4d85ac9
Review 2017-06-08 19:15:33 +02:00
Jeremy Benoist
a8d3fe50df
Add ability to name the client 2017-06-08 14:25:44 +02:00
Jeremy Benoist
eb570e49c8
CS 2017-06-07 23:31:14 +02:00
Jeremy Benoist
0c00e52516
Create a client when creating a user using the api 
While creating a new user using the API, we also create a new client for the current user.
So the app which just create the user can use its newly created client to configure the app.

That new client is only return after creating the user.
When calling the endpoint /api/user to get user information, the new client information won’t be return.
 2017-06-07 23:23:28 +02:00
Nicolas Lœuillet
7bb3aa3177 Merge pull request #3093 from aaa2000/annotation-error-on-save 
Displays an error with an annotation with a too long quote
 2017-06-07 16:30:27 +02:00
Jérémy Benoist
c0d756f67d Merge pull request #3181 from wallabag/api-content-patch 
Add ability to patch an entry with more fields
 2017-06-07 15:40:59 +02:00
Jeremy Benoist
db0c48af36
Refactorize the way to save an Entry in the API 2017-06-07 15:07:55 +02:00
Jérémy Benoist
4e4a5b534f Merge pull request #3184 from wallabag/better-way-image-extension 
Use an alternative way to detect images
 2017-06-07 13:41:25 +02:00
Jérémy Benoist
a3f16a5685 Merge pull request #3179 from wallabag/show-user-command 
Show user command
 2017-06-07 09:40:56 +02:00
Thomas Citharel
e48b238a3e fix tests 2017-06-06 16:18:25 +02:00
Thomas Citharel
d6c4c484c4 add migration 2017-06-06 16:04:51 +02:00
Thomas Citharel
be9d693e74 remove craueconfig domain name setting and add a proper one in parameters 2017-06-06 15:36:21 +02:00
Jérémy Benoist
6ed2627bb3 Merge pull request #3177 from wallabag/api-create-user-update 
API user creation behing a toggle
 2017-06-06 15:25:05 +02:00
Jérémy Benoist
9fe87bc2e2 Merge pull request #3165 from wallabag/it-translation-update 
Update Italian translation
 2017-06-06 11:44:18 +02:00
Jeremy Benoist
577c0b6dd8
Use an alternative way to detect image 
When parsing content to retrieve images to save locally, we only check for the content-type of the image response.
In some case, that value is empty.
Now we’re also checking for the first few bytes of the content as an alternative to detect if it’s an image wallabag can handle.
We might get higher image supports using that alternative method.
 2017-06-05 22:54:02 +02:00
Thomas Citharel
0d8ecb82a3 Fix review 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-04 17:57:40 +02:00
adev
2c3e148b00 Displays an error with an annotation with a too long quote 
Fix #2762
 2017-06-04 11:38:29 +02:00
Jeremy Benoist
645291e8fe
Add ability to patch an entry with more fields 
Like when we create an entry, we can now patch an entry with new fields:
- content
- language
- preview_picture
- published_at
- authors
 2017-06-02 20:52:49 +02:00
Jeremy Benoist
a1e6187406
Return 201 on user creation 2017-06-02 20:03:25 +02:00
Thomas Citharel
d143fa243d Add show user command 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-06-02 16:53:03 +02:00
Jeremy Benoist
1b9cd91782
Add translation 2017-06-02 11:32:38 +02:00
Jeremy Benoist
426bb453d2
API user creation behing a toggle 
I've added a toggle feature (in internal settings) so that user api creation can be disabled while form registration still can be enabled.
Also, the /api/user endpoint shouldn't require authentication. Even if we check the authentication when sending a GET request, to retrieve current user information.

I've moved all the internal settings definition to config to avoid duplicated place to define them.
I don't know why we didn't did that earlier.
 2017-06-02 11:32:38 +02:00
Jérémy Benoist
a687c8d915 Merge pull request #2708 from jcharaoui/import-disablecontentupdate 
Import disableContentUpdate
 2017-06-02 11:26:37 +02:00
Jérémy Benoist
d06a1ebdfb Update messages.it.yml 2017-06-02 09:17:45 +02:00
Jeremy Benoist
9bf7752f73
CS 2017-06-01 22:58:38 +02:00
Jeremy Benoist
fcad69a427
Replace images with & 
Images with `&` in the path weren’t well replaced because they might be with `&amp;` in the html instead.

Replacing `&` with `&amp;` fix the problem.
 2017-06-01 22:50:33 +02:00
Jeremy Benoist
f5924e9547
Fix option attributes 2017-06-01 15:44:36 +02:00
Jeremy Benoist
701d3066fb
We don't need that getter 2017-06-01 12:46:07 +02:00
Jeremy Benoist
ec97072152
No need to catch that Exception 2017-06-01 11:45:02 +02:00
Jeremy Benoist
6acadf8e98
Rewrote code & fix tests 2017-06-01 11:31:45 +02:00
Jeremy Benoist
843182c7cf
CS 2017-06-01 09:52:09 +02:00
Jeremy Benoist
d5c2cc54b5
Fix tests 2017-06-01 09:49:15 +02:00
Jeremy Benoist
432a24f502
CS 2017-06-01 09:48:14 +02:00
Jerome Charaoui
704803e182
Replace Wallabag v1 error strings with v2 strings 2017-06-01 09:48:14 +02:00
Jerome Charaoui
d0e9b3d640
Add disableContentUpdate import option 
This commit also decouples the "import" and "update" functions inside
ContentProxy. If a content array is available, it must be passed to the
new importEntry method.
 2017-06-01 09:48:14 +02:00
Jerome Charaoui
1c5da417e4
Put default fetching error title in global config 2017-06-01 09:43:01 +02:00
Jerome Charaoui
7aba665e48
Avoid returning objects passed by reference. 
Objects are always passed by reference, so it doesn't make sense to
return an object which is passed by reference as it will always be the
same object. This change makes the code a bit more readable.
 2017-06-01 09:43:01 +02:00
Jeremy Benoist
3a6af6c580
fixup! Set the right variable type 2017-06-01 09:36:01 +02:00
Jeremy Benoist
10bf812a9e
Both parameter wasn't used in the function, removing them 2017-06-01 09:30:38 +02:00
Jeremy Benoist
c3f7a2ca70
Set the right variable type 2017-06-01 09:30:20 +02:00
Jeremy Benoist
53da8ad844
Page parameter was never used in the function 
It could have been used if we set the current page inside PreparePagerForEntries.
But we did that in each controller because we can have an OutOfRangeCurrentPageException
 2017-06-01 09:29:18 +02:00
Jérémy Benoist
2a0eec07a5 Merge pull request #3137 from aaa2000/isolated-tests 
Isolated tests
 2017-06-01 07:58:17 +02:00
Nicolas Lœuillet
2e05858e1a
Updated 🇮🇹 translations 
Thank you @matteocoder
 2017-05-31 22:20:44 +02:00
Nicolas Lœuillet
757ec837be Merge pull request #3077 from wallabag/add-tags-list-view 
Added tags on list view
 2017-05-31 21:18:14 +02:00
adev
7ab5eb9508 Isolated tests 
Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation.
 2017-05-31 16:03:54 +02:00
Thomas Citharel
91775f36fe Add some flex magic 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2017-05-31 14:34:46 +02:00
Jeremy Benoist
f0378b4d7c
Forced date can now be a timestamp too 
Add adding more tests for forced content
 2017-05-31 14:00:15 +02:00
Jeremy Benoist
9e349f08a6
Improve docs 2017-05-31 14:00:15 +02:00
Jeremy Benoist
0d6cfb884c
Remove htmlawed and use graby instead 
Instead of using htmlawed (which is already used in graby) use graby directly (which require some refacto on graby side).
Still needs some tests.
 2017-05-31 14:00:15 +02:00
Jeremy Benoist
74a75f7d43
Use graby ContentExtractor to clean html 
It might be better to re-use some graby functionalities to clean html instead of building a new system.
 2017-05-31 14:00:15 +02:00
Jeremy Benoist
fb436e8ca0
Add support for authors 2017-05-31 13:59:45 +02:00
Jeremy Benoist
e668a8124c
Allow other fields to be send using API 
Entry API can now have these new fields:
- content
- language
- preview_picture
- published_at

Re-use the ContentProxy to be able to do the same using the web UI (in the future).
htmLawed is used to clean stuff from content, I hope it’ll be enough to avoid security breach.

Lower content validation when we want to update an entry with content already defined. Before, language & content_type were required. If there weren’t provided, we re-fetched the content using graby. I think these fields aren’t required for an entry to be created. So I removed them.
Which means some import from the v1 export won’t be re-fetched since they provide content, url & title.

Also, remove liberation link from Readability import to avoid overlaping import (from wallabag v1, which had the same link)
 2017-05-31 13:59:45 +02:00
Nicolas Lœuillet
812c980fa5 Fixed tags display on grid view 2017-05-31 13:26:29 +02:00
Nicolas Lœuillet
4423b88c5b Merge pull request #3168 from wallabag/instapaper-tags-import 
Add support for tag in Instapaper import
 2017-05-31 12:32:09 +02:00
Nicolas Lœuillet
d61fd8be4f Merge pull request #3138 from Kdecherf/2835-tags 
Ignore ActionMarkAsRead when removing tag from entry
 2017-05-31 11:48:42 +02:00
Nicolas Lœuillet
3f8578ded3 Merge pull request #3161 from wallabag/scrutinizer-2.3 
Fix some Scrutinizer issues
 2017-05-31 11:46:41 +02:00
Jeremy Benoist
7a8ed3cee1
Add support for tag in Instapaper import 2017-05-31 10:38:00 +02:00