Thomas Citharel
97512ec4bc
Merge pull request #2459 from wallabag/improve-german-translation
...
German: improve existing and add missing translation
2016-10-16 12:06:42 +02:00
Thomas Citharel
dda6398a40
Merge pull request #2457 from wallabag/link-german-docu
...
add link to German documentation in about page
2016-10-16 10:54:19 +02:00
Sven Fischer
5bd7acd50d
German: improve existing and add missing translation
2016-10-16 10:45:51 +02:00
Sven Fischer
f69ab83a5a
add link to German documentation in about page
2016-10-16 09:23:58 +02:00
Thomas Citharel
d9a30ef301
Fix tabs on material
...
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
2016-10-15 19:26:38 +02:00
Thomas Citharel
d32e1c424a
Fix baggy on small screens
2016-10-15 19:04:53 +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
Thomas Citharel
05c009bb85
Merge pull request #2451 from wallabag/add-dev-make
...
Bring make dev
2016-10-15 15:40:20 +02:00
Thomas Citharel
8ecfdd7f8a
Merge pull request #2450 from wallabag/new-improvement-view
...
View improvements
2016-10-15 15:38:49 +02:00
Thomas Citharel
08f5a5b6bd
fix stylelint
2016-10-15 15:25:46 +02:00
Thomas Citharel
f48a6f3a54
Bring make dev
2016-10-15 15:16:35 +02:00
Alexandr Danilov
38dc91be8e
Improved side menu, reduced the font size on small screens, fixed a form to add links on small screens
2016-10-15 14:49:07 +02:00
Thomas Citharel
76f2123def
Merge pull request #2412 from wallabag/fix-postgres-migration
...
Fix PostgreSQL migrations
2016-10-15 14:42:46 +02:00
Nicolas Lœuillet
7131f94274
Merge pull request #2446 from wallabag/fix-taggingrules-doc
...
Added information about tagging rules in documentation
2016-10-15 11:47:12 +02:00
Sven Fischer
f878902e6a
docs/de/user/configuration.rst: German fix for tagging rules docu
2016-10-14 23:48:50 +02:00
Sven Fischer
2752053f99
docs/de/user/configuration.rst: German fix for tagging rules docu
2016-10-14 23:47:37 +02:00
Nicolas Lœuillet
7b9b9ca7f8
Merge pull request #2447 from wallabag/fix-fr-de-doc-homepage
...
Fixed french and german doc homepages
2016-10-14 15:45:13 +02:00
Nicolas Lœuillet
68b8e75f94
Fixed french and german doc homepages
2016-10-14 14:55:45 +02:00
Nicolas Lœuillet
8edb250caa
Added information about tagging rules in documentation
...
Fix #2060
2016-10-14 14:45:32 +02:00
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
