Commit graph

2485 commits

Author SHA1 Message Date
Nicolas Lœuillet 891a026e31 Merge pull request #2160 from wallabag/bin-cs-fixer
Update symlink to php-cs-fixer
2016-06-20 12:11:53 +02:00
Jeremy Benoist 2f30eed236 Update symlink to php-cs-fixer 2016-06-20 11:22:30 +02:00
Nicolas Lœuillet 247cf4897a Merge pull request #2155 from wallabag/php-cs-fixer
Use friendsofphp instead of fabpot
2016-06-20 09:35:55 +02:00
Nicolas Lœuillet 3c552f0d04 Merge pull request #2156 from wallabag/delete-redirect
Try to find bad redirection after delete
2016-06-20 09:35:41 +02:00
Jeremy Benoist ce0e9ec31b Try to find bad redirection after delete
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.
2016-06-17 22:18:48 +02:00
Jeremy Benoist d71b600599 Use friendsofphp instead of fabpot
The fabpot's one is now depreacted
2016-06-17 22:03:29 +02:00
Jeremy Benoist 77c530f43c Merge pull request #2148 from wallabag/start-german-docu
translate documentation to German
2016-06-16 06:50:21 +02:00
Sven Fischer 429480357f translate documentation to German 2016-06-16 00:39:48 +02:00
Jeremy Benoist d220a95121 Merge pull request #2145 from even-allmighty/master
Corrected Regex for lighttpd rewrite
2016-06-13 11:51:37 +02:00
Even Allmighty 02d10905b3 Corrected Regex for lighttpd rewrite 2016-06-13 10:35:05 +02:00
Nicolas Lœuillet 1584067028 Merge pull request #2118 from wallabag/prepare-205
Prepare wallabag 2.0.5
2016-05-31 21:45:01 +02:00
Nicolas Lœuillet 17dfff6918 Prepare wallabag 2.0.5 2016-05-31 21:18:22 +02:00
Nicolas Lœuillet f329e769fd Merge pull request #2122 from wallabag/fix-tags-deletion
Fix the deletion of Tags/Entries relation when delete an entry
2016-05-31 11:31:16 +02:00
Jeremy Benoist 3be047456d Change ManyToMany between entry & tag
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
2016-05-31 10:01:03 +02:00
Jeremy Benoist 39ba51ca1a Display a message when saving an entry failed
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.
2016-05-30 14:32:43 +02:00
Jeremy Benoist 2c045a210a Move fixtures to the right place 2016-05-30 14:18:47 +02:00
Nicolas Lœuillet f41c840b8c
Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121
2016-05-28 13:38:59 +02:00
Jeremy Benoist 839475776b Merge pull request #2052 from danbartram/feature-filter-unread
Add unread filter to entries pages
2016-05-27 09:57:51 +02:00
Nicolas Lœuillet 7b67f785ff Merge pull request #2112 from Poorchop/docs-proposal
Docs proposal
2016-05-26 20:50:11 +02:00
Nicolas Lœuillet c15a150d2e Merge pull request #2111 from wallabag/translate-android-docu-pics-to-english
add screenshots of android docu in English
2016-05-24 13:41:56 +02:00
Sven Fischer 92491227c1 add screenshots of android docu in English 2016-05-23 21:16:53 +02:00
Poorchop b5fa6607a9 Update installation instructions
-Fix grammar
-Add SELinux section
2016-05-23 13:22:12 -04:00
Poorchop 4127d7ad1b Update FAQ
-Fix grammar
-Add notes about MTA, firewall, and SELinux
2016-05-23 13:18:20 -04:00
Nicolas Lœuillet 2857aaa994 Merge pull request #2109 from Poorchop/grammar
Improve English translation
2016-05-23 07:50:47 +02:00
Poorchop 8fef96ee9f Improve English translation 2016-05-23 01:04:17 -04:00
Nicolas Lœuillet 9f95b14dec Merge pull request #2097 from bmillemathias/issue_2045
Fix image path in 2-factor authentification email
2016-05-19 09:19:01 +02:00
Nicolas Lœuillet 151f046f61 Merge pull request #2098 from wallabag/cs-2092
CS
2016-05-19 09:18:16 +02:00
Jeremy Benoist 6922168420 CS 2016-05-19 07:41:54 +02:00
Jeremy Benoist e7658cb009 Merge pull request #2092 from Rurik19/issue2089
Starred and Archived clears if article is already exists
2016-05-19 07:39:30 +02:00
Baptiste Mille-Mathias 2dcb1dbf05 Forgot a double quote 2016-05-19 01:51:50 +02:00
Baptiste Mille-Mathias 871f667a55 Fix image path in 2-factor authentification email
Fix the broken url to image ressource hosted on wallabag.org
2016-05-18 21:18:41 +02:00
Jeremy Benoist d30ec39008 Merge pull request #2093 from wallabag/replace-dots-material
Replace vertical dots in material theme with horizontal dots
2016-05-18 14:58:50 +02:00
Jeremy Benoist 8baf3d4bda Merge pull request #2094 from wallabag/update-contributing
Update CONTRIBUTING file
2016-05-18 14:58:45 +02:00
Nicolas Lœuillet 953305e904
Update CONTRIBUTING file
Fix #2059
2016-05-18 14:33:06 +02:00
Nicolas Lœuillet 9b40422594
Replace vertical dots in material theme with horizontal dots 2016-05-18 14:29:41 +02:00
Yuriy Evdokimov bba271e619 Tests for issue #2089 2016-05-18 15:37:07 +05:00
Yuriy Evdokimov 614a0bfd86 PATCH also clears starred and archived signs 2016-05-18 15:28:49 +05:00
Yuriy Evdokimov 873e380658 Starred and Archived clears if article is already exists 2016-05-18 10:30:33 +05:00
Jeremy Benoist cac3f603cf Merge pull request #2069 from merwan/patch-1
Do not specify language in Firefox addon link
2016-05-13 14:15:01 +02:00
Merouane Atig 5f2971e1d4 Do not specify language in Firefox addon link 2016-05-13 11:58:10 +02:00
Nicolas Lœuillet f7e714bde7 Merge pull request #2068 from mariovor/documentation/datadb
Added information about permissions on data/
2016-05-13 09:16:35 +02:00
Mario Vormstein 458854f1e4 Added information about permissions on data/ 2016-05-12 19:21:27 +02:00
Mario Vormstein e0f953a5a6 Added information about permissions on data/db 2016-05-12 19:10:23 +02:00
Jeremy Benoist 12f8631e8a Merge pull request #2054 from wallabag/jamiroconca-craueconfigbundle-update-1
Update CraueConfigBundle.it.yml
2016-05-11 09:15:24 +02:00
Daniele Conca 9b8d1d8bbf Update CraueConfigBundle.it.yml 2016-05-11 00:23:36 +02:00
Daniel Bartram 30334567a3 Add unread filter test to EntryControllerTest
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.
2016-05-09 19:48:28 +01:00
Nicolas Lœuillet e2f2f61001 Merge pull request #2049 from joshp23/patch-1
Update api.rst
2016-05-09 20:00:40 +02:00
Josh Panter 4ca4d1b3b1 Update api.rst 2016-05-09 11:27:27 -04:00
Daniel Bartram 733b2cf19b Add unread filter to entries pages
Add the ability to filter for unread pages in the filters menu.
2016-05-09 14:56:52 +01:00
Josh Panter acd3c26a74 Update api.rst
I just used google translate for this bit ... I really don't know any French ;)
2016-05-09 08:51:45 -04:00