mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-22 15:46:30 +00:00
Code Issues Projects Releases Wiki Activity
4475 commits 12 branches 100 tags 173 MiB
Commit graph

4475 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeremy Benoist
6fc95673df
Cleanup 2018-11-28 22:04:54 +01:00
Jeremy Benoist
0f159f8fc1
Fix RulerZBundle 
People should really follow semver and provide UPGRADE file when they
provide a library ...
 2018-11-25 10:08:45 +01:00
Jeremy Benoist
3c7900d0cd
Jump to PHP 7.1+ 2018-11-25 10:08:45 +01:00
Jeremy Benoist
b878be4cc9
Merge remote-tracking branch 'origin/master' into 2.4 
# Conflicts:
#	web/wallassets/baggy.js
#	web/wallassets/manifest.json
#	web/wallassets/material.css
#	web/wallassets/material.js
 2018-11-25 09:58:18 +01:00
Jérémy Benoist
bffe65478d
Merge pull request #3775 from wallabag/prepare-2.3.4 
Prepare 2.3.4 release
 2018-11-24 21:13:03 +01:00
Jeremy Benoist
5a4cbf5b70
Create a custom swap to avoid error 2018-11-23 22:11:10 +01:00
Jeremy Benoist
ea60d76e60
Use latest bridge to avoid PHPUnit break 
Because branch 4.8 & 5.7 have been removed
 2018-11-23 22:11:10 +01:00
Jeremy Benoist
d470f817ac
Use new Travis infra 2018-11-23 22:11:04 +01:00
Jeremy Benoist
dc90eab32b
Prepare 2.3.4 release 2018-11-23 08:34:13 +01:00
Jérémy Benoist
e01b00298a
Merge pull request #3774 from Simounet/feature/card-ui 
Card no preview replaced by wallabag logo
 2018-11-21 20:56:09 +01:00
Simounet
2daae77094 Card no preview replaced by wallabag logo 2018-11-21 18:51:44 +01:00
Jérémy Benoist
59a31ed07f
Merge pull request #3772 from techexo/patch-1 
Update translation when marking as read
 2018-11-16 14:34:41 +01:00
Eloi Coutant
060f3ce34c
Update messages.en.yml 2018-11-16 14:16:38 +01:00
Eloi Coutant
ccc3b0a531
Update messages.fr.yml 2018-11-16 01:45:16 +01:00
Eloi Coutant
0ddfb2956c
Update messages.fr.yml 
Modification pour éclaircir le sens de l'option
 2018-11-16 01:37:53 +01:00
Jérémy Benoist
b3bcc6aa06
Merge pull request #3769 from burkemw3/patch-4 
Add rel=noopener to target=_blank links
 2018-11-09 16:08:27 +01:00
Matt Burke
a22b8043b4 Add rel=noopener to target=_blank links 
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
 2018-11-07 20:34:54 -05:00
Jérémy Benoist
078d54411b
Merge pull request #3766 from merwan/patch-1 
Fix link to wallabag requirements in documentation
 2018-11-06 05:20:28 +00:00
Merouane Atig
c7e9610b3f
Fix link to wallabag requirements in documentation 2018-11-05 10:17:50 +01:00
Kevin Decherf
3a69628007
Merge pull request #3764 from shtrom/fix-matches-notmatches-language 
Fix documentation wording for matches/notmatches tagging rules
 2018-11-01 12:04:55 +01:00
Olivier Mehani
3f0dd0f0bc
fixup! fixup! Fix documentation wording for matches/notmatches tagging rules 2018-11-01 19:40:17 +11:00
Olivier Mehani
da7b8e256f
fixup! Fix documentation wording for matches/notmatches tagging rules 2018-11-01 19:26:06 +11:00
Olivier Mehani
0452e869ec
Fix documentation wording for matches/notmatches tagging rules 
Signed-off-by: Olivier Mehani <shtrom@ssji.net>
 2018-10-31 19:56:48 +11:00
Jérémy Benoist
385dac6d31
Merge pull request #3763 from wallabag/ghpr-template-update 
Add note on GitHub PR template to auto-close issues
 2018-10-27 06:15:03 +00:00
Kevin Decherf
96823682f9 misc: add note on GitHub PR template to auto-close issues 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-26 23:50:55 +02:00
Kevin Decherf
a6e4e83809
Merge pull request #3553 from wallabag/url-3529 
Swap entry url with origin url if graby provides an updated one
 2018-10-26 11:31:41 +02:00
Kevin Decherf
1b220426e2 phpcs 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-24 22:33:32 +02:00
Kevin Decherf
6059967951 updateOriginUrl: remove 'query string' case from ignore list 
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>
 2018-10-24 22:27:27 +02:00
Kevin Decherf
44e63667d9 updateOriginUrl: add comment blocks for the parse_url diff check 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-24 22:13:03 +02:00
Kevin Decherf
5ba5e22a09 updateOriginUrl: rewrite some if, resolving feedbacks from PR 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-24 21:54:09 +02:00
Kevin Decherf
b49c87acf1 ignoreOriginUrl: add initial support of ignore lists 
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>
 2018-10-22 23:42:09 +02:00
Kevin Decherf
fc040c749d updateOriginUrl: add behavior when diff is fragment and query 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-22 23:08:58 +02:00
Kevin Decherf
e07fadea76 Refactor updateOriginUrl to include new behaviors behaviors 
- 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>
 2018-10-22 23:01:16 +02:00
Kevin Decherf
781864b954 ContentProxy: swap entry url to origin_url and set new url according to graby content 
Closes #3529

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-21 16:15:31 +02:00
Kevin Decherf
4a81360efc ContentProxy: fix a corner case when entry.url is empty in updateEntry 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2018-10-21 16:13:20 +02:00
Kevin Decherf
ae4f7dceec
Merge pull request #3733 from Deuchnord/root-abort-update 
Abort running install and update script if root
 2018-10-17 11:26:12 +02:00
Jérôme Deuchnord
c2bd272cf3 Added argument to ignore the warning. 2018-10-16 20:34:28 +02:00
Jérémy Benoist
0658ce4f11
Merge pull request #3745 from burkemw3/patch-3 
Add placeholder image to card-based gallery entries page
 2018-10-16 07:45:22 +00:00
Matt Burke
cefbe6a87f Add placeholder image to card-based gallery entries page for #3651 
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.
 2018-10-15 23:59:39 -04:00
Jérémy Benoist
e673b54f70
Merge pull request #3574 from shulard/feature/rename-tags 
Allow to rename tags from the web interface.
 2018-10-15 08:32:59 +00:00
Jérémy Benoist
5bb01c0344
Merge pull request #3216 from wallabag/change-locale-register 
Added possibility to change locale from login/register pages
 2018-10-15 08:31:42 +00:00
Jérémy Benoist
fbdc665487
Merge pull request #3606 from mritzmann/master 
add manifest.json for android pwa
 2018-10-15 08:30:26 +00:00
Kevin Decherf
0ebf595c11
Merge pull request #3706 from shtrom/fix/gnu-make-bash 
Makefile fixes for non GNU systems
 2018-10-14 20:07:42 +02:00
Jérémy Benoist
ba69c04c27
Merge pull request #3743 from burkemw3/patch-1 
Show tags on non-image gallery preview card
 2018-10-13 12:00:00 +00:00
Jeremy Benoist
4d4147b228
Ensure language is valid 
- Do not override locale if user has choosen a locale from the login screen.
- Add some tests about locale url
 2018-10-13 09:39:00 +02:00
Nicolas Lœuillet
be417ef236
Added possibility to change locale from login/register pages 2018-10-13 09:39:00 +02:00
Jérémy Benoist
78ef840eda
Merge pull request #3734 from davidmohamedfr/fix-dockerfile-php72 
Fix dockerfile php72
 2018-10-13 06:30:10 +00:00
Matt Burke
d73bfdbddb
Show tags on non-image gallery preview card 
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.
 2018-10-11 19:47:48 -04:00
Jérémy Benoist
43b6f3a8a8
Merge pull request #3596 from glego/add-secure-email 
Add secure email
 2018-10-11 09:34:52 +00:00
Glenn Goffin
6a3187066f
Add secure email 2018-10-11 07:57:11 +02:00