Commit Graph

2948 Commits

Author SHA1 Message Date
a0e1eafc35 Add some tests
Also, retrieve tag from the request instead of the query (which will be the same but it's more easy to test).

Moved down `deleteTagAction` because it conflicted with the new action:

  api_delete_tag => /api/tags/{tag}.{_format}
  api_delete_tags_label => /api/tags/label.{_format}

And finally, throw exception when a tag is not found before removing it.
2016-08-23 07:26:58 +02:00
9bf83f1fb8 CS 2016-08-23 07:26:58 +02:00
4da01f492b Delete tag or tags by label
Tests not included
2016-08-23 07:26:58 +02:00
e71cef0bb8 Fix typos in field name 2016-08-23 07:26:58 +02:00
119914e65d added name on client 2016-08-23 07:26:58 +02:00
267e8d6361 Add tests for tag list routes 2016-08-23 07:26:18 +02:00
371bcca0f6 Translations and baggy view for tags 2016-08-23 07:26:18 +02:00
891456ba9a Links on each tag in Tags view 2016-08-23 07:24:42 +02:00
d5de909bbc Update SymfonyRequirements 2016-08-23 07:24:00 +02:00
79efca1e6f Merge remote-tracking branch 'origin/master' into 2.1 2016-08-22 23:03:16 +02:00
474b086656 Simplify the initialization of the plugin dotdotdot 2016-08-22 23:59:20 +03:00
e32aea53ab Added the jquery library dotdotdot ( http://dotdotdot.frebsite.nl/ ) that allows you to clip a text on the second line and fixed cut entries title in card view 2016-08-22 23:34:44 +03:00
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
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
80bb0b7344 Merge pull request #2226 from wallabag/prepare-207
Prepare wallabag 2.0.7
2016-08-22 10:40:24 +02:00
5068544e10 Prepare wallabag 2.0.7 2016-08-22 10:08:21 +02:00
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
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
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
8642f14220 Merge pull request #2224 from wallabag/avoid-exception-import
Avoid breaking import when fetching fail
2016-08-20 14:31:32 +02:00
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
e7732deb1f Changed code indentation 2016-08-18 15:37:44 +02:00
eecd7e406d Fixed some translations 2016-08-18 15:30:28 +02:00
4e1be104ab Added creation date and reading time on article view
Fix #2034
2016-08-18 15:23:19 +02:00
519ba0b5e7 Replaced favorite word/icon with star one
Fix #2041
2016-08-18 14:27:17 +02:00
e408d7e895 Merge pull request #2220 from Rurik19/master
Enable PATCH method for CORS in API part
2016-08-18 11:56:02 +02:00
41c9eecfa7 Enable PATCH method for CORS in API part 2016-08-18 14:30:32 +05:00
b762ab3cce Merge pull request #2134 from wallabag/hhvm
Run tests on an uptodate HHVM
2016-08-17 18:00:17 +02:00
fc41abb990 Run tests on an uptodate HHVM
Using some tricks from symfony/symfony
2016-08-17 16:41:36 +02:00
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
0cecfa2536 CS 2016-08-17 14:36:20 +02:00
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
9a5c5c330e Disable autobranch & commit 2016-08-17 12:31:16 +02:00
7dbedfc8a3 Enable Zappr 2016-08-17 12:29:47 +02:00
e49c62fac8 Fix form user display for baggy theme 2016-08-17 11:41:46 +02:00
8f5e220327 Fix form user display when 2FA is disabled 2016-08-17 11:41:46 +02:00
2e16a90339 Merge pull request #2216 from Rurik19/master
Enable CORS headers for OAUTH part
2016-08-16 14:22:43 +02:00
848c2e1b97 Enable CORS headers for OAUTH part 2016-08-12 13:01:53 +05:00
00acc0d006 Changed URL for scrutinizer in README 2016-08-11 20:57:06 +02:00
8617972f3f Merge pull request #2212 from wallabag/prepare-206
Prepare release 2.0.6
2016-08-10 15:03:43 +02:00
a26f91dcb6 Prepare release 2.0.6 2016-08-10 14:26:13 +02:00
b10a422e1f Merge pull request #2202 from wallabag/fix-phpdoc
add some missing phpdoc parameters
2016-07-24 11:49:21 +02:00
8cb869ea95 add some missing phpdoc parameters 2016-07-24 11:47:03 +02:00
029965b6a2 Merge pull request #2200 from charno6/patch-1
Fixed typo in entry:notice:entry_saved
2016-07-23 22:58:26 +02:00
75ac3e6289 Fixed typo in entry:notice:entry_saved
"Eintag" to "Eintrag"
2016-07-23 22:40:23 +02:00
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
57c608fa94 php-cs-fixer pass 2016-07-20 23:08:04 +02:00
40288b7166 Chrome extension URL updated 2016-07-20 22:55:43 +02:00
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
0e1abf392c FIX image inside a figure element max-width (baggy theme) 2016-07-20 20:23:55 +02:00