mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-26 09:00:48 +00:00
Code Issues Projects Releases Wiki Activity
4371 commits 13 branches 99 tags 147 MiB
Commit graph

1706 commits

Author SHA1 Message Date
Nicolas Lœuillet 8f187e280f
Fixed @j0k3r's review 2017-10-11 10:43:19 +02:00
Nicolas Lœuillet dc7fa8dfc6
Fixed @tcitworld's review 2017-10-11 10:43:19 +02:00
Nicolas Lœuillet b1428a1cf8
Translated first page of exported article 2017-10-11 10:43:19 +02:00
Jérémy Benoist d8dc7372ab Merge pull request #3376 from wallabag/symfony-3.3 
Symfony 3.3
 2017-10-11 09:55:03 +02:00
Олег 4bea44da92
update Russian language 2017-10-10 10:48:38 +02:00
Олег ef5fcdee20
add Russian language 2017-10-10 10:48:29 +02:00
Олег 28af2989ec
Add Russian language in CoreBundle Resources and CraueConfigBundle 2017-10-10 10:47:48 +02:00
Jeremy Benoist 3ef055ced3
CS 2017-10-09 16:47:15 +02:00
Jeremy Benoist f40c88eb1f
Jump to Symfony 3.3 & update others deps 
Also update tests urls
 2017-10-09 16:45:12 +02:00
Quent-in f764407daf Update messages.oc.yml 2017-09-09 18:23:59 +02:00
Jeremy Benoist 9c4a7388da
Remove unused function 
Introduce after the rebase I guess
 2017-09-06 22:58:35 +02:00
Jeremy Benoist 33264c2d02
Fix tests 2017-09-06 22:49:16 +02:00
Jeremy Benoist 7c04b7396a
Multiple tag search was broken from API 
First, the setParameter() were done on the same parameter which in fact
just duplicated the condition in the SQL query (like `where t.label =
'test' and t.label = 'test'`.

Changed the parameter doesn't help because the query was then wrong.

Changing the way to match associated tags for an entry and it worked.
 2017-09-06 22:49:15 +02:00
Nicolas Lœuillet 78b36d4dbe Merge pull request #3332 from nclsHart/better-txt-export 
Better entry txt export using html2text
 2017-09-06 15:08:12 +02:00
Jérémy Benoist b9c26b6330 Merge pull request #3337 from strobeltobias/patch-1 
Add missing quotation marks and small fixes (2)
 2017-09-04 12:09:26 +02:00
Jérémy Benoist e85657fb10 Update messages.de.yml 2017-09-04 11:17:26 +02:00
Jérémy Benoist f3e688207d Merge pull request #3333 from Quent-in/2.3 
Update OC
 2017-09-03 20:26:16 +02:00
Jérémy Benoist 3af5d41759 Merge pull request #3139 from Kdecherf/2502-tag-case 
Ignore tag's case
 2017-09-03 20:25:15 +02:00
Tobias Strobel bcb10aeef8 Update to comply with suggested changes 2017-09-03 15:15:38 +02:00
Tobias Strobel 6c2a56458b Add missing quotation marks and small fixes (2) 2017-09-01 23:01:57 +02:00
Quent-in 442147d923 Update wallabag_user.oc.yml 2017-08-30 20:10:58 +02:00
Quent-in de4bbe4968 Update validators.oc.yml 2017-08-30 20:06:34 +02:00
Quent-in 9f33293b7e Update 2017-08-30 20:01:11 +02:00
Jérémy Benoist 119e6c5edb Merge pull request #3330 from franek/set-starred-date 
Add starred_at field which is set when an entry is starred
 2017-08-30 13:53:49 +02:00
Jérémy Benoist 854616ac6d Merge pull request #3294 from wallabag/export-tag-null 
Empty currentTag should be null
 2017-08-30 13:51:20 +02:00
Kevin Decherf 7036d91fe7 Tag: render tags case-insensitive by storing them in lowercase 
Fixes #2502

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-08-27 16:51:23 +02:00
Nicolas Hart c660878388 better entry txt export using html2text 2017-08-27 00:04:21 +02:00
François D a991c46eed Set a starred_at field when an entry is starred. 
This date is used to sort starred entries.

Can not use Entry::timestamps method otherwise starred_at will be updated each time entry is updated.
Add an updateStar method into Entry class
A migration script has been added in order to set starred_at field.
 2017-08-25 21:19:47 +02:00
Jeremy Benoist 2490f61dca
Merge remote-tracking branch 'origin/master' into 2.3 2017-08-22 11:22:47 +02:00
Nicolas Hart dbf1188c5b rename getAllEntriesIdAndUrl into findAllEntriesIdAndUrlByUserId 2017-08-22 10:42:54 +02:00
Nicolas Hart 215409a8b2 rename getAllEntriesId into findAllEntriesIdByUserId 2017-08-22 10:41:28 +02:00
Nicolas Hart 511f1ce1e8 Add reload entry command 2017-08-21 10:45:48 +02:00
Étienne Gilli aa29fc4ec6 Fix export links in baggy theme 2017-08-13 18:03:32 +02:00
Jérémy Benoist 4d2758dfa0 Merge pull request #3319 from Quent-in/2.3 
Translation : OC small changes
 2017-08-10 10:13:09 +02:00
Quent-in 0d7d472c91 Small change 
Apostrophe par erreur, et "aller À votre compte" et non "sur", pas choquant mais mieux je pense en OC.
 2017-08-09 18:40:19 +02:00
Jérémy Benoist 86ecd2b543 Merge pull request #3314 from nclsHart/fix-3313 
Reduce number of queries on tag list
 2017-08-08 19:48:47 +02:00
Mateusz Rumiński e86ee7fd1e Update messages.pl.yml 
add polish translation for credentials
 2017-08-08 15:45:44 +02:00
Nicolas Hart 935e9fffb4 Reduce number of queries on tag list 2017-08-06 23:02:32 +02:00
Quent-in 1aa5b75804 Correction apostrophe encadrée par simples apostrophes 2017-08-05 20:20:18 +02:00
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