pandorafms/pandora_console/general
Tatiana Llorente 9baa3dcfa2 Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
Conflicts:
	pandora_console/extensions/agents_modules.php
	pandora_console/extensions/module_groups.php
	pandora_console/general/login_page.php
	pandora_console/godmode/alerts/alert_list.builder.php
	pandora_console/godmode/alerts/alert_list.list.php
	pandora_console/godmode/gis_maps/configure_gis_map.php
	pandora_console/godmode/groups/group_list.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/godmode/reporting/visual_console_builder.editor.php
	pandora_console/godmode/reporting/visual_console_builder.elements.php
	pandora_console/godmode/setup/setup_visuals.php
	pandora_console/include/chart_generator.php
	pandora_console/include/functions_networkmap.php
	pandora_console/include/functions_pandora_networkmap.php
	pandora_console/include/functions_ui.php
	pandora_console/include/functions_visual_map_editor.php
	pandora_console/include/styles/common.css
	pandora_console/include/styles/countdown.css
	pandora_console/include/styles/datepicker.css
	pandora_console/include/styles/dialog.css
	pandora_console/include/styles/help.css
	pandora_console/include/styles/menu.css
	pandora_console/include/styles/pandora.css
	pandora_console/include/styles/pandora_forms.css
	pandora_console/operation/agentes/estado_monitores.php
	pandora_console/operation/agentes/interface_traffic_graph_win.php
	pandora_console/operation/agentes/realtime_win.php
	pandora_console/operation/agentes/stat_win.php
	pandora_console/operation/events/events.php
	pandora_console/operation/snmpconsole/snmp_view.php
	pandora_console/operation/tree.php
	pandora_console/operation/visual_console/render_view.php


Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
..
firts_task Changed the format of the .php files 2019-01-30 16:18:44 +01:00
license Changed the format of the .js and .html files 2019-01-30 12:27:18 +01:00
ui Changed the format of the .php files 2019-01-30 16:18:44 +01:00
alert_enterprise.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
cg_items.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
check_image_module.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
error_screen.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
footer.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
header.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
last_message.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
links_menu.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
login_help_dialog.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
login_identification_wizard.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
login_page.php Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos 2019-02-05 09:23:53 +01:00
login_required.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
logoff.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
logon_failed.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
logon_ok.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
main_menu.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
news_dialog.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
noaccess.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
noaccess2.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
pandora_help.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
php7_message.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
subselect_data_module.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00