Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | add screenshots of android docu in English | Sven Fischer | 2016-05-23 | 11 | -10/+10 |
| | |||||
* | Merge pull request #2109 from Poorchop/grammar | Nicolas Lœuillet | 2016-05-23 | 1 | -11/+11 |
|\ | | | | | Improve English translation | ||||
| * | Improve English translation | Poorchop | 2016-05-23 | 1 | -11/+11 |
|/ | |||||
* | Merge pull request #2097 from bmillemathias/issue_2045 | Nicolas Lœuillet | 2016-05-19 | 1 | -1/+1 |
|\ | | | | | Fix image path in 2-factor authentification email | ||||
| * | Forgot a double quote | Baptiste Mille-Mathias | 2016-05-19 | 1 | -1/+1 |
| | | |||||
| * | Fix image path in 2-factor authentification email | Baptiste Mille-Mathias | 2016-05-18 | 1 | -1/+1 |
| | | | | | | | | Fix the broken url to image ressource hosted on wallabag.org | ||||
* | | Merge pull request #2098 from wallabag/cs-2092 | Nicolas Lœuillet | 2016-05-19 | 1 | -4/+3 |
|\ \ | | | | | | | CS | ||||
| * | | CS | Jeremy Benoist | 2016-05-19 | 1 | -4/+3 |
|/ / | |||||
* | | Merge pull request #2092 from Rurik19/issue2089 | Jeremy Benoist | 2016-05-19 | 2 | -4/+92 |
|\ \ | |/ |/| | Starred and Archived clears if article is already exists | ||||
| * | Tests for issue #2089 | Yuriy Evdokimov | 2016-05-18 | 1 | -0/+88 |
| | | |||||
| * | PATCH also clears starred and archived signs | Yuriy Evdokimov | 2016-05-18 | 1 | -2/+2 |
| | | |||||
| * | Starred and Archived clears if article is already exists | Yuriy Evdokimov | 2016-05-18 | 1 | -2/+2 |
| | | |||||
* | | Merge pull request #2093 from wallabag/replace-dots-material | Jeremy Benoist | 2016-05-18 | 1 | -1/+1 |
|\ \ | | | | | | | Replace vertical dots in material theme with horizontal dots | ||||
| * | | Replace vertical dots in material theme with horizontal dots | Nicolas Lœuillet | 2016-05-18 | 1 | -1/+1 |
| |/ | |||||
* | | Merge pull request #2094 from wallabag/update-contributing | Jeremy Benoist | 2016-05-18 | 1 | -14/+3 |
|\ \ | |/ |/| | Update CONTRIBUTING file | ||||
| * | Update CONTRIBUTING file | Nicolas Lœuillet | 2016-05-18 | 1 | -14/+3 |
|/ | | | | Fix #2059 | ||||
* | Merge pull request #2069 from merwan/patch-1 | Jeremy Benoist | 2016-05-13 | 1 | -1/+1 |
|\ | | | | | Do not specify language in Firefox addon link | ||||
| * | Do not specify language in Firefox addon link | Merouane Atig | 2016-05-13 | 1 | -1/+1 |
|/ | |||||
* | Merge pull request #2068 from mariovor/documentation/datadb | Nicolas Lœuillet | 2016-05-13 | 1 | -0/+2 |
|\ | | | | | Added information about permissions on data/ | ||||
| * | Added information about permissions on data/ | Mario Vormstein | 2016-05-12 | 1 | -2/+2 |
| | | |||||
| * | Added information about permissions on data/db | Mario Vormstein | 2016-05-12 | 1 | -0/+2 |
|/ | |||||
* | Merge pull request #2054 from wallabag/jamiroconca-craueconfigbundle-update-1 | Jeremy Benoist | 2016-05-11 | 1 | -7/+7 |
|\ | | | | | Update CraueConfigBundle.it.yml | ||||
| * | Update CraueConfigBundle.it.yml | Daniele Conca | 2016-05-11 | 1 | -7/+7 |
|/ | |||||
* | Merge pull request #2049 from joshp23/patch-1 | Nicolas Lœuillet | 2016-05-09 | 1 | -0/+1 |
|\ | | | | | Update api.rst | ||||
| * | Update api.rst | Josh Panter | 2016-05-09 | 1 | -1/+1 |
| | | |||||
| * | Update api.rst | Josh Panter | 2016-05-09 | 1 | -0/+1 |
|/ | | | I just used google translate for this bit ... I really don't know any French ;) | ||||
* | Merge pull request #2044 from joshp23/patch-1 | Nicolas Lœuillet | 2016-05-09 | 1 | -1/+2 |
|\ | | | | | Update api.rst | ||||
| * | Update api.rst | Josh Panter | 2016-05-08 | 1 | -1/+2 |
|/ | | | Added my plugin, renamed the resource section for better english. Propose that the third party resource section have it's own page. | ||||
* | Merge pull request #2038 from foxmask/master | Nicolas Lœuillet | 2016-05-08 | 2 | -0/+45 |
|\ | | | | | new details in the doc about the rights access again;) | ||||
| * | new details in the doc about the rgihts access again;) | Olivier Demah | 2016-05-07 | 2 | -0/+45 |
|/ | |||||
* | Merge pull request #2035 from wallabag/prepare-204 | Nicolas Lœuillet | 2016-05-07 | 5 | -4/+30 |
|\ | | | | | Prepare wallabag 2.0.4 | ||||
| * | Update changelog | Nicolas Lœuillet | 2016-05-07 | 1 | -0/+26 |
| | | |||||
| * | Prepare wallabag 2.0.4 | Nicolas Lœuillet | 2016-05-07 | 4 | -4/+4 |
| | | |||||
* | | Merge pull request #2023 from wallabag/fix-validators-translation | Jeremy Benoist | 2016-05-07 | 24 | -79/+68 |
|\ \ | |/ |/| | Fix translation for validators | ||||
| * | Fix translation for validators | Nicolas Lœuillet | 2016-05-07 | 24 | -79/+68 |
|/ | | | | Fix #2003 | ||||
* | Merge pull request #2016 from wallabag/update-documentation | Jeremy Benoist | 2016-05-07 | 21 | -181/+307 |
|\ | | | | | Update documentation | ||||
| * | Change documentation about Pocket import | Nicolas Lœuillet | 2016-05-05 | 2 | -2/+2 |
| | | | | | | | | Fix wallabag/docker#8 | ||||
| * | Add documentation to know how to contribute to the documentation :trollface: | Nicolas Lœuillet | 2016-05-04 | 4 | -0/+26 |
| | | |||||
| * | Fix lighttpd documentation | Nicolas Lœuillet | 2016-05-04 | 2 | -22/+20 |
| | | |||||
| * | Add Third resources for wallabag API | Nicolas Lœuillet | 2016-05-04 | 2 | -2/+6 |
| | | |||||
| * | Move some parts in FAQ | Nicolas Lœuillet | 2016-05-03 | 12 | -146/+60 |
| | | |||||
| * | Add LigHTTPd documentation | Nicolas Lœuillet | 2016-05-03 | 2 | -4/+82 |
| | | | | | | | | Fix #1931 | ||||
| * | Update documentation | Nicolas Lœuillet | 2016-05-03 | 7 | -32/+138 |
| | | |||||
* | | Merge pull request #2020 from wallabag/fix-number-entries-per-tag | Jeremy Benoist | 2016-05-07 | 3 | -2/+14 |
|\ \ | | | | | | | Fix number of entries in tag/list | ||||
| * | | Rename getEntriesByUser method to getEntriesByUserId | Nicolas Lœuillet | 2016-05-04 | 3 | -3/+3 |
| | | | |||||
| * | | Fix number of entries in tag/list | Nicolas Lœuillet | 2016-05-03 | 3 | -2/+14 |
| | | | | | | | | | | | | Fix #2006 | ||||
* | | | Merge pull request #2024 from wallabag/jamiroconca-patch-messages-it | Jeremy Benoist | 2016-05-07 | 1 | -192/+192 |
|\ \ \ | | | | | | | | | Update messages.it.yml | ||||
| * | | | Update messages.it.yml | Daniele Conca | 2016-05-05 | 1 | -62/+62 |
| | | | | | | | | | | | | other translations added | ||||
| * | | | Update messages.it.yml | Daniele Conca | 2016-05-04 | 1 | -131/+131 |
| | | | | |||||
* | | | | Merge pull request #2029 from wallabag/change-readme | Jeremy Benoist | 2016-05-05 | 1 | -2/+2 |
|\ \ \ \ | | | | | | | | | | | Change Travis/Scrutinizer pictures in README |