mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2025-02-28 00:16:28 +00:00
Code Issues Projects Releases Wiki Activity
4266 commits 16 branches 100 tags 192 MiB
Commit graph

1668 commits

Author SHA1 Message Date
Martin Trigaux
385e651684 php-cs-fixer 
php bin/php-cs-fixer fix src/Wallabag/CoreBundle/Helper/EntriesExport.php
 2017-10-28 17:17:22 +02:00
Martin Trigaux
c779373f2c Set the title in a separated chapter 
Set the export option on the same page, same as done in producePdf
Move the ToC at the end of the book so the title page is the first one
 2017-10-28 14:49:14 +02:00
Martin Trigaux
a6e9ad0b7d add a title page 
The first page of the book is the title
 2017-10-28 10:45:37 +02:00
Kevin Decherf
9ff628ca56 webpack & views: replace bundles/wallabagcore with wallassets 
This change will prevent composer from removing wallabagcore assets when
installing assets.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-10-24 00:15:52 +02:00
Mateusz Rumiński
3828f525e1 Update messages.pl.yml 
add polish translation for export footer_template
 2017-10-19 13:07:24 +02:00
Nicolas Lœuillet
1c5081cdc5 Merge pull request #3373 from wallabag/change-readingtime-notnull 
Changed reading_time field to prevent null values
 2017-10-18 11:33:30 +02:00
Jérémy Benoist
91f9bacf73 Merge pull request #3362 from sviande/fix_3361_api_warning 
Fix #3361 check type for tags in entry repository
 2017-10-18 11:16:50 +02:00
Nicolas Hart
9ca069a6fe Replace kernel.root_dir by kernel.project_dir 
kernel.root_dir and Kernel::getRootDir() are deprecated since Symfony 3.3.
See https://symfony.com/blog/new-in-symfony-3-3-a-simpler-way-to-get-the-project-root-directory and https://github.com/symfony/symfony/blob/3.3/UPGRADE-3.3.md#httpkernel for more information.
 2017-10-14 00:32:56 +02:00
Sébastien Viande
0978bd849e Fix #3361 Entry Rest controller getEntries cast tags params to string 2017-10-13 10:28:05 +02:00
Nicolas Lœuillet
88bac4a33e Changed reading_time field to prevent null values 2017-10-13 09:35:44 +02:00
Sébastien Viande
fafdf17117 Fix #3361 check type for tags in entry repository 
Check is $tags is a string before explode
 2017-10-12 07:38:27 +02:00
Jeremy Benoist
9dd67fa342
CS 2017-10-11 10:43:36 +02:00
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