Diffusion OCS Webserver 1480c4b8bdb9

ocs-webserver into dev
1480c4b8bdb9
Actions

Authored by ronaldv on Dec 4 2019, 1:48 PM.

Description

Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev

Details

Committed

ronaldv

Dec 4 2019, 1:48 PM

Parents

R767:7d24c222a405: comic
R767:bb1eab17a23b: pms comic book reader

Branches

Unknown

Tags

Unknown

ronaldv committed R767:1480c4b8bdb9: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev (authored by ronaldv).Dec 4 2019, 1:48 PM

Merged Changes

Commit	Author	Details	Committed
bb1eab17a23b	David Nelband	pms comic book reader	Dec 4 2019
a5886f68fe0b	David Nelband	pms comic book reader	Dec 4 2019
8e56da5c6312	David Nelband	comic book reader	Dec 4 2019
a22b38c839ae	David Nelband	pms comic book reader	Dec 4 2019
707cdb2e9a8b	David Nelband	pms comic book reader	Dec 4 2019
5e671a04c61c	David Nelband	comic book reader	Dec 4 2019
26a9fc9af978	David Nelband	comic reader fix	Dec 4 2019
6fd13f61cf20	David Nelband	pms comic book reader	Dec 4 2019
be9ad28c9839	David Nelband	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Dec 4 2019
7f92cfba0fe8	David Nelband	pms	Dec 4 2019
873f69acf5ad	siyuandong	tagrating	Dec 4 2019
56354c982368	siyuandong	tagrating	Dec 4 2019
cce6ade8c6db	siyuandong	projectclone	Dec 4 2019
e0ca5561321d	David Nelband	pms book reader	Dec 4 2019
67ecc2ab2550	David Nelband	pms comic book	Dec 4 2019
69220addee73	David Nelband	pms comic book	Dec 4 2019
7ec34d4e6e3f	David Nelband	pms comic book	Dec 4 2019
3fd8b05ff008	David Nelband	pms comic reader	Dec 4 2019
40fa590f35dc	David Nelband	pms comic reader	Dec 4 2019
aaa11e341569	David Nelband	pms comic reader	Dec 4 2019
565ac2a47646	David Nelband	pms comic reader	Dec 4 2019
1523ca103e91	David Nelband	pms comic reader	Dec 4 2019
adc976f1b595	David Nelband	pms book reader	Dec 4 2019
5912cd142af8	David Nelband	pms book reader	Dec 4 2019
b4f1c2a70b63	David Nelband	pms comic reader	Dec 4 2019
3514ae566ea9	David Nelband	pms comic reader	Dec 4 2019
45c08f62964e	David Nelband	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Dec 4 2019
a1ad1f90c55a	David Nelband	pms book reader	Dec 4 2019

Changes (18)

		Path
M		application/modules/default/controllers/ProductController.php
M		application/modules/default/models/DbTable/ProjectClone.php
A		application/modules/default/models/ProjectTagRatings.php
M		application/modules/default/plugins/AclRules.php
M		application/modules/default/views/scripts/product/index.phtml
A		httpdocs/theme/react/bundle/tag-rating-bundle.js
A	(dir)	httpdocs/theme/react/hooks-app/tag-rating/
A	(dir)	httpdocs/theme/react/hooks-app/tag-rating/components/
A		httpdocs/theme/react/hooks-app/tag-rating/components/Rate.js
A		httpdocs/theme/react/hooks-app/tag-rating/components/TagRating.js
A		httpdocs/theme/react/hooks-app/tag-rating/entry-tag-rating.js
M		httpdocs/theme/react/product-media-slider/app/comics-reader.js
M		httpdocs/theme/react/product-media-slider/app/product-media-slider-helpers.js
M		httpdocs/theme/react/product-media-slider/app/product-media-slider.js
M		httpdocs/theme/react/product-media-slider/product-media-slider.js
M		httpdocs/theme/react/product-media-slider/style/product-media-slider.css
M		httpdocs/theme/react/product-media-slider/style/product-media-slider.less
A		sql_code/20191203_tag_rating.sql