devol/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-12-16 18:30:17 +01:00
Code Issues Packages Projects Releases Wiki Activity
2,795 Commits 12 Branches 100 Tags 196 MiB
00283a3b0a
Commit Graph

2795 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Nicolas Lœuillet
317fc6e684 Merge pull request #2195 from wallabag/remove-bin 
Remove binary from repo
 2016-07-20 11:38:55 +02:00
Jeremy Benoist
8d8d48a2bb 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.

⚠️ You have to update your Composer to the 1.2 (`composer selfupdate`)
 2016-07-20 10:51:37 +02:00
Nicolas Lœuillet
0dc09439ef Merge pull request #2048 from wallabag/travis-php-7.1 
Run PHP 7.1 on Travis
 2016-07-19 11:24:26 +02:00
Jeremy Benoist
ab3eb4ba95 Merge pull request #2194 from benages/patch-2 
Fixed spelling Artúclos --> Artículos
 2016-07-18 22:56:02 +02:00
benages
57b62cbf79 Fixed spelling Artúclos --> Artículos 2016-07-18 21:53:53 +02:00
Jeremy Benoist
1973897305 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)
 2016-07-18 18:07:25 +02:00
Jeremy Benoist
2bb138ef6d Merge pull request #2183 from wallabag/tags-entries-view-baggy 
Bring tags on entries view to baggy
 2016-07-18 15:17:33 +02:00
Thomas Citharel
51cbc2ebfe Merge pull request #2185 from wallabag/fix-3rd-party-links 
Fix 3rd-Party Apps links (Chrome & Firefox)
 2016-07-02 12:33:33 +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
Nicolas Lœuillet
9dbd3e9302 Merge pull request #2174 from wallabag/api-filter-tags 
Add filter for tags on API
 2016-07-01 10:35:45 +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
Nicolas Lœuillet
a314b920bf Merge pull request #2176 from wallabag/add-since-parameter 
Add since parameter
 2016-06-29 09:34:39 +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
Nicolas Lœuillet
33e2aec18b Merge pull request #2170 from wallabag/addTagsOnEntriesView 
Add tags on entries view and minor ui fixes
 2016-06-24 14:23:38 +02:00
Nicolas Lœuillet
9f8c43e222 Merge pull request #2172 from wallabag/more-tests 
Change the way to login user in tests
 2016-06-24 14:22:47 +02:00
Thomas Citharel
eef833d644 uniformize tags on article view too 2016-06-24 12:07:45 +02:00
Jeremy Benoist
fdc90ceb17 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
 2016-06-24 11:55:47 +02:00
Thomas Citharel
e7aed21b33 add line to other languages 2016-06-24 11:45:42 +02:00
Jeremy Benoist
2bc9cad78e Remove useless spaces 2016-06-24 11:28:07 +02:00
Jeremy Benoist
b1c9b78203 Merge pull request #2169 from wallabag/fix-fonts 
fix font paths
 2016-06-24 09:20:52 +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
Thomas Citharel
dafc5cf993 fix font paths 2016-06-23 22:10:12 +02:00
Nicolas Lœuillet
20218495a7 Merge pull request #2168 from wallabag/fix-npm-dep-old-nodejs 
Add modules when NodeJS versions are too low.
 2016-06-23 15:09:57 +02:00
Thomas Citharel
9ccb96cfe2 Add modules when NodeJS versions are too low. 
And eventually one required anyway.
 2016-06-23 14:34:59 +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 #2157 from wallabag/lower-upper-readingtime 
Handle only upper or only lower reading filter
 2016-06-23 11:38:10 +02:00
Jeremy Benoist
95859e54c5 Add some tests about readingTime 2016-06-23 10:46:47 +02:00
Jeremy Benoist
bf27f99d54 Merge pull request #2165 from wallabag/translation-typos 
Fix a few french translations typos
 2016-06-23 10:43:06 +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 #2142 from wallabag/v2-use-npm 
Manage assets through npm
 2016-06-23 09:25:01 +02:00
Nicolas Lœuillet
d37bb05c88 Merge pull request #2132 from wallabag/sf3.1 
Jump to Symfony 3.1
 2016-06-23 09:18:18 +02:00
Jeremy Benoist
4eaaa27bb5 Update symlink to php-cs-fixer 2016-06-23 09:15:50 +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
11493858a7 Use friendsofphp instead of fabpot 
The fabpot's one is now depreacted
 2016-06-23 09:15:50 +02:00
Sven Fischer
3247b90776 translate documentation to German 2016-06-23 09:15:50 +02:00
Even Allmighty
afbe800be2 Corrected Regex for lighttpd rewrite 2016-06-23 09:15:50 +02:00
Nicolas Lœuillet
eae86d3403 Prepare wallabag 2.0.5 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 #2121
 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