Jeremy Benoist
5066c3e066
Re-use FOSUser master branch
2016-11-22 21:25:05 +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
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
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
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
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
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
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
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
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
Nicolas Lœuillet
5bdec0195f
Prepare wallabag 2.0.8
2016-09-07 14:27:32 +02:00
Jeremy Benoist
8f8654913c
Merge pull request #2002 from wallabag/feature-display-itemsNumber
...
Feature display items number
2016-09-03 16:13:08 +02:00
Nicolas Lœuillet
b3f4a11a81
Store cache lifetime in config
2016-09-03 14:02:50 +02:00
Thomas Citharel
7149aa5781
Proper parameter name, simplify logic & phpdoc
2016-08-23 07:40:36 +02:00
