Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | 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 | |||||
| * | | Fix tabs on material | Thomas Citharel | 2016-10-15 | 3 | -11/+11 | |
| | | | | | | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr> | |||||
* | | | Merge pull request #2454 from wallabag/fix-baggy-small-width | Jeremy Benoist | 2016-10-16 | 11 | -42/+28 | |
|\ \ \ | | | | | | | | | Fix baggy display on small screens | |||||
| * | | | Fix baggy on small screens | Thomas Citharel | 2016-10-15 | 11 | -42/+28 | |
| |/ / | ||||||
* | | | Merge pull request #2459 from wallabag/improve-german-translation | Thomas Citharel | 2016-10-16 | 3 | -53/+53 | |
|\ \ \ | | | | | | | | | German: improve existing and add missing translation | |||||
| * | | | German: improve existing and add missing translation | Sven Fischer | 2016-10-16 | 3 | -53/+53 | |
| |/ / | ||||||
* | | | Merge pull request #2457 from wallabag/link-german-docu | Thomas Citharel | 2016-10-16 | 1 | -0/+1 | |
|\ \ \ | |/ / |/| | | add link to German documentation in about page | |||||
| * | | add link to German documentation in about page | Sven Fischer | 2016-10-16 | 1 | -0/+1 | |
|/ / | ||||||
* | | Merge pull request #2451 from wallabag/add-dev-make | Thomas Citharel | 2016-10-15 | 2 | -0/+10 | |
|\ \ | | | | | | | Bring make dev | |||||
| * | | Bring make dev | Thomas Citharel | 2016-10-15 | 2 | -0/+10 | |
| | | | ||||||
* | | | Merge pull request #2450 from wallabag/new-improvement-view | Thomas Citharel | 2016-10-15 | 8 | -45/+65 | |
|\ \ \ | |/ / |/| | | View improvements | |||||
| * | | fix stylelint | Thomas Citharel | 2016-10-15 | 9 | -43/+43 | |
| | | | ||||||
| * | | Improved side menu, reduced the font size on small screens, fixed a form to ↵ | Alexandr Danilov | 2016-10-15 | 10 | -35/+55 | |
| | | | | | | | | | | | | add links on small screens | |||||
* | | | Merge pull request #2412 from wallabag/fix-postgres-migration | Thomas Citharel | 2016-10-15 | 4 | -14/+24 | |
|\ \ \ | |/ / |/| | | Fix PostgreSQL migrations | |||||
| * | | Fix PostgreSQL migrations | Jeremy Benoist | 2016-10-09 | 4 | -14/+24 | |
| | | | ||||||
* | | | Merge pull request #2446 from wallabag/fix-taggingrules-doc | Nicolas Lœuillet | 2016-10-15 | 3 | -3/+3 | |
|\ \ \ | | | | | | | | | Added information about tagging rules in documentation | |||||
| * | | | docs/de/user/configuration.rst: German fix for tagging rules docu | Sven Fischer | 2016-10-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | docs/de/user/configuration.rst: German fix for tagging rules docu | Sven Fischer | 2016-10-14 | 1 | -1/+1 | |
| | | | | ||||||
| * | | | Added information about tagging rules in documentation | Nicolas Lœuillet | 2016-10-14 | 3 | -3/+3 | |
| | | | | | | | | | | | | | | | | Fix #2060 | |||||
* | | | | Merge pull request #2447 from wallabag/fix-fr-de-doc-homepage | Nicolas Lœuillet | 2016-10-14 | 2 | -4/+4 | |
|\ \ \ \ | | | | | | | | | | | Fixed french and german doc homepages | |||||
| * | | | | Fixed french and german doc homepages | Nicolas Lœuillet | 2016-10-14 | 2 | -4/+4 | |
|/ / / / | ||||||
* | | | | Merge pull request #2444 from Kaligule/master | Nicolas Lœuillet | 2016-10-14 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | Mention example instance in docs | |||||
| * | | | | Merge pull request #1 from Kaligule/Documentation | Kaligule | 2016-10-14 | 1 | -1/+1 | |
|/| | | | | | | | | | | | | | | Mention example instance | |||||
| * | | | | Mention example instance | Kaligule | 2016-10-14 | 1 | -1/+1 | |
|/ / / / | | | | | | | | | Namely http://v2.wallabag.org/api/doc, so api methods can be looked up without installing wallabag first. | |||||
* | | | | Merge pull request #2435 from wallabag/french-upgrade-doc | Nicolas Lœuillet | 2016-10-13 | 6 | -41/+81 | |
|\ \ \ \ | | | | | | | | | | | Added french documentation for upgrade | |||||
| * | | | | Added missing space | Nicolas Lœuillet | 2016-10-13 | 1 | -1/+1 | |
| | | | | |