Thomas Citharel
0c271b9eb0
fix cs and phpdoc
2016-10-22 09:06:07 +02:00
Thomas Citharel
b1e92f8c14
cs
2016-10-22 09:06:07 +02:00
Thomas Citharel
1eea248bb0
move code
2016-10-22 09:06:07 +02:00
Thomas Citharel
c7935f32d2
cs
2016-10-22 09:06:07 +02:00
Thomas Citharel
351eb8d97e
bring annotations to API
2016-10-22 09:06:07 +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
Nicolas Lœuillet
f99ddbc6f8
Merge pull request #2481 from wallabag/some-fixes
...
Some fixes
2016-10-21 15:15:41 +02:00
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
b64d8f2c9f
Update Twitter cards description
2016-10-21 10:51:20 +02:00
Jeremy Benoist
2cbf0d05d4
Update translation for piwik_host
2016-10-21 10:45:39 +02:00
Jeremy Benoist
645dc7594b
Fix missing translations
2016-10-21 07:52:55 +02:00
Jeremy Benoist
f6798f69c3
This test doesn’t require an internet connection
2016-10-20 23:26:16 +02:00
Jeremy Benoist
9095497191
Fix test
2016-10-20 23:03:37 +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
5453500458
Requeue depending on producer
...
Browser import can requeue message from `parseEntry` but we should take care of the way import are handled (depending on the producer)
2016-10-20 21:17:45 +02:00
Jeremy Benoist
1e3d74a9cf
Avoid RabbitMQ consumer to loop
...
When the `parseEntry` returns null it means the entry already exists in the database. Sending `false` as return, will requeue the message which will then loop forever.
2016-10-20 21:17:03 +02:00
Jeremy Benoist
576d285ddf
Translate date
...
I use a kind of hacky way to convert the user locale (defined with 2 letters, like `fr`) into a local with 5 letters (like `fr_FR`). I guess it should work on most of the case..
2016-10-20 21:16:01 +02:00
Jeremy Benoist
166e8cc6a9
Fix french translation
2016-10-20 21:14: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
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
