aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Fix RulerZBundleJeremy Benoist2018-11-251-1/+1
| | | | | People should really follow semver and provide UPGRADE file when they provide a library ...
* Jump to PHP 7.1+Jeremy Benoist2018-11-251-3/+3
|
* Merge remote-tracking branch 'origin/master' into 2.4Jeremy Benoist2018-11-2540-136/+802
|\ | | | | | | | | | | | | | | # Conflicts: # web/wallassets/baggy.js # web/wallassets/manifest.json # web/wallassets/material.css # web/wallassets/material.js
| * Merge pull request #3775 from wallabag/prepare-2.3.4Jérémy Benoist2018-11-245-22/+63
| |\ | | | | | | Prepare 2.3.4 release
| | * Create a custom swap to avoid errorJeremy Benoist2018-11-231-9/+17
| | |
| | * Use latest bridge to avoid PHPUnit breakJeremy Benoist2018-11-231-1/+1
| | | | | | | | | | | | Because branch 4.8 & 5.7 have been removed
| | * Use new Travis infraJeremy Benoist2018-11-231-9/+6
| | |
| | * Prepare 2.3.4 releaseJeremy Benoist2018-11-233-4/+40
| |/
| * Merge pull request #3774 from Simounet/feature/card-uiJérémy Benoist2018-11-217-16/+12
| |\ | | | | | | Card no preview replaced by wallabag logo
| | * Card no preview replaced by wallabag logoSimounet2018-11-217-16/+12
| |/
| * Merge pull request #3772 from techexo/patch-1Jérémy Benoist2018-11-162-6/+6
| |\ | | | | | | Update translation when marking as read
| | * Update messages.en.ymlEloi Coutant2018-11-161-3/+3
| | |
| | * Update messages.fr.ymlEloi Coutant2018-11-161-1/+1
| | |
| | * Update messages.fr.ymlEloi Coutant2018-11-161-3/+3
| |/ | | | | Modification pour éclaircir le sens de l'option
| * Merge pull request #3769 from burkemw3/patch-4Jérémy Benoist2018-11-096-25/+25
| |\ | | | | | | Add rel=noopener to target=_blank links
| | * Add rel=noopener to target=_blank linksMatt Burke2018-11-076-25/+25
| |/ | | | | | | | | | | | | From https://developers.google.com/web/tools/lighthouse/audits/noopener: - new pages will run in separate processes, avoiding any performance intermingling impacts - new pages won't have access to current page's window object via JavaScript
| * Merge pull request #3766 from merwan/patch-1Jérémy Benoist2018-11-061-1/+1
| |\ | | | | | | Fix link to wallabag requirements in documentation
| | * Fix link to wallabag requirements in documentationMerouane Atig2018-11-051-1/+1
| |/
| * Merge pull request #3764 from shtrom/fix-matches-notmatches-languageKevin Decherf2018-11-018-13/+13
| |\ | | | | | | Fix documentation wording for matches/notmatches tagging rules
| | * fixup! fixup! Fix documentation wording for matches/notmatches tagging rulesOlivier Mehani2018-11-018-8/+8
| | |
| | * fixup! Fix documentation wording for matches/notmatches tagging rulesOlivier Mehani2018-11-018-8/+8
| | |
| | * Fix documentation wording for matches/notmatches tagging rulesOlivier Mehani2018-10-318-13/+13
| | | | | | | | | | | | Signed-off-by: Olivier Mehani <shtrom@ssji.net>
| * | Merge pull request #3763 from wallabag/ghpr-template-updateJérémy Benoist2018-10-271-1/+7
| |\ \ | | | | | | | | Add note on GitHub PR template to auto-close issues
| | * | misc: add note on GitHub PR template to auto-close issuesKevin Decherf2018-10-261-1/+7
| |/ / | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Merge pull request #3553 from wallabag/url-3529Kevin Decherf2018-10-262-1/+244
| |\ \ | | | | | | | | Swap entry url with origin url if graby provides an updated one
| | * | phpcsKevin Decherf2018-10-241-1/+2
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * | updateOriginUrl: remove 'query string' case from ignore listKevin Decherf2018-10-242-12/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Two urls with a different query string may refer to two different pages so keep them both. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * | updateOriginUrl: add comment blocks for the parse_url diff checkKevin Decherf2018-10-241-0/+23
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * | updateOriginUrl: rewrite some if, resolving feedbacks from PRKevin Decherf2018-10-241-32/+35
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * | ignoreOriginUrl: add initial support of ignore listsKevin Decherf2018-10-222-21/+92
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Add the ability to specify hosts and patterns lists to ignore the given entry url and replace it with the fetched content url without touching to origin_url. This initial support should be reworked in the following months to move the hardcoded ignore lists in the database. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * | updateOriginUrl: add behavior when diff is fragment and queryKevin Decherf2018-10-222-0/+9
| | | | | | | | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * | Refactor updateOriginUrl to include new behaviors behaviorsKevin Decherf2018-10-222-35/+140
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | - Leave origin_url unchanged if difference is an ending slash - Leave origin_url unchanged if difference is scheme - Ignore (noop) if difference is query string or fragment Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * | ContentProxy: swap entry url to origin_url and set new url according to ↵Kevin Decherf2018-10-212-4/+37
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | graby content Closes #3529 Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| | * | ContentProxy: fix a corner case when entry.url is empty in updateEntryKevin Decherf2018-10-211-0/+8
| |/ / | | | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
| * | Merge pull request #3733 from Deuchnord/root-abort-updateKevin Decherf2018-10-172-0/+28
| |\ \ | | | | | | | | Abort running install and update script if root
| | * | Added argument to ignore the warning.Jérôme Deuchnord2018-10-162-2/+18
| | | |
| | * | Abort running install and update script if root (closes #3590)Jérôme Deuchnord2018-10-062-0/+12
| | | |
| * | | 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
generated by cgit v1.2.3 (git 2.25.1) at 2024-12-28 11:04:08 +0000