1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-29 02:50:29 +00:00
Commit graph

854 commits

Author SHA1 Message Date
Jeremy Benoist
0faeabefa7 Merge remote-tracking branch 'origin/master' into 2.1 2016-07-20 12:02:02 +02:00
benages
57b62cbf79 Fixed spelling Artúclos --> Artículos 2016-07-18 21:53:53 +02:00
Thomas Citharel
8d4152f70d
Remove fr part 2016-07-02 11:56:14 +02:00
Thomas Citharel
baef8ea26c
Fix 3rd-Party Apps links (Chrome & Firefox) 2016-07-02 11:50:32 +02:00
Thomas Citharel
1d4d9aaf29
Bring tags on entries view to baggy
Also, a couple of UI improvement and CSS fixing
2016-07-01 13:59:30 +02:00
Thomas Citharel
4f0558a0d4 fix merge issue 2016-06-29 20:52:37 +02:00
Thomas Citharel
28803f106b Add filter for tags on API 2016-06-29 09:55:57 +02:00
Thomas Citharel
e43c78abd9 CS 2016-06-25 23:19:21 +02:00
Thomas Citharel
e5fb89e5d3 Add since parameter 2016-06-25 21:05:50 +02:00
Thomas Citharel
e7aed21b33 add line to other languages 2016-06-24 11:45:42 +02:00
Thomas Citharel
a15022db96 minor ui fixes 2016-06-23 23:13:25 +02:00
Thomas Citharel
91826e3ca2 fix typo on icons 2016-06-23 22:51:09 +02:00
Thomas Citharel
25dc07d3c9 Add tags on entries view
Should be tested on old browsers
2016-06-23 22:50:39 +02:00
Jeremy Benoist
f49d9ca383 Merge branch 'master' into 2.1 2016-06-23 11:47:46 +02:00
Jeremy Benoist
fb5c17a9ab Merge pull request from wallabag/lower-upper-readingtime
Handle only upper or only lower reading filter
2016-06-23 11:38:10 +02:00
Jeremy Benoist
2c00dddf01 fixup! Handle only upper or only lower reading filter 2016-06-23 09:41:30 +02:00
Jeremy Benoist
1bdbc39f02 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).
2016-06-23 09:41:30 +02:00
Thomas Citharel
b46124cb9b Fix a few french translations typos 2016-06-23 09:38:49 +02:00
Nicolas Lœuillet
49e2854d5c Merge pull request from wallabag/v2-use-npm
Manage assets through npm
2016-06-23 09:25:01 +02:00
Jeremy Benoist
4e411208cc 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-23 09:15:50 +02:00
Jeremy Benoist
e42b13bcff 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-06-23 09:15:50 +02:00
Jeremy Benoist
6334f2cac1 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-06-23 09:15:50 +02:00
Jeremy Benoist
f06f840c9d Move fixtures to the right place 2016-06-23 09:15:50 +02:00
Nicolas Lœuillet
af95c09c80 Fix the deletion of Tags/Entries relation when delete an entry
Fix 
2016-06-23 09:15:50 +02:00
Daniel Bartram
26ed851f52 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-06-23 09:15:50 +02:00
Daniel Bartram
710f8e69d7 Add unread filter to entries pages
Add the ability to filter for unread pages in the filters menu.
2016-06-23 09:15:50 +02:00
Jeremy Benoist
23634d5d84 Jump to Symfony 3.1 2016-06-22 17:59:35 +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
Thomas Citharel
2e24d12027 remove block added twice 2016-06-09 19:07:41 +02:00
Thomas Citharel
5ecdfcd041 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 

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
2016-06-09 17:12:51 +02:00
Nicolas Lœuillet
f329e769fd Merge pull request 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 
2016-05-28 13:38:59 +02:00
Jeremy Benoist
839475776b Merge pull request from danbartram/feature-filter-unread
Add unread filter to entries pages
2016-05-27 09:57:51 +02:00
Nicolas Lœuillet
235026e2c7 Enhance option in command 2016-05-27 09:43:49 +02:00
Nicolas Lœuillet
3fad6c74fe Add CLI import for wallabag v2 files 2016-05-27 09:43:48 +02:00
Poorchop
8fef96ee9f Improve English translation 2016-05-23 01:04:17 -04:00
Nicolas Lœuillet
9f95b14dec Merge pull request from bmillemathias/issue_2045
Fix image path in 2-factor authentification email
2016-05-19 09:19:01 +02:00
Jeremy Benoist
6922168420 CS 2016-05-19 07:41:54 +02:00
Jeremy Benoist
e7658cb009 Merge pull request 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
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 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
Merouane Atig
5f2971e1d4 Do not specify language in Firefox addon link 2016-05-13 11:58:10 +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
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
Nicolas Lœuillet
1221f5315d Fix translation for validators
Fix 
2016-05-07 13:24:14 +02:00
Jeremy Benoist
f54de6817e Merge pull request from wallabag/fix-number-entries-per-tag
Fix number of entries in tag/list
2016-05-07 11:09:37 +02:00
Daniele Conca
a0640406b4 Update messages.it.yml
other translations added
2016-05-05 17:32:49 +02:00
Daniele Conca
bb7a39d1ed Update messages.it.yml 2016-05-04 11:59:07 +02:00
Nicolas Lœuillet
d9926005b1 Rename getEntriesByUser method to getEntriesByUserId 2016-05-04 11:42:52 +02:00
Nicolas Lœuillet
09e5b9391e
Add pagination bar at the bottom of the page
Fix 
2016-05-03 21:44:57 +02:00
Nicolas Lœuillet
e7cd089fa6
Fix pagination bar on small devices
Fix 
2016-05-03 21:27:07 +02:00
Nicolas Lœuillet
12c697562e
Fix number of entries in tag/list
Fix 
2016-05-03 21:12:40 +02:00
Daniele Conca
439c7e41a3 Create messages.it.yml
baseline for italian translations (cloned from english)
2016-05-03 18:16:36 +02:00
Jeremy Benoist
97c8eb3c23 Merge pull request from wallabag/fix-display-all-tags
Fix tags listing
2016-05-03 10:07:34 +02:00
Nicolas Lœuillet
e9023a16eb Remove useless method 2016-05-03 09:39:34 +02:00
Jeremy Benoist
2142c714ef Merge pull request from wallabag/fix-filter-readingTime
Fix filter reading time
2016-05-03 09:05:31 +02:00
Jeremy Benoist
045859a2b5 Merge pull request from wallabag/fix-readingspeed-not-defined
Fix reading speed not defined when user was created via config page
2016-05-03 09:04:02 +02:00
Nicolas Lœuillet
2a007fe43d
Fix tags listing
Fix 
* Remove unused method in tag repository
2016-05-02 21:32:47 +02:00
Nicolas Lœuillet
c4c062cce0
Add test to check reading time filter 2016-05-02 21:14:23 +02:00
Nicolas Lœuillet
8389074180
Add test for creation of new user in config page 2016-05-02 20:19:57 +02:00
Nicolas Lœuillet
51a15609b3 Set the title via POST /api/entries
Fix 
2016-05-02 12:50:42 +02:00
Nicolas Lœuillet
823397f2d6
Fix reading speed not defined when user was created via config page
Fix 
2016-04-30 15:06:31 +02:00
Jeremy Benoist
10cc2785a0 Fix indentations in ES translation 2016-04-24 20:53:11 +02:00
jami7
acc371a129 Update messages.es.yml 2016-04-24 20:48:16 +02:00
jami7
ef37b9af71 Update messages.es.yml 2016-04-24 20:48:16 +02:00
Nicolas Lœuillet
d6a9e139dc
Fix tests 2016-04-24 20:46:25 +02:00
Nicolas Lœuillet
d8f8a59010
Fix wrong reading time when apply filters 2016-04-24 20:24:23 +02:00
Nicolas Lœuillet
2499cdbf29
Fix translation for Go to your account button after subscription
Fix 
2016-04-20 15:53:20 +02:00
Nicolas Lœuillet
4a25bef077
Update links in documentation 2016-04-19 20:03:34 +02:00
Nicolas Lœuillet
23d24b1750
Add tests 2016-04-18 15:29:57 +02:00
Nicolas Lœuillet
dc12084d93 Add doctrine clear after flush, thanks to @BitOne talk at Symfony Live 2016-04-18 14:48:18 +02:00
Thomas Citharel
0907a72c64 Merge pull request from wallabag/hide-pagination
Display pagination only if we have more than one page
2016-04-18 09:41:56 +02:00
Nicolas Lœuillet
188b74b6df Display pagination only if we have more than one page 2016-04-18 09:03:21 +02:00
jami7
5c2c1a6434 Update messages.es.yml 2016-04-16 14:04:39 -10:00
Nicolas Lœuillet
1f034a3316
Hide pagination if we only have one entry to display 2016-04-16 07:19:30 +02:00
Nicolas Lœuillet
d1f4996b77 Merge pull request from wallabag/fix-redirect-without-referer
Redirect to homepage if referer is null
2016-04-15 17:52:33 +02:00
Nicolas Lœuillet
2d899e8d30
Change guid and link in RSS feeds to give original entry URL
Fix 
2016-04-15 16:07:34 +02:00
Nicolas Lœuillet
345d74268b
Fix redirect when delete entry 2016-04-15 15:39:00 +02:00
Nicolas Lœuillet
4086e0782e
Fix tests 2016-04-15 09:58:29 +02:00
Nicolas Lœuillet
af497a641c
Redirect to homepage if referer is null
Fix 
2016-04-15 07:58:01 +02:00
Nicolas Lœuillet
f2e5fdc366 Merge pull request from wallabag/cleanup
Convert array + phpDoc
2016-04-13 09:43:14 +02:00
Jeremy Benoist
a417b86923 Merge pull request from wallabag/improve-pagination
Improve pagination when user has lot of entries
2016-04-13 09:42:18 +02:00
Nicolas Lœuillet
18078ded12
Fix indentation 2016-04-13 09:20:01 +02:00
Nicolas Lœuillet
c31ea8a409
Remove useless dependancy 2016-04-12 21:47:16 +02:00
Nicolas Lœuillet
c95e39c51a
Lost in translation pager 2016-04-12 20:38:56 +02:00
Nicolas Lœuillet
63995be5ee
Fix display for Next/Previous link when they are disabled 2016-04-12 18:03:40 +02:00
Nicolas Lœuillet
1880da7420
Restore old behavior for OutOfRangeCurrentPageException 2016-04-12 16:40:18 +02:00
Nicolas Lœuillet
76cd8dbb05
Fix tests 2016-04-12 16:32:01 +02:00
Nicolas Lœuillet
624a7c6df1
Improve pagination when user has lot of entries
Fix 
* Usage of whiteoctober/WhiteOctoberPagerfantaBundle
2016-04-12 16:04:17 +02:00
Nicolas Lœuillet
80bd17f00d Merge pull request from wallabag/title-on-title-entry
add title hover on entry titles
2016-04-12 14:54:59 +02:00
Thomas Citharel
1b8b3859c0 Add title hover on entry titles 2016-04-12 14:30:42 +02:00
Jeremy Benoist
443cff9840 Fix MySQL tests on HHVM 2016-04-12 12:37:10 +02:00
Jeremy Benoist
4094ea4771 Convert array + phpDoc
Thanks for https://github.com/thomasbachem/php-short-array-syntax-converter
2016-04-12 12:25:29 +02:00