Commit graph

1640 commits

Author SHA1 Message Date
adev 2680b0bc8c Fix installation command 2017-11-21 21:35:17 +01:00
Nicolas Lœuillet 95b7d92ea5
Merge pull request #3425 from wallabag/add-setting-for-headers
Added internal setting to enable/disable headers storage
2017-11-21 13:26:24 +01:00
Jeremy Benoist 709e21a3f4
Define storeArticleHeaders false by default
Fix tests which must use `$storeArticleHeaders`.
Fix CS
2017-11-21 10:37:36 +01:00
Nicolas Lœuillet 8a21985474 Added internal setting to enable/disable headers storage 2017-11-20 18:47:48 +01:00
Kevin Decherf eae8138b33 Fix phpcs
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:26:13 +01:00
Kevin Decherf ecf41ab3fa Replace hardcoded 'Provided by' string with i18n string
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf 3b771f51a6 Improve origin_url field description and translations
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf 8425f5cc3d Form: move url and origin_url to UrlType 2017-11-19 15:02:11 +01:00
Kevin Decherf 6de4cd35b5 Add support of originUrl field in baggy entry view 2017-11-19 15:02:11 +01:00
Kevin Decherf 00f2368f7a Add some tests for OriginUrl in EntryRestController
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf 3198ea9682 Handle original_url querystring in Shaarli sharing link
This feature needs at least shaarli-plugin-via 0.2 from
https://github.com/Kdecherf/shaarli-plugin-via to work.

Shaarli will silently ignore this parameter if this plugin is missing.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf f0f162b8d2 Add support of originUrl field in material entry view
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf e50e45d6fa Twig: add removeSchemeAndWww filter
This twig filter removes scheme (only http and https are supported) and
pass the result to removeWww filter to also remove 'www.' at the
beginning of an url.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf 03b020eb20 Entry: handle originUrl in edit form, update translations
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Kevin Decherf e0ef1a1c8b Add originUrl property to Entry, handle that in EntryRestController, handle migration
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:02:11 +01:00
Nicolas Lœuillet e585dde46c
Merge pull request #3422 from wallabag/simpleue-2
Jump to Simpleue 2.0
2017-11-19 13:53:13 +01:00
Jeremy Benoist c8ac32cf17
Jump to Simpleue 2.0
The 1.3.0 tag is introducing BC so we jump to the 2.0
2017-11-18 16:28:54 +01:00
Allan Nordhøy 13e677648c
Spelling: Two-factor for wallabag connection 2017-11-18 04:39:52 +01:00
Kevin Decherf 2f510787e7 material: replace card activator with article link on card preview
Fixes #2424

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-06 20:49:41 +01:00
Jérémy Benoist b0f9e52b7e
Merge pull request #3387 from Kdecherf/fix-assets-23
Fix assets for 2.3
2017-11-02 15:49:37 +02:00
Kevin Decherf 8801764583 views/config: fix overlaying drop down menu
Fixes #3393
2017-10-31 23:16:15 +01:00
Jeremy Benoist 15a6402f75
Properly run php-cs-fixer 2017-10-28 20:16:43 +02:00
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