Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge pull request #1985 from foxmask/master | Nicolas Lœuillet | 2016-04-27 | 2 | -0/+55 |
|\ | | | | | Rights access to the folders of the project | ||||
| * | fixed typo | Olivier Demah | 2016-04-26 | 2 | -7/+5 |
| | | |||||
| * | Rights access to the folder of the project | Olivier Demah | 2016-04-26 | 2 | -0/+57 |
|/ | |||||
* | Merge pull request #1977 from wallabag/es-translation | Nicolas Lœuillet | 2016-04-25 | 1 | -98/+98 |
|\ | | | | | Es translation | ||||
| * | Fix indentations in ES translation | Jeremy Benoist | 2016-04-24 | 1 | -39/+39 |
| | | |||||
| * | Update messages.es.yml | jami7 | 2016-04-24 | 1 | -1/+1 |
| | | |||||
| * | Update messages.es.yml | jami7 | 2016-04-24 | 1 | -98/+98 |
|/ | |||||
* | Merge pull request #1970 from wallabag/typo-api-doc | Thomas Citharel | 2016-04-23 | 2 | -6/+2 |
|\ | | | | | Fix typos in API documentation | ||||
| * | Fix typos in API documentation | Nicolas Lœuillet | 2016-04-23 | 2 | -6/+2 |
|/ | |||||
* | Merge pull request #1969 from wallabag/doc-3rd-resources-api | Thomas Citharel | 2016-04-23 | 2 | -0/+18 |
|\ | | | | | Create 3rd Resources chapter in API documentation | ||||
| * | Create 3rd Resources chapter in API documentation | Nicolas Lœuillet | 2016-04-23 | 2 | -0/+18 |
|/ | |||||
* | Merge pull request #1967 from wallabag/add-faq-documentation | Thomas Citharel | 2016-04-23 | 4 | -0/+22 |
|\ | | | | | Add FAQ page in documentation | ||||
| * | Add FAQ page in documentation | Nicolas Lœuillet | 2016-04-23 | 4 | -0/+22 |
|/ | |||||
* | Merge pull request #1965 from wallabag/prepare-203 | Nicolas Lœuillet | 2016-04-22 | 5 | -4/+14 |
|\ | | | | | Prepare release 2.0.3 | ||||
| * | Prepare release 2.0.3 | Nicolas Lœuillet | 2016-04-22 | 5 | -4/+14 |
|/ | |||||
* | Merge pull request #1962 from wallabag/update-api-documentation | Nicolas Lœuillet | 2016-04-22 | 2 | -5/+29 |
|\ | | | | | Update API documentation with cURL examples | ||||
| * | Update API documentation with cURL examples | Nicolas Lœuillet | 2016-04-21 | 2 | -5/+29 |
|/ | |||||
* | Merge pull request #1948 from wallabag/prepare-2022.0.2 | Nicolas Lœuillet | 2016-04-21 | 5 | -4/+26 |
|\ | | | | | Prepare release 2.0.2 | ||||
| * | Update changelog | Nicolas Lœuillet | 2016-04-21 | 1 | -2/+14 |
| | | |||||
| * | Prepare release 2.0.2 | Nicolas Lœuillet | 2016-04-19 | 5 | -4/+14 |
| | | |||||
* | | Merge pull request #1957 from wallabag/fix-gotoaccount-button-translation | Nicolas Lœuillet | 2016-04-21 | 1 | -1/+1 |
|\ \ | | | | | | | Fix translation for Go to your account button after subscription | ||||
| * | | Fix translation for Go to your account button after subscription | Nicolas Lœuillet | 2016-04-20 | 1 | -1/+1 |
|/ / | | | | | | | Fix #1956 | ||||
* | | Merge pull request #1945 from ddeimeke/master | Nicolas Lœuillet | 2016-04-20 | 1 | -0/+24 |
|\ \ | | | | | | | Added some curl examples | ||||
| * | | Added some curl examples | Dirk Deimeke | 2016-04-19 | 1 | -0/+24 |
| |/ | |||||
* | | Merge pull request #1954 from wallabag/update-links-doc | Thomas Citharel | 2016-04-19 | 7 | -15/+15 |
|\ \ | | | | | | | Update links in documentation | ||||
| * | | Update links in documentation | Nicolas Lœuillet | 2016-04-19 | 7 | -15/+15 |
|/ / | |||||
* | | Merge pull request #1953 from maxi62330/master | Nicolas Lœuillet | 2016-04-19 | 2 | -10/+10 |
|\ \ | |/ |/| | Actualisation des liens morts (Documentation de traduction) | ||||
| * | Actualisation des liens morts (Documentation de traduction) | Martinet Maxime | 2016-04-19 | 2 | -10/+10 |
|/ | |||||
* | Merge pull request #1942 from wallabag/optimize-import | Thomas Citharel | 2016-04-18 | 4 | -2/+305 |
|\ | | | | | Optimize import | ||||
| * | Add tests | Nicolas Lœuillet | 2016-04-18 | 4 | -4/+305 |
| | | |||||
| * | Add doctrine clear after flush, thanks to @BitOne talk at Symfony Live | Nicolas Lœuillet | 2016-04-18 | 2 | -0/+2 |
| | | |||||
* | | Merge pull request #1944 from wallabag/travis-rename-branches | Thomas Citharel | 2016-04-18 | 1 | -2/+1 |
|\ \ | |/ |/| | Update Travis configuration with branches renaming | ||||
| * | Update Travis configuration with branches renaming | Nicolas Lœuillet | 2016-04-18 | 1 | -2/+1 |
|/ | |||||
* | Merge pull request #1938 from wallabag/hide-pagination | Thomas Citharel | 2016-04-18 | 2 | -2/+2 |
|\ | | | | | Display pagination only if we have more than one page | ||||
| * | Display pagination only if we have more than one page | Nicolas Lœuillet | 2016-04-18 | 2 | -2/+2 |
| | | |||||
* | | Merge pull request #1935 from jami7/patch-8 | Nicolas Lœuillet | 2016-04-17 | 1 | -24/+24 |
|\ \ | | | | | | | Update messages.es.yml | ||||
| * | | Update messages.es.yml | jami7 | 2016-04-16 | 1 | -24/+24 |
|/ / | |||||
* | | Merge pull request #1933 from wallabag/hide-pagination | Nicolas Lœuillet | 2016-04-16 | 2 | -2/+6 |
|\| | | | | | Hide pagination if we only have one entry to display | ||||
| * | Hide pagination if we only have one entry to display | Nicolas Lœuillet | 2016-04-16 | 2 | -2/+6 |
|/ | |||||
* | Merge pull request #1925 from wallabag/fix-redirect-without-referer | Nicolas Lœuillet | 2016-04-15 | 5 | -4/+111 |
|\ | | | | | Redirect to homepage if referer is null | ||||
| * | Fix redirect when delete entry | Nicolas Lœuillet | 2016-04-15 | 1 | -1/+1 |
| | | |||||
| * | Fix tests | Nicolas Lœuillet | 2016-04-15 | 2 | -11/+18 |
| | | |||||
| * | Redirect to homepage if referer is null | Nicolas Lœuillet | 2016-04-15 | 5 | -4/+104 |
| | | | | | | | | Fix #1924 | ||||
* | | Merge pull request #1929 from wallabag/change-guid-rss | Nicolas Lœuillet | 2016-04-15 | 2 | -4/+4 |
|\ \ | |/ |/| | Change guid and link in RSS feeds to give original entry URL | ||||
| * | Change guid and link in RSS feeds to give original entry URL | Nicolas Lœuillet | 2016-04-15 | 2 | -4/+4 |
|/ | | | | Fix #1926 | ||||
* | Merge pull request #1916 from wallabag/cleanup | Nicolas Lœuillet | 2016-04-13 | 72 | -687/+639 |
|\ | | | | | Convert array + phpDoc | ||||
| * | Move test parameters out of parameters.yml | Jeremy Benoist | 2016-04-12 | 10 | -125/+39 |
| | | | | | | | | The end user doesn't care to about the test database. | ||||
| * | Fix MySQL tests on HHVM | Jeremy Benoist | 2016-04-12 | 1 | -1/+1 |
| | | |||||
| * | Convert array + phpDoc | Jeremy Benoist | 2016-04-12 | 61 | -561/+599 |
| | | | | | | | | Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter | ||||
* | | Merge pull request #1918 from wallabag/improve-pagination | Jeremy Benoist | 2016-04-13 | 9 | -38/+49 |
|\ \ | | | | | | | Improve pagination when user has lot of entries |