Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Try to find bad redirection after delete | Jeremy Benoist | 2016-06-23 | 1 | -3/+4 |
| | | | | | Instead of checking for the whole absolute url, we just check with the relative url. If the referer ends with the relative url of the deleted entry, don't redirect to the referer. | ||||
* | Use friendsofphp instead of fabpot | Jeremy Benoist | 2016-06-23 | 1 | -1/+1 |
| | | | | The fabpot's one is now depreacted | ||||
* | translate documentation to German | Sven Fischer | 2016-06-23 | 23 | -2/+1443 |
| | |||||
* | Corrected Regex for lighttpd rewrite | Even Allmighty | 2016-06-23 | 1 | -1/+1 |
| | |||||
* | Prepare wallabag 2.0.5 | Nicolas Lœuillet | 2016-06-23 | 5 | -4/+24 |
| | |||||
* | Change ManyToMany between entry & tag | Jeremy Benoist | 2016-06-23 | 4 | -7/+68 |
| | | | | | | | | | | | | Following https://gist.github.com/Ocramius/3121916 Be sure to remove the related entity when removing an entity. Let say you have Entry -> EntryTag -> Tag. If you remove the entry: - before that commit, the EntryTag will stay (at least using SQLite). - with that commit, the related entity is removed | ||||
* | Display a message when saving an entry failed | Jeremy Benoist | 2016-06-23 | 12 | -27/+45 |
| | | | | | When saving an entry fail because of database error we previously just returned `false`. Now we got an error in the log and the displayed notice to the user is updated too. | ||||
* | Move fixtures to the right place | Jeremy Benoist | 2016-06-23 | 2 | -6/+8 |
| | |||||
* | Fix the deletion of Tags/Entries relation when delete an entry | Nicolas Lœuillet | 2016-06-23 | 1 | -1/+1 |
| | | | | Fix #2121 | ||||
* | Add unread filter test to EntryControllerTest | Daniel Bartram | 2016-06-23 | 1 | -0/+18 |
| | | | | | | Add a new test to the EntryControllerTest collection which checks that only entries which have not been archived (and are treated as "unread") are retrieved. | ||||
* | Add unread filter to entries pages | Daniel Bartram | 2016-06-23 | 13 | -0/+32 |
| | | | | Add the ability to filter for unread pages in the filters menu. | ||||
* | Enhance option in command | Nicolas Lœuillet | 2016-05-27 | 3 | -8/+6 |
| | |||||
* | Add CLI import for wallabag v2 files | Nicolas Lœuillet | 2016-05-27 | 3 | -33/+52 |
| | |||||
* | Merge pull request #2112 from Poorchop/docs-proposal | Nicolas Lœuillet | 2016-05-26 | 2 | -19/+78 |
|\ | | | | | Docs proposal | ||||
| * | Update installation instructions | Poorchop | 2016-05-23 | 1 | -11/+57 |
| | | | | | | | | | | -Fix grammar -Add SELinux section | ||||
| * | Update FAQ | Poorchop | 2016-05-23 | 1 | -8/+21 |
| | | | | | | | | | | -Fix grammar -Add notes about MTA, firewall, and SELinux | ||||
* | | Merge pull request #2111 from wallabag/translate-android-docu-pics-to-english | Nicolas Lœuillet | 2016-05-24 | 11 | -10/+10 |
|\ \ | |/ |/| | add screenshots of android docu in English | ||||
| * | 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 |
| | |