artu30 b5d3893c41 Merge branch 'develop' into '836-fixed-margin-top-images-in-vc-lines-open-dev' ... # Conflicts: # pandora_console/include/javascript/pandora_visual_console.js		2017-05-22 17:38:49 +02:00
..
DEBIAN	Auto-updated build strings.	2017-05-22 00:01:14 +02:00
attachment	…
extensions	Fix problem with filters in agents / modules	2017-05-04 17:12:32 +02:00
extras	deleted 1.sql	2017-04-25 10:28:46 +02:00
fonts	fixed errors	2017-03-16 18:41:53 +01:00
general	Merge branch 'develop' into '825-La-pantalla-de-login-con-mysql-parado/no-configurado-no-se-ve-correctamente'	2017-05-18 15:23:20 +02:00
godmode	Merge branch '599-csv_divider_selector' into 'develop'	2017-05-22 17:11:52 +02:00
images	Merge branch 'develop' into '805-change-tip-icon-in-trap-editor-dev'	2017-05-17 17:37:10 +02:00
include	Merge branch 'develop' into '836-fixed-margin-top-images-in-vc-lines-open-dev'	2017-05-22 17:38:49 +02:00
mobile	Changed the agent name by its alias in the mobile console	2017-02-22 13:50:06 +01:00
operation	Merge branch '805-change-tip-icon-in-trap-editor-dev' into 'develop'	2017-05-18 10:00:31 +02:00
.gitignore	Update gitignore of pandora_console and pandora_server	2017-03-06 10:16:15 +01:00
AUTHORS	Update AUTHORS	2016-05-10 17:40:12 +02:00
COPYING	…
DB_Dockerfile	Added default MYSQL_DATABASE environment variable	2016-08-12 13:03:55 +02:00
Dockerfile	added net-snmp-utils to Dockerfile	2016-09-26 20:46:23 +02:00
ajax.php	Revert "Fixed problems with double pandora in servers. Ticket: #3557"	2016-11-18 13:01:13 +01:00
docker_entrypoint.sh	…
index.php	Fix logout bad permission with myslq service stopped dialog - #825	2017-05-19 11:12:58 +02:00
install.php	Auto-updated build strings.	2017-05-22 00:01:14 +02:00
pandora_console.redhat.spec	Auto-updated build strings.	2017-05-22 00:01:14 +02:00
pandora_console.spec	Auto-updated build strings.	2017-05-22 00:01:14 +02:00
pandora_console_install	Updated version and build strings.	2017-05-17 12:08:40 +02:00
pandora_console_logrotate_centos	…
pandora_console_logrotate_suse	…
pandora_console_logrotate_ubuntu	…
pandora_console_upgrade	…
pandoradb.sql	add news checkbox for vlan_enabled and snmp_enabled	2017-03-22 16:30:15 +01:00
pandoradb_data.sql	Merge branch '703-MapQuest-Open-no-funciona' into 'develop'	2017-05-17 17:13:33 +02:00