aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #2481 from wallabag/some-fixesNicolas Lœuillet2016-10-2129-19/+68
|\ | | | | Some fixes
| * Update Twitter cards descriptionJeremy Benoist2016-10-211-1/+1
| |
| * Update translation for piwik_hostJeremy Benoist2016-10-2113-13/+13
| |
| * Fix missing translationsJeremy Benoist2016-10-2111-0/+33
| |
| * Fix testJeremy Benoist2016-10-201-1/+1
| |
| * Requeue depending on producerJeremy Benoist2016-10-201-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 loopJeremy Benoist2016-10-201-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 dateJeremy Benoist2016-10-201-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 translationJeremy Benoist2016-10-201-1/+1
| |
* | Merge pull request #2482 from wallabag/avoid-bad-refreshNicolas Lœuillet2016-10-216-2/+53
|\ \ | |/ |/| If reload content failed, don’t update it
| * This test doesn’t require an internet connectionJeremy Benoist2016-10-201-2/+0
| |
| * If reload content failed, don’t update itJeremy Benoist2016-10-206-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-213devJeremy Benoist2016-10-171-1/+1
|\ | | | | Update wallabag version for master branch
| * Update wallabag version for master branchNicolas Lœuillet2016-10-171-1/+1
|/
* Merge pull request #2466 from wallabag/fix-update-docNicolas Lœuillet2016-10-173-3/+3
|\ | | | | Removed MD5 hash in documentation
| * Removed MD5 hash in documentationNicolas Lœuillet2016-10-173-3/+3
|/
* Merge pull request #2452 from wallabag/prepare-212Nicolas Lœuillet2016-10-173-1336/+78
|\ | | | | Prepare wallabag 2.1.2 :rocket:
| * Change release title in changelogNicolas Lœuillet2016-10-171-1/+1
| |
| * Update release processNicolas Lœuillet2016-10-171-1/+1
| |
| * Update changelogNicolas Lœuillet2016-10-171-1356/+50
| |
| * Prepare wallabag 2.1.2 :rocket:Nicolas Lœuillet2016-10-172-3/+51
|/
* Merge pull request #2464 from wallabag/fix-settings-translationNicolas Lœuillet2016-10-171-1/+1
|\ | | | | Fixed hardcoded title for internal settings
| * Fixed hardcoded title for internal settingsNicolas Lœuillet2016-10-171-1/+1
|/ | | | Fix #2458
* Merge pull request #2455 from wallabag/fix-material-config-tabsJeremy Benoist2016-10-163-11/+11
|\ | | | | Fix tabs on material
| * Fix tabs on materialThomas Citharel2016-10-153-11/+11
| | | | | | | | Signed-off-by: Thomas Citharel <tcit@tcit.fr>
* | Merge pull request #2454 from wallabag/fix-baggy-small-widthJeremy Benoist2016-10-1611-42/+28
|\ \ | | | | | | Fix baggy display on small screens
| * | Fix baggy on small screensThomas Citharel2016-10-1511-42/+28
| |/
* | Merge pull request #2459 from wallabag/improve-german-translationThomas Citharel2016-10-163-53/+53
|\ \ | | | | | | German: improve existing and add missing translation
| * | German: improve existing and add missing translationSven Fischer2016-10-163-53/+53
| |/
* | Merge pull request #2457 from wallabag/link-german-docuThomas Citharel2016-10-161-0/+1
|\ \ | |/ |/| add link to German documentation in about page
| * add link to German documentation in about pageSven Fischer2016-10-161-0/+1
|/
* Merge pull request #2451 from wallabag/add-dev-makeThomas Citharel2016-10-152-0/+10
|\ | | | | Bring make dev
| * Bring make devThomas Citharel2016-10-152-0/+10
| |
* | Merge pull request #2450 from wallabag/new-improvement-viewThomas Citharel2016-10-158-45/+65
|\ \ | |/ |/| View improvements
| * fix stylelintThomas Citharel2016-10-159-43/+43
| |
| * Improved side menu, reduced the font size on small screens, fixed a form to ↵Alexandr Danilov2016-10-1510-35/+55
| | | | | | | | add links on small screens
* | Merge pull request #2412 from wallabag/fix-postgres-migrationThomas Citharel2016-10-154-14/+24
|\ \ | |/ |/| Fix PostgreSQL migrations
| * Fix PostgreSQL migrationsJeremy Benoist2016-10-094-14/+24
| |
* | Merge pull request #2446 from wallabag/fix-taggingrules-docNicolas Lœuillet2016-10-153-3/+3
|\ \ | | | | | | Added information about tagging rules in documentation
| * | docs/de/user/configuration.rst: German fix for tagging rules docuSven Fischer2016-10-141-1/+1
| | |
| * | docs/de/user/configuration.rst: German fix for tagging rules docuSven Fischer2016-10-141-1/+1
| | |
| * | Added information about tagging rules in documentationNicolas Lœuillet2016-10-143-3/+3
| | | | | | | | | | | | Fix #2060
* | | Merge pull request #2447 from wallabag/fix-fr-de-doc-homepageNicolas Lœuillet2016-10-142-4/+4
|\ \ \ | | | | | | | | Fixed french and german doc homepages
| * | | Fixed french and german doc homepagesNicolas Lœuillet2016-10-142-4/+4
|/ / /
* | | Merge pull request #2444 from Kaligule/masterNicolas Lœuillet2016-10-141-1/+1
|\ \ \ | | | | | | | | Mention example instance in docs
| * | | Merge pull request #1 from Kaligule/DocumentationKaligule2016-10-141-1/+1
|/| | | | | | | | | | | Mention example instance
| * | | Mention example instanceKaligule2016-10-141-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-docNicolas Lœuillet2016-10-136-41/+81
|\ \ \ | | | | | | | | Added french documentation for upgrade
| * | | Added missing spaceNicolas Lœuillet2016-10-131-1/+1
| | | |
| * | | update German user/upgrade-2.1.x-2.1.y.rstSven Fischer2016-10-121-5/+5
| | | |