aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * | | Merge pull request #3725 from Tobi823/masterKevin Decherf2018-09-242-0/+298
| |\ \ \
| | * | | Run php-cs-fixer for fixing coding standard issues (on ContentProxyTest)Tobi8232018-09-231-11/+19
| | * | | Run php-cs-fixer for fixing coding standard issuesTobi8232018-09-231-41/+53
| | * | | Make helper methods strToHex and hexToStr in ContentProxyTest.php privateTobi8232018-09-211-2/+2
| | * | | Override the value of the given parameter ($title) with the (hopefully)Tobi8232018-09-211-2/+1
| | * | | Add tests for logicTobi8232018-09-212-2/+238
| | * | | Try to detect the character encoding in PDFs and try to translateTobi8232018-09-211-13/+33
| | * | | Remove type declaration for PHP 5 compatibilityTobi8232018-09-211-1/+1
| | * | | Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 charactersTobi8232018-09-211-0/+23
| |/ / /
* | | | Merge pull request #3574 from shulard/feature/rename-tagsJérémy Benoist2018-10-1528-13/+247
|\ \ \ \
| * | | | Update assetsJeremy Benoist2018-09-256-8/+7
| * | | | Add tests about the tag renaming process.Stéphane HULARD2018-09-251-0/+45
| * | | | Add specific styles for the card tag form element.Stéphane HULARD2018-09-253-3/+23
| * | | | Add translations about latest Tag changes.Stéphane HULARD2018-09-2514-1/+43
| * | | | Update tag list template to allow renaming.Stéphane HULARD2018-09-253-4/+46
| * | | | Add RenameForm as tag list view parameters.Stéphane HULARD2018-09-251-0/+6
| * | | | Create a new Tag action to rename tags.Stéphane HULARD2018-09-251-0/+45
| * | | | Rename Tag : Add a new FormTypeStéphane HULARD2018-09-251-0/+35
* | | | | Merge pull request #3216 from wallabag/change-locale-registerJérémy Benoist2018-10-1510-7/+102
|\ \ \ \ \
| * | | | | Ensure language is validJeremy Benoist2018-10-136-9/+76
| * | | | | Added possibility to change locale from login/register pagesNicolas Lœuillet2018-10-136-3/+31
|/ / / / /
* | | | | Merge pull request #3596 from glego/add-secure-emailJérémy Benoist2018-10-112-8/+14
|\ \ \ \ \
| * | | | | Add secure emailGlenn Goffin2018-10-112-8/+14
|/ / / / /
* | | | | Merge pull request #3731 from wallabag/symfony3.4Jérémy Benoist2018-10-0834-62/+132
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | Jump to Symfony 3.4Jeremy Benoist2018-10-0434-62/+132
|/ / / /
* | | | Merge pull request #3630 from sviande/archived_atJérémy Benoist2018-09-2115-19/+136
|\ \ \ \
| * | | | Sort archive page by archived atJeremy Benoist2018-09-212-3/+1
| * | | | Code StyleSébastien Viande2018-09-211-1/+1
| * | | | Entry: add sort parameter archivedSébastien Viande2018-09-212-1/+3
| * | | | Entry: add archived_at property and updateArchived methodSébastien Viande2018-09-2113-15/+132
|/ / / /
* | | | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2018-09-215-11/+14
|\| | |
| * | | Merge pull request #3726 from wallabag/fix-testsJérémy Benoist2018-09-215-11/+14
| |\ \ \
| | * | | Liberation goes httpsJeremy Benoist2018-09-215-11/+14
| |/ / /
* | | | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2018-09-165-7/+26
|\| | |
| * | | Merge pull request #3719 from wallabag/fix-sort-parametersKevin Decherf2018-09-075-7/+26
| |\ \ \
| | * | | Updating node to 6.10Jeremy Benoist2018-09-072-2/+6
| | * | | Fix testsJeremy Benoist2018-09-071-4/+4
| | * | | Jump to the new Scrutinizer PHP analysis engineJeremy Benoist2018-09-071-0/+15
| | * | | Add missing parametersJeremy Benoist2018-09-071-1/+1
| |/ / /
* | | | Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2018-09-0776-744/+246
|\| | |
| * | | Merge pull request #3712 from wallabag/refactor-entry-queriesJérémy Benoist2018-09-072-16/+55
| |\ \ \
| | * | | php-cs-fixerKevin Decherf2018-09-051-7/+7
| | * | | EntryRepository: refactor getBuilderForUntaggedByUserKevin Decherf2018-09-051-3/+16
| | * | | EntryRepository: refactor getBuilderByUserKevin Decherf2018-09-051-12/+38
| | * | | AnnotationRepository: rename getBuilderByUserKevin Decherf2018-09-051-2/+2
| * | | | Merge pull request #3717 from wallabag/php-72Kevin Decherf2018-09-061-1/+0
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | PHP 7.2 shouldn't failJérémy Benoist2018-09-061-1/+0
| |/ / /
| * | | Merge pull request #3716 from wallabag/csfixerJérémy Benoist2018-09-0548-89/+89
| |\ \ \
| | * | | php-cs-fixerKevin Decherf2018-09-0548-89/+89
| |/ / /
| * | | Merge pull request #3707 from wallabag/fix-test-de-atJérémy Benoist2018-08-192-14/+3
| |\ \ \