Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | CS | Jeremy Benoist | 2017-11-21 | 3 | -3/+3 |
| | |||||
* | Fix MySQL issue on mig from #3373 | Kevin Decherf | 2017-11-20 | 1 | -0/+1 |
| | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #3346 from Kdecherf/origin-property | Nicolas Lœuillet | 2017-11-20 | 25 | -4/+356 |
|\ | | | | | Add originUrl property to Entry | ||||
| * | Fix phpcs | Kevin Decherf | 2017-11-19 | 5 | -22/+22 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Improve EntryRestControllerTest for origin_url | Kevin Decherf | 2017-11-19 | 1 | -0/+55 |
| | | | | | | | | | | | | | | | | 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> | ||||
| * | Update EntryControllerTest to handle origin_url | Kevin Decherf | 2017-11-19 | 1 | -2/+38 |
| | | | | | | | | | | | | | | Set an origin_url in testEditUpdate Test origin_url deletion in testEditRemoveOriginUrl Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Replace hardcoded 'Provided by' string with i18n string | Kevin Decherf | 2017-11-19 | 15 | -2/+15 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Improve origin_url field description and translations | Kevin Decherf | 2017-11-19 | 14 | -14/+15 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Form: move url and origin_url to UrlType | Kevin Decherf | 2017-11-19 | 1 | -2/+3 |
| | | |||||
| * | Add support of originUrl field in baggy entry view | Kevin Decherf | 2017-11-19 | 1 | -0/+8 |
| | | |||||
| * | Add some tests for OriginUrl in EntryRestController | Kevin Decherf | 2017-11-19 | 2 | -0/+74 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Handle original_url querystring in Shaarli sharing link | Kevin Decherf | 2017-11-19 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | 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> | ||||
| * | Add support of originUrl field in material entry view | Kevin Decherf | 2017-11-19 | 1 | -0/+8 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Twig: add removeSchemeAndWww filter | Kevin Decherf | 2017-11-19 | 2 | -0/+35 |
| | | | | | | | | | | | | | | | | 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> | ||||
| * | Entry: handle originUrl in edit form, update translations | Kevin Decherf | 2017-11-19 | 14 | -0/+22 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Add originUrl property to Entry, handle that in EntryRestController, handle ↵ | Kevin Decherf | 2017-11-19 | 3 | -0/+99 |
| | | | | | | | | | | | | migration Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #3423 from wallabag/composer | Kevin Decherf | 2017-11-20 | 1 | -28/+28 |
|\ \ | |/ |/| | composer: update dependency versions to reduce memory footprint | ||||
| * | composer: update dependency versions to reduce memory footprint | Kevin Decherf | 2017-11-19 | 1 | -28/+28 |
|/ | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #3422 from wallabag/simpleue-2 | Nicolas Lœuillet | 2017-11-19 | 2 | -1/+18 |
|\ | | | | | Jump to Simpleue 2.0 | ||||
| * | Jump to Simpleue 2.0 | Jeremy Benoist | 2017-11-18 | 2 | -1/+18 |
| | | | | | | | | The 1.3.0 tag is introducing BC so we jump to the 2.0 | ||||
* | | Merge pull request #3421 from comradekingu/patch-2 | Kevin Decherf | 2017-11-19 | 1 | -10/+10 |
|\ \ | | | | | | | Spelling: diaspora, e-mail, moved ?, URL, sharing | ||||
| * | | "for the public wallabag demo", paywalled websites, diaspora* | Allan Nordhøy | 2017-11-18 | 1 | -3/+3 |
| | | | |||||
| * | | Spelling: diaspora, e-mail, moved ?, URL, sharing | Allan Nordhøy | 2017-11-18 | 1 | -8/+8 |
| |/ | |||||
* | | Merge pull request #3420 from comradekingu/patch-1 | Kevin Decherf | 2017-11-19 | 1 | -1/+1 |
|\ \ | |/ |/| | Spelling: Two-factor for wallabag connection | ||||
| * | Spelling: Two-factor for wallabag connection | Allan Nordhøy | 2017-11-18 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #3412 from aaa2000/fix-tests | Jérémy Benoist | 2017-11-12 | 2 | -6/+7 |
|\ | | | | | Fix the tests | ||||
| * | Fix phpcs | adev | 2017-11-11 | 1 | -1/+1 |
| | | |||||
| * | Fix tests | adev | 2017-11-11 | 2 | -6/+7 |
|/ | |||||
* | Merge pull request #3404 from wallabag/issue-2424 | Kevin Decherf | 2017-11-07 | 5 | -4/+15 |
|\ | | | | | material: replace card activator with article link on card preview | ||||
| * | material: replace card activator with article link on card preview | Kevin Decherf | 2017-11-06 | 5 | -4/+15 |
|/ | | | | | | Fixes #2424 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #3397 from wallabag/issue-1871 | Kevin Decherf | 2017-11-06 | 4 | -2/+12 |
|\ | | | | | material: disable editing of entry url input when submitting new url | ||||
| * | Update assets for #3397 | Kevin Decherf | 2017-11-05 | 2 | -2/+2 |
| | | |||||
| * | material: disable editing of entry url input when submitting new url | Kevin Decherf | 2017-11-05 | 2 | -0/+10 |
|/ | | | | | | Fixes #1871 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #3387 from Kdecherf/fix-assets-23 | Jérémy Benoist | 2017-11-02 | 116 | -411/+42 |
|\ | | | | | Fix assets for 2.3 | ||||
| * | Updating .gitignore | Kevin Decherf | 2017-10-24 | 2 | -4/+3 |
| | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
| * | Removing web/bundles/wallabagcore and adding prod assets in web/wallassets | Kevin Decherf | 2017-10-24 | 105 | -375/+7 |
| | | | | | | | | | | | | | | 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> | ||||
| * | webpack & views: replace bundles/wallabagcore with wallassets | Kevin Decherf | 2017-10-24 | 9 | -32/+32 |
| | | | | | | | | | | | | | | This change will prevent composer from removing wallabagcore assets when installing assets. Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | Merge pull request #3399 from aaa2000/editorconfig-makefile | Jérémy Benoist | 2017-11-02 | 1 | -0/+3 |
|\ \ | | | | | | | Update .editorconfig for makefile | ||||
| * | | Update .editorconfig for makefile | adev | 2017-11-01 | 1 | -0/+3 |
|/ / | |||||
* | | Merge pull request #3395 from wallabag/issue-3393 | Kevin Decherf | 2017-11-01 | 1 | -1/+1 |
|\ \ | | | | | | | views/config: fix overlaying drop down menu | ||||
| * | | views/config: fix overlaying drop down menu | Kevin Decherf | 2017-10-31 | 1 | -1/+1 |
|/ / | | | | | | | Fixes #3393 | ||||
* | | Merge pull request #3392 from mart-e/add-title-page-epub | Jérémy Benoist | 2017-10-31 | 1 | -3/+3 |
|\ \ | |/ |/| | add the title of article on the epub export | ||||
| * | Properly run php-cs-fixer | Jeremy Benoist | 2017-10-28 | 1 | -23/+23 |
| | | |||||
| * | php-cs-fixer | Martin Trigaux | 2017-10-28 | 1 | -24/+24 |
| | | | | | | | | php bin/php-cs-fixer fix src/Wallabag/CoreBundle/Helper/EntriesExport.php | ||||
| * | Set the title in a separated chapter | Martin Trigaux | 2017-10-28 | 1 | -5/+4 |
| | | | | | | | | | | 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 | ||||
| * | add a title page | Martin Trigaux | 2017-10-28 | 1 | -1/+2 |
|/ | | | | The first page of the book is the title | ||||
* | Merge pull request #3011 from wallabag/2.3 | Jérémy Benoist | 2017-10-23 | 666 | -147616/+21014 |
|\ | | | | | wallabag 2.3.0 | ||||
| * | Merge pull request #3385 from wallabag/prepare-23 | Nicolas Lœuillet | 2017-10-20 | 3 | -185/+84 |
| |\ | | | | | | | Prepare wallabag 2.3.0 | ||||
| | * | Prepare wallabag 2.3.0 | Nicolas Lœuillet | 2017-10-20 | 3 | -185/+84 |
| | | | |||||
| * | | Merge pull request #3384 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2017-10-19 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | Update messages.pl.yml |