Commit graph

3022 commits

Author SHA1 Message Date
Jeremy Benoist 1e7807e703 Merge pull request #2456 from wallabag/use-new-pdf
use new tcpdf library version
2016-10-22 13:29:58 +02:00
Thomas Citharel af2ff7c6da
use new tcpdf library version 2016-10-22 12:52:23 +02:00
Nicolas Lœuillet e8331dd9e7 Merge pull request #2453 from wallabag/fix-api-export
Fix API export
2016-10-21 15:22:11 +02:00
Jeremy Benoist 5960aa1ffc
CS 2016-10-15 18:00:08 +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 6147736868 Merge pull request #2438 from wallabag/mruminski-patch-1
Update messages.pl.yml
2016-10-12 20:01:13 +02:00
Mateusz Rumiński fa100dd1e0 Update messages.pl.yml
translate delete section to polish
2016-10-12 19:32:30 +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 e4cf672ccf
Merge remote-tracking branch 'origin/master' into 2.2 2016-10-11 21:01:30 +02:00
Nicolas Lœuillet dbe94e73a9 Merge pull request #2429 from wallabag/lock-fos-user
Lock deps for FOSUser
2016-10-11 19:32:22 +02:00
Jeremy Benoist a0a4ce3135
Lock deps for FOSUser
We’ll wait until the final release will be out and other related project will be update to support it.
Meanwhile we can safely lock to a previous version.
2016-10-11 18:59:08 +02:00
Jeremy Benoist e57df5611f Merge pull request #2409 from wallabag/Quent-in-patch-1
Occitan version update
2016-10-11 18:18:29 +02:00
Nicolas Lœuillet 9bed0ea236 Merge pull request #2422 from wallabag/typo-doc
Fixed display for note in installation page
2016-10-11 15:03:46 +02:00
Nicolas Lœuillet c8976118d4 Merge pull request #2426 from wallabag/fix-doc
Fix links on english documentation homepage
2016-10-11 15:00:59 +02:00
Nicolas Lœuillet 7e72b371ba Fix links on english documentation homepage 2016-10-11 14:59:32 +02:00
Quent-in a9e4d6dad2 Update messages.oc.yml
I thought I had translated the Docker installation line, apparently not!
Thanks Nicolas for the other changes!
2016-10-10 20:01:25 +02:00
Nicolas Lœuillet 7dacf35845 Merge pull request #2420 from wallabag/redis-tests
Avoid error when Redis isn't here in tests
2016-10-10 19:02:05 +02:00
Nicolas Lœuillet 36ef9e2730
Fixed display for note in installation page 2016-10-10 18:51:20 +02:00
Jeremy Benoist bccf7a70bc Merge pull request #2403 from wallabag/cleanup-install-process-in-doc
Cleaned up documentation for installation process
2016-10-10 16:58:15 +02:00
Jeremy Benoist e40bed3607
Avoid error when Redis isn't here in tests 2016-10-10 16:34:57 +02:00
Nicolas Lœuillet c99d90455b Merge pull request #2419 from wallabag/fix-twitter-cards
Fixed Twitter Cards by adding a description tag
2016-10-10 16:09:52 +02:00
Nicolas Lœuillet a2f42d8eaa
Fixed Twitter Cards by adding a description tag 2016-10-10 16:05:06 +02:00
Nicolas Lœuillet fa4c39b37c
Added steps about Redis/RabbitMQ activation 2016-10-10 15:38:49 +02:00
Nicolas Lœuillet c15f083896
Fixed links on import page 2016-10-10 15:38:42 +02:00
Nicolas Lœuillet 0ff674a952 Merge pull request #2418 from wallabag/add-twitter-cards
Added support of Twitter Cards for public articles
2016-10-10 15:20:06 +02:00
Nicolas Lœuillet 020c723e28 Added support of Twitter Cards for public articles 2016-10-10 14:33:34 +02:00
Jeremy Benoist 035513b025 Use table for parameters.yml 2016-10-10 13:42:50 +02:00
Nicolas Lœuillet 3e761063e2 Merge pull request #2417 from wallabag/version-dev
Define a dev version for the master
2016-10-10 13:03:34 +02:00
Nicolas Lœuillet ed11d7f731
Added page about parameters.yml 2016-10-10 13:01:14 +02:00
Jeremy Benoist 6b1317a627 Add -dev version
Following https://github.com/wallabag/wallabag/pull/2417
2016-10-10 11:39:42 +02:00
Nicolas Lœuillet eb54d338e8
Typos in upgrade doc 2016-10-10 11:35:32 +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 7c1ce28342
Update upgrade documentation 2016-10-10 11:21:20 +02:00
Nicolas Lœuillet 7c1225347d
Update documentation 2016-10-10 10:20:32 +02:00
Nicolas Lœuillet c26d1285ba Fixed review 2016-10-10 10:05:50 +02:00
Nicolas Lœuillet 84e3c36e02
Added documentation about testsuite
Fix #2415
2016-10-10 09:15:53 +02:00
Jeremy Benoist edc8bc0b2f Update RELEASE_PROCESS.md 2016-10-10 09:12:24 +02:00
Jeremy Benoist 3175e33012 Update README.md 2016-10-10 09:11:26 +02:00
Nicolas Lœuillet 2a5ff7f554 Merge pull request #2411 from wallabag/fix-entities
Fix entities definition
2016-10-10 08:02:25 +02:00
Jeremy Benoist 8eeefc658c Merge pull request #2414 from szafranek/bugfix-bookmarklet
Remove automatic closing of the window from bookmarklet
2016-10-10 07:11:01 +02:00
Jeremy Benoist e93c9dc4ab Merge pull request #2413 from wallabag/sub-command-verbose
When a sub command fail, display error message
2016-10-10 07:09:45 +02:00
Krzysztof Szafranek d8a9209cfc Remove automatic closing of the window from bookmarklet 2016-10-09 22:40:55 +02:00
Jeremy Benoist 39a19bdf47
When a sub command fail, display error message
We often got issue with message “The command "doctrine:database:create" terminated with an error code: 1.”.

Using the `BufferedOutput` we can store the output and only display it if an error occurs.
2016-10-09 22:39:43 +02:00
Nicolas Lœuillet 02edf0707f
Changed the default command when we launch make 2016-10-09 22:01:24 +02:00
Nicolas Lœuillet 4e7863c6aa
Created scripts folder to store update/install/release process 2016-10-09 21:50:15 +02:00
Nicolas Lœuillet 47508f004f Merge pull request #2410 from wallabag/tag-optim
Optimize tag list display
2016-10-09 21:27:47 +02:00
Nicolas Lœuillet 418626e836 Merge pull request #2177 from wallabag/delete-account
Delete user
2016-10-09 21:21:03 +02:00
Nicolas Lœuillet 26490a8794
Update Makefile 2016-10-09 21:15:57 +02:00
Nicolas Lœuillet 46aeaab8ff
Update Makefile 2016-10-09 21:06:26 +02:00
Jeremy Benoist 8dc4cd0f25
Fix entities definition
As per Doctrine said in the debug tool bar:

- The field Wallabag\ApiBundle\Entity\Client#refreshTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\RefreshToken#client does not contain the required 'inversedBy="refreshTokens"' attribute.

- The field Wallabag\ApiBundle\Entity\Client#accessTokens is on the inverse side of a bi-directional relationship, but the specified mappedBy association on the target-entity Wallabag\ApiBundle\Entity\AccessToken#client does not contain the required 'inversedBy="accessTokens"' attribute.
2016-10-09 20:51:37 +02:00