aboutsummaryrefslogtreecommitdiffhomepage
path: root/src
Commit message (Collapse)AuthorAgeFilesLines
* Twig: add removeSchemeAndWww filterKevin Decherf2017-11-191-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 translationsKevin Decherf2017-11-1914-0/+22
| | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Add originUrl property to Entry, handle that in EntryRestController, handle ↵Kevin Decherf2017-11-192-0/+44
| | | | | | migration Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3422 from wallabag/simpleue-2Nicolas Lœuillet2017-11-191-0/+17
|\ | | | | Jump to Simpleue 2.0
| * Jump to Simpleue 2.0Jeremy Benoist2017-11-181-0/+17
| | | | | | | | The 1.3.0 tag is introducing BC so we jump to the 2.0
* | Spelling: Two-factor for wallabag connectionAllan Nordhøy2017-11-181-1/+1
|/
* material: replace card activator with article link on card previewKevin Decherf2017-11-063-3/+13
| | | | | | Fixes #2424 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3387 from Kdecherf/fix-assets-23Jérémy Benoist2017-11-028-30/+30
|\ | | | | Fix assets for 2.3
| * webpack & views: replace bundles/wallabagcore with wallassetsKevin Decherf2017-10-248-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 menuKevin Decherf2017-10-311-1/+1
| | | | | | | | Fixes #3393
* | Properly run php-cs-fixerJeremy Benoist2017-10-281-23/+23
| |
* | php-cs-fixerMartin Trigaux2017-10-281-24/+24
| | | | | | | | php bin/php-cs-fixer fix src/Wallabag/CoreBundle/Helper/EntriesExport.php
* | Set the title in a separated chapterMartin Trigaux2017-10-281-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 pageMartin Trigaux2017-10-281-1/+2
|/ | | | The first page of the book is the title
* Update messages.pl.ymlMateusz Rumiński2017-10-191-2/+2
| | | add polish translation for export footer_template
* Merge pull request #3373 from wallabag/change-readingtime-notnullNicolas Lœuillet2017-10-181-2/+2
|\ | | | | Changed reading_time field to prevent null values
| * Changed reading_time field to prevent null valuesNicolas Lœuillet2017-10-131-2/+2
| |
* | Merge pull request #3362 from sviande/fix_3361_api_warningJérémy Benoist2017-10-182-2/+2
|\ \ | | | | | | Fix #3361 check type for tags in entry repository
| * | Fix #3361 Entry Rest controller getEntries cast tags params to stringSébastien Viande2017-10-131-1/+1
| | |
| * | Fix #3361 check type for tags in entry repositorySébastien Viande2017-10-121-1/+1
| |/ | | | | | | Check is $tags is a string before explode
* / Replace kernel.root_dir by kernel.project_dirNicolas Hart2017-10-142-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.
* CSJeremy Benoist2017-10-111-3/+3
|
* Fixed @j0k3r's reviewNicolas Lœuillet2017-10-111-0/+1
|
* Fixed @tcitworld's reviewNicolas Lœuillet2017-10-112-7/+3
|
* Translated first page of exported articleNicolas Lœuillet2017-10-1114-2/+44
|
* Merge pull request #3376 from wallabag/symfony-3.3Jérémy Benoist2017-10-1126-43/+43
|\ | | | | Symfony 3.3
| * CSJeremy Benoist2017-10-0922-30/+30
| |
| * Jump to Symfony 3.3 & update others depsJeremy Benoist2017-10-095-13/+13
| | | | | | | | Also update tests urls
* | update Russian languageОлег2017-10-102-62/+68
| |
* | add Russian languageОлег2017-10-101-0/+11
| |
* | Add Russian language in CoreBundle Resources and CraueConfigBundleОлег2017-10-101-0/+564
|/
* Update messages.oc.ymlQuent-in2017-09-091-1/+1
|
* Remove unused functionJeremy Benoist2017-09-061-20/+0
| | | | Introduce after the rebase I guess
* Fix testsJeremy Benoist2017-09-061-1/+1
|
* Multiple tag search was broken from APIJeremy Benoist2017-09-062-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-exportNicolas Lœuillet2017-09-061-1/+3
|\ | | | | Better entry txt export using html2text
| * better entry txt export using html2textNicolas Hart2017-08-271-1/+3
| |
* | Merge pull request #3337 from strobeltobias/patch-1Jérémy Benoist2017-09-041-90/+90
|\ \ | | | | | | Add missing quotation marks and small fixes (2)
| * | Update messages.de.ymlJérémy Benoist2017-09-041-1/+1
| | |
| * | Update to comply with suggested changesTobias Strobel2017-09-031-7/+7
| | |
| * | Add missing quotation marks and small fixes (2)Tobias Strobel2017-09-011-90/+90
| | |
* | | Merge pull request #3333 from Quent-in/2.3Jérémy Benoist2017-09-033-59/+59
|\ \ \ | | | | | | | | Update OC
| * | | Update wallabag_user.oc.ymlQuent-in2017-08-301-2/+2
| | | |
| * | | Update validators.oc.ymlQuent-in2017-08-301-2/+2
| | | |
| * | | UpdateQuent-in2017-08-301-55/+55
| |/ /
* | | Merge pull request #3139 from Kdecherf/2502-tag-caseJérémy Benoist2017-09-032-2/+2
|\ \ \ | |/ / |/| | Ignore tag's case
| * | Tag: render tags case-insensitive by storing them in lowercaseKevin Decherf2017-08-272-2/+2
| |/ | | | | | | | | | | Fixes #2502 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3330 from franek/set-starred-dateJérémy Benoist2017-08-304-7/+56
|\ \ | | | | | | Add starred_at field which is set when an entry is starred
| * | Set a starred_at field when an entry is starred.François D2017-08-254-7/+56
| |/ | | | | | | | | | | | | | | This date is used to sort starred entries. Can not use Entry::timestamps method otherwise starred_at will be updated each time entry is updated. Add an updateStar method into Entry class A migration script has been added in order to set starred_at field.
* | Merge pull request #3294 from wallabag/export-tag-nullJérémy Benoist2017-08-302-2/+2
|\ \ | |/ |/| Empty currentTag should be null