Diffusion OCS Webserver 23888f501222

Merge branch 'dev' of git.kde.org:ocs-webserver into dev
23888f501222
Actions

Authored by david nelband <dnelband@gmail.com> on Jan 15 2019, 10:41 AM.

Description

Merge branch 'dev' of git.kde.org:ocs-webserver into dev

Details

Committed

david nelband <dnelband@gmail.com>

Jan 15 2019, 10:41 AM

Parents

R767:402f3de1d373: no message
R767:0ed7ebdf8bfe: community

Branches

Unknown

Tags

Unknown

david nelband <dnelband@gmail.com> committed R767:23888f501222: Merge branch 'dev' of git.kde.org:ocs-webserver into dev (authored by david nelband <dnelband@gmail.com>).Jan 15 2019, 10:41 AM

Merged Changes

Commit	Author	Details	Committed
0ed7ebdf8bfe	siyuandong	community	Jan 15 2019
4594e38c86fa	alexanderschmidt	updated method for deleting users in the forum	Jan 14 2019
671b7d0b5d66	alexanderschmidt	updated method for deleting users in the forum	Jan 14 2019
d6a5d288d035	siyuandong	update	Jan 14 2019
c6d65848cd5f	siyuandong	fix	Jan 14 2019
56d253419e1d	siyuandong	aboutme	Jan 14 2019
ac88fac451f7	siyuandong	aboutme	Jan 14 2019
6d8a98cef483	siyuandong	aboutme	Jan 14 2019
5a13cf115e0b	siyuandong	aboutme	Jan 14 2019
eb92f79375f5	siyuandong	community	Jan 14 2019
8dfeb2f34ed8	siyuandong	aboutme	Jan 14 2019
b175708604e1	siyuandong	aboutme	Jan 14 2019
d8a9a2624972	siyuandong	issue709 cleanup	Jan 14 2019
8323606ea250	siyuandong	aboutme	Jan 14 2019
a891f07af942	alexanderschmidt	Manage Spam Keywords from backend	Jan 14 2019
5d038e9f62c3	siyuandong	issues	Jan 13 2019
863e67981b91	alexanderschmidt	Manage Spam Keywords from backend	Jan 11 2019
7018f32c8ebd	siyuandong	spam comments	Jan 11 2019
3d1a65fe1dd6	siyuandong	spam comments	Jan 11 2019
d7eae3d5001e	ronaldv	mandant	Jan 11 2019

Changes (26)

		Path
M		application/modules/backend/controllers/CdiscourseController.php
P		application/modules/backend/controllers/SpamkeywordsController.php Copied from application/modules/backend/controllers/PayoutstatusController.php
A	(dir)	application/modules/backend/views/scripts/spamkeywords/
A		application/modules/backend/views/scripts/spamkeywords/index.phtml
M		application/modules/default/controllers/ProductController.php
M		application/modules/default/controllers/UserController.php
A		application/modules/default/models/DbTable/SpamKeywords.php
M		application/modules/default/models/Info.php
M		application/modules/default/models/MemberDeactivationLog.php
M		application/modules/default/models/Ocs/Forum.php
M		application/modules/default/models/Project.php
M		application/modules/default/models/ProjectClone.php
M		application/modules/default/models/Spam.php
M		application/modules/default/models/StatDownload.php
M		application/modules/default/plugins/AclRules.php
M		application/modules/default/views/scripts/community/index.phtml
M		application/modules/default/views/scripts/spam/comments.phtml
M		application/modules/default/views/scripts/user/aboutme.phtml
P		application/modules/default/views/scripts/user/partials/aboutme-featured.phtml Copied from application/modules/default/views/scripts/user/partials/aboutme-products.phtml
P		application/modules/default/views/scripts/user/partials/aboutme-products.phtml Copied to application/modules/default/views/scripts/user/partials/aboutme-featured.phtml
M		httpdocs/theme/backend/js/backend_nav_admin.js
M		httpdocs/theme/flatui/css/stylesheet.css
M		httpdocs/theme/flatui/less/stylesheet.less
M		library/Local/Model/Table.php
A		sql_code/20190110_add_table_spam_keywords.sql
A		sql_code/20190110_store_config_show_git.sql