aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | Merge pull request #3745 from burkemw3/patch-3Jérémy Benoist2018-10-165-18/+12
| |\ \ \ | | | | | | | | | | Add placeholder image to card-based gallery entries page
| | * | | Add placeholder image to card-based gallery entries page for #3651Matt Burke2018-10-155-18/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I referenced https://css-tricks.com/using-svg/ for using the SVG icon. The icon has a black foreground and white background, which doesn't look very good as a placeholder. So, using the background-image style to show the svg and the inversion filter to make it white on gray. With the image always present, there isn't much difference between the with and without image preview templates, so I merged them. Tested on Chrome, Firefox, and Safari on OSX.
| * | | | Merge pull request #3606 from mritzmann/masterJérémy Benoist2018-10-153-0/+50
| |\ \ \ \ | | | | | | | | | | | | add manifest.json for android pwa
| | * | | | add 512x512 appiconmritzmann2018-03-202-0/+5
| | | | | |
| | * | | | change href link for manifest.jsonMarkus Ritzmann2018-03-191-1/+1
| | | | | |
| | * | | | add manifest.json for android pwamritzmann2018-03-182-0/+45
| | | | | |
| * | | | | Merge pull request #3706 from shtrom/fix/gnu-make-bashKevin Decherf2018-10-147-52/+55
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Makefile fixes for non GNU systems
| | * | | | Makefile fixes for non GNU systemsOlivier Mehani2018-08-187-52/+55
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Move `Makefile` to `GNUmakefile`, which GNU `make` picks first * Add `Makefile` so other `make`s forward to `gmake` * Set the `SHELL` variable and let `make` handle the shell Signed-off-by: Olivier Mehani <shtrom@ssji.net>
| * | | | Merge pull request #3743 from burkemw3/patch-1Jérémy Benoist2018-10-131-0/+7
| |\ \ \ \ | | | | | | | | | | | | Show tags on non-image gallery preview card
| | * | | | Show tags on non-image gallery preview cardMatt Burke2018-10-111-0/+7
| | | |_|/ | | |/| | | | | | | | | | | | | | | | | Tags and images aren't coupled, so they shouldn't be coupled in the UI, either. This also makes the titles and source domains show up consistently for image and non-image entry cards.
| * | | | Merge pull request #3734 from davidmohamedfr/fix-dockerfile-php72Jérémy Benoist2018-10-131-2/+2
| |\ \ \ \ | | |/ / / | |/| | | Fix dockerfile php72
| | * | | libpng12-dev was rename as libpng-devDavid MOHAMED2018-10-061-1/+1
| | | | |
| | * | | remove mcrypt since openssl is included in php 7.2David MOHAMED2018-10-061-1/+1
| |/ / / | | | | | | | | mcrypt extension doesn't exist anymore
| * | | Merge pull request #3725 from Tobi823/masterKevin Decherf2018-09-242-0/+298
| |\ \ \ | | | | | | | | | | Bugfix: Sanitize the title of a saved webpage from invalid UTF-8 characters.
| | * | | 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
| | | | | | | | | | | | | | | | | | | | to prevent misusage (from outside this class)
| | * | | Override the value of the given parameter ($title) with the (hopefully)Tobi8232018-09-211-2/+1
| | | | | | | | | | | | | | | | | | | | correct (to UTF-8) converted PDF title
| | * | | Add tests for logicTobi8232018-09-212-2/+238
| | | | | | | | | | | | | | | | | | | | Try to translate the title of a PDF from UTF-8 (then UTF-16BE, then WINDOWS-1252) to UTF-8
| | * | | Try to detect the character encoding in PDFs and try to translateTobi8232018-09-211-13/+33
| | | | | | | | | | | | | | | | | | | | the title from the PDF to UTF-8
| | * | | 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
|\ \ \ \ | | | | | | | | | | Allow to rename tags from the web interface.
| * | | | 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
| | | | | | | | | | | | | | | | | | | | Also add a `.hidden` class in the baggy theme to have consistency with material.
| * | | | Add translations about latest Tag changes.Stéphane HULARD2018-09-2514-1/+43
| | | | | | | | | | | | | | | | | | | | Add new translations in each language file.
| * | | | Update tag list template to allow renaming.Stéphane HULARD2018-09-253-4/+46
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * Add a form on each tag to handle rename action. * Add JavaScript to handle action on the corresponding page inside the global index.js file. * Add support for the 2 active themes : material / baggy The form solution is cleaner than an Ajax one because it let the browser validate input data and make the POST easier without the need to handle JSON response.
| * | | | Add RenameForm as tag list view parameters.Stéphane HULARD2018-09-251-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | This will help handling the CSRF protection token and use symfony HTML generation layer. Also a FormView instance is generated for each tag because we need to render a form for each tag and FormView are not reusable.
| * | | | Create a new Tag action to rename tags.Stéphane HULARD2018-09-251-0/+45
| | | | | | | | | | | | | | | | | | | | The current tag is removed from all the current logged user entries. Then the new one is created and attached.
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Added possibility to change locale from login/register pages
| * | | | | Ensure language is validJeremy Benoist2018-10-136-9/+76
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Do not override locale if user has choosen a locale from the login screen. - Add some tests about locale url
| * | | | | 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 email
| * | | | | 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.4
| * | | | Jump to Symfony 3.4Jeremy Benoist2018-10-0434-62/+132
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Thanks to the BC compatibility, almost nothing have to be changed. All changes are related to new bundle version of: - SensioFrameworkExtraBundle - DoctrineFixturesBundle
* | | | Merge pull request #3630 from sviande/archived_atJérémy Benoist2018-09-2115-19/+136
|\ \ \ \ | | | | | | | | | | Entry: add archived_at property and updateArchived method
| * | | | 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 https
| | * | | 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
| |\ \ \ | | | | | | | | | | Fix sort parameters
| | * | | Updating node to 6.10Jeremy Benoist2018-09-072-2/+6
| | | | | | | | | | | | | | | | | | | | Same as defined in .travis.yml
| | * | | Fix testsJeremy Benoist2018-09-071-4/+4
| | | | |