aboutsummaryrefslogtreecommitdiffhomepage
Commit message (Collapse)AuthorAgeFilesLines
* Change ManyToMany between entry & tagJeremy Benoist2016-06-234-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 failedJeremy Benoist2016-06-2312-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 placeJeremy Benoist2016-06-232-6/+8
|
* Fix the deletion of Tags/Entries relation when delete an entryNicolas Lœuillet2016-06-231-1/+1
| | | | Fix #2121
* Add unread filter test to EntryControllerTestDaniel Bartram2016-06-231-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 pagesDaniel Bartram2016-06-2313-0/+32
| | | | Add the ability to filter for unread pages in the filters menu.
* 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
|\ | | | | Docs proposal
| * Update installation instructionsPoorchop2016-05-231-11/+57
| | | | | | | | | | -Fix grammar -Add SELinux section
| * Update FAQPoorchop2016-05-231-8/+21
| | | | | | | | | | -Fix grammar -Add notes about MTA, firewall, and SELinux
* | Merge pull request #2111 from wallabag/translate-android-docu-pics-to-englishNicolas Lœuillet2016-05-2411-10/+10
|\ \ | |/ |/| add screenshots of android docu in English
| * 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 translation
| * Improve English translationPoorchop2016-05-231-11/+11
|/
* Merge pull request #2097 from bmillemathias/issue_2045Nicolas Lœuillet2016-05-191-1/+1
|\ | | | | Fix image path in 2-factor authentification email
| * Forgot a double quoteBaptiste Mille-Mathias2016-05-191-1/+1
| |
| * Fix image path in 2-factor authentification emailBaptiste Mille-Mathias2016-05-181-1/+1
| | | | | | | | Fix the broken url to image ressource hosted on wallabag.org
* | Merge pull request #2098 from wallabag/cs-2092Nicolas Lœuillet2016-05-191-4/+3
|\ \ | | | | | | CS
| * | CSJeremy Benoist2016-05-191-4/+3
|/ /
* | Merge pull request #2092 from Rurik19/issue2089Jeremy Benoist2016-05-192-4/+92
|\ \ | |/ |/| Starred and Archived clears if article is already exists
| * 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 dots
| * | 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 file
| * Update CONTRIBUTING fileNicolas Lœuillet2016-05-181-14/+3
|/ | | | Fix #2059
* Merge pull request #2069 from merwan/patch-1Jeremy Benoist2016-05-131-1/+1
|\ | | | | Do not specify language in Firefox addon link
| * 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/
| * 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.yml
| * 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.rst
| * Update api.rstJosh Panter2016-05-091-1/+1
| |
| * Update api.rstJosh Panter2016-05-091-0/+1
|/ | | I just used google translate for this bit ... I really don't know any French ;)
* Merge pull request #2044 from joshp23/patch-1Nicolas Lœuillet2016-05-091-1/+2
|\ | | | | Update api.rst
| * Update api.rstJosh Panter2016-05-081-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/masterNicolas Lœuillet2016-05-082-0/+45
|\ | | | | new details in the doc about the rights access again;)
| * 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
|\ | | | | Prepare wallabag 2.0.4
| * 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 validators
| * Fix translation for validatorsNicolas Lœuillet2016-05-0724-79/+68
|/ | | | Fix #2003
* Merge pull request #2016 from wallabag/update-documentationJeremy Benoist2016-05-0721-181/+307
|\ | | | | Update documentation
| * Change documentation about Pocket importNicolas Lœuillet2016-05-052-2/+2
| | | | | | | | Fix wallabag/docker#8
| * Add documentation to know how to contribute to the documentation :trollface:Nicolas Lœuillet2016-05-044-0/+26
| |