lp:~ubuntu-weilnetz/ocsinventory-windows-agent/ocsinventory-windows-agent

Branch merges

Ready for review for merging into lp:ocsinventory-windows-agent

Didier Liroulet: Pending requested 2015-05-07

Diff: 1049 lines (+101/-101)

46 files modified

Agent/CapDownload.h (+1/-1)
Agent/CapExecute.cpp (+1/-1)
Agent/CapacityAbstract.cpp (+1/-1)
Agent/OCSInventory.cpp (+2/-2)
Agent/PluginApi.h (+1/-1)
Agent/Plugins.cpp (+1/-1)
Agent/Plugins.h (+1/-1)
CHANGELOG (+8/-8)
ComHTTP/HTTPCrypt.cpp (+1/-1)
Download/Download.h (+1/-1)
Download/Package.cpp (+2/-2)
Download/Package.h (+2/-2)
External_Deps/OCS_Make_Required_Libs.bat (+1/-1)
NSIS_agent_setup/Agent.ini (+2/-2)
NSIS_agent_setup/OCS-NG_Windows_Agent_Setup.nsi (+6/-6)
NSIS_agent_setup/Readme.txt (+2/-2)
OCSInventory Front/Config.cpp (+1/-1)
OCSInventory Front/Config.h (+2/-2)
OCSInventory Front/Deviceid.cpp (+1/-1)
OCSInventory Front/ExecCommand.h (+5/-5)
OCSInventory Front/InventoryRequest.cpp (+2/-2)
OCSInventory Front/Log.h (+2/-2)
OCSInventory Front/Markup.cpp (+1/-1)
OCSInventory Front/OcsUtils.cpp (+1/-1)
OCSInventory Front/RequestAbstract.cpp (+1/-1)
OCSInventory Front/commonDownload.h (+1/-1)
OPTIONS.TXT (+2/-2)
OcsNotifyUser/OcsNotifyUser.h (+1/-1)
OcsSystray/SystemTray.cpp (+2/-2)
README.TXT (+5/-5)
Service/NTService.cpp (+1/-1)
Service/OcsService.cpp (+4/-4)
SysInfo/DMI.cpp (+1/-1)
SysInfo/DMI.h (+1/-1)
SysInfo/Dtwinver.cpp (+3/-3)
SysInfo/EDID.cpp (+1/-1)
SysInfo/EDID.h (+3/-3)
SysInfo/Registry.cpp (+9/-9)
SysInfo/SnmpAPI.cpp (+1/-1)
SysInfo/StoragePeripheral.cpp (+1/-1)
SysInfo/SysInfo.cpp (+1/-1)
SysInfo/VMSystem.h (+4/-4)
TestSysInfo/TestSysInfoDlg.cpp (+8/-8)
logon/OcsLogon.nsi (+1/-1)
logon/Readme.txt (+1/-1)
ocsinventory.ini.sample (+1/-1)

api

Propose for merging

Related source package recipes

No recipes using this branch. (?)

Create packaging recipe

Related snap packages

Related bugs

Related blueprints

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

Fix typos (most of them were reported by Codespell)

504. By Didier Liroulet on 2014-08-25

Update to Zlib 1.2.8, OpenSSL 1.0.0n, cURL 7.37.1, tinyxml 2.6.2

503. By Didier Liroulet on 2014-08-24

Update version to 2.1.1.2

502. By Didier Liroulet on 2014-08-24

Fix Bug #1353559 and Bug #1249006: If disk S/N is hex encoded, try to decode it, then ensure S/N is printable before storing it.
If S/N is not printable, hex encode it

501. By Didier Liroulet on 2014-08-22

Activate Bug #966320 fix: Disable support for Windows 2000

500. By Didier Liroulet on 2014-08-22

Fix Bug #1329003: custom warnings are empty, and Bug #1343818: show empty inventory information. COM initialization is no more needed into OcsSystray and OcsNotifyUser projects.

499. By Didier Liroulet on 2014-08-06

Merge patch from Jacek Kowalski for reading Motherboard informations (Manufacturer, Model and Serail number)

498. By Didier Liroulet on 2014-08-06

Fix incorrect format specifier for logger in Wmi.cpp, causing /DEBUG=2 to fail.
By Jacek Kowalski

497. By Didier Liroulet on 2014-08-04

Better detect Microsoft VM

496. By Didier Liroulet on 2014-06-25

Update SimpleBrowser class to lastest version