Diffusion OCS Webserver 61c555dd2e10

ocs-webserver into dev
61c555dd2e10
Actions

Authored by David Nelband <dnelband@gmail.com> on Jul 19 2019, 9:53 AM.

Description

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

Details

Committed

David Nelband <dnelband@gmail.com>

Jul 19 2019, 9:53 AM

Parents

R767:b39ec334d2ab: init my local server
R767:9d79a3db5c67: cookie policy

Branches

Unknown

Tags

Unknown

David Nelband <dnelband@gmail.com> committed R767:61c555dd2e10: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev (authored by David Nelband <dnelband@gmail.com>).Jul 19 2019, 9:53 AM

Merged Changes

Commit	Author	Details	Committed
9d79a3db5c67	siyuandong	cookie policy	Jul 19 2019
586cb6a88a94	siyuandong	cookie policy	Jul 19 2019
826d0ccd9b34	siyuandong	startpage fix	Jul 19 2019
6e9b1c6a27ef	siyuandong	metaheader fix	Jul 19 2019
1e70d01a001d	siyuandong	metaheader fix	Jul 19 2019
4d3ea5e7273d	siyuandong	startpage no header	Jul 19 2019
018f427d657e	siyuandong	startpage	Jul 18 2019
604c35f57e20	siyuandong	startpage	Jul 18 2019
41a53762266b	siyuandong	startpage	Jul 18 2019
1fc19ce477b9	siyuandong	startpage	Jul 18 2019
e68a358dd5e4	siyuandong	startpage	Jul 18 2019
9dabcd119c47	siyuandong	startpage	Jul 18 2019
dc7b171c1036	siyuandong	startpage	Jul 18 2019
8c2325749074	siyuandong	startpage	Jul 18 2019
3b56f98ced92	siyuandong	metaheader	Jul 18 2019
82a669fcfddb	siyuandong	metaheader update	Jul 18 2019
018781fd775b	siyuandong	startpage opendesktop	Jul 18 2019
30ec77bedb35	siyuandong	startpage	Jul 18 2019
f4a076d0228a	siyuandong	startpage	Jul 18 2019
78d6e7a97bba	ronaldv	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Jul 18 2019
a5804fed911c	ronaldv	change prod url	Jul 18 2019
6e80b10de37c	siyuandong	startpage	Jul 18 2019
1bfe472821ed	siyuandong	cookie only store startpage	Jul 18 2019

Changes (26)

				Path	Packages
	M			application/modules/default/controllers/JsonController.php
	M			application/modules/default/views/helpers/BuildProductUrl.php
	M			application/modules/default/views/layout/flat_ui_template.phtml
	M			application/modules/default/views/layout/home_template.phtml
	M			application/modules/default/views/layout/layout_pling_home.phtml
	P			application/modules/default/views/scripts/home/index-opendesktop-test4.phtml Copied to application/modules/default/views/scripts/home/index-opendesktop.phtml
	P			application/modules/default/views/scripts/home/index-opendesktop.phtml Copied from application/modules/default/views/scripts/home/index-opendesktop-test4.phtml
	M			application/modules/default/views/scripts/home/index-plingcom-test4.phtml
	M			application/modules/default/views/scripts/home/index-plingcom.phtml
	M			httpdocs/partials/terms-cookies.phtml
	M			httpdocs/theme/react/bundle/home-main-container-bundle.js
	M			httpdocs/theme/react/bundle/metaheader-bundle.js
	M			httpdocs/theme/react/bundle/metaheader-local-bundle.js
	M			httpdocs/theme/react/src/metaheader/MobileLeftMenu.js
	M			httpdocs/theme/react/src/metaheader/UserLoginMenuContainer.js
	M			httpdocs/theme/react/src/opendesktop-home/BlogFeedContainer.js
	M			httpdocs/theme/react/src/opendesktop-home/CommentsContainer.js
	M			httpdocs/theme/react/src/opendesktop-home/HomeMainContainer.js
	M			httpdocs/theme/react/src/opendesktop-home/Introduction.js
	M			httpdocs/theme/react/src/opendesktop-home/IntroductionDetailCode.js
	M			httpdocs/theme/react/src/opendesktop-home/IntroductionDetailCommunity.js
	M			httpdocs/theme/react/src/opendesktop-home/IntroductionDetailPersonal.js
	M			httpdocs/theme/react/src/opendesktop-home/IntroductionDetailPublish.js
	M			httpdocs/theme/react/src/opendesktop-home/PersonalActivityContainer.js
	M			httpdocs/theme/react/src/opendesktop-home/Product.js
	M			httpdocs/theme/react/src/opendesktop-home/ProductsContainer.js