Diffusion OCS Webserver 1e269fed2561

ocs-webserver into dev
1e269fed2561
Actions

Authored by David Nelband <dnelband@gmail.com> on May 23 2019, 11:24 AM.

Description

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

Details

Committed

David Nelband <dnelband@gmail.com>

May 23 2019, 11:24 AM

Parents

R767:a3b5ca364032: pms fix video player height
R767:ee913f986e37: product detail

Branches

Unknown

Tags

Unknown

David Nelband <dnelband@gmail.com> committed R767:1e269fed2561: Merge branch 'dev' of https://github.com/KDE/ocs-webserver into dev (authored by David Nelband <dnelband@gmail.com>).May 23 2019, 11:24 AM

Merged Changes

Commit	Author	Details	Committed
ee913f986e37	ronaldv	product detail	May 23 2019
10a65ea322d7	ronaldv	add statistics module again	May 23 2019
f84217e933bb	siyuandong	rating fix	May 23 2019

Changes (23)

		Path
M		application/modules/default/controllers/ProductController.php
M		application/modules/default/controllers/ProductcommentController.php
M		application/modules/default/views/scripts/product/partials/details.phtml
A	(dir)	application/modules/statistics/
A		application/modules/statistics/Bootstrap.php
A	(dir)	application/modules/statistics/controllers/
A		application/modules/statistics/controllers/CronController.php
P		application/modules/statistics/controllers/CronDailyController.php Copied from application/modules/default/models/DbRow/ActivityLogType.php
A		application/modules/statistics/controllers/DailyController.php
A		application/modules/statistics/controllers/DataController.php
A		application/modules/statistics/controllers/MonthlyController.php
A		application/modules/statistics/controllers/WeeklyController.php
A	(dir)	application/modules/statistics/library/
A	(dir)	application/modules/statistics/library/statistics/
A	(dir)	application/modules/statistics/library/statistics/ranking/
P		application/modules/statistics/library/statistics/ranking/RankingInterface.php Copied from library/Local/Db/Table/Row/ValidateInterface.php
P		application/modules/statistics/library/statistics/ranking/WeightedAverageRanking.php Copied from library/Local/Payment/PayPal/AdaptiveAccounts/Response.php
A	(dir)	application/modules/statistics/models/
A		application/modules/statistics/models/Data.php
A	(dir)	application/modules/statistics/models/DbTable/
A		application/modules/statistics/models/DbTable/StatDaily.php
A		application/modules/statistics/models/GoalStatistics.php
P		application/modules/statistics/models/Stat.php Copied from application/modules/default/models/DbRow/ActivityLog.php