]>
git.immae.eu Git - github/wallabag/wallabag.git/log
Thomas Citharel [Fri, 1 Jul 2016 11:59:30 +0000 (13:59 +0200)]
Bring tags on entries view to baggy
Also, a couple of UI improvement and CSS fixing
Nicolas Lœuillet [Fri, 1 Jul 2016 08:35:45 +0000 (10:35 +0200)]
Merge pull request #2174 from wallabag/api-filter-tags
Add filter for tags on API
Thomas Citharel [Wed, 29 Jun 2016 18:52:37 +0000 (20:52 +0200)]
fix merge issue
Thomas Citharel [Sat, 25 Jun 2016 14:27:38 +0000 (16:27 +0200)]
Add filter for tags on API
Nicolas Lœuillet [Wed, 29 Jun 2016 07:34:39 +0000 (09:34 +0200)]
Merge pull request #2176 from wallabag/add-since-parameter
Add since parameter
Thomas Citharel [Sat, 25 Jun 2016 21:19:21 +0000 (23:19 +0200)]
CS
Thomas Citharel [Sat, 25 Jun 2016 19:05:50 +0000 (21:05 +0200)]
Add since parameter
Nicolas Lœuillet [Fri, 24 Jun 2016 12:23:38 +0000 (14:23 +0200)]
Merge pull request #2170 from wallabag/addTagsOnEntriesView
Add tags on entries view and minor ui fixes
Thomas Citharel [Fri, 24 Jun 2016 10:07:45 +0000 (12:07 +0200)]
uniformize tags on article view too
Thomas Citharel [Fri, 24 Jun 2016 09:45:42 +0000 (11:45 +0200)]
add line to other languages
Jeremy Benoist [Fri, 24 Jun 2016 07:20:52 +0000 (09:20 +0200)]
Merge pull request #2169 from wallabag/fix-fonts
fix font paths
Thomas Citharel [Thu, 23 Jun 2016 21:13:25 +0000 (23:13 +0200)]
minor ui fixes
Thomas Citharel [Thu, 23 Jun 2016 20:51:09 +0000 (22:51 +0200)]
fix typo on icons
Thomas Citharel [Thu, 23 Jun 2016 07:06:54 +0000 (09:06 +0200)]
Add tags on entries view
Should be tested on old browsers
Thomas Citharel [Thu, 23 Jun 2016 20:10:12 +0000 (22:10 +0200)]
fix font paths
Nicolas Lœuillet [Thu, 23 Jun 2016 13:09:57 +0000 (15:09 +0200)]
Merge pull request #2168 from wallabag/fix-npm-dep-old-nodejs
Add modules when NodeJS versions are too low.
Thomas Citharel [Thu, 23 Jun 2016 12:34:59 +0000 (14:34 +0200)]
Add modules when NodeJS versions are too low.
And eventually one required anyway.
Jeremy Benoist [Thu, 23 Jun 2016 09:47:46 +0000 (11:47 +0200)]
Merge branch 'master' into 2.1
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:25:01 +0000 (09:25 +0200)]
Merge pull request #2142 from wallabag/v2-use-npm
Manage assets through npm
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 [Mon, 20 Jun 2016 09:22:30 +0000 (11:22 +0200)]
Update symlink to php-cs-fixer
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
Sven Fischer [Mon, 23 May 2016 19:41:00 +0000 (21:41 +0200)]
translate documentation to German
Even Allmighty [Mon, 13 Jun 2016 08:35:05 +0000 (10:35 +0200)]
Corrected Regex for lighttpd rewrite
Nicolas Lœuillet [Mon, 23 May 2016 14:54:46 +0000 (16:54 +0200)]
Prepare wallabag 2.0.5
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
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.
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.
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
Thomas Citharel [Thu, 9 Jun 2016 18:08:57 +0000 (20:08 +0200)]
trailing comma
Thomas Citharel [Thu, 9 Jun 2016 17:07:41 +0000 (19:07 +0200)]
remove block added twice
Thomas Citharel [Thu, 9 Jun 2016 17:02:38 +0000 (19:02 +0200)]
clean & lint stuff
Thomas Citharel [Tue, 8 Mar 2016 16:02:34 +0000 (17:02 +0100)]
manage assets through npm
first draft
remote assetic totally
work
nearly there
use at least nodejs > 0.12
use proper version of grunt
bump nodejs version for travis
update npm
workaround for materialize
install node 5.0
add grunt-cli
baggy theme & cache node modules
cache bower & npm
make travis build assets on php7 only
exclude installing node & npm if not needed & use bash
clean & try to make icomoon work on baggy
ready
config for travis
rebase
make travis work
more travis work
impove travis & update deps
add missing pixrem deps
add module through oddly lost
ui updates
install latest nodejs
add install_dev.sh, link local binaries for npm/bower/grunt
ui improvements (mostly baggy)
fix travis build
no need to install on travis
Add unread filter to entries pages
Add the ability to filter for unread pages in the filters menu.
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.
Improve English translation
Update FAQ
-Fix grammar
-Add notes about MTA, firewall, and SELinux
Update installation instructions
-Fix grammar
-Add SELinux section
add screenshots of android docu in English
Fix the deletion of Tags/Entries relation when delete an entry
Fix #2121
Move fixtures to the right place
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.
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
Prepare wallabag 2.0.5
enforce older materialize version
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, 28 Apr 2016 11:41:36 +0000 (13:41 +0200)]
Enhance option in command
Nicolas Lœuillet [Wed, 27 Apr 2016 18:30:24 +0000 (20:30 +0200)]
Add CLI import for wallabag v2 files
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;)