Diffusion OCS Webserver 173980122c28

ocs-webserver into dev
173980122c28
Actions

Authored by ronaldv on Nov 15 2019, 9:37 AM.

Description

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

Details

Committed

ronaldv

Nov 15 2019, 9:37 AM

Parents

R767:952ab95cb20c: payout
R767:77b38f3f3ce9: related

Branches

Unknown

Tags

Unknown

ronaldv committed R767:173980122c28: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev (authored by ronaldv).Nov 15 2019, 9:37 AM

Merged Changes

Commit	Author	Details	Committed
77b38f3f3ce9	siyuandong	related	Nov 15 2019
adbae9a083d6	David Nelband	hide latest carousel in appimageshub	Nov 14 2019
8af907a02fce	David Nelband	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Nov 14 2019
428d1d9554a6	David Nelband	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Nov 14 2019
62bb25d5afdb	siyuandong	react	Nov 14 2019
5835b64d73ee	David Nelband	fix index=2/3 mistake	Nov 14 2019
7a450def2652	siyuandong	metaheader	Nov 14 2019
573b14b18283	siyuandong	metaheader	Nov 14 2019
99a2ba5c031f	siyuandong	metaheader	Nov 14 2019
46c59953287d	siyuandong	pagedetail	Nov 14 2019
757cebdbca72	alexanderschmidt	updated Image Helper -> getDataUri Prototype	Nov 14 2019
0ed7d17e5ce3	siyuandong	pagedetail	Nov 14 2019
c18062e78822	siyuandong	browser new layout	Nov 14 2019
b98d23ac3384	siyuandong	browser new layout	Nov 14 2019
4aca4addc9d1	David Nelband	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Nov 14 2019
9c6e9c75c6a8	David Nelband	product browse view type icons / apps	Nov 14 2019
8043c0911293	alexanderschmidt	updated sql script to rename imageserver	Nov 14 2019
90d23d79aaf7	siyuandong	suppoert	Nov 14 2019
d1346591fa7e	siyuandong	supporter	Nov 14 2019
a8046c3d8b0d	siyuandong	supporters	Nov 14 2019

Changes (29)

				Path	Packages
	M			application/modules/default/controllers/ExploreController.php
	M			application/modules/default/controllers/ProductController.php
	M			application/modules/default/controllers/SupportersController.php
	M			application/modules/default/models/ProjectClone.php
	M			application/modules/default/views/helpers/Image.php
	P			application/modules/default/views/scripts/explore/index-react8.phtml Copied from application/modules/default/views/scripts/explore/index-react3.phtml
	P			application/modules/default/views/scripts/explore/index-react9.phtml Copied from application/modules/default/views/scripts/explore/index-react3.phtml
	M			application/modules/default/views/scripts/product/index.phtml
	A			application/modules/default/views/scripts/product/partials/productRelated.phtml
	P			application/modules/default/views/scripts/product/partials/productRelatedProducts.phtml Copied from application/modules/default/views/scripts/user/partials/aboutme-featured.phtml
	M			application/modules/default/views/scripts/subscription/support2.phtml
	M			httpdocs/theme/react/all.js
	M			httpdocs/theme/react/assets/css/carousel.css
	M			httpdocs/theme/react/assets/css/pling-section.css
	M			httpdocs/theme/react/assets/less/carousel.less
	M			httpdocs/theme/react/assets/less/pling-section.less
	M			httpdocs/theme/react/bundle/app-supporters-bundle.js
	M			httpdocs/theme/react/bundle/metaheader-bundle.js
	M			httpdocs/theme/react/bundle/metaheader-local-bundle.js
	M			httpdocs/theme/react/hooks-app/app-supporters/components/AppSupporters.js
	M			httpdocs/theme/react/hooks-app/app-supporters/components/Creator.js
	M			httpdocs/theme/react/hooks-app/app-supporters/components/Product.js
	M			httpdocs/theme/react/hooks-app/app-supporters/components/RecentPlingedProduct.js
	M			httpdocs/theme/react/hooks-app/metaheader/components/DomainsMenu.js
	M			httpdocs/theme/react/package-lock.json
	M			httpdocs/theme/react/product-browse/app/product-browse-helpers.js
	M			httpdocs/theme/react/product-browse/app/product-browse-item.js
	M			httpdocs/theme/react/product-browse/product-browse.js
	M			sql_code/20191113_alter_imageserver_host.sql