64a5a6cfc5
CS
2017-11-21 10:30:35 +01:00
b3d85e69e9
Fix MySQL issue on mig from #3373
...
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2017-11-20 22:39:33 +01:00
f4f7994c40
Merge pull request #3346 from Kdecherf/origin-property
...
Add originUrl property to Entry
2017-11-20 21:10:33 +01:00
16b1939827
Merge pull request #3423 from wallabag/composer
...
composer: update dependency versions to reduce memory footprint
2017-11-20 19:51:03 +01:00
8a21985474
Added internal setting to enable/disable headers storage
2017-11-20 18:47:48 +01:00
b495929c0d
composer: update dependency versions to reduce memory footprint
...
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2017-11-19 21:00:27 +01:00
eae8138b33
Fix phpcs
...
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2017-11-19 15:26:13 +01:00
65152fcb89
Improve EntryRestControllerTest for origin_url
...
Ensure that origin_url is initially null
Ensure patching entry with origin_url=''
Ensure patching entry with origin_url=null
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2017-11-19 15:02:11 +01:00
97444566db
Update EntryControllerTest to handle origin_url
...
Set an origin_url in testEditUpdate
Test origin_url deletion in testEditRemoveOriginUrl
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2017-11-19 15:02:11 +01:00
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
3b771f51a6
Improve origin_url field description and translations
...
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2017-11-19 15:02:11 +01:00
8425f5cc3d
Form: move url and origin_url to UrlType
2017-11-19 15:02:11 +01:00
6de4cd35b5
Add support of originUrl field in baggy entry view
2017-11-19 15:02:11 +01:00
00f2368f7a
Add some tests for OriginUrl in EntryRestController
...
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2017-11-19 15:02:11 +01:00
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
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
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
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
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
e585dde46c
Merge pull request #3422 from wallabag/simpleue-2
...
Jump to Simpleue 2.0
2017-11-19 13:53:13 +01:00
8bde7de1ee
Replace ant with Makefile
...
Fixes #1735
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2017-11-19 12:33:21 +01:00
f6988b5aa3
Merge pull request #3421 from comradekingu/patch-2
...
Spelling: diaspora, e-mail, moved ?, URL, sharing
2017-11-19 11:31:46 +01:00
00d66d39fc
Merge pull request #3420 from comradekingu/patch-1
...
Spelling: Two-factor for wallabag connection
2017-11-19 11:31:26 +01:00
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
2c437e930c
"for the public wallabag demo", paywalled websites, diaspora*
2017-11-18 04:55:33 +01:00
3c6b00dc28
Spelling: diaspora, e-mail, moved ?, URL, sharing
2017-11-18 04:52:28 +01:00
13e677648c
Spelling: Two-factor for wallabag connection
2017-11-18 04:39:52 +01:00
d0c596461b
Add CraueConfigBundle.th.yml
2017-11-18 01:27:51 +07:00
2a4a861b34
Merge pull request #3412 from aaa2000/fix-tests
...
Fix the tests
2017-11-12 11:33:18 +01:00
cc79712738
Fix phpcs
2017-11-11 23:55:13 +01:00
d81bf605af
Fix tests
2017-11-11 23:37:57 +01:00
f39cfa4690
Merge pull request #3404 from wallabag/issue-2424
...
material: replace card activator with article link on card preview
2017-11-07 13:59:47 +01:00
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
8abb6c1321
Merge pull request #3397 from wallabag/issue-1871
...
material: disable editing of entry url input when submitting new url
2017-11-06 20:43:48 +01:00
46ee68ea48
Update assets for #3397
2017-11-05 13:20:50 +01:00
3d46eeeb33
material: disable editing of entry url input when submitting new url
...
Fixes #1871
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2017-11-05 13:14:47 +01:00
b0f9e52b7e
Merge pull request #3387 from Kdecherf/fix-assets-23
...
Fix assets for 2.3
2017-11-02 15:49:37 +02:00
dccec95401
Merge pull request #3399 from aaa2000/editorconfig-makefile
...
Update .editorconfig for makefile
2017-11-02 10:21:10 +02:00
5872cd191c
Update .editorconfig for makefile
2017-11-01 14:47:06 +01:00
c20327fc72
Merge pull request #3395 from wallabag/issue-3393
...
views/config: fix overlaying drop down menu
2017-11-01 11:12:44 +01:00
8801764583
views/config: fix overlaying drop down menu
...
Fixes #3393
2017-10-31 23:16:15 +01:00
494b47f299
Merge pull request #3392 from mart-e/add-title-page-epub
...
add the title of article on the epub export
2017-10-31 15:10:41 +02:00
15a6402f75
Properly run php-cs-fixer
2017-10-28 20:16:43 +02:00
385e651684
php-cs-fixer
...
php bin/php-cs-fixer fix src/Wallabag/CoreBundle/Helper/EntriesExport.php
2017-10-28 17:17:22 +02:00
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
a6e9ad0b7d
add a title page
...
The first page of the book is the title
2017-10-28 10:45:37 +02:00
efbbfe0135
Updating .gitignore
...
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2017-10-24 00:20:56 +02:00
0b3ab03782
Removing web/bundles/wallabagcore and adding prod assets in web/wallassets
...
baggy.css, baggy.js, material.css, material.js and public.js are seen as
new files, something changed in these files.
Signed-off-by: Kevin Decherf <kevin@kdecherf.com >
2017-10-24 00:19:00 +02:00
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
1953a87293
Merge pull request #3011 from wallabag/2.3
...
wallabag 2.3.0
2017-10-23 11:09:17 +02:00
