aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
...
| * Merge pull request #2148 from wallabag/start-german-docuJeremy Benoist2016-06-1623-2/+1443
| |\
| | * translate documentation to GermanSven Fischer2016-06-1623-2/+1443
| * | Merge pull request #2145 from even-allmighty/masterJeremy Benoist2016-06-131-1/+1
| |\|
| | * Corrected Regex for lighttpd rewriteEven Allmighty2016-06-131-1/+1
| |/
| * Merge pull request #2118 from wallabag/prepare-205Nicolas Lœuillet2016-05-315-4/+24
| |\
| | * Prepare wallabag 2.0.5Nicolas Lœuillet2016-05-315-5/+25
| * | Merge pull request #2122 from wallabag/fix-tags-deletionNicolas Lœuillet2016-05-3117-41/+122
| |\ \
| | * | Change ManyToMany between entry & tagJeremy Benoist2016-05-314-7/+68
| | * | Display a message when saving an entry failedJeremy Benoist2016-05-3012-27/+45
| | * | Move fixtures to the right placeJeremy Benoist2016-05-302-6/+8
| | * | Fix the deletion of Tags/Entries relation when delete an entryNicolas Lœuillet2016-05-281-1/+1
| | |/
| * | Merge pull request #2052 from danbartram/feature-filter-unreadJeremy Benoist2016-05-2714-0/+50
| |\ \
| | * | Add unread filter test to EntryControllerTestDaniel Bartram2016-05-091-0/+18
| | * | Add unread filter to entries pagesDaniel Bartram2016-05-0913-0/+32
* | | | 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
|\ \ \