Diffusion OCS Webserver 049f9ee3f3c5

ocs-webserver into dev
049f9ee3f3c5
Actions

Authored by David Nelband <dnelband@gmail.com> on Nov 13 2019, 10:53 AM.

Description

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

Details

Committed

David Nelband <dnelband@gmail.com>

Nov 13 2019, 10:53 AM

Parents

R767:ca3ac2f8ebac: pms cl
R767:49bc901a8c10: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev

Branches

Unknown

Tags

Unknown

David Nelband <dnelband@gmail.com> committed R767:049f9ee3f3c5: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev (authored by David Nelband <dnelband@gmail.com>).Nov 13 2019, 10:53 AM

Merged Changes

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

Commit	Author	Details	Committed
49bc901a8c10	ronaldv	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Nov 13 2019
91065f56d4d8	ronaldv	media	Nov 13 2019
35620a957cfa	siyuandong	polish	Nov 13 2019
6aa1b8eb6f91	siyuandong	polish	Nov 13 2019
68aeb9f0132c	siyuandong	app-supporters	Nov 12 2019
605b6f94d895	siyuandong	mdsum	Nov 12 2019
119a8f72c5f1	siyuandong	section	Nov 12 2019
8701b823bd78	siyuandong	fav limit	Nov 12 2019
a12011779ef3	siyuandong	section	Nov 12 2019
97c6ab61fcd8	ronaldv	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Nov 11 2019
d69e5abf6ca9	ronaldv	original	Nov 11 2019
e068a3eeaa6b	siyuandong	aboutme	Nov 11 2019
61cf72230235	siyuandong	unpublished	Nov 11 2019
31d42ab10ed4	siyuandong	unpublished	Nov 11 2019
0e4f13686ae6	siyuandong	suppporters	Nov 8 2019
eb21626798c2	ronaldv	login	Nov 8 2019
46185e172232	ronaldv	login	Nov 8 2019
4ecccf4a63e1	ronaldv	login	Nov 8 2019
1be6988961e3	ronaldv	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Nov 8 2019
dc6f9eb36c30	ronaldv	login	Nov 8 2019
48e7cc423caf	siyuandong	search	Nov 8 2019
713059e6df6c	ronaldv	login	Nov 8 2019
c3e029e6d6bf	ronaldv	Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev	Nov 8 2019
5f38d7200bfb	ronaldv	login	Nov 8 2019
c7a84b4542c7	siyuandong	metaheader search	Nov 8 2019
77f7a534a76c	ronaldv	login	Nov 8 2019
5d0646d9ab4f	ronaldv	login	Nov 8 2019
6784c0eef857	ronaldv	login	Nov 7 2019
1e2f27873290	ronaldv	login	Nov 7 2019
7d9a704d74ef	ronaldv	login	Nov 7 2019
cf86c2b293a2	ronaldv	login	Nov 7 2019
0b8630875a4c	ronaldv	login	Nov 7 2019
96dd6222a840	ronaldv	login	Nov 7 2019
681bde5c8605	ronaldv	login	Nov 7 2019
c79935e7a2a5	ronaldv	login	Nov 7 2019
fcf6d6e924ce	ronaldv	login	Nov 7 2019
a9feb539db26	ronaldv	login	Nov 7 2019
2347003f71eb	ronaldv	login	Nov 7 2019
1d55ae44dcf9	ronaldv	login	Nov 7 2019
ae00cbdaad04	ronaldv	login	Nov 7 2019
297c82739711	ronaldv	login	Nov 7 2019
1cba11576224	ronaldv	login	Nov 7 2019
0c90d55a4991	ronaldv	login	Nov 7 2019
5ca092b5b125	ronaldv	login	Nov 7 2019
9d72f40f7e44	ronaldv	login	Nov 7 2019
fbeb641d344c	ronaldv	login	Nov 7 2019
82fba3d71589	ronaldv	login	Nov 7 2019
a747b92aa9ba	ronaldv	login	Nov 7 2019
caa9e739696f	ronaldv	login	Nov 7 2019
51200bc66f4a	ronaldv	login	Nov 7 2019

Changes (61)

		Path
M		application/modules/backend/views/scripts/statistics/payout-member.phtml
M		application/modules/default/controllers/AuthorizationController.php
M		application/modules/default/controllers/ExploreController.php
M		application/modules/default/controllers/JsonController.php
P		application/modules/default/controllers/LoginController.php Copied to application/modules/default/models/DbTable/LoginHistory.php
M		application/modules/default/controllers/ProductController.php
M		application/modules/default/controllers/SpamController.php
A		application/modules/default/controllers/SupportersController.php
M		application/modules/default/controllers/UserController.php
P		application/modules/default/models/DbTable/LoginHistory.php Copied from application/modules/default/controllers/LoginController.php
A		application/modules/default/models/LoginHistory.php
M		application/modules/default/models/Member.php
M		application/modules/default/models/Project.php
M		application/modules/default/models/Section.php
M		application/modules/default/models/StatDownload.php
M		application/modules/default/plugins/AclRules.php
M		application/modules/default/views/scripts/authorization/login.phtml
M		application/modules/default/views/scripts/authorization/partials/loginForm.phtml
M		application/modules/default/views/scripts/dl/index.phtml
M		application/modules/default/views/scripts/home/index-plingcom.phtml
M		application/modules/default/views/scripts/home/partials/product_group.phtml
M		application/modules/default/views/scripts/product/add.phtml
M		application/modules/default/views/scripts/product/partials/details.phtml
M		application/modules/default/views/scripts/spam/mdsum.phtml
M		application/modules/default/views/scripts/spam/unpublishedproduct.phtml
A	(dir)	application/modules/default/views/scripts/supporters/
A		application/modules/default/views/scripts/supporters/index.phtml
M		application/modules/default/views/scripts/user/aboutme.phtml
M		application/modules/default/views/scripts/user/partials/loopSectionCreditsForMonth.phtml
M		application/modules/default/views/scripts/user/partials/loopSectionPlingsForMonth.phtml
M		httpdocs/partials/faq.phtml
M		httpdocs/theme/react/assets/css/pling-section.css
M		httpdocs/theme/react/assets/less/pling-section.less
A		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
A	(dir)	httpdocs/theme/react/hooks-app/app-supporters/
A	(dir)	httpdocs/theme/react/hooks-app/app-supporters/components/
A		httpdocs/theme/react/hooks-app/app-supporters/components/App.js
A		httpdocs/theme/react/hooks-app/app-supporters/components/AppSupporters.js
A		httpdocs/theme/react/hooks-app/app-supporters/components/Creator.js
A		httpdocs/theme/react/hooks-app/app-supporters/components/Header.js
A		httpdocs/theme/react/hooks-app/app-supporters/components/Product.js
A		httpdocs/theme/react/hooks-app/app-supporters/components/RecentPlinged.js
A		httpdocs/theme/react/hooks-app/app-supporters/components/RecentPlingedProduct.js
A		httpdocs/theme/react/hooks-app/app-supporters/components/Support.js
A		httpdocs/theme/react/hooks-app/app-supporters/components/Supporters.js
A		httpdocs/theme/react/hooks-app/app-supporters/components/TopCreators.js
A		httpdocs/theme/react/hooks-app/app-supporters/components/TopProducts.js
A		httpdocs/theme/react/hooks-app/app-supporters/components/util.js
A	(dir)	httpdocs/theme/react/hooks-app/app-supporters/contexts/
A		httpdocs/theme/react/hooks-app/app-supporters/contexts/AppSupportersContext.js
A		httpdocs/theme/react/hooks-app/app-supporters/entry-app-supporters.js
M		httpdocs/theme/react/hooks-app/metaheader/components/MobileLeftMenu.js
M		httpdocs/theme/react/hooks-app/metaheader/components/SearchForm.js
M		httpdocs/theme/react/hooks-app/metaheader/components/function/CommunityMenuItems.js
A	(dir)	httpdocs/theme/react/hooks-app/metaheader/contexts/
A		httpdocs/theme/react/hooks-app/metaheader/contexts/MetaheaderContext.js
M		httpdocs/theme/react/hooks-app/webpack.config.js
A		sql_code/20191104_micro_payout_add_org_factor.sql
A		sql_code/20191106_new_table_login_history.sql