Commit graph

3333 commits

Author SHA1 Message Date
Nicolas Lœuillet 311285f585 Merge pull request #2444 from Kaligule/master
Mention example instance in docs
2016-10-14 09:57:34 +02:00
Kaligule 7880838943 Merge pull request #1 from Kaligule/Documentation
Mention example instance
2016-10-14 09:15:14 +02:00
Kaligule eb7d1b4b30 Mention example instance
Namely http://v2.wallabag.org/api/doc, so api methods can be looked up without installing wallabag first.
2016-10-14 09:09:28 +02:00
Nicolas Lœuillet bf8e088033 Merge pull request #2435 from wallabag/french-upgrade-doc
Added french documentation for upgrade
2016-10-13 16:56:37 +02:00
Nicolas Lœuillet 83634bab22 Added missing space 2016-10-13 16:56:03 +02:00
Nicolas Lœuillet 8b28151e14 Merge pull request #2434 from wallabag/parameters-doc
Added french documentation for parameters.yml
2016-10-13 16:53:13 +02:00
Nicolas Lœuillet e65c27587b Merge pull request #2439 from zertrin/minor-fix-docs-1
Minor fixes in the english documentation
2016-10-13 16:52:25 +02:00
zertrin a25377cb4c Minor fixes in the english documentation 2016-10-13 11:07:24 +02:00
Sven Fischer 17064d3c54 update German user/upgrade-2.1.x-2.1.y.rst 2016-10-12 20:45:28 +02:00
Sven Fischer f68e351018 update German user/upgrade-2.0.x-2.1.1 2016-10-12 20:41:15 +02:00
Sven Fischer 75a1506c27 translate to German: user/parameters 2016-10-12 20:33:55 +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
Nicolas Lœuillet b09cafbb3f
Added french documentation for upgrade 2016-10-12 13:37:50 +02:00
Nicolas Lœuillet 18470d7c6a Added french documentation for parameters.yml 2016-10-12 13:19:45 +02:00
Nicolas Lœuillet da8ecdfa17 Merge pull request #2432 from wallabag/issue-site-config
Update ISSUE_TEMPLATE.md
2016-10-12 12:04:08 +02:00
Jeremy Benoist 7ffa48a11c Update ISSUE_TEMPLATE.md 2016-10-12 11:22:11 +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