Commit Graph

5493 Commits

Author SHA1 Message Date
jsatoh f220046f1e 2012-05-12 Junichi Satoh <junichi@rworks.jp>
* godmode/reporting/reporting_builder.item_editor.php: Wrapped 
	inventory_get_agents() in enterprise_hook();



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6295 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-12 06:10:32 +00:00
mdtrooper 2be7256a85 2012-05-11 Miguel de Dios <miguel.dedios@artica.es>
* extensions/update_manager/lib/functions.php: fixed into the
	function "update_pandora_installation" lost var,  and into the
	function "update_pandora_get_list_downloaded_packages" check fail
	dir.
	
	* extensions/update_manager/update_pandora.php: fixed foreach a non
	array in list download packages when fail.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6293 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-11 11:39:50 +00:00
jsatoh e27f160c90 2012-05-11 Junichi Satoh <junichi@rworks.jp>
* ChangeLog: Fixed conflict with previous commit. (Added lost lines.)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6291 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-11 04:47:57 +00:00
zarzuelo d458a4792c 2012-05-10 Sergio Martin <sergio.martin@artica.es>
* unix/Linux/pandora_agent.conf
	unix/pandora_agent: Added units parameter to the 
	agent and added units to the default modules in
	conf for pending task #3520530



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6290 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-10 16:27:15 +00:00
juanmanuelr 3cc649fb39 2012-05-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* general/login_help_dialog.php: Removed variable due to 
	obfuscation.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6289 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-10 15:58:31 +00:00
zarzuelo a60652739e 2012-05-10 Sergio Martin <sergio.martin@artica.es>
* include/javascript/pandora_modules.js
	pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_4.1.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql
	godmode/agentes/module_manager_editor_common.php
	godmode/modules/manage_network_components_form.php
	godmode/modules/manage_network_components_form_common.php
	godmode/modules/manage_network_components.php: Fix some layout
	little bugs in module editor and added unit parameter
	to network components for pending task #3520706



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6287 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-10 15:35:28 +00:00
mdtrooper ae09d03d3d 2012-05-10 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_users.php: fixes from the equal chat in the
	Integria IMS.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6286 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-10 15:05:18 +00:00
zarzuelo 59c560c1ac 2012-05-10 Sergio Martin <sergio.martin@artica.es>
* lib/PandoraFMS/DB.pm
	lib/PandoraFMS/Core.pm: Added the macro _alert_text_severity_ to
	the alerts



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6284 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-10 12:18:43 +00:00
zarzuelo b3919979e3 2012-05-10 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql: Set default value to id_alert_command
	column in db to avoid comparison errors in server




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6283 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-10 12:09:00 +00:00
jsatoh fdf0d4dfb7 2012-05-10 Junichi Satoh <junichi@rworks.jp>
* FreeBSD/pandora_server.conf: Synchronized with the generic
	configuration file, conf/pandora_server.conf (better default values).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6281 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-10 09:51:42 +00:00
jsatoh 95a5e943a1 2012-05-10 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_alert_macros.php: Added to help two new macros.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6280 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-10 09:39:53 +00:00
zarzuelo b5847fc364 2012-05-10 Sergio Martin <sergio.martin@artica.es>
* include/help/en/help_alert_macros.php
	include/help/es/help_alert_macros.php: Added to help two new
	macros



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6279 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-10 08:45:55 +00:00
zarzuelo 417b31ab46 2012-05-09 Sergio Martin <sergio.martin@artica.es>
* include/functions_agents.php: Merged from 4.0 the extra_sql
	get code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6277 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-09 16:13:31 +00:00
zarzuelo 957d8c679e 2012-05-09 Sergio Martin <sergio.martin@artica.es>
* include/help/en/help_alert_macros.php
	include/help/es/help_alert_macros.php
	include/functions.php
	include/functions_agents.php: Fixing some missing or wrong macros
	into help and added Minor and Major severities to alerts 
	and clean some code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6276 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-09 16:05:16 +00:00
darode 5f3c0c15d5 2012-05-09 Dario Rodriguez <dario.rodriguez@artica.es>
* util/plugin/ipmi-plugin.pl,
	util/recon_scripts/ipmi-recon.pl: Fixed some bugs of plugin and
	recon

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6275 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-09 07:40:24 +00:00
slerena 9938275789 2012-05-08 Sancho Lerena <slerena@artica.es>
* conf/pandora_server.conf: Better default values.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6272 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-08 15:47:19 +00:00
slerena c60fa7b089 2012-05-08 Sancho Lerena <slerena@artica.es>
* operation/agentes/datos_agente.php: Fixed search, was
        not working due html encoding in the SQL. Alter some layout
        issues (centering data in columns)

        * extensions/ssh_gateway*: New extension to connect SSH/Telnet
        servers from the console, using external anytermd daemon running
        in the pandora server.

        * pandora.css: Fix title height.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6271 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-08 15:43:45 +00:00
darode ee218293ca 2012-05-08 Dario Rodriguez <dario.rodriguez@artica.es>
* unix/Linux/pandora_agent.conf: Fixed an example module name.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6267 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-08 14:27:34 +00:00
juanmanuelr 95467a5892 2012-05-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/header_f2b.png: Changed image size to 3000px width.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6265 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-08 10:58:19 +00:00
juanmanuelr 6c76e3bea5 2012-05-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/opera_browser.png
	 images/safari_browser.jpeg
	 images/iexplorer.jpeg: Added browser images.

	* general/login_page.php: Changed browser warning modal window.

	* images/mozilla_firefox.png: Modified image.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6264 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-08 08:55:35 +00:00
juanmanuelr e72a7f02c0 2012-05-07 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora.css: Reverted changes (bag visualization
	in Firefox).



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6263 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-07 14:54:23 +00:00
juanmanuelr 6c5b302f2f 2012-05-07 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora.css: Fixed input layout in login screen.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6261 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-07 14:37:28 +00:00
slerena 78d246414e 2012-05-04 Sancho Lerena <slerena@artica.es>
* anytermd.suse.spec: Added specific spec for SUSE. Tested on a
        opensuse 11.3/i586.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6260 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-04 20:47:23 +00:00
slerena dc852b20f5 012-05-05 Sancho Lerena <slerena@artica.es>
* anytermd: Added anyterm to extras. Included modifications on original
	anytermd project source code. Added a new spec file for centos/fedora/rhel.
	Tested on FC16/i386 and centos6/x86_84.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6257 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-04 19:14:27 +00:00
juanmanuelr 3dd1ca8580 2012-05-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* operation/agentes/ver_agente.php: Changed way of truncate agent 
	name in header due to bad visualization if agent name has entities.
		
	* include/styles/pandora.css
	images/header_f2.png: Modified header image with 3000px width. 



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6254 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-04 08:43:26 +00:00
zarzuelo dde2146987 2012-05-03 Sergio Martin <sergio.martin@artica.es>
* win32/windows/pandora_wmi.cc: Added to the windows
	agent inventory module for patches the service pack
	column

	Merged from 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6251 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-03 14:45:42 +00:00
mdtrooper 8e027fc001 2012-05-03 Miguel de Dios <miguel.dedios@artica.es>
* include/styles/pandora.css: fixed ".is_submenu2 li" because there
	is not ":".
	
	* include/functions_reporting.php: cleaned source code style.
	
	* godmode/reporting/reporting_builder.php: removed a PHP notice
	message about a uninicialized var.
	
	* godmode/reporting/graphs.php: fixed lost icon in the header bar
	in this page.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6248 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-03 13:57:55 +00:00
mdtrooper beb743815b 2012-05-03 Miguel de Dios <miguel.dedios@artica.es>
* include/styles/menu.css: fixed bad colour name "#grey" for correct
	colour name "grey".
	
	* include/constants.php: added constants for backup.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6246 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-03 11:29:04 +00:00
juanmanuelr 648605f2aa 2012-05-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora.css: Removed background color of 
	header separators and background header font color in godmode views.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6243 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-03 11:11:22 +00:00
juanmanuelr 14082b25dc 2012-05-03 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora_legacy.css
	 include/styles/pandora.css
	 images/skin/skin_default/include/styles/pandora.css: Fixed 
	 information messages in other css files different than the default
	 css file. Also resized header image to 100% width.
	 
	* operation/agentes/tactical.php: Fixed print_cells_temp function 
	when it has not color like argument.

	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6241 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-03 10:44:07 +00:00
mdtrooper fc87947dd9 2012-05-03 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.php: refixed the add the
	items with modules with entities.
	
	* include/functions_reporting.php, include/functions_networkmap.php,
	include/functions_visual_map.php: cleaned source code style.
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6238 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-05-03 09:35:30 +00:00
slerena c80c10d0b5 2012-04-30 Sancho Lerena <slerena@artica.es>
All changes (except a small patch on function_groups) are
	ported from 4.0.2 development branch. 

	* include/help/en/help_main_help.php: Added new general
	introduction help file. Need work.

	* include/functions_events.php: Fixed link colors and other 
	aesthetic improvements.
	
	* include/styles/pandora_legacy.css
	include/styles/pandora_black.css
	include/styles/pandora.css
	include/styles/pandora_bluenavy.css
	include/styles/pandora_minimal.css
	include/styles/pandora_blackmetal.css
	include/styles/pandora_green.css:
	
	
	* extensions/agents_modules.php,
	include/functions_groups.php: now colors uses CSS instead
	fixed codes in code. In function_groups also I've also applied a missing
	patch from the 4.0 with corrections on the Group extration from the DB.
	
	* operation/events/sound_events.php: Fixed small format problem.
	
	* operation/events/events_list.php: Link on event now "zoom it" instead
	filter for the same events (nosense since agrupatio is the default view!). 
	Fixed a	lof of aesthetic issues, now uses CSS for most issues.

	* operation/agentes/tactical.php
	operation/agentes/estado_generalagente.php: more work in the visual
	aspect of the information.
	
	* images/status_sets/default/agent_ok.png
	images/status_sets/default/module_warning.png
	images/status_sets/default/module_ok.png
	images/status_sets/default/agent_warning.png: Replaced colors with
	more contrast, easier to view for operators!.
	
	* images/header_f2b.png
	images/header_f2.png: new style headers.
	
	* general/header.php: New icon for general help.
	
	* godmode/agentes/agent_manager.php: Removed ugly visualization for GIS
	agent icons. Now it's much better :)




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6236 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-30 19:22:07 +00:00
vgilc 113252ef72 2012-04-30 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_filemanager.php: Fixed: Collection list
	looks bad.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6233 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-30 15:21:38 +00:00
vgilc 6b8959dc28 2012-04-30 Vanessa Gil <vanessa.gil@artica.es>
* operation/reporting/graph_viewer.php
	  operation/events: Fixed calendar.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6232 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-30 14:54:25 +00:00
vgilc 4bb6c612dd 2012-04-30 Vanessa Gil <vanessa.gil@artica.es>
* operation/agentes/datos_agente.php: Fixed: bad layout in view data and
	changed calendar.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6231 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-30 14:07:23 +00:00
mdtrooper ffad6bb505 2012-04-30 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/visual_console_builder.php: fixed when the
	module have a spaces or other entities in the name when try to
	create a items with the wizzard.
	
	* godmode/reporting/visual_console_builder.wizard.php: changed the
	style of form to show more horizontality.
	
	Fixes: #3521724
	
	
	
	* include/functions_reporting.php: fixed the "Top-N".
	
	Fixes: #3521724
	
	* include/functions_agents.php: cleaned source code style.
	
	* operation/agentes/ver_agente.php: return more data in the ajax
	request for the modules.
	
	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6230 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-30 12:44:26 +00:00
vgilc 616a926d21 2012-04-30 Vanessa Gil <vanessa.gil@artica.es>
* pandoradb.php
	  extras/pandoradb_migrate_4.0.x_to_4.1.mysql.sql: Fixed: BLOB/TEXT column 
	can't have a default value.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6229 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-30 12:21:38 +00:00
vgilc 4ce1bab8c6 2012-04-30 Vanessa Gil <vanessa.gil@artica.es>
* include/functions_server.php: Fixed broken link in server view.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6225 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-30 09:25:07 +00:00
vgilc 1430ba27c5 2012-04-30 Vanessa Gil <vanessa.gil@artica.es>
* godmode/servers/modificar_server.php: Changed values of columns 'load',
	'modules' and 'lag'.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6224 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-30 09:11:16 +00:00
jsatoh fdcbe6886f 2012-04-28 Junichi Satoh <junichi@rworks.jp>
* godmode/setup/setup.php: Fixed SQL error with PostgreSQL.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6221 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-28 07:48:24 +00:00
jsatoh 8a4092219d 2012-04-28 Junichi Satoh <junichi@rworks.jp>
* pandoradb.postgreSQL.sql,
	extras/pandoradb_migrate_4.0.x_to_4.1.postgreSQL.sql: Fixed database
	creation failure with before 9.1 version of PostgreSQL.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6220 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-28 05:48:54 +00:00
jsatoh a438d3f683 2012-04-28 Junichi Satoh <junichi@rworks.jp>
* lib/PandoraFMS/Core.pm: Added a missing argument to process_data()
	call.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6216 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-28 01:43:04 +00:00
juanmanuelr 3df62a96f8 2012-04-27 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/enterprise_version.png
	 images/online_help.png
	 images/license_key.png
	 images/error_login.png
	 images/documentation.png
	 images/support.png
	 images/lock_license.png: Added new images for modal windows.

	* general/login_help_dialog.php
	 general/login_page.php: 
	 extensions/update_manager.php: Changed images for modal windows.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6215 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-27 18:21:26 +00:00
mdtrooper 3719c2f66a 2012-04-27 Miguel de Dios <miguel.dedios@artica.es>
* include/functions_events.php: into the function
	"events_validate_event" fixed the return false when fail validation.
	
	* include/functions_network_components.php: fixed the includes.
	
	* operation/agentes/exportdata.php: cleaned source code style.
	
	* include/functions_api.php: fixed the checking error to healty
	level into the function "get_events".
	
	MERGED FROM 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6212 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-27 12:52:33 +00:00
vgilc 8f824f63ad 2012-04-27 Vanessa Gil <vanessa.gil@artica.es>
* godmode/alerts/alerts_list.list.php: Fixed: Action filter
	don't show right actions group.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6210 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-27 12:32:40 +00:00
mdtrooper 8a14d45a7c 2012-12-27 Miguel de Dios <miguel.dedios@artica.es>
* AndroidManifest.xml,
	src/pandroid_event_viewer/pandorafms/PopupValidationEvent.java,
	src/pandroid_event_viewer/pandorafms/PandroidEventviewerActivity.java,
	src/pandroid_event_viewer/pandorafms/Main.java,
	src/pandroid_event_viewer/pandorafms/About.java,
	src/pandroid_event_viewer/pandorafms/Options.java,
	src/pandroid_event_viewer/pandorafms/Info.java,
	src/pandroid_event_viewer/pandorafms/EventList.java,
	res/values/strings.xml,res/values-en/strings.xml,
	res/values-es/strings.xml,res/layout/info.xml: fixed some things and
	added more stability and a pretty splashscreen.
	
	MERGED FROM BRANCH 4.0.2




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6209 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-27 12:30:31 +00:00
zarzuelo f250a7a61e 2012-04-27 Sergio Martin <sergio.martin@artica.es>
* include/functions_groups.php
	include/functions_ui.php
	operation/agentes/estado_ultimopaquete.php
	operation/agentes/estado_generalagente.php
	operation/agentes/estado_monitores.php
	godmode/reporting/visual_console_builder.elements.php: Fixed several 
	title text in force icon (green donut)

	* operation/menu.php: Fixed missed "Edit my user" option



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6206 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-27 11:13:03 +00:00
darode f16a1ef2c8 2012-04-27 Dario Rodriguez <dario.rodriguez@artica.es>
* unix/plugins/inventory: Fixed a small error related to inventory plugin

	MERGED FROM 4.0.2


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6205 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-27 10:53:50 +00:00
darode 38d0f61da5 2012-04-27 Dario Rodriguez <dario.rodriguez@artica.es>
* unix/plugins/inventory,
	unix/Linux/pandora_agent.conf: Inventory improved: added Mac to NIC, 
	created new modules for IPs and Route table. Update pandora agent conf.

	MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6203 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-27 10:12:29 +00:00
juanmanuelr e739de9f8a 2012-04-26 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/styles/pandora.css
	 include/javascript/jquery.pandora.js
	 index.php
	 general/login_help_dialog.php: Added input for license in blocking
	 license modal windows.

	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@6201 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2012-04-26 20:46:38 +00:00