Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #3431 from wallabag/disable-site-credentials | Jérémy Benoist | 2017-11-22 | 1 | -0/+18 |
|\ | | | | | Disable controller access if feature disabled | ||||
| * | Disable controller access if feature disabled | Jeremy Benoist | 2017-11-22 | 1 | -0/+18 |
| | | | | | | | | If `restricted_access` is disabled, accessing `/site-credentials/` must be disabled. | ||||
* | | Merge pull request #3425 from wallabag/add-setting-for-headers | Nicolas Lœuillet | 2017-11-21 | 2 | -2/+5 |
|\| | | | | | Added internal setting to enable/disable headers storage | ||||
| * | Define storeArticleHeaders false by default | Jeremy Benoist | 2017-11-21 | 1 | -1/+1 |
| | | | | | | | | | | Fix tests which must use `$storeArticleHeaders`. Fix CS | ||||
| * | Added internal setting to enable/disable headers storage | Nicolas Lœuillet | 2017-11-20 | 2 | -2/+5 |
| | | |||||
* | | Fix phpcs | Kevin Decherf | 2017-11-19 | 1 | -2/+2 |
| | | | | | | | | 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 | 1 | -0/+1 |
| | | | | | | | | 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 | 1 | -0/+8 |
| | | | | | | | | | | | | | | | | 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 | 2 | -0/+44 |
|/ | | | | | | migration Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #3422 from wallabag/simpleue-2 | Nicolas Lœuillet | 2017-11-19 | 1 | -0/+17 |
|\ | | | | | Jump to Simpleue 2.0 | ||||
| * | Jump to Simpleue 2.0 | Jeremy Benoist | 2017-11-18 | 1 | -0/+17 |
| | | | | | | | | The 1.3.0 tag is introducing BC so we jump to the 2.0 | ||||
* | | Spelling: Two-factor for wallabag connection | Allan Nordhøy | 2017-11-18 | 1 | -1/+1 |
|/ | |||||
* | material: replace card activator with article link on card preview | Kevin Decherf | 2017-11-06 | 3 | -3/+13 |
| | | | | | | Fixes #2424 Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | Merge pull request #3387 from Kdecherf/fix-assets-23 | Jérémy Benoist | 2017-11-02 | 8 | -30/+30 |
|\ | | | | | Fix assets for 2.3 | ||||
| * | webpack & views: replace bundles/wallabagcore with wallassets | Kevin Decherf | 2017-10-24 | 8 | -30/+30 |
| | | | | | | | | | | | | | | This change will prevent composer from removing wallabagcore assets when installing assets. Signed-off-by: Kevin Decherf <kevin@kdecherf.com> | ||||
* | | views/config: fix overlaying drop down menu | Kevin Decherf | 2017-10-31 | 1 | -1/+1 |
| | | | | | | | | Fixes #3393 | ||||
* | | 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 | ||||
* | Update messages.pl.yml | Mateusz Rumiński | 2017-10-19 | 1 | -2/+2 |
| | | | add polish translation for export footer_template | ||||
* | Merge pull request #3373 from wallabag/change-readingtime-notnull | Nicolas Lœuillet | 2017-10-18 | 1 | -2/+2 |
|\ | | | | | Changed reading_time field to prevent null values | ||||
| * | Changed reading_time field to prevent null values | Nicolas Lœuillet | 2017-10-13 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #3362 from sviande/fix_3361_api_warning | Jérémy Benoist | 2017-10-18 | 2 | -2/+2 |
|\ \ | | | | | | | Fix #3361 check type for tags in entry repository | ||||
| * | | Fix #3361 Entry Rest controller getEntries cast tags params to string | Sébastien Viande | 2017-10-13 | 1 | -1/+1 |
| | | | |||||
| * | | Fix #3361 check type for tags in entry repository | Sébastien Viande | 2017-10-12 | 1 | -1/+1 |
| |/ | | | | | | | Check is $tags is a string before explode | ||||
* / | Replace kernel.root_dir by kernel.project_dir | Nicolas Hart | 2017-10-14 | 2 | -2/+2 |
|/ | | | | | 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. | ||||
* | CS | Jeremy Benoist | 2017-10-11 | 1 | -3/+3 |
| | |||||
* | Fixed @j0k3r's review | Nicolas Lœuillet | 2017-10-11 | 1 | -0/+1 |
| | |||||
* | Fixed @tcitworld's review | Nicolas Lœuillet | 2017-10-11 | 2 | -7/+3 |
| | |||||
* | Translated first page of exported article | Nicolas Lœuillet | 2017-10-11 | 14 | -2/+44 |
| | |||||
* | Merge pull request #3376 from wallabag/symfony-3.3 | Jérémy Benoist | 2017-10-11 | 26 | -43/+43 |
|\ | | | | | Symfony 3.3 | ||||
| * | CS | Jeremy Benoist | 2017-10-09 | 22 | -30/+30 |
| | | |||||
| * | Jump to Symfony 3.3 & update others deps | Jeremy Benoist | 2017-10-09 | 5 | -13/+13 |
| | | | | | | | | Also update tests urls | ||||
* | | update Russian language | Олег | 2017-10-10 | 2 | -62/+68 |
| | | |||||
* | | add Russian language | Олег | 2017-10-10 | 1 | -0/+11 |
| | | |||||
* | | Add Russian language in CoreBundle Resources and CraueConfigBundle | Олег | 2017-10-10 | 1 | -0/+564 |
|/ | |||||
* | Update messages.oc.yml | Quent-in | 2017-09-09 | 1 | -1/+1 |
| | |||||
* | Remove unused function | Jeremy Benoist | 2017-09-06 | 1 | -20/+0 |
| | | | | Introduce after the rebase I guess | ||||
* | Fix tests | Jeremy Benoist | 2017-09-06 | 1 | -1/+1 |
| | |||||
* | Multiple tag search was broken from API | Jeremy Benoist | 2017-09-06 | 2 | -6/+48 |
| | | | | | | | | | | 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. | ||||
* | Merge pull request #3332 from nclsHart/better-txt-export | Nicolas Lœuillet | 2017-09-06 | 1 | -1/+3 |
|\ | | | | | Better entry txt export using html2text | ||||
| * | better entry txt export using html2text | Nicolas Hart | 2017-08-27 | 1 | -1/+3 |
| | |