aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Fix RulerZBundleJeremy Benoist2018-11-251-1/+1
* 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
|\
| * Merge pull request #3775 from wallabag/prepare-2.3.4Jérémy Benoist2018-11-245-22/+63
| |\
| | * Create a custom swap to avoid errorJeremy Benoist2018-11-231-9/+17
| | * Use latest bridge to avoid PHPUnit breakJeremy Benoist2018-11-231-1/+1
| | * 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 logoSimounet2018-11-217-16/+12
| |/
| * Merge pull request #3772 from techexo/patch-1Jérémy Benoist2018-11-162-6/+6
| |\
| | * 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
| |/
| * Merge pull request #3769 from burkemw3/patch-4Jérémy Benoist2018-11-096-25/+25
| |\
| | * Add rel=noopener to target=_blank linksMatt Burke2018-11-076-25/+25
| |/
| * Merge pull request #3766 from merwan/patch-1Jérémy Benoist2018-11-061-1/+1
| |\
| | * 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
| |\
| | * 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
| * | Merge pull request #3763 from wallabag/ghpr-template-updateJérémy Benoist2018-10-271-1/+7
| |\ \
| | * | misc: add note on GitHub PR template to auto-close issuesKevin Decherf2018-10-261-1/+7
| |/ /
| * | Merge pull request #3553 from wallabag/url-3529Kevin Decherf2018-10-262-1/+244
| |\ \
| | * | phpcsKevin Decherf2018-10-241-1/+2
| | * | updateOriginUrl: remove 'query string' case from ignore listKevin Decherf2018-10-242-12/+2
| | * | updateOriginUrl: add comment blocks for the parse_url diff checkKevin Decherf2018-10-241-0/+23
| | * | updateOriginUrl: rewrite some if, resolving feedbacks from PRKevin Decherf2018-10-241-32/+35
| | * | ignoreOriginUrl: add initial support of ignore listsKevin Decherf2018-10-222-21/+92
| | * | updateOriginUrl: add behavior when diff is fragment and queryKevin Decherf2018-10-222-0/+9
| | * | Refactor updateOriginUrl to include new behaviors behaviorsKevin Decherf2018-10-222-35/+140
| | * | ContentProxy: swap entry url to origin_url and set new url according to graby...Kevin Decherf2018-10-212-4/+37
| | * | ContentProxy: fix a corner case when entry.url is empty in updateEntryKevin Decherf2018-10-211-0/+8
| |/ /
| * | Merge pull request #3733 from Deuchnord/root-abort-updateKevin Decherf2018-10-172-0/+28
| |\ \
| | * | 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 for #3651Matt Burke2018-10-155-18/+12
| * | | | Merge pull request #3606 from mritzmann/masterJérémy Benoist2018-10-153-0/+50
| |\ \ \ \
| | * | | | 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 systemsOlivier Mehani2018-08-187-52/+55
| | | |_|/ | | |/| |
| * | | | Merge pull request #3743 from burkemw3/patch-1Jérémy Benoist2018-10-131-0/+7
| |\ \ \ \
| | * | | | Show tags on non-image gallery preview cardMatt Burke2018-10-111-0/+7
| | | |_|/ | | |/| |
| * | | | Merge pull request #3734 from davidmohamedfr/fix-dockerfile-php72Jérémy Benoist2018-10-131-2/+2
| |\ \ \ \ | | |/ / / | |/| | |
| | * | | 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
| |/ / /