Nicolas Lœuillet
23406ca3f1
Added relation between API Client and User
...
Fix #2062
2016-10-24 21:56:28 +02:00
Nicolas Lœuillet
8e58be9fb6
Merge pull request #2496 from wallabag/mruminski-patch-1
...
Update messages.pl.yml
2016-10-24 20:19:53 +02:00
Mateusz Rumiński
cd99bfae68
Update messages.pl.yml
...
translate reset section to polish
2016-10-24 19:49:33 +02:00
Jeremy Benoist
64a8781e45
Merge remote-tracking branch 'origin/master' into 2.2
2016-10-24 12:03:17 +02:00
Jeremy Benoist
9313ea9d44
Merge pull request #2401 from wallabag/reset-account
...
Reset account
2016-10-24 11:57:51 +02:00
Jeremy Benoist
f623516e10
SQLite should use utf8, not utf8mb4
2016-10-24 10:10:38 +02:00
Nicolas Lœuillet
a1c1841828
Merge pull request #1890 from wallabag/v2-api-annotation-switched
...
bring annotations to API
2016-10-24 10:06:12 +02:00
Jeremy Benoist
5ce1528953
Fix migrations
2016-10-23 12:35:57 +02:00
Jeremy Benoist
c64b4941d5
Merge pull request #2486 from wallabag/translate-backup-doc
...
Added 🇫🇷 documentation for wallabag backup
2016-10-22 22:23:15 +02:00
Julian Oster
2ca1cc0c18
Translate backup.rst to German
2016-10-22 21:11:20 +02:00
Nicolas Lœuillet
67aa755fb5
Added 🇫🇷 documentation for wallabag backup
2016-10-22 14:16:17 +02:00
Jeremy Benoist
88d5d94dcb
Lowercase wallabag
2016-10-22 14:05:59 +02:00
Jeremy Benoist
5751b41491
Add migration for MySQL utf8mb4
2016-10-22 14:01:58 +02:00
Nicolas Lœuillet
f69636c4db
Merge pull request #2484 from bmillemathias/fix_2479
...
Document what to backup in Wallabag
2016-10-22 13:55:46 +02:00
Jeremy Benoist
fc79f1ffa8
Add verification check for MySQL version
...
Must now be >= 5.5.4
2016-10-22 13:41:03 +02:00
Jeremy Benoist
f7f6bfb7e9
Merge pull request #2485 from bmillemathias/fix_android_documentation
...
Fix missing words in Android application documentation
2016-10-22 13:31:14 +02:00
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
Baptiste Mille-Mathias
89abc0b61b
Add missing words in the documentation
2016-10-22 13:21:53 +02:00
Jeremy Benoist
b0de88f75d
Use statements & update translation
2016-10-22 13:13:07 +02:00
Jeremy Benoist
8c61fd12b1
CS
2016-10-22 13:13:07 +02:00
Jeremy Benoist
ca8b49f46e
Add baggy reset part
2016-10-22 13:13:07 +02:00
Jeremy Benoist
f71e55ac88
Avoid orphan tags
2016-10-22 13:13:07 +02:00
Jeremy Benoist
2f82e7f8e1
Cleanup subscriber / listener definition
2016-10-22 13:13:07 +02:00
Jeremy Benoist
191564b7f7
Add custom doctrine subscriber for SQLite
...
Since SQLite doesn’t handle cascade remove by default, we need to handle it manually.
Also some refacto
2016-10-22 13:13:07 +02:00
Jeremy Benoist
98efffc2a6
Fix emoji insertion in MySQL
...
Switch to utf8mb4 instead of utf8 because f*** MySQL
See https://github.com/doctrine/dbal/pull/851
2016-10-22 13:13:07 +02:00
Jeremy Benoist
206bade58a
Add ability to reset some datas
...
- annotations
- tags
- entries
2016-10-22 13:13:06 +02:00
Thomas Citharel
af2ff7c6da
use new tcpdf library version
2016-10-22 12:52:23 +02:00
Jeremy Benoist
aa4741091f
Add test on /api/annotations
...
Fix controller forward in WallabagRestController.
Update PHPDoc so it is sorted the same way as others one
Duplicate all annotations test to use both api & normal way
Also, make annotation tests independent to each other
2016-10-22 12:09:20 +02:00
Jeremy Benoist
3199ec4702
CS
2016-10-22 09:17:01 +02:00
Baptiste Mille-Mathias
fc75009de7
Document what to backup in Wallabag
...
Fixes issue #2479
2016-10-22 09:14:07 +02:00
Nicolas Lœuillet
d9b7768dca
Added a missing namespace
2016-10-22 09:06:07 +02:00
Nicolas Lœuillet
e5edb6e127
PHP CS
2016-10-22 09:06:07 +02:00
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
