aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* manage assets through npmThomas Citharel2016-06-09160-17580/+2743
* Merge pull request #2097 from bmillemathias/issue_2045Nicolas Lœuillet2016-05-191-1/+1
|\
| * Forgot a double quoteBaptiste Mille-Mathias2016-05-191-1/+1
| * Fix image path in 2-factor authentification emailBaptiste Mille-Mathias2016-05-181-1/+1
* | Merge pull request #2098 from wallabag/cs-2092Nicolas Lœuillet2016-05-191-4/+3
|\ \
| * | CSJeremy Benoist2016-05-191-4/+3
|/ /
* | Merge pull request #2092 from Rurik19/issue2089Jeremy Benoist2016-05-192-4/+92
|\ \ | |/ |/|
| * Tests for issue #2089Yuriy Evdokimov2016-05-181-0/+88
| * PATCH also clears starred and archived signsYuriy Evdokimov2016-05-181-2/+2
| * Starred and Archived clears if article is already existsYuriy Evdokimov2016-05-181-2/+2
* | Merge pull request #2093 from wallabag/replace-dots-materialJeremy Benoist2016-05-181-1/+1
|\ \
| * | Replace vertical dots in material theme with horizontal dotsNicolas Lœuillet2016-05-181-1/+1
| |/
* | Merge pull request #2094 from wallabag/update-contributingJeremy Benoist2016-05-181-14/+3
|\ \ | |/ |/|
| * Update CONTRIBUTING fileNicolas Lœuillet2016-05-181-14/+3
|/
* Merge pull request #2069 from merwan/patch-1Jeremy Benoist2016-05-131-1/+1
|\
| * Do not specify language in Firefox addon linkMerouane Atig2016-05-131-1/+1
|/
* Merge pull request #2068 from mariovor/documentation/datadbNicolas Lœuillet2016-05-131-0/+2
|\
| * Added information about permissions on data/Mario Vormstein2016-05-121-2/+2
| * Added information about permissions on data/dbMario Vormstein2016-05-121-0/+2
|/
* Merge pull request #2054 from wallabag/jamiroconca-craueconfigbundle-update-1Jeremy Benoist2016-05-111-7/+7
|\
| * Update CraueConfigBundle.it.ymlDaniele Conca2016-05-111-7/+7
|/
* Merge pull request #2049 from joshp23/patch-1Nicolas Lœuillet2016-05-091-0/+1
|\
| * Update api.rstJosh Panter2016-05-091-1/+1
| * Update api.rstJosh Panter2016-05-091-0/+1
|/
* Merge pull request #2044 from joshp23/patch-1Nicolas Lœuillet2016-05-091-1/+2
|\
| * Update api.rstJosh Panter2016-05-081-1/+2
|/
* Merge pull request #2038 from foxmask/masterNicolas Lœuillet2016-05-082-0/+45
|\
| * new details in the doc about the rgihts access again;)Olivier Demah2016-05-072-0/+45
|/
* Merge pull request #2035 from wallabag/prepare-204Nicolas Lœuillet2016-05-075-4/+30
|\
| * Update changelogNicolas Lœuillet2016-05-071-0/+26
| * Prepare wallabag 2.0.4Nicolas Lœuillet2016-05-074-4/+4
* | Merge pull request #2023 from wallabag/fix-validators-translationJeremy Benoist2016-05-0724-79/+68
|\ \ | |/ |/|
| * Fix translation for validatorsNicolas Lœuillet2016-05-0724-79/+68
|/
* Merge pull request #2016 from wallabag/update-documentationJeremy Benoist2016-05-0721-181/+307
|\
| * Change documentation about Pocket importNicolas Lœuillet2016-05-052-2/+2
| * Add documentation to know how to contribute to the documentation :trollface:Nicolas Lœuillet2016-05-044-0/+26
| * Fix lighttpd documentationNicolas Lœuillet2016-05-042-22/+20
| * Add Third resources for wallabag APINicolas Lœuillet2016-05-042-2/+6
| * Move some parts in FAQNicolas Lœuillet2016-05-0312-146/+60
| * Add LigHTTPd documentationNicolas Lœuillet2016-05-032-4/+82
| * Update documentationNicolas Lœuillet2016-05-037-32/+138
* | Merge pull request #2020 from wallabag/fix-number-entries-per-tagJeremy Benoist2016-05-073-2/+14
|\ \
| * | Rename getEntriesByUser method to getEntriesByUserIdNicolas Lœuillet2016-05-043-3/+3
| * | Fix number of entries in tag/listNicolas Lœuillet2016-05-033-2/+14
* | | Merge pull request #2024 from wallabag/jamiroconca-patch-messages-itJeremy Benoist2016-05-071-192/+192
|\ \ \
| * | | Update messages.it.ymlDaniele Conca2016-05-051-62/+62
| * | | Update messages.it.ymlDaniele Conca2016-05-041-131/+131
* | | | Merge pull request #2029 from wallabag/change-readmeJeremy Benoist2016-05-051-2/+2
|\ \ \ \
| * | | | Change Travis/Scrutinizer pictures in READMENicolas Lœuillet2016-05-051-2/+2
|/ / / /
* | | | Merge pull request #2028 from wallabag/docu-for-android-appNicolas Lœuillet2016-05-0512-0/+108
|\ \ \ \ | |/ / / |/| | |