aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Return 304 when content isn't reloaded using the APIJeremy Benoist2016-11-222-8/+4
| | | | | | Previously it was a 400 but this is more related to a real error. Using the API user should only know the content got reloaded or not. If reloaded: 200 otherwise: 304.
* Merge pull request #2613 from wallabag/fix-overlapThomas Citharel2016-11-225-29/+33
|\ | | | | Fix card action overlap
| * Fix card action overlapJeremy Benoist2016-11-205-29/+33
| | | | | | | | On smaller resolution
* | Merge pull request #2614 from wallabag/api-reloadNicolas Lœuillet2016-11-222-0/+85
|\ \ | | | | | | Add ability to reload entry from API
| * | Return an explicit error if reload failJeremy Benoist2016-11-202-7/+8
| | |
| * | Fixing testsJeremy Benoist2016-11-202-4/+3
| | |
| * | Add ability to reload entry from APIJeremy Benoist2016-11-202-0/+85
| | |
* | | Merge pull request #2632 from wallabag/mruminski-patch-1Nicolas Lœuillet2016-11-211-11/+11
|\ \ \ | | | | | | | | Update messages.pl.yml
| * | | Update messages.pl.ymlMateusz Rumiński2016-11-211-11/+11
|/ / / | | | | | | missing polish translation added
* | | Merge pull request #2630 from ThibaudDauce/fix-black-headingsJeremy Benoist2016-11-211-6/+6
|\ \ \ | | | | | | | | Add white-text class to card-title too
| * | | Add white-text class to card-title tooThibaud Dauce2016-11-211-6/+6
| | | |
* | | | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-213-4/+14
|\| | |
| * | | Merge pull request #2624 from Rurik19/masterJeremy Benoist2016-11-211-1/+3
| |\ \ \ | | | | | | | | | | Fix #2056 update config.yml
| | * | | wrong spacesYuriy Evdokimov2016-11-211-2/+2
| | | | |
| | * | | Fix #2056 update config.ymlYuriy Evdokimov2016-11-211-1/+3
| | | | | | | | | | | | | | | Resolves refresh token lifetime issue
| * | | | Merge pull request #2625 from wallabag/prepare-215Nicolas Lœuillet2016-11-212-1/+6
| |\ \ \ \ | | | | | | | | | | | | Prepare wallabag 2.1.5
| | * | | | Prepare wallabag 2.1.5 :rocket:Nicolas Lœuillet2016-11-212-1/+6
| |/ / / /
| * | | | Merge pull request #2623 from wallabag/composer-php-5.5Jeremy Benoist2016-11-211-2/+5
| |\ \ \ \ | | |/ / / | |/| | | Force composer to run as PHP 5.5.9
| | * | | Lock down PHPUnit for PHP 5.5Jeremy Benoist2016-11-211-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | | Since Composer defined lowest version is now PHP 5.5.9. PHPUnit 5.0 require PHP 5.6.
| | * | | Force composer to run as PHP 5.5.9Jeremy Benoist2016-11-201-1/+4
| |/ / /
* | | | Merge pull request #2621 from wallabag/redis-passwordJeremy Benoist2016-11-205-0/+8
|\ \ \ \ | |_|/ / |/| | | Add ability to use Redis with password
| * | | Add german translationJulian Oster2016-11-201-1/+1
| | | |
| * | | Add ability to use Redis with passwordJeremy Benoist2016-11-205-0/+8
|/ / /
* | | Merge pull request #2609 from wallabag/rss-pagingJeremy Benoist2016-11-2018-13/+112
|\ \ \ | |_|/ |/| | RSS paging
| * | Add documentation about RSS pagingJeremy Benoist2016-11-203-0/+9
| | |
| * | Fix testsJeremy Benoist2016-11-201-9/+5
| | |
| * | Add RSS paginationJeremy Benoist2016-11-203-12/+91
| | | | | | | | | | | | Following https://tools.ietf.org/html/rfc5005#page-4
| * | Add missing translationsJeremy Benoist2016-11-2012-1/+16
|/ /
* | Merge pull request #2543 from wallabag/search-engineNicolas Lœuillet2016-11-1934-64/+307
|\ \ | | | | | | Added a simple search engine
| * | Added shortcutNicolas Lœuillet2016-11-197-5/+19
| | |
| * | Added testsNicolas Lœuillet2016-11-196-5/+73
| | |
| * | Added translations and currentRoute parameterNicolas Lœuillet2016-11-1915-8/+57
| | |
| * | Added search engine in baggy themeNicolas Lœuillet2016-11-195-15/+26
| | |
| * | Added a simple search engineNicolas Lœuillet2016-11-1915-50/+151
|/ / | | | | | | Fix #18
* | Messed up DE import translationJeremy Benoist2016-11-191-34/+1
| |
* | Merge remote-tracking branch 'origin/master' into 2.2Jeremy Benoist2016-11-19124-2586/+2827
|\| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | # Conflicts: # .editorconfig # docs/de/index.rst # docs/de/user/import.rst # docs/en/index.rst # docs/en/user/configuration.rst # docs/en/user/import.rst # docs/fr/index.rst # docs/fr/user/import.rst # src/Wallabag/CoreBundle/Command/InstallCommand.php # src/Wallabag/CoreBundle/Resources/translations/messages.da.yml # src/Wallabag/CoreBundle/Resources/translations/messages.de.yml # src/Wallabag/CoreBundle/Resources/translations/messages.en.yml # src/Wallabag/CoreBundle/Resources/translations/messages.es.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fa.yml # src/Wallabag/CoreBundle/Resources/translations/messages.fr.yml # src/Wallabag/CoreBundle/Resources/translations/messages.it.yml # src/Wallabag/CoreBundle/Resources/translations/messages.oc.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pl.yml # src/Wallabag/CoreBundle/Resources/translations/messages.pt.yml # src/Wallabag/CoreBundle/Resources/translations/messages.ro.yml # src/Wallabag/CoreBundle/Resources/translations/messages.tr.yml # src/Wallabag/CoreBundle/Resources/views/themes/baggy/Config/index.html.twig # web/bundles/wallabagcore/themes/baggy/css/style.min.css # web/bundles/wallabagcore/themes/baggy/js/baggy.min.js # web/bundles/wallabagcore/themes/material/css/style.min.css # web/bundles/wallabagcore/themes/material/js/material.min.js
| * Merge pull request #2608 from wallabag/change-dev-versionJeremy Benoist2016-11-191-1/+1
| |\ | | | | | | Change version to 2.2.0-dev
| | * Change version to 2.2.0-devNicolas Lœuillet2016-11-191-1/+1
| |/
| * Merge pull request #2607 from wallabag/update-changelogNicolas Lœuillet2016-11-191-1/+5
| |\ | | | | | | Updated changelog for 2.1.4
| | * Updated changelog for 2.1.4Nicolas Lœuillet2016-11-191-1/+5
| |/
| * Merge pull request #2604 from wallabag/postgresql-versionNicolas Lœuillet2016-11-191-1/+22
| |\ | | | | | | wallabag can’t work on PostgreSQL <= 9.1
| | * Wallabag can’t work on PostgreSQL <= 9.1Jeremy Benoist2016-11-191-1/+22
| | |
| * | Merge pull request #2605 from wallabag/update-release-processNicolas Lœuillet2016-11-191-1/+14
| |\ \ | | | | | | | | Add .travis.yml change to RELEASE_PROCESS
| | * | Add .travis.yml change to RELEASE_PROCESSJeremy Benoist2016-11-191-1/+14
| | |/
| * | Merge pull request #2603 from wallabag/fix-composer-no-devJeremy Benoist2016-11-191-2/+2
| |\ \ | | |/ | |/| Fix clear-cache problem using —no-dev
| | * Fix clear-cache problem using —no-devJeremy Benoist2016-11-191-2/+2
| |/ | | | | | | | | | | Related to : > PHP Fatal error: Class 'FOS\RestBundle\Serializer\JMSSerializerAdapter' not found in /Users/j0k/Sites/github/wallabag/var/cache/prod/appProdProjectContainer.php on line 9139
| * Merge pull request #2596 from wallabag/prepare-214Nicolas Lœuillet2016-11-182-1/+20
| |\ | | | | | | Prepare wallabag 2.1.4 :rocket:
| | * Prepare wallabag 2.1.4 :rocket:Nicolas Lœuillet2016-11-182-1/+20
| |/
| * Merge pull request #2550 from wallabag/reorder-documentationNicolas Lœuillet2016-11-1860-1418/+1681
| |\ | | | | | | Reordered documentation
| | * Undo translation of 'in english'.Julian Oster2016-11-181-1/+1
| | |
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-08 13:35:34 +0000