aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #3385 from wallabag/prepare-23Nicolas Lœuillet2017-10-203-185/+84
|\ | | | | Prepare wallabag 2.3.0
| * Prepare wallabag 2.3.0Nicolas Lœuillet2017-10-203-185/+84
| |
* | Merge pull request #3384 from wallabag/mruminski-patch-1Nicolas Lœuillet2017-10-191-2/+2
|\ \ | |/ |/| Update messages.pl.yml
| * 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-182-2/+66
|\ | | | | Changed reading_time field to prevent null values
| * Fixed @Kdecherf's reviewNicolas Lœuillet2017-10-131-0/+1
| |
| * CSJeremy Benoist2017-10-131-3/+3
| |
| * Changed reading_time field to prevent null valuesNicolas Lœuillet2017-10-132-2/+65
| |
* | Merge pull request #3362 from sviande/fix_3361_api_warningJérémy Benoist2017-10-183-2/+9
|\ \ | | | | | | 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
| | |
| * | CSJeremy Benoist2017-10-121-1/+1
| | |
| * | Fix #3361 add testSébastien Viande2017-10-121-0/+7
| | |
| * | Fix #3361 check type for tags in entry repositorySébastien Viande2017-10-121-1/+1
| |/ | | | | | | Check is $tags is a string before explode
* | Merge pull request #3383 from Kdecherf/fix-webpack-and-loginNicolas Lœuillet2017-10-1635-20/+682
|\ \ | | | | | | Fix webpack and login screen
| * | Update prod assetsKevin Decherf2017-10-1632-18/+665
| | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | webpack: handle _global img folderKevin Decherf2017-10-162-1/+16
| | | | | | | | | | | | | | | | | | | | | | | | Fixes missing image files after composer cleaning assets Source of requireAll(): https://stackoverflow.com/a/30652110 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Fix non-centered login formKevin Decherf2017-10-161-1/+1
|/ / | | | | | | | | | | Fixes #3343 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3382 from nclsHart/replace-kernel-rootdirJérémy Benoist2017-10-1511-20/+15
|\ \ | | | | | | Replace kernel.root_dir by kernel.project_dir
| * | Replace kernel.root_dir by kernel.project_dirNicolas Hart2017-10-1411-20/+15
| |/ | | | | | | | | 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.
* | Merge pull request #3381 from nclsHart/webserverbundleJérémy Benoist2017-10-151-0/+1
|\ \ | |/ |/| Enable WebServerBundle in dev environment
| * Enable WebServerBundle in dev environmentNicolas Hart2017-10-131-0/+1
|/ | | | Since #3376, the web server console commands were not available.
* Merge pull request #3372 from wallabag/translate-export-pageNicolas Lœuillet2017-10-1114-8/+47
|\ | | | | Translated first page of exported article
| * 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-1144-68/+90
|\ | | | | Symfony 3.3
| * Fix MondeDiplo https urlJeremy Benoist2017-10-101-1/+1
| |
| * CSJeremy Benoist2017-10-0927-37/+37
| |
| * Jump to Symfony 3.3 & update others depsJeremy Benoist2017-10-0918-30/+52
| | | | | | | | Also update tests urls
* | Merge pull request #3378 from wallabag/2.3-ruJérémy Benoist2017-10-105-0/+617
|\ \ | |/ |/| Add Russian language
| * update Russian languageОлег2017-10-103-90/+96
| |
| * add Russian languageОлег2017-10-102-0/+12
| |
| * Add Russian language in CoreBundle Resources and CraueConfigBundleОлег2017-10-102-0/+599
|/
* Merge pull request #3347 from Kdecherf/entry-statsNicolas Lœuillet2017-09-161-2/+7
|\ | | | | Entry view: update .stats margins and color
| * Entry view: update .stats margins and colorKevin Decherf2017-09-091-2/+7
| | | | | | | | | | | | | | | | Decreasing margin of .stats, increasing vertical margin of .stats li, increasing right margin of material icons and reducing contrast of material icons. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3345 from wallabag/Quent-in-patch-1Jérémy Benoist2017-09-091-1/+1
|\ \ | | | | | | Update messages.oc.yml
| * | Update messages.oc.ymlQuent-in2017-09-091-1/+1
|/ /
* | Merge pull request #3340 from Kdecherf/fix-webpackJérémy Benoist2017-09-072-2/+2
|\ \ | | | | | | Fix webpack error on comments
| * | Fix webpack error on commentsKevin Decherf2017-09-062-2/+2
| |/ | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3309 from wallabag/fix-multiple-tag-searchJérémy Benoist2017-09-075-10/+36
|\ \ | | | | | | Multiple tag search, which was broken from API
| * | Remove unused functionJeremy Benoist2017-09-061-20/+0
| | | | | | | | | | | | Introduce after the rebase I guess
| * | Fix testsJeremy Benoist2017-09-062-2/+3
| | |
| * | Multiple tag search was broken from APIJeremy Benoist2017-09-065-10/+55
|/ / | | | | | | | | | | | | | | | | | | 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-062-2/+5
|\ \ | |/ |/| Better entry txt export using html2text
| * better entry txt export using html2textNicolas Hart2017-08-272-2/+5
| |
* | 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
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-19 15:48:30 +0000