Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | Use doctrine event to download images | Jeremy Benoist | 2016-10-30 | 6 | -128/+397 | |
| | | | | | | | ||||||
| * | | | | | | Cleanup | Jeremy Benoist | 2016-10-30 | 2 | -3/+2 | |
| | | | | | | | ||||||
| * | | | | | | Move related event things in Event folder | Jeremy Benoist | 2016-10-30 | 8 | -9/+10 | |
| | | | | | | | ||||||
| * | | | | | | CS | Jeremy Benoist | 2016-10-29 | 2 | -37/+42 | |
| | | | | | | | ||||||
| * | | | | | | Working | Thomas Citharel | 2016-10-29 | 1 | -1/+43 | |
| | | | | | | | ||||||
| * | | | | | | Download pictures successfully | Thomas Citharel | 2016-10-29 | 3 | -170/+158 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Needs to rewrite them properly (get base url) | |||||
| * | | | | | | first draft (from v1) | Thomas Citharel | 2016-10-29 | 1 | -0/+168 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #2523 from wallabag/qrcode-android-app | Nicolas Lœuillet | 2016-11-03 | 19 | -38/+80 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | Added QRCode and link to configure android application | |||||
| * | | | | | | avoid eslint warning by disabling line | Thomas Citharel | 2016-11-03 | 5 | -35/+36 | |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | |||||
| * | | | | | | Fixed review | Nicolas Lœuillet | 2016-10-31 | 2 | -8/+8 | |
| | | | | | | | ||||||
| * | | | | | | Added translations and baggy part | Nicolas Lœuillet | 2016-10-31 | 16 | -5/+26 | |
| | | | | | | | ||||||
| * | | | | | | Added QRCode and link to configure android application | Nicolas Lœuillet | 2016-10-31 | 8 | -39/+59 | |
|/ / / / / / | ||||||
* | | | | | | Merge pull request #2499 from wallabag/add-relation-client-user | Jeremy Benoist | 2016-10-29 | 6 | -7/+110 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Added relation between API Client and User | |||||
| * | | | | | | Remove backquote in query | Nicolas Lœuillet | 2016-10-28 | 1 | -4/+1 | |
| | | | | | | | ||||||
| * | | | | | | Fixed migration and added tests | Nicolas Lœuillet | 2016-10-28 | 3 | -4/+18 | |
| | | | | | | | ||||||
| * | | | | | | Added relation between API Client and User | Nicolas Lœuillet | 2016-10-24 | 4 | -3/+95 | |
|/ / / / / / | | | | | | | | | | | | | | | | | | | Fix #2062 | |||||
* | | | | | | Merge pull request #2496 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2016-10-24 | 1 | -10/+10 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Update messages.pl.yml | |||||
| * | | | | | | Update messages.pl.yml | Mateusz Rumiński | 2016-10-24 | 1 | -10/+10 | |
|/ / / / / / | | | | | | | | | | | | | translate reset section to polish | |||||
* | | | | | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-10-24 | 82 | -1574/+659 | |
|\| | | | | | ||||||
| * | | | | | Merge pull request #2486 from wallabag/translate-backup-doc | Jeremy Benoist | 2016-10-22 | 5 | -11/+63 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Added :fr: documentation for wallabag backup | |||||
| | * | | | | | Translate backup.rst to German | Julian Oster | 2016-10-22 | 1 | -14/+14 | |
| | | | | | | | ||||||
| | * | | | | | Added :fr: documentation for wallabag backup | Nicolas Lœuillet | 2016-10-22 | 5 | -11/+63 | |
| |/ / / / / | ||||||
| * | | | | | Merge pull request #2484 from bmillemathias/fix_2479 | Nicolas Lœuillet | 2016-10-22 | 2 | -0/+27 | |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Document what to backup in Wallabag | |||||
| | * | | | | | Document what to backup in Wallabag | Baptiste Mille-Mathias | 2016-10-22 | 2 | -0/+27 | |
| | | |_|_|/ | | |/| | | | | | | | | | | | | | | | Fixes issue #2479 | |||||
| * | | | | | Merge pull request #2485 from bmillemathias/fix_android_documentation | Jeremy Benoist | 2016-10-22 | 1 | -1/+1 | |
| |\ \ \ \ \ | | |/ / / / | |/| | | | | Fix missing words in Android application documentation | |||||
| | * | | | | Add missing words in the documentation | Baptiste Mille-Mathias | 2016-10-22 | 1 | -1/+1 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #2481 from wallabag/some-fixes | Nicolas Lœuillet | 2016-10-21 | 29 | -19/+68 | |
| |\ \ \ \ | | | | | | | | | | | | | Some fixes | |||||
| | * | | | | Update Twitter cards description | Jeremy Benoist | 2016-10-21 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Update translation for piwik_host | Jeremy Benoist | 2016-10-21 | 13 | -13/+13 | |
| | | | | | | ||||||
| | * | | | | Fix missing translations | Jeremy Benoist | 2016-10-21 | 11 | -0/+33 | |
| | | | | | | ||||||
| | * | | | | Fix test | Jeremy Benoist | 2016-10-20 | 1 | -1/+1 | |
| | | | | | | ||||||
| | * | | | | Requeue depending on producer | Jeremy Benoist | 2016-10-20 | 1 | -0/+12 | |
| | | | | | | | | | | | | | | | | | | | | | | | | Browser import can requeue message from `parseEntry` but we should take care of the way import are handled (depending on the producer) | |||||
| | * | | | | Avoid RabbitMQ consumer to loop | Jeremy Benoist | 2016-10-20 | 1 | -2/+3 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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. | |||||
| | * | | | | Translate date | Jeremy Benoist | 2016-10-20 | 1 | -1/+4 | |
| | | | | | | | | | | | | | | | | | | | | | | | | 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.. | |||||
| | * | | | | Fix french translation | Jeremy Benoist | 2016-10-20 | 1 | -1/+1 | |
| | | |/ / | | |/| | | ||||||
| * | | | | Merge pull request #2482 from wallabag/avoid-bad-refresh | Nicolas Lœuillet | 2016-10-21 | 6 | -2/+53 | |
| |\ \ \ \ | | |/ / / | |/| | | | If reload content failed, don’t update it | |||||
| | * | | | This test doesn’t require an internet connection | Jeremy Benoist | 2016-10-20 | 1 | -2/+0 | |
| | | | | | ||||||
| | * | | | If reload content failed, don’t update it | Jeremy Benoist | 2016-10-20 | 6 | -2/+55 | |
| |/ / / | | | | | | | | | | | | | 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. | |||||
| * | | | Merge pull request #2467 from wallabag/version-213dev | Jeremy Benoist | 2016-10-17 | 1 | -1/+1 | |
| |\ \ \ | | | | | | | | | | | Update wallabag version for master branch | |||||
| | * | | | Update wallabag version for master branch | Nicolas Lœuillet | 2016-10-17 | 1 | -1/+1 | |
| |/ / / | ||||||
| * | | | Merge pull request #2466 from wallabag/fix-update-doc | Nicolas Lœuillet | 2016-10-17 | 3 | -3/+3 | |
| |\ \ \ | | |_|/ | |/| | | Removed MD5 hash in documentation | |||||
| | * | | Removed MD5 hash in documentation | Nicolas Lœuillet | 2016-10-17 | 3 | -3/+3 | |
| |/ / | ||||||
| * | | Merge pull request #2452 from wallabag/prepare-212 | Nicolas Lœuillet | 2016-10-17 | 3 | -1336/+78 | |
| |\ \ | | | | | | | | | Prepare wallabag 2.1.2 :rocket: | |||||
| | * | | Change release title in changelog | Nicolas Lœuillet | 2016-10-17 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Update release process | Nicolas Lœuillet | 2016-10-17 | 1 | -1/+1 | |
| | | | | ||||||
| | * | | Update changelog | Nicolas Lœuillet | 2016-10-17 | 1 | -1356/+50 | |
| | | | | ||||||
| | * | | Prepare wallabag 2.1.2 :rocket: | Nicolas Lœuillet | 2016-10-17 | 2 | -3/+51 | |
| |/ / | ||||||
| * | | Merge pull request #2464 from wallabag/fix-settings-translation | Nicolas Lœuillet | 2016-10-17 | 1 | -1/+1 | |
| |\ \ | | | | | | | | | Fixed hardcoded title for internal settings | |||||
| | * | | Fixed hardcoded title for internal settings | Nicolas Lœuillet | 2016-10-17 | 1 | -1/+1 | |
| |/ / | | | | | | | | | | Fix #2458 | |||||
| * | | Merge pull request #2455 from wallabag/fix-material-config-tabs | Jeremy Benoist | 2016-10-16 | 3 | -11/+11 | |
| |\ \ | | | | | | | | | Fix tabs on material |