]>
git.immae.eu Git - github/wallabag/wallabag.git/log
Simounet [Wed, 20 Jul 2016 18:23:55 +0000 (20:23 +0200)]
FIX image inside a figure element max-width (baggy theme)
Simounet [Wed, 20 Jul 2016 17:30:29 +0000 (19:30 +0200)]
FIX image inside a figure element max-width
Nicolas Lœuillet [Wed, 20 Jul 2016 09:38:55 +0000 (11:38 +0200)]
Merge pull request #2195 from wallabag/remove-bin
Remove binary from repo
Jeremy Benoist [Wed, 20 Jul 2016 08:44:46 +0000 (10:44 +0200)]
Remove binary from repo
Since Composer 1.2, binaries are re-installed from vendors if there aren't found.
This avoid us to commit binaries vendors into the repo.
:warning: You have to update your Composer to the 1.2 (`composer selfupdate`)
Nicolas Lœuillet [Tue, 19 Jul 2016 09:24:26 +0000 (11:24 +0200)]
Merge pull request #2048 from wallabag/travis-php-7.1
Run PHP 7.1 on Travis
Jeremy Benoist [Mon, 18 Jul 2016 20:56:02 +0000 (22:56 +0200)]
Merge pull request #2194 from benages/patch-2
Fixed spelling Artúclos --> Artículos
benages [Mon, 18 Jul 2016 19:53:53 +0000 (21:53 +0200)]
Fixed spelling Artúclos --> Artículos
Jeremy Benoist [Mon, 9 May 2016 08:42:11 +0000 (10:42 +0200)]
Run PHP 7.1 on Travis
- Using nightly (as of now it's PHP 7.1 alpha)
- Force guzzle to be at least 5.3.1 (which fix some bugs in PHP 7)
Thomas Citharel [Sat, 2 Jul 2016 10:33:33 +0000 (12:33 +0200)]
Merge pull request #2185 from wallabag/fix-3rd-party-links
Fix 3rd-Party Apps links (Chrome & Firefox)
Thomas Citharel [Sat, 2 Jul 2016 09:56:14 +0000 (11:56 +0200)]
Remove fr part
Thomas Citharel [Sat, 2 Jul 2016 09:50:32 +0000 (11:50 +0200)]
Fix 3rd-Party Apps links (Chrome & Firefox)
Nicolas Lœuillet [Fri, 24 Jun 2016 12:22:47 +0000 (14:22 +0200)]
Merge pull request #2172 from wallabag/more-tests
Change the way to login user in tests
Jeremy Benoist [Fri, 24 Jun 2016 09:55:45 +0000 (11:55 +0200)]
Change the way to login user in tests
Instead of using a HTTP request we just login user like FOSUser does.
It allows us to mock service in container for functional tests.
Also, fix a bad config name in fos_user for firewall
And finally, add functional test to PocketImport
Jeremy Benoist [Fri, 24 Jun 2016 09:28:07 +0000 (11:28 +0200)]
Remove useless spaces
Jeremy Benoist [Thu, 23 Jun 2016 09:38:10 +0000 (11:38 +0200)]
Merge pull request #2157 from wallabag/lower-upper-readingtime
Handle only upper or only lower reading filter
Jeremy Benoist [Thu, 23 Jun 2016 08:46:47 +0000 (10:46 +0200)]
Add some tests about readingTime
Jeremy Benoist [Thu, 23 Jun 2016 08:43:06 +0000 (10:43 +0200)]
Merge pull request #2165 from wallabag/translation-typos
Fix a few french translations typos
Jeremy Benoist [Fri, 17 Jun 2016 22:22:04 +0000 (00:22 +0200)]
fixup! Handle only upper or only lower reading filter
Jeremy Benoist [Fri, 17 Jun 2016 21:48:51 +0000 (23:48 +0200)]
Handle only upper or only lower reading filter
When we select only one value in the reading time filter, we need to perform a query with only one value (greater than OR lower than).
Thomas Citharel [Wed, 22 Jun 2016 19:50:41 +0000 (21:50 +0200)]
Fix a few french translations typos
Nicolas Lœuillet [Thu, 23 Jun 2016 07:18:18 +0000 (09:18 +0200)]
Merge pull request #2132 from wallabag/sf3.1
Jump to Symfony 3.1
Jeremy Benoist [Wed, 22 Jun 2016 21:15:09 +0000 (23:15 +0200)]
Fix bad loading fixtures
Since doctrine/data-fixtures 1.2.0 fixtures seems to be badly loaded.
No time for investigate but reverting back to 1.1.* is fixing issues.
Jeremy Benoist [Wed, 1 Jun 2016 19:27:35 +0000 (21:27 +0200)]
Jump to Symfony 3.1
Nicolas Lœuillet [Mon, 20 Jun 2016 10:11:53 +0000 (12:11 +0200)]
Merge pull request #2160 from wallabag/bin-cs-fixer
Update symlink to php-cs-fixer
Jeremy Benoist [Mon, 20 Jun 2016 09:22:30 +0000 (11:22 +0200)]
Update symlink to php-cs-fixer
Nicolas Lœuillet [Mon, 20 Jun 2016 07:35:55 +0000 (09:35 +0200)]
Merge pull request #2155 from wallabag/php-cs-fixer
Use friendsofphp instead of fabpot
Nicolas Lœuillet [Mon, 20 Jun 2016 07:35:41 +0000 (09:35 +0200)]
Merge pull request #2156 from wallabag/delete-redirect
Try to find bad redirection after delete
Jeremy Benoist [Fri, 17 Jun 2016 20:18:48 +0000 (22:18 +0200)]
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.
Jeremy Benoist [Fri, 17 Jun 2016 20:03:29 +0000 (22:03 +0200)]
Use friendsofphp instead of fabpot
The fabpot's one is now depreacted
Jeremy Benoist [Thu, 16 Jun 2016 04:50:21 +0000 (06:50 +0200)]
Merge pull request #2148 from wallabag/start-german-docu
translate documentation to German
Sven Fischer [Mon, 23 May 2016 19:41:00 +0000 (21:41 +0200)]
translate documentation to German
Jeremy Benoist [Mon, 13 Jun 2016 09:51:37 +0000 (11:51 +0200)]
Merge pull request #2145 from even-allmighty/master
Corrected Regex for lighttpd rewrite
Even Allmighty [Mon, 13 Jun 2016 08:35:05 +0000 (10:35 +0200)]
Corrected Regex for lighttpd rewrite
Nicolas Lœuillet [Tue, 31 May 2016 19:45:01 +0000 (21:45 +0200)]
Merge pull request #2118 from wallabag/prepare-205
Prepare wallabag 2.0.5
Nicolas Lœuillet [Mon, 23 May 2016 14:54:46 +0000 (16:54 +0200)]
Prepare wallabag 2.0.5
Nicolas Lœuillet [Tue, 31 May 2016 09:31:16 +0000 (11:31 +0200)]
Merge pull request #2122 from wallabag/fix-tags-deletion
Fix the deletion of Tags/Entries relation when delete an entry
Jeremy Benoist [Mon, 30 May 2016 12:34:11 +0000 (14:34 +0200)]
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
Jeremy Benoist [Mon, 30 May 2016 12:32:41 +0000 (14:32 +0200)]
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.
Jeremy Benoist [Mon, 30 May 2016 12:18:47 +0000 (14:18 +0200)]
Move fixtures to the right place
Nicolas Lœuillet [Sat, 28 May 2016 11:38:59 +0000 (13:38 +0200)]
Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121
Jeremy Benoist [Fri, 27 May 2016 07:57:51 +0000 (09:57 +0200)]
Merge pull request #2052 from danbartram/feature-filter-unread
Add unread filter to entries pages
Nicolas Lœuillet [Thu, 26 May 2016 18:50:11 +0000 (20:50 +0200)]
Merge pull request #2112 from Poorchop/docs-proposal
Docs proposal
Nicolas Lœuillet [Tue, 24 May 2016 11:41:56 +0000 (13:41 +0200)]
Merge pull request #2111 from wallabag/translate-android-docu-pics-to-english
add screenshots of android docu in English
Sven Fischer [Mon, 23 May 2016 19:16:53 +0000 (21:16 +0200)]
add screenshots of android docu in English
Poorchop [Mon, 23 May 2016 17:22:12 +0000 (13:22 -0400)]
Update installation instructions
-Fix grammar
-Add SELinux section
Poorchop [Mon, 23 May 2016 17:18:20 +0000 (13:18 -0400)]
Update FAQ
-Fix grammar
-Add notes about MTA, firewall, and SELinux
Nicolas Lœuillet [Mon, 23 May 2016 05:50:47 +0000 (07:50 +0200)]
Merge pull request #2109 from Poorchop/grammar
Improve English translation
Poorchop [Mon, 23 May 2016 05:04:17 +0000 (01:04 -0400)]
Improve English translation
Nicolas Lœuillet [Thu, 19 May 2016 07:19:01 +0000 (09:19 +0200)]
Merge pull request #2097 from bmillemathias/issue_2045
Fix image path in 2-factor authentification email
Nicolas Lœuillet [Thu, 19 May 2016 07:18:16 +0000 (09:18 +0200)]
Merge pull request #2098 from wallabag/cs-2092
CS
Jeremy Benoist [Thu, 19 May 2016 05:41:54 +0000 (07:41 +0200)]
CS
Jeremy Benoist [Thu, 19 May 2016 05:39:30 +0000 (07:39 +0200)]
Merge pull request #2092 from Rurik19/issue2089
Starred and Archived clears if article is already exists
Baptiste Mille-Mathias [Wed, 18 May 2016 23:51:50 +0000 (01:51 +0200)]
Forgot a double quote
Baptiste Mille-Mathias [Wed, 18 May 2016 19:18:41 +0000 (21:18 +0200)]
Fix image path in 2-factor authentification email
Fix the broken url to image ressource hosted on wallabag.org
Jeremy Benoist [Wed, 18 May 2016 12:58:50 +0000 (14:58 +0200)]
Merge pull request #2093 from wallabag/replace-dots-material
Replace vertical dots in material theme with horizontal dots
Jeremy Benoist [Wed, 18 May 2016 12:58:45 +0000 (14:58 +0200)]
Merge pull request #2094 from wallabag/update-contributing
Update CONTRIBUTING file
Nicolas Lœuillet [Wed, 18 May 2016 12:33:06 +0000 (14:33 +0200)]
Update CONTRIBUTING file
Fix #2059
Nicolas Lœuillet [Wed, 18 May 2016 12:29:41 +0000 (14:29 +0200)]
Replace vertical dots in material theme with horizontal dots
Yuriy Evdokimov [Wed, 18 May 2016 10:37:07 +0000 (15:37 +0500)]
Tests for issue #2089
Yuriy Evdokimov [Wed, 18 May 2016 05:55:37 +0000 (10:55 +0500)]
PATCH also clears starred and archived signs
Yuriy Evdokimov [Wed, 18 May 2016 05:30:33 +0000 (10:30 +0500)]
Starred and Archived clears if article is already exists
Jeremy Benoist [Fri, 13 May 2016 12:15:01 +0000 (14:15 +0200)]
Merge pull request #2069 from merwan/patch-1
Do not specify language in Firefox addon link
Merouane Atig [Fri, 13 May 2016 09:58:10 +0000 (11:58 +0200)]
Do not specify language in Firefox addon link
Nicolas Lœuillet [Fri, 13 May 2016 07:16:35 +0000 (09:16 +0200)]
Merge pull request #2068 from mariovor/documentation/datadb
Added information about permissions on data/
Mario Vormstein [Thu, 12 May 2016 17:21:27 +0000 (19:21 +0200)]
Added information about permissions on data/
Mario Vormstein [Thu, 12 May 2016 17:10:23 +0000 (19:10 +0200)]
Added information about permissions on data/db
Jeremy Benoist [Wed, 11 May 2016 07:15:24 +0000 (09:15 +0200)]
Merge pull request #2054 from wallabag/jamiroconca-craueconfigbundle-update-1
Update CraueConfigBundle.it.yml
Daniele Conca [Tue, 10 May 2016 22:23:36 +0000 (00:23 +0200)]
Update CraueConfigBundle.it.yml
Daniel Bartram [Mon, 9 May 2016 18:48:28 +0000 (19:48 +0100)]
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.
Nicolas Lœuillet [Mon, 9 May 2016 18:00:40 +0000 (20:00 +0200)]
Merge pull request #2049 from joshp23/patch-1
Update api.rst
Josh Panter [Mon, 9 May 2016 15:27:27 +0000 (11:27 -0400)]
Update api.rst
Daniel Bartram [Mon, 9 May 2016 13:19:09 +0000 (14:19 +0100)]
Add unread filter to entries pages
Add the ability to filter for unread pages in the filters menu.
Josh Panter [Mon, 9 May 2016 12:51:45 +0000 (08:51 -0400)]
Update api.rst
I just used google translate for this bit ... I really don't know any French ;)
Nicolas Lœuillet [Mon, 9 May 2016 02:39:59 +0000 (04:39 +0200)]
Merge pull request #2044 from joshp23/patch-1
Update api.rst
Josh Panter [Sun, 8 May 2016 22:04:14 +0000 (18:04 -0400)]
Update api.rst
Added my plugin, renamed the resource section for better english. Propose that the third party resource section have it's own page.
Nicolas Lœuillet [Sun, 8 May 2016 06:47:48 +0000 (08:47 +0200)]
Merge pull request #2038 from foxmask/master
new details in the doc about the rights access again;)
Olivier Demah [Sat, 7 May 2016 20:55:19 +0000 (22:55 +0200)]
new details in the doc about the rgihts access again;)
Nicolas Lœuillet [Sat, 7 May 2016 17:58:31 +0000 (19:58 +0200)]
Merge pull request #2035 from wallabag/prepare-204
Prepare wallabag 2.0.4
Nicolas Lœuillet [Sat, 7 May 2016 11:39:55 +0000 (13:39 +0200)]
Update changelog
Jeremy Benoist [Sat, 7 May 2016 13:28:30 +0000 (15:28 +0200)]
Merge pull request #2023 from wallabag/fix-validators-translation
Fix translation for validators
Nicolas Lœuillet [Sat, 7 May 2016 11:26:55 +0000 (13:26 +0200)]
Prepare wallabag 2.0.4
Nicolas Lœuillet [Tue, 3 May 2016 20:06:07 +0000 (22:06 +0200)]
Fix translation for validators
Fix #2003
Jeremy Benoist [Sat, 7 May 2016 09:10:21 +0000 (11:10 +0200)]
Merge pull request #2016 from wallabag/update-documentation
Update documentation
Jeremy Benoist [Sat, 7 May 2016 09:09:37 +0000 (11:09 +0200)]
Merge pull request #2020 from wallabag/fix-number-entries-per-tag
Fix number of entries in tag/list
Jeremy Benoist [Sat, 7 May 2016 09:08:40 +0000 (11:08 +0200)]
Merge pull request #2024 from wallabag/jamiroconca-patch-messages-it
Update messages.it.yml
Daniele Conca [Thu, 5 May 2016 15:32:49 +0000 (17:32 +0200)]
Update messages.it.yml
other translations added
Jeremy Benoist [Thu, 5 May 2016 13:43:17 +0000 (15:43 +0200)]
Merge pull request #2029 from wallabag/change-readme
Change Travis/Scrutinizer pictures in README
Nicolas Lœuillet [Thu, 5 May 2016 13:21:12 +0000 (15:21 +0200)]
Change Travis/Scrutinizer pictures in README
Nicolas Lœuillet [Thu, 5 May 2016 12:38:17 +0000 (14:38 +0200)]
Merge pull request #2028 from wallabag/docu-for-android-app
Docu for android app
Nicolas Lœuillet [Thu, 5 May 2016 11:55:39 +0000 (13:55 +0200)]
Change documentation about Pocket import
Fix wallabag/docker#8
Sven Fischer [Thu, 5 May 2016 09:24:04 +0000 (11:24 +0200)]
android docu: Wallabag > wallabag (no uppercase)
Sven Fischer [Wed, 4 May 2016 21:25:49 +0000 (23:25 +0200)]
add first draft of Android app documentation
Nicolas Lœuillet [Wed, 4 May 2016 12:42:14 +0000 (14:42 +0200)]
Add documentation to know how to contribute to the documentation :trollface:
Daniele Conca [Wed, 4 May 2016 09:59:07 +0000 (11:59 +0200)]
Update messages.it.yml
Nicolas Lœuillet [Wed, 4 May 2016 09:42:52 +0000 (11:42 +0200)]
Rename getEntriesByUser method to getEntriesByUserId
Nicolas Lœuillet [Wed, 4 May 2016 09:40:13 +0000 (11:40 +0200)]
Fix lighttpd documentation
Nicolas Lœuillet [Wed, 4 May 2016 08:18:08 +0000 (10:18 +0200)]
Merge pull request #2022 from wallabag/fix-pagination-bar
Fix pagination bar on small devices
Nicolas Lœuillet [Wed, 4 May 2016 04:52:26 +0000 (06:52 +0200)]
Add Third resources for wallabag API
Nicolas Lœuillet [Tue, 3 May 2016 19:44:57 +0000 (21:44 +0200)]
Add pagination bar at the bottom of the page
Fix #2021
Nicolas Lœuillet [Tue, 3 May 2016 19:27:07 +0000 (21:27 +0200)]
Fix pagination bar on small devices
Fix #2008