Allan Nordhøy
13e677648c
Spelling: Two-factor for wallabag connection
2017-11-18 04:39:52 +01:00
Jérémy Benoist
2a4a861b34
Merge pull request #3412 from aaa2000/fix-tests
...
Fix the tests
2017-11-12 11:33:18 +01:00
adev
cc79712738
Fix phpcs
2017-11-11 23:55:13 +01:00
adev
d81bf605af
Fix tests
2017-11-11 23:37:57 +01:00
Kevin Decherf
f39cfa4690
Merge pull request #3404 from wallabag/issue-2424
...
material: replace card activator with article link on card preview
2017-11-07 13:59:47 +01:00
Kevin Decherf
2f510787e7
material: replace card activator with article link on card preview
...
Fixes #2424
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-06 20:49:41 +01:00
Kevin Decherf
8abb6c1321
Merge pull request #3397 from wallabag/issue-1871
...
material: disable editing of entry url input when submitting new url
2017-11-06 20:43:48 +01:00
Kevin Decherf
46ee68ea48
Update assets for #3397
2017-11-05 13:20:50 +01:00
Kevin Decherf
3d46eeeb33
material: disable editing of entry url input when submitting new url
...
Fixes #1871
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-11-05 13:14:47 +01:00
Jérémy Benoist
b0f9e52b7e
Merge pull request #3387 from Kdecherf/fix-assets-23
...
Fix assets for 2.3
2017-11-02 15:49:37 +02:00
Jérémy Benoist
dccec95401
Merge pull request #3399 from aaa2000/editorconfig-makefile
...
Update .editorconfig for makefile
2017-11-02 10:21:10 +02:00
adev
5872cd191c
Update .editorconfig for makefile
2017-11-01 14:47:06 +01:00
Kevin Decherf
c20327fc72
Merge pull request #3395 from wallabag/issue-3393
...
views/config: fix overlaying drop down menu
2017-11-01 11:12:44 +01:00
Kevin Decherf
8801764583
views/config: fix overlaying drop down menu
...
Fixes #3393
2017-10-31 23:16:15 +01:00
Jérémy Benoist
494b47f299
Merge pull request #3392 from mart-e/add-title-page-epub
...
add the title of article on the epub export
2017-10-31 15:10:41 +02:00
Jeremy Benoist
15a6402f75
Properly run php-cs-fixer
2017-10-28 20:16:43 +02:00
Martin Trigaux
385e651684
php-cs-fixer
...
php bin/php-cs-fixer fix src/Wallabag/CoreBundle/Helper/EntriesExport.php
2017-10-28 17:17:22 +02:00
Martin Trigaux
c779373f2c
Set the title in a separated chapter
...
Set the export option on the same page, same as done in producePdf
Move the ToC at the end of the book so the title page is the first one
2017-10-28 14:49:14 +02:00
Martin Trigaux
a6e9ad0b7d
add a title page
...
The first page of the book is the title
2017-10-28 10:45:37 +02:00
Kevin Decherf
efbbfe0135
Updating .gitignore
...
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-24 00:20:56 +02:00
Kevin Decherf
0b3ab03782
Removing web/bundles/wallabagcore and adding prod assets in web/wallassets
...
baggy.css, baggy.js, material.css, material.js and public.js are seen as
new files, something changed in these files.
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-24 00:19:00 +02:00
Kevin Decherf
9ff628ca56
webpack & views: replace bundles/wallabagcore with wallassets
...
This change will prevent composer from removing wallabagcore assets when
installing assets.
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-24 00:15:52 +02:00
Jérémy Benoist
1953a87293
Merge pull request #3011 from wallabag/2.3
...
wallabag 2.3.0
2017-10-23 11:09:17 +02:00
Nicolas Lœuillet
702f2d67d6
Merge pull request #3385 from wallabag/prepare-23
...
Prepare wallabag 2.3.0
2017-10-20 15:43:13 +02:00
Nicolas Lœuillet
b4da3ee8e5
Prepare wallabag 2.3.0
2017-10-20 14:17:37 +02:00
Nicolas Lœuillet
8a30241dc5
Merge pull request #3384 from wallabag/mruminski-patch-1
...
Update messages.pl.yml
2017-10-19 15:07:43 +02:00
Mateusz Rumiński
3828f525e1
Update messages.pl.yml
...
add polish translation for export footer_template
2017-10-19 13:07:24 +02:00
Nicolas Lœuillet
1c5081cdc5
Merge pull request #3373 from wallabag/change-readingtime-notnull
...
Changed reading_time field to prevent null values
2017-10-18 11:33:30 +02:00
Jérémy Benoist
91f9bacf73
Merge pull request #3362 from sviande/fix_3361_api_warning
...
Fix #3361 check type for tags in entry repository
2017-10-18 11:16:50 +02:00
Nicolas Lœuillet
7f5d03a98d
Merge pull request #3383 from Kdecherf/fix-webpack-and-login
...
Fix webpack and login screen
2017-10-16 09:02:47 +02:00
Kevin Decherf
3f29386cb7
Update prod assets
...
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-16 00:07:12 +02:00
Kevin Decherf
7a1e1247cb
webpack: handle _global img folder
...
Fixes missing image files after composer cleaning assets
Source of requireAll(): https://stackoverflow.com/a/30652110
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-16 00:01:52 +02:00
Kevin Decherf
ef7f187fa8
Fix non-centered login form
...
Fixes #3343
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-10-16 00:01:52 +02:00
Jérémy Benoist
3930201003
Merge pull request #3382 from nclsHart/replace-kernel-rootdir
...
Replace kernel.root_dir by kernel.project_dir
2017-10-15 09:24:32 +02:00
Jérémy Benoist
64f4112cae
Merge pull request #3381 from nclsHart/webserverbundle
...
Enable WebServerBundle in dev environment
2017-10-15 09:23:31 +02:00
Nicolas Hart
9ca069a6fe
Replace kernel.root_dir by kernel.project_dir
...
kernel.root_dir and Kernel::getRootDir() are deprecated since Symfony 3.3.
See https://symfony.com/blog/new-in-symfony-3-3-a-simpler-way-to-get-the-project-root-directory and https://github.com/symfony/symfony/blob/3.3/UPGRADE-3.3.md#httpkernel for more information.
2017-10-14 00:32:56 +02:00
Nicolas Hart
3c9fbb4e32
Enable WebServerBundle in dev environment
...
Since #3376 , the web server console commands were not available.
2017-10-13 23:04:16 +02:00
Sébastien Viande
0978bd849e
Fix #3361 Entry Rest controller getEntries cast tags params to string
2017-10-13 10:28:05 +02:00
Nicolas Lœuillet
abce2f05dd
Fixed @Kdecherf's review
2017-10-13 10:11:24 +02:00
Jeremy Benoist
705d3c38dc
CS
2017-10-13 09:35:44 +02:00
Nicolas Lœuillet
88bac4a33e
Changed reading_time field to prevent null values
2017-10-13 09:35:44 +02:00
Jeremy Benoist
bb86dc6486
CS
2017-10-12 07:38:27 +02:00
Sébastien Viande
d03b72f405
Fix #3361 add test
2017-10-12 07:38:27 +02:00
Sébastien Viande
fafdf17117
Fix #3361 check type for tags in entry repository
...
Check is $tags is a string before explode
2017-10-12 07:38:27 +02:00
Nicolas Lœuillet
f44a927530
Merge pull request #3372 from wallabag/translate-export-page
...
Translated first page of exported article
2017-10-11 14:12:49 +02:00
Jeremy Benoist
9dd67fa342
CS
2017-10-11 10:43:36 +02:00
Nicolas Lœuillet
8f187e280f
Fixed @j0k3r's review
2017-10-11 10:43:19 +02:00
Nicolas Lœuillet
dc7fa8dfc6
Fixed @tcitworld's review
2017-10-11 10:43:19 +02:00
Nicolas Lœuillet
b1428a1cf8
Translated first page of exported article
2017-10-11 10:43:19 +02:00
Jérémy Benoist
d8dc7372ab
Merge pull request #3376 from wallabag/symfony-3.3
...
Symfony 3.3
2017-10-11 09:55:03 +02:00