Diffusion OCS Webserver 5e7735a768e9

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

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

Tags

None

Subscribers

None

Description

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

Details

Committed

david nelband <dnelband@gmail.com>

Jan 15 2019, 12:45 PM

Parents

R767:5d599468c42d: no message
R767:d5a3bb8fadfd: pling list

Branches

Unknown

Tags

Unknown

david nelband <dnelband@gmail.com> committed R767:5e7735a768e9: Merge branch 'dev' of git.kde.org:ocs-webserver into dev (authored by david nelband <dnelband@gmail.com>).Jan 15 2019, 12:45 PM

Merged Changes

	Commit			Author	Details	Committed
	d5a3bb8fadfd			ronaldv	pling list	Jan 15 2019
	09ca9b9212c8			ronaldv	Merge branch 'plinglist' into dev	Jan 15 2019
	1cb011d20e61			ronaldv	pling list	Jan 15 2019
	913091519d12			ronaldv	list	Jan 11 2019
	1b75668bf544			ronaldv	add ajax	Jan 10 2019
	5717aef76074			ronaldv	pling list	Jan 9 2019
	19c72340f935			ronaldv	add lazy loading	Jan 8 2019

Changes (11)

				Path	Packages
	M			application/modules/default/Bootstrap.php
	M			application/modules/default/controllers/UserController.php
	M			application/modules/default/models/StatDownload.php
	M			application/modules/default/plugins/AclRules.php
	P			application/modules/default/views/scripts/user/partials/loopPlings.phtml Copied to multiple locations: application/modules/default/views/scripts/user/partials/loopPlingsForMonth.phtml application/modules/default/views/scripts/user/partials/loopPlingsOld.phtml
	P			application/modules/default/views/scripts/user/partials/loopPlingsForMonth.phtml Copied from application/modules/default/views/scripts/user/partials/loopPlings.phtml
	P			application/modules/default/views/scripts/user/partials/loopPlingsOld.phtml Copied from application/modules/default/views/scripts/user/partials/loopPlings.phtml
	P			application/modules/default/views/scripts/user/plings.phtml Copied to application/modules/default/views/scripts/user/plingsold.phtml
	P			application/modules/default/views/scripts/user/plingsajax.phtml Copied from application/modules/default/views/scripts/home/index-plingcom.phtml
	P			application/modules/default/views/scripts/user/plingsmonthajax.phtml Copied from application/modules/default/views/scripts/product/viewscripts/form_default.phtml
	P			application/modules/default/views/scripts/user/plingsold.phtml Copied from application/modules/default/views/scripts/user/plings.phtml

R767:5e7735a768e9

application/modules/default/Bootstrap.php

Loading...

application/modules/default/controllers/UserController.php

Loading...

application/modules/default/models/StatDownload.php

Loading...

application/modules/default/plugins/AclRules.php

Loading...

application/modules/default/views/scripts/user/partials/loopPlings.phtml

Loading...

application/modules/default/views/scripts/user/partials/loopPlingsForMonth.phtml

Loading...

application/modules/default/views/scripts/user/partials/loopPlingsOld.phtml

Loading...

application/modules/default/views/scripts/user/plings.phtml

Loading...

application/modules/default/views/scripts/user/plingsajax.phtml

Loading...

application/modules/default/views/scripts/user/plingsmonthajax.phtml

Loading...

application/modules/default/views/scripts/user/plingsold.phtml

Loading...