aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #2160 from wallabag/bin-cs-fixerNicolas Lœuillet2016-06-201-1/+1
|\
| * Update symlink to php-cs-fixerJeremy Benoist2016-06-201-1/+1
|/
* Merge pull request #2155 from wallabag/php-cs-fixerNicolas Lœuillet2016-06-201-1/+1
|\
| * Use friendsofphp instead of fabpotJeremy Benoist2016-06-171-1/+1
* | Merge pull request #2156 from wallabag/delete-redirectNicolas Lœuillet2016-06-201-3/+4
|\ \ | |/ |/|
| * Try to find bad redirection after deleteJeremy Benoist2016-06-171-3/+4
|/
* 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 #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
|/