mirrors/wallabag
1
0
Fork 0
mirror of https://github.com/wallabag/wallabag.git synced 2024-11-23 17:41:01 +00:00
Code Issues Projects Releases Wiki Activity
2536 commits 12 branches 100 tags 170 MiB
Commit graph

2536 commits

This branch
This branch
All branches
Author SHA1 Message Date
Jeremy Benoist
4e4e8e9899 Merge pull request #2221 from wallabag/replace-favorite-star 
Replaced favorite word/icon with star one
 2016-08-21 22:11:20 +02:00
Thomas Citharel
8642f14220 Merge pull request #2224 from wallabag/avoid-exception-import 
Avoid breaking import when fetching fail
 2016-08-20 14:31:32 +02:00
Jeremy Benoist
19d9efab32
Avoid breaking import when fetching fail 
graby will throw an Exception in some case (like a bad url, a restricted url or a secured pdf).

Import doesn't handle that case and break the whole import.
With that commit the import isn't stopped but the entry is just skipped.

Also, as a  bonus, I've added extra test on WallabagImportV2 when the json is empty.
 2016-08-20 01:17:26 +02:00
Nicolas Lœuillet
eecd7e406d
Fixed some translations 2016-08-18 15:30:28 +02:00
Nicolas Lœuillet
519ba0b5e7 Replaced favorite word/icon with star one 
Fix #2041
 2016-08-18 14:27:17 +02:00
Jeremy Benoist
e408d7e895 Merge pull request #2220 from Rurik19/master 
Enable PATCH method for CORS in API part
 2016-08-18 11:56:02 +02:00
Rurik19
41c9eecfa7 Enable PATCH method for CORS in API part 2016-08-18 14:30:32 +05:00
Jeremy Benoist
b762ab3cce Merge pull request #2134 from wallabag/hhvm 
Run tests on an uptodate HHVM
 2016-08-17 18:00:17 +02:00
Jeremy Benoist
fc41abb990 Run tests on an uptodate HHVM 
Using some tricks from symfony/symfony
 2016-08-17 16:41:36 +02:00
Jeremy Benoist
782390a80e Merge pull request #2095 from wallabag/fix-2auth-form 
Fix form user display when 2FA is disabled
 2016-08-17 15:17:07 +02:00
Jeremy Benoist
0cecfa2536 CS 2016-08-17 14:36:20 +02:00
Jeremy Benoist
6dfac457d8 Fix tests 
Ensure tests after the InstallCommand test will have a clean database.
Previous attempt failed because of a foreign key

Also, nightly on Travis seems to target PHP 7.2-dev, so I put 7.1 in requirement and moved nightly in allowed failures.
And it seems xdebug isn't shipped with PHP 7.1, so I added a workaround to avoid build to fail when trying to remove xdebug.ini file.
 2016-08-17 14:34:39 +02:00
Jeremy Benoist
9a5c5c330e Disable autobranch & commit 2016-08-17 12:31:16 +02:00
Jeremy Benoist
7dbedfc8a3 Enable Zappr 2016-08-17 12:29:47 +02:00
Nicolas Lœuillet
e49c62fac8 Fix form user display for baggy theme 2016-08-17 11:41:46 +02:00
Nicolas Lœuillet
8f5e220327 Fix form user display when 2FA is disabled 2016-08-17 11:41:46 +02:00
Nicolas Lœuillet
2e16a90339 Merge pull request #2216 from Rurik19/master 
Enable CORS headers for OAUTH part
 2016-08-16 14:22:43 +02:00
Rurik19
848c2e1b97 Enable CORS headers for OAUTH part 2016-08-12 13:01:53 +05:00
Nicolas Lœuillet
00acc0d006 Changed URL for scrutinizer in README 2016-08-11 20:57:06 +02:00
Nicolas Lœuillet
8617972f3f Merge pull request #2212 from wallabag/prepare-206 
Prepare release 2.0.6
 2016-08-10 15:03:43 +02:00
Nicolas Lœuillet
a26f91dcb6 Prepare release 2.0.6 2016-08-10 14:26:13 +02:00
Thomas Citharel
029965b6a2 Merge pull request #2200 from charno6/patch-1 
Fixed typo in entry:notice:entry_saved
 2016-07-23 22:58:26 +02:00
charno6
75ac3e6289 Fixed typo in entry:notice:entry_saved 
"Eintag" to "Eintrag"
 2016-07-23 22:40:23 +02:00
Jeremy Benoist
8c7d7c0300 Merge pull request #2199 from Simounet/facto/social-links 
Handling socials links into a config file
 2016-07-21 16:17:53 +02:00
Simounet
57c608fa94 php-cs-fixer pass 2016-07-20 23:08:04 +02:00
Simounet
40288b7166 Chrome extension URL updated 2016-07-20 22:55:43 +02:00
Thomas Citharel
78d1727096 Merge pull request #2198 from Simounet/fix/image-inside-figure 
FIX image inside a figure element max-width
 2016-07-20 20:44:47 +02:00
Simounet
0e1abf392c FIX image inside a figure element max-width (baggy theme) 2016-07-20 20:23:55 +02:00
Simounet
f64472e9f8 FIX image inside a figure element max-width 2016-07-20 19:39:24 +02:00
Simounet
39f27d6370 Handling socials links into a config file 2016-07-20 19:36:01 +02:00
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
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
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
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
Jeremy Benoist
2bc9cad78e Remove useless spaces 2016-06-24 11:28:07 +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
d37bb05c88 Merge pull request #2132 from wallabag/sf3.1 
Jump to Symfony 3.1
 2016-06-23 09:18:18 +02:00
Jeremy Benoist
99451fe4b7 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.
 2016-06-22 23:15:17 +02:00