Diffusion OCS Webserver 5ae50b793034

ocs-webserver into dev
5ae50b793034
Actions

Authored by David Nelband <dnelband@gmail.com> on Dec 2 2019, 5:42 PM.

Description

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

Details

Committed

David Nelband <dnelband@gmail.com>

Dec 2 2019, 5:42 PM

Parents

R767:138832553a48: pms music player fix cosmetic
R767:3154e317d0cc: aboutme

Branches

Unknown

Tags

Unknown

David Nelband <dnelband@gmail.com> committed R767:5ae50b793034: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev (authored by David Nelband <dnelband@gmail.com>).Dec 2 2019, 5:42 PM

Merged Changes

This commit merges a very large number of changes. Only the first 50 are shown.

Commit	Author	Details	Committed
3154e317d0cc	siyuandong	aboutme	Dec 2 2019
8f78a19e11cf	ronaldv	fix gap	Dec 2 2019
26ae42826dec	ronaldv	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Dec 2 2019
d8c646ab105d	ronaldv	aboutme	Dec 2 2019
cfea68bcccbb	siyuandong	aboutme	Dec 2 2019
9cf83af619ff	ronaldv	filter	Dec 2 2019
037164c6d0b9	ronaldv	filter	Dec 2 2019
64b4d83c4e4e	ronaldv	filter	Dec 2 2019
42192b09fdbe	ronaldv	filter	Dec 2 2019
240446a12417	ronaldv	filter	Dec 2 2019
10091f0aa326	ronaldv	filter	Dec 2 2019
3401b0e61cdc	ronaldv	filter	Dec 2 2019
daadc769cced	ronaldv	filter	Dec 2 2019
17e5556c66c2	ronaldv	filter	Dec 2 2019
6a0b84ace294	ronaldv	filter	Dec 2 2019
8c4130109a1f	ronaldv	filter	Dec 2 2019
e9a45fbacc86	ronaldv	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Dec 2 2019
9f8e6c72e14e	ronaldv	filter	Dec 2 2019
1002c1f983f5	siyuandong	suppporters	Dec 2 2019
4ad2975d35d3	ronaldv	filter	Dec 2 2019
51672c30c731	ronaldv	filter	Dec 2 2019
7c06f99ed863	ronaldv	filter	Dec 2 2019
f1b39f7bc380	ronaldv	filter	Dec 2 2019
e195a06650a4	ronaldv	filter	Dec 2 2019
6f974e9dbd81	siyuandong	all.js	Dec 2 2019
7dd4e9552711	siyuandong	supporter active	Nov 29 2019
4f74ea2f4eb3	siyuandong	supporter active	Nov 29 2019
7a342b359ba4	siyuandong	supporter active	Nov 29 2019
42fbf74e404a	siyuandong	mods	Nov 28 2019
bdf73a453dcb	siyuandong	mods	Nov 28 2019
e831bca24967	siyuandong	mods	Nov 28 2019
027fe6607e25	siyuandong	mod	Nov 28 2019
0b8339fabcbe	ronaldv	comment notification	Nov 28 2019
ef396a1968f4	ronaldv	torrent	Nov 28 2019
fd452cbecdba	ronaldv	torrent	Nov 28 2019
9138f7b17bec	ronaldv	torrent	Nov 28 2019
d383e840e083	ronaldv	torrent	Nov 28 2019
7c405994370a	ronaldv	torrent	Nov 28 2019
873438bb2a3e	ronaldv	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Nov 28 2019
67c7f9f5d35e	ronaldv	torrent	Nov 28 2019
1514f1565b8e	siyuandong	featured activities	Nov 28 2019
61d851f83134	ronaldv	torrent	Nov 28 2019
db9f0e3af57c	ronaldv	torrent	Nov 28 2019
bd201d3c297d	ronaldv	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Nov 28 2019
6219f9839231	ronaldv	torrent	Nov 28 2019
7acd9656e2f3	siyuandong	mod	Nov 27 2019
b4e78953951a	ronaldv	torrent	Nov 27 2019
7f0c6572b002	ronaldv	fix	Nov 27 2019
ac1857aa9fe5	ronaldv	torrent	Nov 27 2019
f677491d1e1d	ronaldv	torrent	Nov 27 2019

Changes (47)

				Path	Packages
	M			application/modules/default/Bootstrap.php
	M			application/modules/default/controllers/CreditsController.php
	M			application/modules/default/controllers/ModerationController.php
	M			application/modules/default/controllers/ProductController.php
	M			application/modules/default/controllers/ProductcommentController.php
	M			application/modules/default/controllers/ReportController.php
	M			application/modules/default/controllers/UserController.php
	M			application/modules/default/forms/Product.php
	M			application/modules/default/models/DbTable/Comments.php
	M			application/modules/default/models/DbTable/Tags.php
	M			application/modules/default/models/Info.php
	M			application/modules/default/models/ProjectCategory.php
	M			application/modules/default/models/ProjectClone.php
	M			application/modules/default/models/ProjectComments.php
	M			application/modules/default/models/Section.php
	M			application/modules/default/plugins/AclRules.php
	P			application/modules/default/views/helpers/IsProjectMod.php Copied from application/modules/default/views/helpers/IsProjectEbook.php
	P			application/modules/default/views/helpers/IsSupporterActive.php Copied from application/modules/default/models/DbRowset/PlingFaq.php
	M			application/modules/default/views/scripts/collection/index.phtml
	M			application/modules/default/views/scripts/collection/partials/productCommentsUX1.phtml
	P			application/modules/default/views/scripts/credits/mods.phtml Copied from application/modules/default/views/scripts/credits/index.phtml
	M			application/modules/default/views/scripts/dl/index.phtml
	M			application/modules/default/views/scripts/explore/partials/filter.phtml
	M			application/modules/default/views/scripts/home/index-opendesktop.phtml
	A			application/modules/default/views/scripts/moderation/productmoderation.phtml
	M			application/modules/default/views/scripts/partials/paginationControlComment.phtml
	M			application/modules/default/views/scripts/product/index.phtml
	P			application/modules/default/views/scripts/product/partials/productCommentsUX1.phtml Copied to application/modules/default/views/scripts/product/partials/productCommentsUX2.phtml
	P			application/modules/default/views/scripts/product/partials/productCommentsUX2.phtml Copied from application/modules/default/views/scripts/product/partials/productCommentsUX1.phtml
	M			application/modules/default/views/scripts/product/search.phtml
	M			application/modules/default/views/scripts/user/aboutme.phtml
	M			application/modules/default/views/scripts/user/activities.phtml
	M			httpdocs/theme/flatui/css/style.css
	M			httpdocs/theme/flatui/css/stylesheet.css
	M			httpdocs/theme/flatui/js/script.js
	M			httpdocs/theme/flatui/js/script.min.js
	M			httpdocs/theme/flatui/less/stylesheet.less
	M			httpdocs/theme/react/all.js
	M			httpdocs/theme/react/bundle/app-product-relationship-bundle.js
	M			httpdocs/theme/react/bundle/home-main-container-bundle.js
	P			httpdocs/theme/react/hooks-app/app-product-relationship/components/ModalAddRelationship.js Copied from httpdocs/theme/react/hooks-app/app-product-relationship/components/ProductRelationship.js
	A			httpdocs/theme/react/hooks-app/app-product-relationship/components/ModalFlagModification.js
	P			httpdocs/theme/react/hooks-app/app-product-relationship/components/ProductRelationship.js Copied to httpdocs/theme/react/hooks-app/app-product-relationship/components/ModalAddRelationship.js
	M			httpdocs/theme/react/hooks-app/opendesktop-home/components/CommentsContainer.js
	M			httpdocs/theme/react/hooks-app/opendesktop-home/components/HomeMainContainer.js
	M			httpdocs/theme/react/hooks-app/opendesktop-home/function/WatchlistContainer.js
	A			sql_code/20191127_mail_tmp_comment_moderation.sql