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

Authored by david nelband <dnelband@gmail.com> on Jan 15 2019, 1:02 PM.

Description

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

Committed

david nelband <dnelband@gmail.com>

Jan 15 2019, 1:02 PM

Parents

R767:06ff05cafc8a: no message
R767:f40ade69a7d6: stati

Branches

Unknown

Tags

Unknown

	Commit			Author	Details	Committed
	f40ade69a7d6			siyuandong	stati	Jan 15 2019
	b875c87c8d98			siyuandong	stati	Jan 15 2019

				Path	Packages
	M			application/modules/backend/controllers/IndexController.php
	M			application/modules/backend/views/scripts/index/index.phtml
	M			application/modules/default/controllers/UserController.php
	M			application/modules/statistics/models/Data.php
	M			httpdocs/theme/backend/css/backend/stati.css
	M			httpdocs/theme/backend/js/backend_stati.js
	A			httpdocs/theme/flatui/js/stati/newproductsweekly.js