Commit graph

5107 commits

Author SHA1 Message Date
Kevin Decherf
f38b8f0d86
Merge pull request #4278 from wallabag/fix/4240
Fix entries export from search view
2020-03-15 13:54:44 +01:00
dependabot-preview[bot]
f3db257902
[Security] Bump friendsofsymfony/oauth2-php from 1.2.3 to 1.3.0
Bumps [friendsofsymfony/oauth2-php](https://github.com/FriendsOfSymfony/oauth2-php) from 1.2.3 to 1.3.0. **This update includes a security fix.**
- [Release notes](https://github.com/FriendsOfSymfony/oauth2-php/releases)
- [Changelog](https://github.com/FriendsOfSymfony/oauth2-php/blob/master/CHANGELOG.txt)
- [Commits](https://github.com/FriendsOfSymfony/oauth2-php/compare/1.2.3...1.3.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-15 11:27:16 +00:00
Kevin Decherf
899ab0d04f Remove capistrano-related files
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2020-03-08 17:00:51 +01:00
Kevin Decherf
ba820b12b6
Merge pull request #4287 from wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.2
Bump friendsofsymfony/rest-bundle from 2.7.1 to 2.7.2
2020-03-06 16:52:04 +01:00
dependabot-preview[bot]
552957bbf1
Bump friendsofsymfony/rest-bundle from 2.7.1 to 2.7.2
Bumps [friendsofsymfony/rest-bundle](https://github.com/FriendsOfSymfony/FOSRestBundle) from 2.7.1 to 2.7.2.
- [Release notes](https://github.com/FriendsOfSymfony/FOSRestBundle/releases)
- [Changelog](https://github.com/FriendsOfSymfony/FOSRestBundle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FriendsOfSymfony/FOSRestBundle/compare/2.7.1...2.7.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-05 03:49:44 +00:00
dependabot-preview[bot]
ec37106f32
Bump symfony/symfony from 3.4.37 to 3.4.38
Bumps [symfony/symfony](https://github.com/symfony/symfony) from 3.4.37 to 3.4.38.
- [Release notes](https://github.com/symfony/symfony/releases)
- [Changelog](https://github.com/symfony/symfony/blob/v3.4.38/CHANGELOG-3.4.md)
- [Commits](https://github.com/symfony/symfony/compare/v3.4.37...v3.4.38)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-03-02 03:30:42 +00:00
Kevin Decherf
a167f002bb
Merge pull request #4282 from wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.1
Bump friendsofsymfony/rest-bundle from 2.7.0 to 2.7.1
2020-02-29 12:20:33 +01:00
dependabot-preview[bot]
d3c8bf87c2
Bump friendsofsymfony/rest-bundle from 2.7.0 to 2.7.1
Bumps [friendsofsymfony/rest-bundle](https://github.com/FriendsOfSymfony/FOSRestBundle) from 2.7.0 to 2.7.1.
- [Release notes](https://github.com/FriendsOfSymfony/FOSRestBundle/releases)
- [Changelog](https://github.com/FriendsOfSymfony/FOSRestBundle/blob/2.7.1/CHANGELOG.md)
- [Commits](https://github.com/FriendsOfSymfony/FOSRestBundle/compare/2.7.0...2.7.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-25 04:01:53 +00:00
lizyn
9ce18f06c3 Added Simplified Chinese as a language option 2020-02-25 00:19:04 +08:00
lizyn
4a654ae49a Added translation in Simplified Chinese(简体中文) 2020-02-25 00:13:26 +08:00
lizyn
b19df31d78
Merge pull request #1 from wallabag/master
Keep up with the master again
2020-02-24 10:04:13 +08:00
Kevin Decherf
80609790ca travis: remove double triggers for PR, remove nightly
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2020-02-23 00:43:26 +01:00
Kevin Decherf
93c5b47e88 ExportController: fix entries export from search view
Fixes #4240

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2020-02-23 00:43:21 +01:00
Kevin Decherf
04d918cae0
Merge pull request #4280 from wallabag/dependabot/composer/scheb/two-factor-bundle-4.14.0
Bump scheb/two-factor-bundle from 4.13.0 to 4.14.0
2020-02-19 21:35:16 +01:00
dependabot-preview[bot]
de166a37d4
Bump scheb/two-factor-bundle from 4.13.0 to 4.14.0
Bumps [scheb/two-factor-bundle](https://github.com/scheb/two-factor-bundle) from 4.13.0 to 4.14.0.
- [Release notes](https://github.com/scheb/two-factor-bundle/releases)
- [Commits](https://github.com/scheb/two-factor-bundle/compare/v4.13.0...v4.14.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-17 04:06:40 +00:00
Simounet
33e3eeaec8
Load custom.css only if exists 2020-02-07 13:21:48 +01:00
Jérémy Benoist
3bf941c4a4
Merge pull request #4277 from wallabag/dependabot/composer/symfony/phpunit-bridge-4.3.11
Bump symfony/phpunit-bridge from 4.3.10 to 4.3.11
2020-02-03 07:23:56 +01:00
Jérémy Benoist
c1a201a472
Merge pull request #4276 from wallabag/dependabot/composer/scheb/two-factor-bundle-4.13.0
Bump scheb/two-factor-bundle from 4.12.0 to 4.13.0
2020-02-03 07:23:22 +01:00
Jérémy Benoist
e09f585232
Merge pull request #4275 from wallabag/dependabot/composer/friendsofsymfony/rest-bundle-2.7.0
Bump friendsofsymfony/rest-bundle from 2.6.0 to 2.7.0
2020-02-03 07:22:35 +01:00
dependabot-preview[bot]
2a59cfa331
Bump symfony/phpunit-bridge from 4.3.10 to 4.3.11
Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 4.3.10 to 4.3.11.
- [Release notes](https://github.com/symfony/phpunit-bridge/releases)
- [Changelog](https://github.com/symfony/phpunit-bridge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/phpunit-bridge/compare/v4.3.10...v4.3.11)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-03 04:16:45 +00:00
dependabot-preview[bot]
2ffaf28458
Bump scheb/two-factor-bundle from 4.12.0 to 4.13.0
Bumps [scheb/two-factor-bundle](https://github.com/scheb/two-factor-bundle) from 4.12.0 to 4.13.0.
- [Release notes](https://github.com/scheb/two-factor-bundle/releases)
- [Commits](https://github.com/scheb/two-factor-bundle/compare/v4.12.0...v4.13.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-03 04:08:18 +00:00
dependabot-preview[bot]
0c801a4758
Bump friendsofsymfony/rest-bundle from 2.6.0 to 2.7.0
Bumps [friendsofsymfony/rest-bundle](https://github.com/FriendsOfSymfony/FOSRestBundle) from 2.6.0 to 2.7.0.
- [Release notes](https://github.com/FriendsOfSymfony/FOSRestBundle/releases)
- [Changelog](https://github.com/FriendsOfSymfony/FOSRestBundle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FriendsOfSymfony/FOSRestBundle/compare/2.6.0...2.7.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-02-03 03:57:51 +00:00
Jérémy Benoist
62107f50d3
Merge pull request #4264 from herrriehm/master
cosmetic changes
2020-01-28 10:07:22 +01:00
Jérémy Benoist
8afcb3a647
Merge pull request #4257 from Simounet/feat/lang-attribute
Use lang attribute
2020-01-28 10:06:30 +01:00
Sebastian Riehm
1de4a8f938
Update messages.es.yml 2020-01-27 20:05:49 +01:00
Jérémy Benoist
97c6561d5c
Merge pull request #4263 from wallabag/4251-firefox-print
Fix print of long pages
2020-01-27 08:50:57 +01:00
Sebastian Riehm
6fb7d4a7ae
fixed annoying typo 2020-01-26 09:48:17 +01:00
Sebastian Riehm
20349b02dd
Update wallabag.yml
reverted generic urls
2020-01-26 09:45:31 +01:00
Sebastian Riehm
1e921a657f cosmetic changes:
- http to https
- replaced generic .com by specific TLD
- updated some dead urls
2020-01-25 16:16:43 +01:00
Kevin Decherf
3dcb701975 baggy: remove logo from printed pages
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2020-01-25 15:42:43 +01:00
Kevin Decherf
45582f2992 material: replace display: flex with block in print mode
This change is a workaround for a reported issue with printing flex
items on Firefox

See: https://bugzilla.mozilla.org/show_bug.cgi?id=939897

Fixes #4251

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2020-01-25 15:40:29 +01:00
Jérémy Benoist
52cd86f1c2
Merge pull request #4261 from wallabag/dependabot/composer/j0k3r/graby-2.1.1
Bump j0k3r/graby from 2.1.0 to 2.1.1
2020-01-24 07:26:32 +01:00
dependabot-preview[bot]
514c55a161
Bump j0k3r/graby from 2.1.0 to 2.1.1
Bumps [j0k3r/graby](https://github.com/j0k3r/graby) from 2.1.0 to 2.1.1.
- [Release notes](https://github.com/j0k3r/graby/releases)
- [Commits](https://github.com/j0k3r/graby/compare/2.1.0...2.1.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-24 03:48:48 +00:00
Simounet
416d44d0ae
Use lang attribute 2020-01-23 21:21:54 +01:00
Jérémy Benoist
fdb885ddbf
Merge pull request #4260 from wallabag/dependabot/composer/symfony/symfony-3.4.37
Bump symfony/symfony from 3.4.36 to 3.4.37
2020-01-23 07:09:29 +01:00
dependabot-preview[bot]
94e7ba3174
Bump symfony/symfony from 3.4.36 to 3.4.37
Bumps [symfony/symfony](https://github.com/symfony/symfony) from 3.4.36 to 3.4.37.
- [Release notes](https://github.com/symfony/symfony/releases)
- [Changelog](https://github.com/symfony/symfony/blob/v3.4.37/CHANGELOG-3.4.md)
- [Commits](https://github.com/symfony/symfony/compare/v3.4.36...v3.4.37)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-23 04:33:53 +00:00
Jérémy Benoist
6f43803c58
Merge pull request #4258 from wallabag/dependabot/composer/symfony/phpunit-bridge-4.3.10
Bump symfony/phpunit-bridge from 4.3.9 to 4.3.10
2020-01-22 06:02:53 +01:00
dependabot-preview[bot]
509097b841
Bump symfony/phpunit-bridge from 4.3.9 to 4.3.10
Bumps [symfony/phpunit-bridge](https://github.com/symfony/phpunit-bridge) from 4.3.9 to 4.3.10.
- [Release notes](https://github.com/symfony/phpunit-bridge/releases)
- [Changelog](https://github.com/symfony/phpunit-bridge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/symfony/phpunit-bridge/compare/v4.3.9...v4.3.10)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-22 04:21:14 +00:00
Jérémy Benoist
7937ed0c20
Merge pull request #4255 from Simounet/feat/actions-from-sticky-btn
Feat/actions from sticky btn
2020-01-21 15:32:41 +01:00
Simounet
dc23bf9f29
Entry action buttons displayed on page end reached 2020-01-21 14:06:08 +01:00
Simounet
cfd77d1c2a
Sticky nav on entry action button click 2020-01-21 12:00:21 +01:00
Jérémy Benoist
996b2ec170
Merge pull request #4254 from Simounet/feat/sidebar-sub-entries-no-hover
Sidebar sub entries not conditioned by hover anymore
2020-01-21 10:31:03 +01:00
Jérémy Benoist
a5afdc539f
Merge pull request #4256 from wallabag/dependabot/composer/doctrine/doctrine-bundle-1.12.7
Bump doctrine/doctrine-bundle from 1.12.6 to 1.12.7
2020-01-20 06:54:33 +01:00
dependabot-preview[bot]
0f4e90c1ac
Bump doctrine/doctrine-bundle from 1.12.6 to 1.12.7
Bumps [doctrine/doctrine-bundle](https://github.com/doctrine/DoctrineBundle) from 1.12.6 to 1.12.7.
- [Release notes](https://github.com/doctrine/DoctrineBundle/releases)
- [Commits](https://github.com/doctrine/DoctrineBundle/compare/1.12.6...1.12.7)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-20 04:02:00 +00:00
Simounet
0a81f9b9d9
Sidebar sub entries not conditioned by hover anymore 2020-01-19 11:01:24 +01:00
Jérémy Benoist
913c3bc7aa
Merge pull request #4249 from wallabag/fix/env-not-well-defined
Ensure ENV is well defined when using make
2020-01-14 14:30:17 +01:00
Jeremy Benoist
29f5515959
Improve check by using list
See https://stackoverflow.com/a/27335439/569101
2020-01-13 15:58:59 +01:00
Nicolas Lœuillet
7dc4cbe70f
Merge pull request #4250 from wallabag/fix-twitter-sharing
Fixed URL to share entry via twitter
2020-01-13 15:38:03 +01:00
Nicolas Lœuillet
62682c073b
Fixed URL to share entry via twitter 2020-01-13 15:17:06 +01:00
Jeremy Benoist
49eb5405de
Ensure ENV is well defined when using make
This command should fail before calling other commands (which will fail to because the environment is wrong):

```
ENV=toto make install
```
2020-01-13 14:26:10 +01:00