aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2142 from wallabag/v2-use-npmNicolas Lœuillet2016-06-23135-17886/+2755
|\
| * trailing commaThomas Citharel2016-06-091-1/+1
| * remove block added twiceThomas Citharel2016-06-091-85/+0
| * clean & lint stuffThomas Citharel2016-06-0911-390/+391
| * manage assets through npmThomas Citharel2016-06-09160-17580/+2743
* | Update symlink to php-cs-fixerJeremy Benoist2016-06-231-1/+1
* | Try to find bad redirection after deleteJeremy Benoist2016-06-231-3/+4
* | Use friendsofphp instead of fabpotJeremy Benoist2016-06-231-1/+1
* | translate documentation to GermanSven Fischer2016-06-2323-2/+1443
* | Corrected Regex for lighttpd rewriteEven Allmighty2016-06-231-1/+1
* | Prepare wallabag 2.0.5Nicolas Lœuillet2016-06-235-4/+24
* | Change ManyToMany between entry & tagJeremy Benoist2016-06-234-7/+68
* | Display a message when saving an entry failedJeremy Benoist2016-06-2312-27/+45
* | Move fixtures to the right placeJeremy Benoist2016-06-232-6/+8
* | Fix the deletion of Tags/Entries relation when delete an entryNicolas Lœuillet2016-06-231-1/+1
* | Add unread filter test to EntryControllerTestDaniel Bartram2016-06-231-0/+18
* | Add unread filter to entries pagesDaniel Bartram2016-06-2313-0/+32
* | Enhance option in commandNicolas Lœuillet2016-05-273-8/+6
* | Add CLI import for wallabag v2 filesNicolas Lœuillet2016-05-273-33/+52
* | Merge pull request #2112 from Poorchop/docs-proposalNicolas Lœuillet2016-05-262-19/+78
|\ \
| * | Update installation instructionsPoorchop2016-05-231-11/+57
| * | Update FAQPoorchop2016-05-231-8/+21
* | | Merge pull request #2111 from wallabag/translate-android-docu-pics-to-englishNicolas Lœuillet2016-05-2411-10/+10
|\ \ \ | |/ / |/| |
| * | add screenshots of android docu in EnglishSven Fischer2016-05-2311-10/+10
|/ /
* | Merge pull request #2109 from Poorchop/grammarNicolas Lœuillet2016-05-231-11/+11
|\ \ | |/ |/|
| * Improve English translationPoorchop2016-05-231-11/+11
|/
* 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
|\