Diffusion OCS Webserver 9540e621086a

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

Authored by ronaldv on Mar 13 2019, 3:33 PM.

Description

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

Details

Committed
ronaldvMar 13 2019, 3:33 PM
Parents
R767:355e0e15bf69: my products
R767:c87baca87975: startpage
Branches
Unknown
Tags
Unknown

Merged Changes

CommitAuthorDetailsCommitted
c87baca87975siyuandong
startpage 
Mar 13 2019
a4d535363276siyuandong
startpage 
Mar 13 2019
bb3c26e9ae30siyuandong
aboutmt 
Mar 13 2019

Changes (19)

PathPackages
Mapplication/modules/default/controllers/UserController.php
Mapplication/modules/default/views/scripts/home/index-opendesktop-test4.phtml
Mhttpdocs/theme/react/assets/css/home-main-container.css
Ahttpdocs/theme/react/assets/img/start-bg.png
Mhttpdocs/theme/react/assets/less/home-main-container.less
Mhttpdocs/theme/react/bundle/home-main-container-bundle.js
A(dir)httpdocs/theme/react/opendesktop-home/
Phttpdocs/theme/react/opendesktop-home/BlogFeedContainer.js
Copied from httpdocs/theme/react/src/opendesktop-home/BlogFeedContainer.js
Ahttpdocs/theme/react/opendesktop-home/ChatContainer.js
Ahttpdocs/theme/react/opendesktop-home/ChatMember.js
Phttpdocs/theme/react/opendesktop-home/CommentsContainer.js
Copied from httpdocs/theme/react/src/opendesktop-home/CommentsContainer.js
Phttpdocs/theme/react/opendesktop-home/DrawerOpenRight.js
Copied from httpdocs/theme/react/src/opendesktop-home/DrawerOpenRight.js
Phttpdocs/theme/react/opendesktop-home/HomeMainContainer.js
Copied from httpdocs/theme/react/src/opendesktop-home/HomeMainContainer.js
Phttpdocs/theme/react/opendesktop-home/Product.js
Copied from httpdocs/theme/react/src/opendesktop-home/Product.js
Ahttpdocs/theme/react/opendesktop-home/ProductGit.js
Phttpdocs/theme/react/opendesktop-home/ProductsContainer.js
Copied from httpdocs/theme/react/src/opendesktop-home/ProductsContainer.js
Ahttpdocs/theme/react/opendesktop-home/ProductsGitContainer.js
Phttpdocs/theme/react/opendesktop-home/RssNewsContainer.js
Copied from httpdocs/theme/react/src/opendesktop-home/RssNewsContainer.js
Mhttpdocs/theme/react/package.json

R767:9540e621086a

View Options

application/modules/default/controllers/UserController.php

Loading...
View Options

application/modules/default/views/scripts/home/index-opendesktop-test4.phtml

Loading...
View Options

httpdocs/theme/react/assets/css/home-main-container.css

Loading...
View Options

httpdocs/theme/react/assets/img/start-bg.png

Loading...
View Options

httpdocs/theme/react/assets/less/home-main-container.less

Loading...
View Options

httpdocs/theme/react/bundle/home-main-container-bundle.js

Loading...
View Options

httpdocs/theme/react/opendesktop-home/BlogFeedContainer.js

Loading...
View Options

httpdocs/theme/react/opendesktop-home/ChatContainer.js

Loading...
View Options

httpdocs/theme/react/opendesktop-home/ChatMember.js

Loading...
View Options

httpdocs/theme/react/opendesktop-home/CommentsContainer.js

Loading...
View Options

httpdocs/theme/react/opendesktop-home/DrawerOpenRight.js

Loading...
View Options

httpdocs/theme/react/opendesktop-home/HomeMainContainer.js

Loading...
View Options

httpdocs/theme/react/opendesktop-home/Product.js

Loading...
View Options

httpdocs/theme/react/opendesktop-home/ProductGit.js

Loading...
View Options

httpdocs/theme/react/opendesktop-home/ProductsContainer.js

Loading...
View Options

httpdocs/theme/react/opendesktop-home/ProductsGitContainer.js

Loading...
View Options

httpdocs/theme/react/opendesktop-home/RssNewsContainer.js

Loading...
View Options

httpdocs/theme/react/package.json

Loading...