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
Jérémy Benoist
21bdbb2d5e
Merge pull request #3378 from wallabag/2.3-ru
...
Add Russian language
2017-10-10 12:22:22 +02:00
Олег
4bea44da92
update Russian language
2017-10-10 10:48:38 +02:00
Олег
ef5fcdee20
add Russian language
2017-10-10 10:48:29 +02:00
Олег
28af2989ec
Add Russian language in CoreBundle Resources and CraueConfigBundle
2017-10-10 10:47:48 +02:00
Jeremy Benoist
f645d371ce
Fix MondeDiplo https url
2017-10-10 10:20:57 +02:00
Jeremy Benoist
3ef055ced3
CS
2017-10-09 16:47:15 +02:00
Jeremy Benoist
f40c88eb1f
Jump to Symfony 3.3 & update others deps
...
Also update tests urls
2017-10-09 16:45:12 +02:00
Nicolas Lœuillet
ed5e175c20
Merge pull request #3347 from Kdecherf/entry-stats
...
Entry view: update .stats margins and color
2017-09-16 13:01:33 +02:00
Kevin Decherf
79ea33c9d3
Entry view: update .stats margins and color
...
Decreasing margin of .stats, increasing vertical margin of .stats li,
increasing right margin of material icons and reducing contrast of
material icons.
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-09-09 21:35:19 +02:00
Jérémy Benoist
23246a5da6
Merge pull request #3345 from wallabag/Quent-in-patch-1
...
Update messages.oc.yml
2017-09-09 18:57:50 +02:00
Quent-in
f764407daf
Update messages.oc.yml
2017-09-09 18:23:59 +02:00
Jérémy Benoist
061fca8c6e
Merge pull request #3340 from Kdecherf/fix-webpack
...
Fix webpack error on comments
2017-09-07 07:17:05 +02:00
Jérémy Benoist
f6d042f56d
Merge pull request #3309 from wallabag/fix-multiple-tag-search
...
Multiple tag search, which was broken from API
2017-09-07 07:16:26 +02:00
Jeremy Benoist
9c4a7388da
Remove unused function
...
Introduce after the rebase I guess
2017-09-06 22:58:35 +02:00
Jeremy Benoist
33264c2d02
Fix tests
2017-09-06 22:49:16 +02:00
Jeremy Benoist
7c04b7396a
Multiple tag search was broken from API
...
First, the setParameter() were done on the same parameter which in fact
just duplicated the condition in the SQL query (like `where t.label =
'test' and t.label = 'test'`.
Changed the parameter doesn't help because the query was then wrong.
Changing the way to match associated tags for an entry and it worked.
2017-09-06 22:49:15 +02:00
Kevin Decherf
e317a5ab60
Fix webpack error on comments
...
Signed-off-by: Kevin Decherf <kevin@kdecherf.com>
2017-09-06 22:42:23 +02:00
Nicolas Lœuillet
78b36d4dbe
Merge pull request #3332 from nclsHart/better-txt-export
...
Better entry txt export using html2text
2017-09-06 15:08:12 +02:00
Jérémy Benoist
b9c26b6330
Merge pull request #3337 from strobeltobias/patch-1
...
Add missing quotation marks and small fixes (2)
2017-09-04 12:09:26 +02:00
Jérémy Benoist
e85657fb10
Update messages.de.yml
2017-09-04 11:17:26 +02:00
Jérémy Benoist
f3e688207d
Merge pull request #3333 from Quent-in/2.3
...
Update OC
2017-09-03 20:26:16 +02:00