mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-06-02 13:29:22 +00:00
Code Issues Projects Releases Wiki Activity
9598 commits 12 branches 99 tags 142 MiB
Commit graph

517 commits

Author SHA1 Message Date
Nicolas Lœuillet 9a9d8840bb Enabled greek translation 2022-03-08 15:30:45 +01:00
Nicolas Lœuillet 6dfc031839
Enhanced tests and changed route 2022-03-02 20:07:43 +01:00
Nicolas Lœuillet dce50ddb79
Added route to list entries with annotations 2022-03-02 20:07:17 +01:00
Jeremy Benoist 9a6146d2ef
Merge remote-tracking branch 'origin/master' into 2.5.0 2022-03-02 20:03:33 +01:00
Jeremy Benoist 9e5a7db740
2.4.3 
Also exclude @dependabot from automated GitHub release
 2022-02-14 16:25:16 +01:00
Jeremy Benoist 01609f8514
Update to ESLint 8 
And run it:
- `yarn eslint app/**/*.js --fix`
- `yarn eslint web/**/*.js --fix`
 2022-01-05 21:43:32 +01:00
Jeremy Benoist 9d1716c0e5
Rebuild assets 
And add `postcss-scss` and fixing some issues.
 2022-01-05 20:43:36 +01:00
Jérémy Benoist 7a444ed4aa
Merge pull request #5535 from marapavelka/patch-2 
Add Czech language
 2022-01-05 16:49:30 +01:00
marapavelka c429a31273
Update wallabag.yml 
Added option for Czech language.
 2022-01-05 16:40:28 +01:00
Jeremy Benoist 100469025a
Update webpack dev server config & webpack-cli package 2022-01-05 16:40:08 +01:00
Jeremy Benoist 283675ccd0
Rebuild assets and update webpack config 
And optimize images (Thanks ImageOptim)
 2022-01-05 16:09:43 +01:00
Kevin Decherf c467bf9382 Update npm/yarn dependencies 
Replace deprecated babel-eslint with @babel/eslint-parser
Replace deprecated eslint-loader with eslint-webpack-plugin
Update other plugins, resolving several opened security reports.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2021-08-05 22:51:23 +02:00
Jeremy Benoist ed9210db09
Prepare 2.4.2 release 2021-03-16 09:23:37 +01:00
Jeremy Benoist dd9d6a4c64
Add Delicious import 
Since 2021, you can export again your data \o/

Also fix indentation in json fixtures files.
 2021-02-08 09:47:56 +01:00
Jeremy Benoist 5a69fec5da
Prepare 2.4.1 
- update changelog
- bump version
- update deps
 2021-01-04 10:21:07 +01:00
Thomas Citharel 21dee08b4d Add issuer to otp config 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2020-12-31 18:09:14 +01:00
Jeremy Benoist f5d82abcfe
Update release process and introduce 2.4.1-dev 2020-12-10 15:01:47 +01:00
Jeremy Benoist 289406f258
Ensure manifest files are sorted properly 2020-12-08 09:34:17 +01:00
Jeremy Benoist 92b14a3536
Update for webpack-manifest-plugin 2020-12-03 10:15:21 +01:00
Nicolas Lœuillet dd36b9bda5
Updated changelog for wallabag 2.4.0 2020-11-30 12:17:42 +01:00
Jeremy Benoist 40c01ad1d4
Ditch Travis to use GitHub Actions 2020-11-27 14:14:44 +01:00
Simounet 9937d3a060
Webpack upgraded from 4 to 5 + dependancies updated 2020-11-24 22:28:52 +01:00
Tom 8eac42a897
Added dutch translation to the settings 
Since the NL translation is 100% i think it deserves a place in the settings page :-)
 2020-10-09 15:23:58 +02:00
Jeremy Benoist dce3c84c9c
Upgrade to NodeJS 12 
Update javascript deps to latest version.
Rebuild assets

- Keep `stylehint` in a lower version because starting at v9.0.0 it generates too much errors. We might fix them later.
- Don't touch `materialize-css` to avoid too much side effect. We might update it later (to 1.0.0).
 2020-08-25 12:28:12 +02:00
Jérémy Benoist 885a1daec5
Add Croatian translation 2020-08-24 07:03:09 +02:00
Volodymyr Fedyk 488f01f50e Add Ukrainian translation 2020-07-26 21:23:56 +03:00
Nicolas Lœuillet 9717d01298
Upgrade Piwik Twig Extension to Matomo 2020-04-29 14:19:31 +02:00
Kevin Decherf 7408a6cb68 Add controller, views and translations for ignore origin instance rules 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2020-04-25 15:59:23 +02:00
Kevin Decherf 2495b19761 Add default system-wide ignore origin rules with install support 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2020-04-25 15:59:23 +02:00
Jeremy Benoist d20a8c5fb4
Add ability to define lifetime token for the API 
It'll allow admin of a wallabag instance to define its own lifetime for the refresh token and the access token.
The default value are the recommended one from the wallabag team.
 2020-04-08 09:18:17 +02:00
Jérémy Benoist c9b83a13c0
Merge pull request #4274 from AKKED/add_ja 
add Japanese translation
 2020-03-28 17:16:37 +01:00
Jérémy Benoist 11079d204d
Merge pull request #4272 from Simounet/feat/load-custom-css-only-if-exists 
Load custom.css only if exists
 2020-03-28 16:49:29 +01:00
AKKED 7d4176b27b
Add Japanese translation 2020-03-28 16:47:44 +01:00
Jérémy Benoist d8a40d703e
Merge pull request #4281 from lizyn/zh_translation 
Added language support for Simplified Chinese（简体中文）
 2020-03-28 16:39:17 +01:00
Kevin Decherf 899ab0d04f Remove capistrano-related files 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2020-03-08 17:00:51 +01:00
lizyn 9ce18f06c3 Added Simplified Chinese as a language option 2020-02-25 00:19:04 +08:00
Simounet 33e3eeaec8
Load custom.css only if exists 2020-02-07 13:21:48 +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
Nicolas Lœuillet 958e77e6a7
Added elCurator import 2019-11-15 16:08:36 +01:00
Nicolas Lœuillet af7b22a3be
Fixed default value for reading speed 2019-09-19 14:23:06 +02:00
Jeremy Benoist 1576905e03
Rename internal settings table 
In fact it's not _just_ a rename.
We are now able to use our own entity with the CraueConfigBundle which allow us to enforce a custom length on string field and avoid error with utf8mb4 on MySQL.
To fix that issue before we were in need to fork CraueConfigBundle to hard apply these length changes.

The recent 2.3.0 release fix that issue. That's why we are in need to rename the table (getting rid of the bundle name from it)

Also updating deps:
  - Updating symfony/polyfill-mbstring (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-ctype (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-php70 (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-util (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-php56 (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-intl-icu (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-apcu (v1.11.0 => v1.12.0)
  - Updating j0k3r/graby-site-config (1.0.88 => 1.0.89)
  - Updating php-http/message (1.7.2 => 1.8.0)
  - Updating symfony/polyfill-php73 (v1.11.0 => v1.12.0)
  - Updating symfony/http-client (v4.3.2 => v4.3.3)
  - Updating symfony/polyfill-php72 (v1.11.0 => v1.12.0)
  - Updating symfony/polyfill-intl-idn (v1.11.0 => v1.12.0)
  - Updating symfony/mime (v4.3.2 => v4.3.3)
  - Updating craue/config-bundle (dev-utf8mb4 46cfd37 => 2.3.0)
  - Updating masterminds/html5 (2.6.0 => 2.7.0)
  - Updating nette/di (v3.0.0 => v3.0.1)
  - Updating symfony/polyfill-iconv (v1.11.0 => v1.12.0)
  - Updating wallabag/php-mobi (1.0.1 => 1.1.0)
 2019-08-08 16:03:20 +02:00
Jérémy Benoist 7e5b7e029a
Merge pull request #3990 from wallabag/feature/sentry 
Add Sentry support
 2019-06-05 14:41:42 +02:00
Jérémy Benoist c822b20835
Try to force people to update the secret 2019-06-05 14:14:17 +02:00
Jeremy Benoist 955a3bde17
Add Sentry support 
Only enable in production
 2019-06-05 13:15:15 +02:00
Jeremy Benoist 6546aca4a3
Keep composer.lock 
We initially ignored the `composer.lock` because it generated a lock of rebase on PR when someone updated it and the master updated it too.
Now we have less contributions (sadly) so I think we won't run against that problem.
Also, it'll solve issue about people cloning the master and got angry because composer eat all the available memory to determine packages to install.
It'll also be much easier to make release.
Scrutinizer & Travis will be faster too.
 2019-05-29 11:41:07 +02:00
adev 1048c9c4a8
Configure timeout 2019-05-28 11:42:27 +02:00
adev bf9ace0643
Use httplug 2019-05-28 11:40:41 +02:00
Jeremy Benoist 9f0957b831
Merge remote-tracking branch 'origin/master' into 2.4 2019-05-15 14:38:07 +02:00
Jeremy Benoist cc181629a0
Prepare 2.3.8 release 2019-05-14 10:16:46 +02:00
Jeremy Benoist 68a90821a3
Handle redirection from previous feeds 2019-04-26 13:40:58 +02:00
Thomas Citharel 531c8d0a5c
Changed RSS to Atom feed and improve paging 2019-04-25 13:46:31 +02:00
Jeremy Benoist 3620dae1e6
Merge remote-tracking branch 'origin/master' into 2.4 2019-04-01 13:16:15 +02:00
Jeremy Benoist 3d7a1f4caf
Jump to 2.3.8-dev 2019-03-04 13:49:23 +01:00
Jeremy Benoist f2aa373054
Prepare 2.3.7 release 2019-03-04 09:32:26 +01:00
Rurik19 a9f61d3dbb
CORS repare for api 2019-02-11 11:57:52 +01:00
Jeremy Benoist dfd0a7bc5f
Add backup codes 2019-01-23 13:28:03 +01:00
Jeremy Benoist a6b242a1fd
Enable OTP 2FA 
- Update SchebTwoFactorBundle to version 3
- Enable Google 2fa on the bundle
- Disallow ability to use both email and google as 2fa
- Update Ocramius Proxy Manager to handle typed function & attributes (from PHP 7)
- use `$this->addFlash` shortcut instead of `$this->get('session')->getFlashBag()->add`
- update admin to be able to create/reset the 2fa
 2019-01-23 13:28:02 +01:00
Jeremy Benoist 6113dbbc20
Removed hardcoded database version 2019-01-22 20:38:28 +01:00
Jeremy Benoist 3bd65991ad
Add a new endpoint to retrieve information from the wallabag instance 
Useful for api client which required some information.
We might add more inside them in the future.

The endpoint /api/version should be avoided now as it contains not so much information rather the version.
 2019-01-15 10:17:11 +01:00
Jeremy Benoist 5419a8368e
Merge remote-tracking branch 'origin/master' into 2.4 2019-01-15 09:41:18 +01:00
Jérémy Benoist 314f647238
Jump to 2.3.7-dev 2019-01-11 22:17:48 +01:00
Jeremy Benoist 3bed2e440e
Prepare 2.3.6 release 2019-01-11 14:16:41 +01:00
Jeremy Benoist 4fd5f670fe
Jump to 2.3.6-dev and update release process 
Fix release archive in `release.sh` and also fix a typo in the release process
 2018-12-15 08:14:47 +01:00
Jeremy Benoist a1272ab84d
Prepare 2.3.5 release 2018-12-14 20:59:16 +01:00
Jeremy Benoist 1b6b77f029
Remove custom Postgres class 
Because PG > 10 is now supported by DBAL >= 2.6.0
 2018-11-28 22:04:54 +01:00
Jeremy Benoist db9b6d8d0d
Update fixtures 2018-11-28 22:04:54 +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
Jeremy Benoist a03c4d90b2
Jump to 2.3.5-dev and update release process 
After the latest release, I update the documentation about it so it’s more clear
 2018-11-25 09:43:21 +01:00
Jeremy Benoist dc90eab32b
Prepare 2.3.4 release 2018-11-23 08:34:13 +01:00
Nicolas Lœuillet be417ef236
Added possibility to change locale from login/register pages 2018-10-13 09:39:00 +02:00
Glenn Goffin 6a3187066f
Add secure email 2018-10-11 07:57:11 +02:00
Jeremy Benoist 115de64e5b
Jump to Symfony 3.4 
Thanks to the BC compatibility, almost nothing have to be changed.
All changes are related to new bundle version of:
- SensioFrameworkExtraBundle
- DoctrineFixturesBundle
 2018-10-04 14:11:57 +02:00
Jeremy Benoist 80336f77fd
The 'framework.trusted_proxies' configuration key has been deprecated in Symfony 3.3 2018-07-05 21:01:45 +02:00
Jeremy Benoist 7ddba67745
Prepare 2.3.3 release 2018-06-19 06:50:13 +02:00
Floran Brutel 08d6bedcaa
Allow login by email 2018-04-01 20:57:10 +02:00
Jeremy Benoist ac1811f83e
Prepare 2.3.2 release 2018-01-22 10:06:31 +01:00
Nicolas Lœuillet f83e9e32fc
Prepared wallabag 2.3.1 2017-12-26 09:15:39 +01:00
Kevin Decherf e8694faad6 Remove fixed relative path for assets 2017-12-20 21:53:48 +01:00
Jeremy Benoist eb3754509d
Add missing parameter for test 2017-12-18 13:29:33 +01:00
Jeremy Benoist a1661af17c
Add custom driver & schema manager for PostgreSQL 10 2017-12-12 12:14:40 +01:00
Christophe VERGNE a40a8038d3
Fix All RSS not accessible if not logged in + Tests 2017-12-11 16:04:06 +01:00
Kevin Decherf 893fd6434f Add craue setting to enable sharing of origin url to Shaarli 
Also fix the field name used in the query string and add it to baggy
theme

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-11-25 17:07:55 +01:00
Jérémy Benoist 773ac5b0f7
Merge pull request #3419 from NatJNP/patch1 
Add Thai language
 2017-11-25 12:29:53 +01:00
NatPi 2020b4456c Add all file thai Language for translate 2017-11-24 02:53:01 +07:00
Nicolas Lœuillet 8a21985474 Added internal setting to enable/disable headers storage 2017-11-20 18:47:48 +01:00
Kevin Decherf 9ff628ca56 webpack & views: replace bundles/wallabagcore with wallassets 
This change will prevent composer from removing wallabagcore assets when
installing assets.

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-10-24 00:15:52 +02:00
Nicolas Lœuillet b4da3ee8e5
Prepare wallabag 2.3.0 2017-10-20 14:17:37 +02:00
Kevin Decherf 3f29386cb7 Update prod assets 
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-10-16 00:07:12 +02:00
Kevin Decherf 7a1e1247cb webpack: handle _global img folder 
Fixes missing image files after composer cleaning assets

Source of requireAll(): https://stackoverflow.com/a/30652110

Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
 2017-10-16 00:01:52 +02:00
Nicolas Hart 9ca069a6fe Replace kernel.root_dir by kernel.project_dir 
kernel.root_dir and Kernel::getRootDir() are deprecated since Symfony 3.3.
See https://symfony.com/blog/new-in-symfony-3-3-a-simpler-way-to-get-the-project-root-directory and https://github.com/symfony/symfony/blob/3.3/UPGRADE-3.3.md#httpkernel for more information.
 2017-10-14 00:32:56 +02:00
Jérémy Benoist d8dc7372ab Merge pull request #3376 from wallabag/symfony-3.3 
Symfony 3.3
 2017-10-11 09:55:03 +02:00
Олег ef5fcdee20
add Russian language 2017-10-10 10:48:29 +02:00
Jeremy Benoist f40c88eb1f
Jump to Symfony 3.3 & update others deps 
Also update tests urls
 2017-10-09 16:45:12 +02:00
Jeremy Benoist 2e6239bb9f
Disallow html for templating formats 
Using html template format will then put the html format in the allowed list for the api doc which we don’t want since the api doesn’t response for html format.
 2017-07-09 10:07:14 +02:00
Thomas Citharel 77255d6688 Add css on share public page 2017-06-22 12:15:24 +02:00
Jeremy Benoist 789c46821d Fix linter issue on webpack config files 2017-06-22 12:13:22 +02:00
Jeremy Benoist 18c38dffc6
Add RSS tags feeds 2017-06-21 11:44:35 +02:00
Jeremy Benoist 906424c1b6
Crypt site credential password 2017-06-20 16:03:35 +02:00
Jeremy Benoist 5a9bc00726
Retrieve username/password from database 
Inject the current user & the repo to retrieve username/password from the database
 2017-06-20 16:03:13 +02:00
Jeremy Benoist 1a94252831
Promote https 2017-06-09 10:07:27 +02:00
Jeremy Benoist 80f4d85ac9
Review 2017-06-08 19:15:33 +02:00
Thomas Citharel e48b238a3e fix tests 2017-06-06 16:18:25 +02:00
Thomas Citharel d6c4c484c4 add migration 2017-06-06 16:04:51 +02:00
Thomas Citharel be9d693e74 remove craueconfig domain name setting and add a proper one in parameters 2017-06-06 15:36:21 +02:00
Jeremy Benoist bf7f0cb5a3
Use a dedicated file for wallabag config 2017-06-02 11:33:11 +02:00
Jeremy Benoist 426bb453d2
API user creation behing a toggle 
I've added a toggle feature (in internal settings) so that user api creation can be disabled while form registration still can be enabled.
Also, the /api/user endpoint shouldn't require authentication. Even if we check the authentication when sending a GET request, to retrieve current user information.

I've moved all the internal settings definition to config to avoid duplicated place to define them.
I don't know why we didn't did that earlier.
 2017-06-02 11:32:38 +02:00
Jérémy Benoist a687c8d915 Merge pull request #2708 from jcharaoui/import-disablecontentupdate 
Import disableContentUpdate
 2017-06-02 11:26:37 +02:00
Nicolas Lœuillet 5901516805 Merge pull request #3171 from wallabag/drop-fucking-sqlite 
Defined MySQL as the default rdbms for wallabag
 2017-06-01 14:46:01 +02:00
Jerome Charaoui 1c5da417e4
Put default fetching error title in global config 2017-06-01 09:43:01 +02:00
Nicolas Lœuillet ec42e697ea
Changed default database name 2017-06-01 09:17:05 +02:00
Nicolas Lœuillet 46825cfffb
Fixed @tcitworld 's review 2017-05-31 22:50:18 +02:00
Nicolas Lœuillet 7d5e84fec1
Defined MySQL as the default rdbms for wallabag 2017-05-31 22:36:21 +02:00
adev 7ab5eb9508 Isolated tests 
Use https://github.com/dmaicher/doctrine-test-bundle to have test isolation.
 2017-05-31 16:03:54 +02:00
Jeremy Benoist d181bd7285
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-30 09:59:06 +02:00
Damien Cassou ac1509a66b
Fix documentation URL for "How can I help to fix that?" 2017-05-24 12:57:46 +02:00
Jeremy Benoist 4ab0d25f65
Merge remote-tracking branch 'origin/master' into 2.3 2017-05-19 11:25:19 +02:00
Nicolas Lœuillet c0e8e6037b Prepare wallabag 2.2.3 2017-05-17 17:21:14 +02:00
Nicolas Lœuillet 3b792787d7 Upgraded CraueConfigBundle to 2.0 2017-05-12 16:39:47 +02:00
Thomas Citharel b28c5430ef Merge pull request #3022 from wallabag/webpack 
Adds Webpack support and remove Grunt
 2017-05-09 11:43:48 +02:00
Thomas Citharel e35f8439a7 add comment to config.yml to explain live reload feature 2017-05-04 14:49:44 +02:00
Thomas Citharel 8655913ebf disable default dev server 2017-05-04 14:49:44 +02:00
Thomas Citharel 64f81bc316 Adds Webpack support and removes the use for Grunt 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>

use scss

Signed-off-by: Thomas Citharel <tcit@tcit.fr>

fix build, add babel, fix annotations

fixes (and improvements !) for baggy

add live reload & environments & eslint & theme fixes
 2017-05-04 14:49:44 +02:00
Nicolas Lœuillet efd351c98f Added limit 2017-05-01 09:26:12 +02:00
Nicolas Lœuillet 1680c95c27
Changed default value for list mode (grid instead of list) 2017-03-29 14:43:47 +02:00
Nicolas Lœuillet 8ef1df8157
Changed wallabag version 2017-03-02 14:42:16 +01:00
Kévin Gomez 177c5510ff Update RulerZ 2017-02-05 18:02:09 +01:00
Nicolas Lœuillet 4021c928be
Prepare wallabag 2.2.1 🚀 2017-01-31 11:06:35 +01:00
Nicolas Lœuillet c833d576a9
Prepare wallabag 2.2.0 🚀 2017-01-27 17:28:58 +01:00
Jeremy Benoist 78295b99dd
Merge remote-tracking branch 'origin/master' into 2.2 2017-01-26 13:32:07 +01:00
Nicolas Lœuillet 1ba542ce04 Prepare wallabag 2.1.6 🚀 2017-01-17 13:59:39 +01:00
Nicolas Lœuillet 0bacc9e175
Fixed API error 'No matching accepted Response format could be determined' 2016-12-30 13:23:02 +01:00
Nicolas Lœuillet 881b0578e7
Moved RabbitMQ QoS to parameters 2016-12-15 22:23:28 +01:00
Nicolas Lœuillet 99712e5d85
Added QoS for RabbitMQ 2016-12-15 22:23:28 +01:00
Nicolas Lœuillet 24becc9717 Merge pull request #2667 from wallabag/upgrade-symfony-32 
Upgrade to Symfony 3.2
 2016-12-15 22:18:45 +01:00
Jeremy Benoist 21e7ccef3d
Fix tests & deprecation notice 2016-12-15 21:38:16 +01:00
Jeremy Benoist 24879db1f7
Add default value for list_mode 2016-12-12 17:41:03 +01:00
Nicolas Lœuillet 66e9dde0dc
Fixed logout shortcut 2016-11-23 14:40:00 +01:00
Jeremy Benoist 5066c3e066
Re-use FOSUser master branch 2016-11-22 21:25:05 +01:00
Bertrand Dunogier 7aab0ecf2f Added authentication for restricted access articles 
Fix #438. Thank you so much @bdunogier
 2016-11-22 14:01:46 +01:00
Jeremy Benoist eb2d613c3e
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-21 15:15:30 +01:00
Jeremy Benoist 625bb56181 Merge pull request #2624 from Rurik19/master 
Fix #2056 update config.yml
 2016-11-21 13:14:31 +01:00
Nicolas Lœuillet 98253436e9
Prepare wallabag 2.1.5 🚀 2016-11-21 09:20:27 +01:00
Yuriy Evdokimov 05cdd393d8 wrong spaces 2016-11-21 11:29:09 +05:00
Yuriy Evdokimov 5e7fdfc8dd Fix #2056 update config.yml 
Resolves refresh token lifetime issue
 2016-11-21 11:13:40 +05:00
Jeremy Benoist c1683778ab
Add ability to use Redis with password 2016-11-20 20:43:04 +01:00
Nicolas Lœuillet 995c204428 Added shortcut 2016-11-19 20:05:16 +01:00
Jeremy Benoist 68003139e1
Merge remote-tracking branch 'origin/master' into 2.2 
# Conflicts:
#	.editorconfig
#	docs/de/index.rst
#	docs/de/user/import.rst
#	docs/en/index.rst
#	docs/en/user/configuration.rst
#	docs/en/user/import.rst
#	docs/fr/index.rst
#	docs/fr/user/import.rst
#	src/Wallabag/CoreBundle/Command/InstallCommand.php
#	src/Wallabag/CoreBundle/Resources/translations/messages.da.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.de.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.en.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.es.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.it.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml
#	src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml
#	src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig
#	web/bundles/wallabagcore/themes/baggy/css/style.min.css
#	web/bundles/wallabagcore/themes/baggy/js/baggy.min.js
#	web/bundles/wallabagcore/themes/material/css/style.min.css
#	web/bundles/wallabagcore/themes/material/js/material.min.js
 2016-11-19 15:30:49 +01:00
Nicolas Lœuillet 8fdadee3a5
Change version to 2.2.0-dev 2016-11-19 14:28:25 +01:00
Nicolas Lœuillet 5d2971cadd
Prepare wallabag 2.1.4 🚀 2016-11-18 10:00:29 +01:00
Nicolas Lœuillet f9cded7dd2 Added new shortcuts 2016-11-15 21:54:34 +01:00
Nicolas Lœuillet 49c5d0ad6e Changed FOSJSRouting format in config 2016-11-15 21:54:20 +01:00
Nicolas Lœuillet 3cc78f0679 Added shortcuts 2016-11-15 21:54:20 +01:00
Jeremy Benoist 41c2178685 Merge pull request #2548 from wallabag/pinboard 
Add Pinboard import
 2016-11-08 14:19:40 +01:00
Nicolas Lœuillet db3838545c
Removed Maintenance bundle 2016-11-06 15:34:08 +01:00
Jeremy Benoist 9ab024b4f5
Add Pinboard import 2016-11-04 22:44:31 +01:00
Nicolas Lœuillet a3f7d8a870
Prepare wallabag 2.1.3 🚀 2016-11-04 09:10:15 +01:00
Jeremy Benoist 5a619812ca
Merge remote-tracking branch 'origin/master' into 2.2 2016-11-03 16:41:29 +01:00
Jeremy Benoist 535bfcbe80
Move related event things in Event folder 2016-10-30 09:58:39 +01:00
Nicolas Lœuillet c4b3933bae Updated Capistrano configuration 2016-10-29 14:39:07 +02:00
Jeremy Benoist c68720d40e Merge pull request #2473 from pmichelazzo/master 
Portuguese (Brazilian) translation
 2016-10-25 11:41:24 +02:00
Nicolas Lœuillet d36e5e20a5 Removed the email part 2016-10-24 21:01:13 +02:00
Jeremy Benoist 64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-24 12:03:17 +02:00
Jeremy Benoist f623516e10
SQLite should use utf8, not utf8mb4 2016-10-24 10:10:38 +02:00
Baptiste Mille-Mathias d1b075509d Add relevant links to fetch content error pages. 
We link to the troubleshooting guide and give the mail link.
 2016-10-23 15:34:52 +02:00
Jeremy Benoist fc79f1ffa8
Add verification check for MySQL version 
Must now be >= 5.5.4
 2016-10-22 13:41:03 +02:00
Jeremy Benoist b0de88f75d
Use statements & update translation 2016-10-22 13:13:07 +02:00
Jeremy Benoist 2f82e7f8e1
Cleanup subscriber / listener definition 2016-10-22 13:13:07 +02:00
Jeremy Benoist 98efffc2a6
Fix emoji insertion in MySQL 
Switch to utf8mb4 instead of utf8 because f*** MySQL
See https://github.com/doctrine/dbal/pull/851
 2016-10-22 13:13:07 +02:00
Jeremy Benoist 2297d60f10
If reload content failed, don’t update it 
In case user wants a fresh version of the current one and the website isn’t available, don’t erase it with a boring message saying wallabag wasn’t able to refresh the content.
 2016-10-20 22:49:46 +02:00
Paulino Michelazzo 5d6cffedb1 Update Portuguese (Brazilian) translation 
Adding the config.yml on the package.
 2016-10-19 19:25:48 +02:00
Nicolas Lœuillet f31361a6d9 Update wallabag version for master branch 2016-10-17 11:56:29 +02:00
Nicolas Lœuillet ef22711605 Prepare wallabag 2.1.2 🚀 2016-10-17 09:43:13 +02:00
Jeremy Benoist f1c3f68e90
ApiDoc & Route annotation were conflicted 
The generated error was “Unable to guess how to get a Doctrine instance from the request information.”.

I haven’t checked deeper in Doctrine (I know it was coming from the DoctrineParamConverter).

Anyway, I check for FosRest possiblity to add extra format without allowing them for every route (like it was done in the first place).

I finally found a way but it then seems all request goes to the FormatListener of FosRest so I needed to add a custom rules to match all request to be sure we don’t get  a 406 error from FosRest.

Should be ok now …
 2016-10-15 16:46:42 +02:00
Jeremy Benoist b1b561da51 Merge pull request #2372 from pmartin/api-get-entry-as-epub 
API: ability to export entry in all available format (epub, pdf, etc...)
 2016-10-12 14:06:33 +02:00
Jeremy Benoist fb8835cc8f Define a dev version for the master 
This is to be sure that user testing wallabag from the master will have the version defined as dev.
 2016-10-10 11:31:57 +02:00
Nicolas Lœuillet 93a95c09bf Merge pull request #2351 from wallabag/fix-api-client-deletion 
Changed relation between API client and refresh token
 2016-10-08 13:31:54 +02:00
Jeremy Benoist 3f3a60879e
Add entry export in API 
Export isn't available for json & xml because user can use the default
entry endpoint instead.
 2016-10-08 12:59:19 +02:00
Jeremy Benoist dd32c89ed6
Use default locale for user config 
When creating a user, we set the language config “en” by default. We should use the defined locale (from `parameters.yml`) instead
 2016-10-08 09:33:55 +02:00
Jeremy Benoist ee32248f43
Ensure access_token are removed 
When we remove the client, we should ensure that access_token are also removed.

To ensure that, I created a test that generated an access_token. So when we remove the client, this association should be cascaded and shouldn’t generate an error.

Also I moved some Api related stuff to the ApiBundle (like the developer controler and ClientType form)
 2016-10-08 00:05:41 +02:00
Jeremy Benoist 6d204f5382
Add ability to use socket 
For Redis & MySQL
 2016-10-07 21:00:13 +02:00
Nicolas Lœuillet 5958597ba6
Prepare wallabag 2.1.1 2016-10-04 17:08:34 +02:00
Jeremy Benoist f440e28281
Update doc 
Merge VALIDATE_TRANSLATION_FILE & ASSET build (less build on Travis)
 2016-10-04 10:31:03 +02:00
Jeremy Benoist 152fcccd44
Add users management UI 
- remove the “add a user” from the config page
- add a CRUD on user
- fix some missing translations (+ bad indentation)
 2016-10-02 11:08:53 +02:00
Jeremy Benoist bfb3ae01da Merge pull request #2323 from wallabag/footer-stats 
Add simple stats in footer
 2016-10-02 11:04:49 +02:00
Jeremy Benoist 1264029cd4
Add simple stats in footer 2016-10-01 16:03:50 +02:00
Jeremy Benoist 40e219622a
Customize errors templates 
All error goes to the same template which only display the error message and the status code.
 2016-10-01 14:58:48 +02:00
Jeremy Benoist c7ea9b41f3 Add controller test for Instapaper 2016-09-27 20:27:08 +02:00
Jeremy Benoist ff1a5362f7 Add Instapaper import 
Also update ImportController with latest import (chrome, firefox & instapaper).
 2016-09-27 20:27:08 +02:00
Thomas Citharel 2c61db30b7
cs & fixes 2016-09-25 12:29:19 +02:00
Nicolas Lœuillet e406a94ab6 Fixed version in documentation 2016-09-19 15:23:04 +02:00
Nicolas Lœuillet 8fed8d1bac Add documentation about article sharing 2016-09-19 15:20:46 +02:00
Jeremy Benoist d7b4b2c72c
Merge remote-tracking branch 'origin/master' into 2.1 2016-09-19 11:23:07 +02:00
Jeremy Benoist ac87e0db2a
AMPQ -> AMQP 2016-09-14 10:18:02 +02:00
Jeremy Benoist b3437d58ae
Enable Redis async import 
- using javibravo/simpleue
- internal config value are now `import_with_redis` & `import_with_rabbit` which are more clear
- if both option are enable rabbit will be choosen
- services imports related to async are now splitted into 2 files: `redis.yml` & `rabbit.yml`
-
 2016-09-11 21:58:56 +02:00
Jeremy Benoist 13470c3596
Add test for RabbitMQ 
Also update Symfony deps
 2016-09-11 21:58:56 +02:00
Jeremy Benoist c98db1b653
Convert other imports to Rabbit 2016-09-11 21:58:31 +02:00
Jeremy Benoist ef75e1220e
Send every imported item to the queue 
Instead of queing real Entry to process, we queue all the item to import from Pocket in a raw format.
Then, the worker retrieve that information, find / create the entry and save it.
 2016-09-11 21:57:46 +02:00
Nicolas Lœuillet 56c778b415
1st draft for rabbitMQ 2016-09-11 21:57:09 +02:00