lp:~ubuntu-weilnetz/ocsinventory-ocsreports/ocsinventory-ocsreports

Branch merges

Propose for merging

No branches dependent on this one.

Ready for review for merging into lp:ocsinventory-ocsreports

OCS Inventory Core Team: Pending requested 2015-05-07

Diff: 596 lines (+60/-60)

27 files modified

Changes (+3/-3)
backend/require/lib/phpcas/PGTStorage/pgt-db.php (+1/-1)
backend/require/lib/phpcas/PGTStorage/pgt-file.php (+1/-1)
backend/require/lib/phpcas/client.php (+13/-13)
config/urls.xml (+3/-3)
install.php (+1/-1)
js/graph/elycharts.js (+3/-3)
js/graph/jquery-1.6.2.js (+3/-3)
js/graph/raphael.js (+3/-3)
js/jquery.fileupload.js (+1/-1)
libraries/datatable/media/js/jquery.dataTables.js (+1/-1)
libraries/linfo/CHANGELOG (+1/-1)
libraries/linfo/lib/class.GetHddTemp.php (+2/-2)
libraries/linfo/lib/class.LinfoOutput.php (+2/-2)
libraries/linfo/lib/class.OS_Darwin.php (+1/-1)
libraries/linfo/lib/class.OS_DragonFly.php (+1/-1)
libraries/linfo/lib/class.OS_FreeBSD.php (+1/-1)
libraries/linfo/lib/class.OS_Linux.php (+1/-1)
libraries/linfo/lib/class.OS_NetBSD.php (+1/-1)
libraries/linfo/lib/class.OS_OpenBSD.php (+1/-1)
libraries/linfo/lib/class.OS_SunOS.php (+3/-3)
libraries/linfo/lib/class.OS_Windows.php (+2/-2)
libraries/linfo/lib/class.ext_transmission.php (+1/-1)
plugins/main_sections/ms_teledeploy/ms_tele_package.php (+5/-5)
require/function_server.php (+3/-3)
require/menu/Menu.php (+1/-1)
require/menu/MenuRenderer.php (+1/-1)

api

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

1017. By Stefan Weil <email address hidden> on 2015-05-07

Fix typos (most of them found by Codespell)

1016. By Erwan on 2015-03-03

Change version number

1015. By Arthur Jaouen <email address hidden> on 2015-01-05

Fix error with apk

1014. By Arthur Jaouen <email address hidden> on 2015-01-05

Add priority to package form

1013. By Arthur Jaouen <email address hidden> on 2015-01-05

Better handling of apk and android packages

1012. By Arthur Jaouen <email address hidden> on 2014-12-30

fix conf reload bug

1011. By Arthur Jaouen <email address hidden> on 2014-12-30

Replace build package menu with the new one

1010. By Arthur Jaouen <email address hidden> on 2014-12-30

Handle post_max_size errors + json error for csrf attack when ajax request

1009. By Arthur Jaouen <email address hidden> on 2014-12-29

New package form (work in progress)

1008. By Arthur Jaouen <email address hidden> on 2014-12-29

Fix bug in profiles list