Commit graph

4405 commits

Author SHA1 Message Date
Simounet
1f84aa903d Fix wrong selected page number alignment on pagination 2017-12-04 22:46:35 +01:00
Simounet
f836b98fa6 Fix pagination on list mode 2017-12-04 22:31:30 +01:00
Jérémy Benoist
b9be1cf1ee
Merge pull request #3449 from Simounet/feature/share-page
Share page improved (mobile + header's padding)
2017-12-04 10:11:32 +01:00
Simounet
2784f674ea Figure image and figcaption centered on share page 2017-12-03 14:41:15 +01:00
Simounet
970e107524 Share page improved (mobile + header's padding) 2017-12-03 14:38:46 +01:00
Tobias Strobel
e2ee70f477
Translate new validators string 2017-11-26 14:49:59 +01:00
Tobias Strobel
ca8d3ed598
Translate new strings 2017-11-26 14:24:03 +01:00
Nicolas Lœuillet
1d91f14516
Merge pull request #3436 from wallabag/origin-shaarli
Add craue setting to enable sharing of origin url to Shaarli
2017-11-26 08:58:17 +01:00
Kevin Decherf
893fd6434f Add craue setting to enable sharing of origin url to Shaarli
Also fix the field name used in the query string and add it to baggy
theme

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-25 17:07:55 +01:00
Jérémy Benoist
773ac5b0f7
Merge pull request #3419 from NatJNP/patch1
Add Thai language
2017-11-25 12:29:53 +01:00
Jérémy Benoist
ceff312db8
Merge pull request #3401 from aaa2000/migration-initial
Add an initial doctrine migration
2017-11-25 12:28:41 +01:00
NatPi
2020b4456c Add all file thai Language for translate 2017-11-24 02:53:01 +07:00
Jérémy Benoist
f818f64145
Merge pull request #3431 from wallabag/disable-site-credentials
Disable controller access if feature disabled
2017-11-22 15:11:25 +01:00
Jeremy Benoist
ef2b4041fb
Disable controller access if feature disabled
If `restricted_access` is disabled, accessing `/site-credentials/` must be disabled.
2017-11-22 10:00:45 +01:00
adev
f4e7a0df0e Fix phpcs 2017-11-21 22:07:37 +01:00
adev
e36c85eb79 Fix travis fold 2017-11-21 21:35:17 +01:00
adev
4c0ac1d10b Remove data sql files 2017-11-21 21:35:17 +01:00
adev
18865cec86 Implements down migration 2017-11-21 21:35:17 +01:00
adev
2680b0bc8c Fix installation command 2017-11-21 21:35:17 +01:00
adev
2054740fdb Fold travis make prepare 2017-11-21 21:35:16 +01:00
adev
18fb777b89 Add an initial migration 2017-11-21 21:35:16 +01:00
Nicolas Lœuillet
d3d0defabc
Merge pull request #3398 from wallabag/issue-1735
Replace ant with Makefile
2017-11-21 15:12:48 +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
Nicolas Lœuillet
fb258aeef0
Merge pull request #3426 from wallabag/fix-migration-3373
Fix MySQL issue on mig from #3373
2017-11-21 11:03:39 +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
Jeremy Benoist
64a5a6cfc5
CS 2017-11-21 10:30:35 +01:00
Kevin Decherf
b3d85e69e9 Fix MySQL issue on mig from #3373
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-20 22:39:33 +01:00
Nicolas Lœuillet
f4f7994c40
Merge pull request #3346 from Kdecherf/origin-property
Add originUrl property to Entry
2017-11-20 21:10:33 +01:00
Kevin Decherf
16b1939827
Merge pull request #3423 from wallabag/composer
composer: update dependency versions to reduce memory footprint
2017-11-20 19:51:03 +01:00
Nicolas Lœuillet
8a21985474 Added internal setting to enable/disable headers storage 2017-11-20 18:47:48 +01:00
Kevin Decherf
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
Kevin Decherf
eae8138b33 Fix phpcs
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 15:26:13 +01:00
Kevin Decherf
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
Kevin Decherf
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
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
Kevin Decherf
8bde7de1ee Replace ant with Makefile
Fixes #1735

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-19 12:33:21 +01:00
Kevin Decherf
f6988b5aa3
Merge pull request #3421 from comradekingu/patch-2
Spelling: diaspora, e-mail, moved ?, URL, sharing
2017-11-19 11:31:46 +01:00
Kevin Decherf
00d66d39fc
Merge pull request #3420 from comradekingu/patch-1
Spelling: Two-factor for wallabag connection
2017-11-19 11:31:26 +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
2c437e930c
"for the public wallabag demo", paywalled websites, diaspora* 2017-11-18 04:55:33 +01:00