Commit Graph

2590 Commits

Author SHA1 Message Date
Nicolas Lœuillet
8541b3c4fd
Add simple test 2016-08-24 10:28:43 +02:00
Jeremy Benoist
ee4442f42a
CS 2016-08-23 07:40:36 +02:00
Thomas Citharel
7149aa5781
Proper parameter name, simplify logic & phpdoc 2016-08-23 07:40:36 +02:00
Thomas Citharel
de3d716ae4
Add option to disable registration 2016-08-23 07:40:36 +02:00
Jeremy Benoist
79efca1e6f
Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02:00
Thomas Citharel
9c545fe028
Added name on client
- Fix typos in field name
- Added migration for name field in API client table

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2171
2016-08-22 20:18:27 +02:00
Jeremy Benoist
db4d63fc1a
Upgrade PHPUnit to version 5
- Fix deprecated getMock
- Use PHPUnit 4 for PHP 5.5 build

Manually cherry-picked from PR
https://github.com/wallabag/wallabag/pull/2201
2016-08-22 20:16:50 +02:00
Nicolas Lœuillet
80bb0b7344 Merge pull request #2226 from wallabag/prepare-207
Prepare wallabag 2.0.7
2016-08-22 10:40:24 +02:00
Nicolas Lœuillet
5068544e10
Prepare wallabag 2.0.7 2016-08-22 10:08:21 +02:00
Nicolas Lœuillet
c649d43381 Merge pull request #2222 from wallabag/add-date-on-article-view
Added creation date and reading time on article view
2016-08-22 09:40:21 +02:00
Jeremy Benoist
d35ba2c3d6
Display text on baggy
Instead of using icons (which aren't available) display real text for reading time & creation date
2016-08-21 22:22:34 +02:00
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
e7732deb1f Changed code indentation 2016-08-18 15:37:44 +02:00
Nicolas Lœuillet
eecd7e406d
Fixed some translations 2016-08-18 15:30:28 +02:00
Nicolas Lœuillet
4e1be104ab
Added creation date and reading time on article view
Fix #2034
2016-08-18 15:23:19 +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
Jeremy Benoist
b10a422e1f Merge pull request #2202 from wallabag/fix-phpdoc
add some missing phpdoc parameters
2016-07-24 11:49:21 +02:00
Thomas Citharel
8cb869ea95
add some missing phpdoc parameters 2016-07-24 11:47:03 +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
Jeremy Benoist
0faeabefa7 Merge remote-tracking branch 'origin/master' into 2.1 2016-07-20 12:02:02 +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