Commit graph

3042 commits

Author SHA1 Message Date
Nicolas Lœuillet
49dee2d2de Merge pull request #2482 from wallabag/avoid-bad-refresh
If reload content failed, don’t update it
2016-10-21 15:12:29 +02:00
Jeremy Benoist
f6798f69c3
This test doesn’t require an internet connection 2016-10-20 23:26:16 +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
Jeremy Benoist
7180aaed45 Merge pull request #2467 from wallabag/version-213dev
Update wallabag version for master branch
2016-10-17 11:57:52 +02:00
Nicolas Lœuillet
f31361a6d9 Update wallabag version for master branch 2016-10-17 11:56:29 +02:00
Nicolas Lœuillet
fd461c25aa Merge pull request #2466 from wallabag/fix-update-doc
Removed MD5 hash in documentation
2016-10-17 11:40:03 +02:00
Nicolas Lœuillet
39c3dd30d2 Removed MD5 hash in documentation 2016-10-17 11:38:11 +02:00
Nicolas Lœuillet
1172622a07 Merge pull request #2452 from wallabag/prepare-212
Prepare wallabag 2.1.2 🚀
2016-10-17 11:04:20 +02:00
Nicolas Lœuillet
d4e9ce5807
Change release title in changelog 2016-10-17 10:27:07 +02:00
Nicolas Lœuillet
fd54f236f4
Update release process 2016-10-17 10:23:34 +02:00
Nicolas Lœuillet
545748bad1
Update changelog 2016-10-17 10:22:51 +02:00
Nicolas Lœuillet
ef22711605 Prepare wallabag 2.1.2 🚀 2016-10-17 09:43:13 +02:00
Nicolas Lœuillet
72ec79a5d6 Merge pull request #2464 from wallabag/fix-settings-translation
Fixed hardcoded title for internal settings
2016-10-17 09:23:15 +02:00
Nicolas Lœuillet
5e469b91d9
Fixed hardcoded title for internal settings
Fix #2458
2016-10-17 09:14:05 +02:00
Jeremy Benoist
692f9388cb Merge pull request #2455 from wallabag/fix-material-config-tabs
Fix tabs on material
2016-10-16 21:06:23 +02:00
Jeremy Benoist
3fb409ffc6 Merge pull request #2454 from wallabag/fix-baggy-small-width
Fix baggy display on small screens
2016-10-16 21:05:30 +02:00
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
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
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
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