Commit message (Expand) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #2613 from wallabag/fix-overlap | Thomas Citharel | 2016-11-22 | 5 | -29/+33 |
|\ | |||||
| * | Fix card action overlap | Jeremy Benoist | 2016-11-20 | 5 | -29/+33 |
* | | Merge pull request #2614 from wallabag/api-reload | Nicolas Lœuillet | 2016-11-22 | 2 | -0/+85 |
|\ \ | |||||
| * | | Return an explicit error if reload fail | Jeremy Benoist | 2016-11-20 | 2 | -7/+8 |
| * | | Fixing tests | Jeremy Benoist | 2016-11-20 | 2 | -4/+3 |
| * | | Add ability to reload entry from API | Jeremy Benoist | 2016-11-20 | 2 | -0/+85 |
* | | | Merge pull request #2632 from wallabag/mruminski-patch-1 | Nicolas Lœuillet | 2016-11-21 | 1 | -11/+11 |
|\ \ \ | |||||
| * | | | Update messages.pl.yml | Mateusz Rumiński | 2016-11-21 | 1 | -11/+11 |
|/ / / | |||||
* | | | Merge pull request #2630 from ThibaudDauce/fix-black-headings | Jeremy Benoist | 2016-11-21 | 1 | -6/+6 |
|\ \ \ | |||||
| * | | | Add white-text class to card-title too | Thibaud Dauce | 2016-11-21 | 1 | -6/+6 |
* | | | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-21 | 3 | -4/+14 |
|\| | | | |||||
| * | | | Merge pull request #2624 from Rurik19/master | Jeremy Benoist | 2016-11-21 | 1 | -1/+3 |
| |\ \ \ | |||||
| | * | | | wrong spaces | Yuriy Evdokimov | 2016-11-21 | 1 | -2/+2 |
| | * | | | Fix #2056 update config.yml | Yuriy Evdokimov | 2016-11-21 | 1 | -1/+3 |
| * | | | | Merge pull request #2625 from wallabag/prepare-215 | Nicolas Lœuillet | 2016-11-21 | 2 | -1/+6 |
| |\ \ \ \ | |||||
| | * | | | | Prepare wallabag 2.1.5 :rocket: | Nicolas Lœuillet | 2016-11-21 | 2 | -1/+6 |
| |/ / / / | |||||
| * | | | | Merge pull request #2623 from wallabag/composer-php-5.5 | Jeremy Benoist | 2016-11-21 | 1 | -2/+5 |
| |\ \ \ \ | | |/ / / | |/| | | | |||||
| | * | | | Lock down PHPUnit for PHP 5.5 | Jeremy Benoist | 2016-11-21 | 1 | -1/+1 |
| | * | | | Force composer to run as PHP 5.5.9 | Jeremy Benoist | 2016-11-20 | 1 | -1/+4 |
| |/ / / | |||||
* | | | | Merge pull request #2621 from wallabag/redis-password | Jeremy Benoist | 2016-11-20 | 5 | -0/+8 |
|\ \ \ \ | |_|/ / |/| | | | |||||
| * | | | Add german translation | Julian Oster | 2016-11-20 | 1 | -1/+1 |
| * | | | Add ability to use Redis with password | Jeremy Benoist | 2016-11-20 | 5 | -0/+8 |
|/ / / | |||||
* | | | Merge pull request #2609 from wallabag/rss-paging | Jeremy Benoist | 2016-11-20 | 18 | -13/+112 |
|\ \ \ | |_|/ |/| | | |||||
| * | | Add documentation about RSS paging | Jeremy Benoist | 2016-11-20 | 3 | -0/+9 |
| * | | Fix tests | Jeremy Benoist | 2016-11-20 | 1 | -9/+5 |
| * | | Add RSS pagination | Jeremy Benoist | 2016-11-20 | 3 | -12/+91 |
| * | | Add missing translations | Jeremy Benoist | 2016-11-20 | 12 | -1/+16 |
|/ / | |||||
* | | Merge pull request #2543 from wallabag/search-engine | Nicolas Lœuillet | 2016-11-19 | 34 | -64/+307 |
|\ \ | |||||
| * | | Added shortcut | Nicolas Lœuillet | 2016-11-19 | 7 | -5/+19 |
| * | | Added tests | Nicolas Lœuillet | 2016-11-19 | 6 | -5/+73 |
| * | | Added translations and currentRoute parameter | Nicolas Lœuillet | 2016-11-19 | 15 | -8/+57 |
| * | | Added search engine in baggy theme | Nicolas Lœuillet | 2016-11-19 | 5 | -15/+26 |
| * | | Added a simple search engine | Nicolas Lœuillet | 2016-11-19 | 15 | -50/+151 |
|/ / | |||||
* | | Messed up DE import translation | Jeremy Benoist | 2016-11-19 | 1 | -34/+1 |
* | | Merge remote-tracking branch 'origin/master' into 2.2 | Jeremy Benoist | 2016-11-19 | 124 | -2586/+2827 |
|\| | |||||
| * | Merge pull request #2608 from wallabag/change-dev-version | Jeremy Benoist | 2016-11-19 | 1 | -1/+1 |
| |\ | |||||
| | * | Change version to 2.2.0-dev | Nicolas Lœuillet | 2016-11-19 | 1 | -1/+1 |
| |/ | |||||
| * | Merge pull request #2607 from wallabag/update-changelog | Nicolas Lœuillet | 2016-11-19 | 1 | -1/+5 |
| |\ | |||||
| | * | Updated changelog for 2.1.4 | Nicolas Lœuillet | 2016-11-19 | 1 | -1/+5 |
| |/ | |||||
| * | Merge pull request #2604 from wallabag/postgresql-version | Nicolas Lœuillet | 2016-11-19 | 1 | -1/+22 |
| |\ | |||||
| | * | Wallabag can’t work on PostgreSQL <= 9.1 | Jeremy Benoist | 2016-11-19 | 1 | -1/+22 |
| * | | Merge pull request #2605 from wallabag/update-release-process | Nicolas Lœuillet | 2016-11-19 | 1 | -1/+14 |
| |\ \ | |||||
| | * | | Add .travis.yml change to RELEASE_PROCESS | Jeremy Benoist | 2016-11-19 | 1 | -1/+14 |
| | |/ | |||||
| * | | Merge pull request #2603 from wallabag/fix-composer-no-dev | Jeremy Benoist | 2016-11-19 | 1 | -2/+2 |
| |\ \ | | |/ | |/| | |||||
| | * | Fix clear-cache problem using —no-dev | Jeremy Benoist | 2016-11-19 | 1 | -2/+2 |
| |/ | |||||
| * | Merge pull request #2596 from wallabag/prepare-214 | Nicolas Lœuillet | 2016-11-18 | 2 | -1/+20 |
| |\ | |||||
| | * | Prepare wallabag 2.1.4 :rocket: | Nicolas Lœuillet | 2016-11-18 | 2 | -1/+20 |
| |/ | |||||
| * | Merge pull request #2550 from wallabag/reorder-documentation | Nicolas Lœuillet | 2016-11-18 | 60 | -1418/+1681 |
| |\ | |||||
| | * | Undo translation of 'in english'. | Julian Oster | 2016-11-18 | 1 | -1/+1 |
| | * | Reordered documentation for German. | Julian Oster | 2016-11-17 | 19 | -485/+545 |