pandorafms/pandora_console
fermin831 0ed6c6d620 Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery
Conflicts:
	pandora_console/godmode/wizards/Wizard.main.php

Former-commit-id: 570168ca638ea3403de5768b08c640a909aa27d2
2019-02-20 16:54:52 +01:00
..
DEBIAN Auto-updated build strings. 2019-02-08 00:01:29 +01:00
attachment Changed the format of the .js and .html files 2019-01-30 12:27:18 +01:00
extensions Merge remote-tracking branch 'origin/develop' into 3446-Imagen-grupos-no-se-muestra-None 2019-02-07 08:59:45 +01:00
extras Revert "Wiz.Applications SQL updates" Identification using recon_script 2019-02-19 18:33:17 +01:00
fonts fixed errors 2017-03-16 18:41:53 +01:00
general Discovery Tasks first tasks and some minor fixes 2019-02-15 18:42:44 +01:00
godmode Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery 2019-02-20 16:54:52 +01:00
images Added visual changes 2019-02-18 11:42:55 +01:00
include Merge branch 'ent-3430-discovery' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3430-discovery 2019-02-20 16:54:52 +01:00
mobile Changed the format of the .php files 2019-01-30 16:18:44 +01:00
operation Recovered notification editor for user 2019-02-18 15:14:24 +01:00
vendor fixed php7 2018-10-04 11:43:08 +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 Fixes to the Dockerfiles. Thanks to marcelo-ochoa. 2018-05-04 10:02:52 +02:00
Dockerfile Fixes to the Dockerfiles. Thanks to marcelo-ochoa. 2018-05-04 10:02:52 +02:00
ajax.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
composer.json Changed the format of the .js and .html files 2019-01-30 12:27:18 +01:00
composer.lock fixed php7 2018-10-04 11:43:08 +02:00
docker_entrypoint.sh Removed all traces of anytermd from code 2017-09-04 16:19:56 +02:00
index.php Changed the format of the .php files 2019-01-30 16:18:44 +01:00
install.php missed install... 2019-02-14 17:20:00 +01:00
pandora_console.redhat.spec Auto-updated build strings. 2019-02-08 00:01:29 +01:00
pandora_console.spec Auto-updated build strings. 2019-02-08 00:01:29 +01:00
pandora_console_install Updated version and build strings. 2019-01-29 11:08:54 +01:00
pandora_console_logrotate_centos Log rotation to .deb and split pandora_console_logrotate 2015-11-16 17:29:58 +01:00
pandora_console_logrotate_suse Log rotation to .deb and split pandora_console_logrotate 2015-11-16 17:29:58 +01:00
pandora_console_logrotate_ubuntu Log rotation to .deb and split pandora_console_logrotate 2015-11-16 17:29:58 +01:00
pandora_console_upgrade Fixed some copyrights dates 2015-12-01 12:15:20 +01:00
pandoradb.sql Revert "Wiz.Applications SQL updates" Identification using recon_script 2019-02-19 18:33:17 +01:00
pandoradb_data.sql Merge remote-tracking branch 'origin/ent-3430-discovery' into ent-3371-sistema-de-notificaciones-pandora 2019-02-12 12:41:11 +01:00