Commit Graph

4351 Commits

Author SHA1 Message Date
darode 08d2dac7b3 2013-01-15 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_visual_map.php: Now modules with warning
        status and alert fired are in yellow with orange border, before
        they were red with orange border.
        * include/constants.php: Mew constant for visual map to
        identify modules with warning status and alerts fired.

        MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7472 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-15 10:09:37 +00:00
juanmanuelr c92b473301 2013-01-15 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/db/postgresql.php
	include/db/mysql.php
	include/db/oracle.php: Fixed function get_system_time when 
	timesource is system.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7470 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-15 09:35:16 +00:00
zarzuelo 7fd387b9d7 2013-01-14 Sergio Martin <sergio.martin@artica.es>
* pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/network_components.oracle.sql
	extras/network_components.postgreSQL.sql: Delete old
	alert compound tables from database schemme

	* godmode/category/category.php
	godmode/category/edit_category.php: Adapt the category editor
	to metaconsole



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7468 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 17:09:26 +00:00
darode 4a86617714 2013-01-14 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/menu.php: Moved duplicated config view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7467 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 16:50:08 +00:00
darode e4db3a4d30 2013-01-14 Dario Rodriguez <dario.rodriguez@artica.es>
* include/functions_treeview.php: Now agents appear
        ordered by name.

        PORTER FROM 4.0.3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7466 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 16:23:54 +00:00
zarzuelo b452c87bfe 2013-01-14 Sergio Martin <sergio.martin@artica.es>
* godmode/alerts/alert_list.list.php
	godmode/alerts/alert_list.php: Fix ACLs bug of AD flag
	and aesthetic issues



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7465 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 16:14:32 +00:00
juanmanuelr e2f1ed02c5 2013-01-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* images/skin/skin_default/include/styles/pandora.css: Fixed small
	bug in default skin css.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7464 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 15:59:46 +00:00
darode 451a06177e 2013-01-14 Dario Rodriguez <dario.rodriguez@artica.es>
* pandoradb_data.sql: Fixed insert for MySQL plugin.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7463 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 15:47:31 +00:00
zarzuelo cfe2b286e6 2013-01-14 Sergio Martin <sergio.martin@artica.es>
* include/functions_ui.php
	include/functions.php
	operation/agentes/alerts_status.php
	operation/agentes/estado_agente.php
	godmode/agentes/module_manager.php
	godmode/agentes/modificar_agente.php
	godmode/agentes/configurar_agente.php
	godmode/menu.php
	godmode/alerts/alert_list.list.php
	godmode/alerts/alert_list.php: Added checks to new flag AD
	in godmode views for agents, modules and alerts. Clean 
	some old extra_sql (policy acls) code



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7461 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 15:11:07 +00:00
darode f62b64ffd0 2013-01-14 Dario Rodriguez <dario.rodriguez@artica.es>
* pandoradb_data.sql: Added a missing column name in
	tnetwork_component insert statemen.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7460 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 14:59:56 +00:00
darode f6abfbdf7d 2013-01-14 Dario Rodriguez <dario.rodriguez@artica.es>
* pandoradb_data.sql: Fixed tnetwork_component insert.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7459 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 14:49:20 +00:00
juanmanuelr f9e067bfbf 2013-01-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_component_groups.php
	 godmode/modules/manage_network_components.php: Don't remove 
	 parent component groups with childs assigned to components.
	 
	 Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7457 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 14:16:06 +00:00
juanmanuelr f1d25a41a7 2013-01-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/modules/manage_nc_groups.php: Parent row removed.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7455 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 13:46:39 +00:00
darode 7e9a019065 2013-01-14 Dario Rodriguez <dario.rodriguez@artica.es>
* extras/network_components.postgreSQL.sql,
	extras/local_components.postgreSQL.sql,
	extras/network_components.mysql.sql,
	extras/network_components.oracle.sql,
	extras/local_components.mysql.sql,
	extras/local_components.oracle.sql: Renamed files.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7451 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 11:17:05 +00:00
darode fea4125cfe 2013-01-14 Dario Rodriguez <dario.rodriguez@artica.es>
* extras/local_components.postgreSQL.sql,
	extras/local_components.mysql.sql,
	extras/local_components.oracle.sql: Create new sql script to 
	add new network components and groups by yourself if something
	fails.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7450 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 11:14:50 +00:00
darode 10f1268544 2013-01-14 Dario Rodriguez <dario.rodriguez@artica.es>
* extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql,
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql: Added network
	components and groups to migration script.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7449 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 11:09:00 +00:00
darode dbbb8da5e7 2013-01-14 Dario Rodriguez <dario.rodriguez@artica.es>
* extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql: Added network 
        components and groups to migration script.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7448 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 10:53:54 +00:00
mdtrooper c131bf5034 2013-01-14 Miguel de Dios <miguel.dedios@artica.es>
* include/styles/dialog.css: fixed the typo for disabled the styles.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7446 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 10:46:10 +00:00
juanmanuelr d8d89e62f9 2013-01-14 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_modules.php
	godmode/extensions.php
	godmode/agentes/configurar_agente.php
	godmode/servers/manage_recontask.php: Merged fixes from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7444 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-14 09:51:44 +00:00
Ramon Novoa d7f2723bc3 2013-01-11 Ramon Novoa <rnovoa@artica.es>
* godmode/setup/setup_netflow.php: Fixed a string.

	* include/functions_config.php,
	  operation/menu.php,
	  godmode/menu.php: Added support for the log viewer.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7442 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-11 16:02:10 +00:00
juanmanuelr 7677661126 2013-01-11 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_component_groups.php
	godmode/modules/manage_network_components.php
	godmode/modules/manage_nc_groups.php: Added tree format for
	component groups and make more restrictive filters in local/network
	components.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7440 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-11 14:32:28 +00:00
zarzuelo e623e950d8 2013-01-11 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql
	include/functions_ui.php
	include/functions.php
	include/functions_agents.php
	pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	operation/agentes/alerts_status.php
	pandoradb.data.postgreSQL.sql
	pandoradb.data.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql
	godmode/agentes/module_manager_editor.php
	godmode/users/profile_list.php
	godmode/users/configure_profile.php
	godmode/modules/manage_network_components_form.php
	godmode/modules/manage_network_components_form_common.php
	godmode/modules/manage_network_components.php: Clean deprecated compound
	alerts code, added new Agent disable flag into profiles, clean wizard mode
	combo from components in normal console (not metaconsole)



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7437 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-11 13:18:27 +00:00
darode eafeeea7e8 2013-01-11 Dario Rodriguez <dario.rodriguez@artica.es>
* pandoradb.data.postgreSQL.sql
        pandoradb.data.oracle.sql: Ported new network componentes and groups
        to oracle and postgres.

        MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7436 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-11 12:32:31 +00:00
darode 6419e68843 2013-01-11 Dario Rodrigue <dario.rodriguez@artica.es>
* pandoradb_data.sql: Added new network componentes and groups.

        MERGED FROM 4.0.2



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7435 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-11 12:27:29 +00:00
slerena e7cb1d3277 2012-01-10 Sancho Lerena <slerena@artica.es>
* godmode/agentes/module_manager.php: Updated text to library link.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7426 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-10 17:30:00 +00:00
zarzuelo 40af736176 2013-01-10 Sergio Martin <sergio.martin@artica.es>
* include/functions_ui.php
	include/functions_agents.php
	include/functions_tags.php
	operation/tree.php
	operation/agentes/status_monitor.php
	operation/agentes/alerts_status.php
	operation/agentes/estado_ultimopaquete.php
	operation/agentes/estado_agente.php
	operation/agentes/status_events.php
	operation/agentes/estado_monitores.php
	operation/agentes/tactical.php
	operation/agentes/group_view.php
	operation/agentes/networkmap.php
	operation/events/events_list.php
	general/logon_ok.php
	godmode/agentes/module_manager.php
	godmode/alerts/alert_list.list.php: Add tags acl checks to modules
	and alerts view. Add warn messages to zones with status counts when the
	user has acl tags assigned



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7425 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-10 16:00:30 +00:00
juanmanuelr ab7b55af2e 2013-01-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* pandoradb_data.sql
	include/functions_config.php
	pandoradb.data.postgreSQL.sql
	pandoradb.data.oracle.sql
	godmode/setup/performance.php: Max recommended number of files in
	attachment directory parametrized.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7423 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-10 15:23:06 +00:00
juanmanuelr c576382e5a 2013-01-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_networkmap.php: Fixed entity problem in 
	networkmap and hided agents without alerts if "only module with 
	alerts" option enabled.
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7421 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-10 14:07:52 +00:00
juanmanuelr ab784df478 2013-01-10 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php
	 include/functions_treeview.php
	 extensions/net_tools.php
	 extensions/module_groups.php
	 operation/agentes/status_monitor.php
	 operation/agentes/sla_view.php
	 operation/messages/message_list.php
	 godmode/agentes/fields_manager.php
	 godmode/alerts/alert_list.builder.php
	 godmode/massive/massive_delete_agents.php
	 godmode/massive/massive_edit_agents.php
	 godmode/massive/massive_delete_modules.php
	 godmode/massive/massive_delete_alerts.php
	 godmode/massive/massive_edit_modules.php: Merged fixes from 
	 branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7414 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-10 12:18:13 +00:00
slerena 48825d25e5 2012-01-09 Sancho Lerena <slerena@artica.es>
* godmode/setup/setup.php: Fixed warning on enabling EACL.
	Merged from 4.0.x branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7408 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 18:49:05 +00:00
mdtrooper 5ba8450b97 2013-01-09 Miguel de Dios <miguel.dedios@artica.es>
* godmode/reporting/reporting_builder.php,
	godmode/reporting/reporting_builder.item_editor.php,
	godmode/agentes/agent_manager.php, include/functions_events.php,
	include/functions_reporting.php: added the option "no validaded" in
	the items for events.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7403 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 16:19:20 +00:00
mdtrooper bcabe90da1 2013-01-09 Miguel de Dios <miguel.dedios@artica.es>
* include/constants.php: added the default weight for unknown status
	for agent, module or service in the services.




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7397 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 13:23:51 +00:00
juanmanuelr 7d756bf1a8 2013-01-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/functions_agents.php: Changed constraint in agent creation
	about the interval (now only greater than zero).
	
	Merged from branches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7392 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 12:38:49 +00:00
juanmanuelr 620981e9d1 2013-01-09 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/module_manager_editor_prediction.php: Fixed bug
	in prediction modules editor.
	
	Merged from braches.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7385 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 10:35:10 +00:00
zarzuelo 949650deb2 2013-01-09 Sergio Martin <sergio.martin@artica.es>
* pandoradb_data.sql
	pandoradb.sql
	pandoradb.postgreSQL.sql
	pandoradb.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.mysql.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.oracle.sql
	extras/pandoradb_migrate_4.0.x_to_5.0.postgreSQL.sql:
	Add profile tags to the database structure

	* include/ajax/events.php
	include/functions.php
	include/functions_events.php
	include/functions_reporting.php
	include/functions_treeview.php
	include/functions_profile.php
	include/constants.php
	include/functions_tags.php
	operation/tree.php
	operation/users/user_edit.php
	operation/events/events_list.php
	pandoradb.data.postgreSQL.sql
	pandoradb.data.oracle.sql
	godmode/users/configure_user.php: Add new acl control with
	tags in events and tree views. Fix a lot of little bugs like ACLs
	in tree view (tags mode), add the tags mode on tree view of the normal 
	console, pass the ACL flag to some forgotten functions, etc.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7383 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 09:25:07 +00:00
jsatoh b5e0442b9a 2013-01-09 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_reporting_advanced_tab.php: Translated
	description for _REPORT_NAME_ into Japanese.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7381 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 07:18:38 +00:00
hkosaka 395dddf359 2013-01-09 Hirofumi Kosaka <kosaka@rworks.jp>
* include/functions.php: Fixed that the console sometimes shows
	negative timestamp (e.g. '-2 sec') when using 'comparison in
	roll-over' format.  Merged from 4.0.x.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7380 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-09 01:48:47 +00:00
darode 8417ad0c22 2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es>
* extensions/system_info.php: Added link to download System info file.

	MERGED FROM 4.0.3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7377 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 17:50:54 +00:00
juanmanuelr fc9908cb26 2013-01-08 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/agent_template.php: Fixed duplication of modules
	when template is applied several times. 
	
	Bug id: #3599442



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7374 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 15:59:23 +00:00
juanmanuelr 5d5e8e4aeb 2013-01-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* godmode/agentes/agent_template.php: Fixed duplication of modules
	when template is applied several times. 
	
	Bug id: #3599442



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7372 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 15:36:33 +00:00
darode cea90b747a 2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/agentes/module_manager.php: changed text from Libray to Library



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7367 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 11:19:20 +00:00
darode 85f09c4729 2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/agentes/module_manager.php: Fixed a problem with link to module
	library because in trunk version there is an additional field to search
	modules.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7366 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 11:17:16 +00:00
darode d206125313 2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/reporting/reporting_builder.php: Added a default cover
	for PDF reports.
	include/help/ja/help_reporting_advanced_tab.php,
	include/help/en/help_reporting_advanced_tab.php,
	include/help/es/help_reporting_advanced_tab.php: Documented new macro
	called REPORT_NAME

	MERGED FROM 4.0.3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7365 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 11:05:14 +00:00
darode 2a9e758f10 2013-01-08 Dario Rodriguez <dario.rodriguez@artica.es>
* godmode/agentes/module_manager.php: Added a link to module library
	in create module view.

	MERGED FROM 4.0.3



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7361 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-08 08:32:44 +00:00
hkosaka ad2f76187f 2013-01-07 Hirofumi Kosaka <kosaka@rworks.jp>
* godmode/reporting/graph_builder.php: Fixed bug that
	unspecified graph name was displayed in the header line
	when creating a new custom graph. Merged from branch 4.0.


git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7359 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-07 09:59:56 +00:00
jsatoh 204bca886e 2013-01-07 Junichi Satoh <junichi@rworks.jp>
* include/help/ja/help_alert_macros.php: Added macro _email_tag_.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7357 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-07 08:53:53 +00:00
slerena 285d741b2c 2013-01-05 Sancho Lerena <slerena@artica.es>
* include/styles/pandora.css: Fixed footer problem
        in Chrome. 




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7356 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-05 12:37:16 +00:00
juanmanuelr c39bdebce9 2013-01-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/config_process.php: Removed php notice in this view.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7353 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-04 11:30:55 +00:00
juanmanuelr 032958b443 2013-01-04 Juan Manuel Ramon <juanmanuel.ramon@artica.es>
* include/help/en/help_alert_macros.php
	 include/help/es/help_alert_macros.php: Added macro _email_tag_
	 to these help screens.
	* include/functions_reports.php: Added exception to templates when
	report types are displayed.



git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7352 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-04 09:58:13 +00:00
mdtrooper d99abb39bb 2013-01-03 Miguel de Dios <miguel.dedios@artica.es>
* extensions/resource_registration.php,
	extensions/resource_exportation.php,
	operation/events/event_statistics.php,
	operation/events/events_list.php,
	operation/reporting/reporting_viewer.php,
	godmode/reporting/reporting_builder.php,
	godmode/reporting/reporting_builder.item_editor.php,
	include/functions_alerts.php, include/functions_reports.php,
	include/functions_events.php, include/graphs/fgraph.php,
	include/functions_graph.php, include/styles/pandora.css,
	include/functions_reporting.php, include/functions_agents.php: a lot
	of changes and fixes from the branch for the reports.
	
	MERGED FROM PANDORA_4.0




git-svn-id: https://svn.code.sf.net/p/pandora/code/trunk@7351 c3f86ba8-e40f-0410-aaad-9ba5e7f4b01f
2013-01-03 18:52:21 +00:00