Commit Graph

5684 Commits

Author SHA1 Message Date
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
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
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
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
33e3eeaec8 Load custom.css only if exists 2020-02-07 13:21:48 +01:00
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
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
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
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
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
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
62107f50d3 Merge pull request #4264 from herrriehm/master
cosmetic changes
2020-01-28 10:07:22 +01:00
8afcb3a647 Merge pull request #4257 from Simounet/feat/lang-attribute
Use lang attribute
2020-01-28 10:06:30 +01:00
1de4a8f938 Update messages.es.yml 2020-01-27 20:05:49 +01:00
97c6561d5c Merge pull request #4263 from wallabag/4251-firefox-print
Fix print of long pages
2020-01-27 08:50:57 +01:00
6fb7d4a7ae fixed annoying typo 2020-01-26 09:48:17 +01:00
20349b02dd Update wallabag.yml
reverted generic urls
2020-01-26 09:45:31 +01:00
1e921a657f cosmetic changes:
- http to https
- replaced generic .com by specific TLD
- updated some dead urls
2020-01-25 16:16:43 +01:00
3dcb701975 baggy: remove logo from printed pages
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2020-01-25 15:42:43 +01:00
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
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
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
416d44d0ae Use lang attribute 2020-01-23 21:21:54 +01:00
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
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
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
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
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
dc23bf9f29 Entry action buttons displayed on page end reached 2020-01-21 14:06:08 +01:00
cfd77d1c2a Sticky nav on entry action button click 2020-01-21 12:00:21 +01:00
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
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
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
0a81f9b9d9 Sidebar sub entries not conditioned by hover anymore 2020-01-19 11:01:24 +01:00
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
29f5515959 Improve check by using list
See https://stackoverflow.com/a/27335439/569101
2020-01-13 15:58:59 +01:00
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
62682c073b Fixed URL to share entry via twitter 2020-01-13 15:17:06 +01:00
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
68fd40e4fc Merge pull request #4247 from wallabag/dependabot/composer/friendsofsymfony/jsrouting-bundle-2.5.3
Bump friendsofsymfony/jsrouting-bundle from 2.5.1 to 2.5.3
2020-01-13 06:58:54 +01:00
15f8a1f09c Merge pull request #4248 from wallabag/dependabot/composer/scheb/two-factor-bundle-4.12.0
Bump scheb/two-factor-bundle from 4.11.1 to 4.12.0
2020-01-13 06:45:40 +01:00
36eab58bb3 Bump scheb/two-factor-bundle from 4.11.1 to 4.12.0
Bumps [scheb/two-factor-bundle](https://github.com/scheb/two-factor-bundle) from 4.11.1 to 4.12.0.
- [Release notes](https://github.com/scheb/two-factor-bundle/releases)
- [Commits](https://github.com/scheb/two-factor-bundle/compare/v4.11.1...v4.12.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-13 03:58:51 +00:00
3d850ba9ac Bump friendsofsymfony/jsrouting-bundle from 2.5.1 to 2.5.3
Bumps [friendsofsymfony/jsrouting-bundle](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle) from 2.5.1 to 2.5.3.
- [Release notes](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/releases)
- [Changelog](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/FriendsOfSymfony/FOSJsRoutingBundle/compare/2.5.1...v2.5.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-13 03:50:53 +00:00
66d91fa116 Merge pull request #4245 from wallabag/dependabot/composer/m6web/redis-mock-5.0.0
Bump m6web/redis-mock from 4.7.0 to 5.0.0
2020-01-09 11:36:49 +01:00
501d5fd102 Bump m6web/redis-mock from 4.7.0 to 5.0.0
Bumps [m6web/redis-mock](https://github.com/M6Web/RedisMock) from 4.7.0 to 5.0.0.
- [Release notes](https://github.com/M6Web/RedisMock/releases)
- [Commits](https://github.com/M6Web/RedisMock/compare/v4.7.0...v5.0.0)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2020-01-09 03:56:31 +00:00
27db0551c9 Merge pull request #4238 from prcmt/master
Change API URL used in dev docs to app.wallabag.it
2020-01-02 08:17:08 +01:00
3f3b5058aa Change API URL used in dev docs to app.wallabag.it
Currently the documentation uses the defunct v2.wallabag.org URL which
can be confusing to someone configuring their first API client with
wallabag.it.
2019-12-31 21:31:59 +00:00
3a9576a889 Merge pull request #4237 from JENkt4k/master
Fix broken ENV file - removed "export"s
2019-12-31 09:32:09 +01:00
0ca270f385 Update env 2019-12-31 09:19:02 +01:00
5a071f29b7 Fix broken ENV file - removed "export"s 2019-12-30 14:29:20 -06:00