aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* fix incorrect reading time calculation for entries with CJK characterslizyn2018-12-254-1/+22
|
* Merge pull request #3814 from wallabag/2.3.6-devJérémy Benoist2018-12-173-4/+4
|\ | | | | Jump to 2.3.6-dev and update release process
| * Jump to 2.3.6-dev and update release processJeremy Benoist2018-12-153-4/+4
|/ | | | Fix release archive in `release.sh` and also fix a typo in the release process
* Merge pull request #3812 from wallabag/prepare-2.3.5Jérémy Benoist2018-12-143-5/+21
|\ | | | | Prepare 2.3.5 release
| * Prepare 2.3.5 releaseJeremy Benoist2018-12-143-5/+21
|/
* Merge pull request #3810 from wallabag/remove-guzzle-site-authenticator-devJérémy Benoist2018-12-141-1/+1
|\ | | | | No more dev for guzzle-site-authenticator
| * No more dev for guzzle-site-authenticatorJeremy Benoist2018-12-131-1/+1
| |
* | Merge pull request #3781 from wallabag/yarn-upJérémy Benoist2018-12-136-1259/+3129
|\ \ | |/ |/| build: upgrade yarn dependencies, update prod assets
| * build: upgrade yarn dependencies, update prod assetsKevin Decherf2018-12-106-1259/+3129
|/ | | | | | Production assets are rebuilt against new dependency versions. Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* Merge pull request #3783 from wallabag/issue-3780Kevin Decherf2018-11-261-1/+3
|\ | | | | material: decrease size of tags on list view
| * material: decrease size of tags on list viewKevin Decherf2018-11-251-1/+3
| | | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3782 from wallabag/issue-3779Kevin Decherf2018-11-262-25/+20
|\ \ | | | | | | material: fix missing thumbnail on list view
| * | material: fix missing thumbnail on list viewKevin Decherf2018-11-252-25/+20
| |/ | | | | | | Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
* | Merge pull request #3784 from giuppi/masterJérémy Benoist2018-11-261-1/+1
|\ \ | | | | | | Fix Android app login issue
| * | Fix Android app login issuegiuppi2018-11-251-1/+1
| |/ | | | | class and alt tags must be in the correct order for the android app to recognize the wallabag server
* | Merge pull request #3765 from burkemw3/patch-2Jérémy Benoist2018-11-262-7/+0
|\ \ | | | | | | Remove preview picture from single entry view page for #1875
| * | Remove preview picture from single entry view page for #1875Matt Burke2018-11-242-7/+0
| | | | | | | | | | | | | | | | | | Showing the preview picture usually leads to showing a duplicate image, and frequently leads to showing duplicate images directly adjacent to each other.
* | | Merge pull request #3778 from wallabag/better-releaseJérémy Benoist2018-11-253-13/+12
|\ \ \ | |_|/ |/| | Jump to 2.3.5-dev and update release process
| * | Jump to 2.3.5-dev and update release processJeremy Benoist2018-11-253-13/+12
|/ / | | | | | | After the latest release, I update the documentation about it so it’s more clear
* | 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>