tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
pandorafms/pandora_console
History
Daniel Rodriguez d314062623 Merge branch 'ent-2674-Nueva_macro_event_timestamp' into 'develop' 
Ent 2674 nueva macro event timestamp

See merge request artica/pandorafms!2244

Former-commit-id: 9414e607f69637c19a5d8e61e80a2d43abb9ce0b
 		2019-03-12 13:51:47 +01:00
..
DEBIAN Auto-updated build strings. 2019-03-12 00:01:23 +01:00
attachment Changed the format of the .js and .html files 2019-01-30 12:27:18 +01:00
extensions Revert changes on dbmanager.php 2019-03-07 10:36:06 +01:00
extras Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7 2019-03-12 13:07:12 +01:00
fonts
…
general Fixed url 2019-03-11 12:47:27 +01:00
godmode Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7 2019-03-12 13:07:12 +01:00
images Merge branch 'develop' into 'ent-3432-Nueva-cabecera-y-menu-lateral' 2019-03-06 09:18:38 +01:00
include Merge branch 'ent-2674-Nueva_macro_event_timestamp' into 'develop' 2019-03-12 13:51:47 +01:00
mobile Merge branch 'develop' into 3154-Agent-name-en-vistas-de-alertas-de-consola-movil 2019-02-15 15:30:36 +01:00
operation Merge branch 'ent-3084-Warnings_en_PHP_7' into 'develop' 2019-03-12 13:24:48 +01:00
vendor
…
.gitignore
…
AUTHORS
…
COPYING
…
DB_Dockerfile
…
Dockerfile
…
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
…
docker_entrypoint.sh
…
index.php new header and menu 2019-03-05 12:54:11 +01:00
install.php Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7 2019-03-12 13:07:12 +01:00
pandora_console.redhat.spec Auto-updated build strings. 2019-03-12 00:01:23 +01:00
pandora_console.spec Auto-updated build strings. 2019-03-12 00:01:23 +01:00
pandora_console_install Updated version and build strings. 2019-02-27 11:25:50 +01:00
pandora_console_logrotate_centos
…
pandora_console_logrotate_suse
…
pandora_console_logrotate_ubuntu
…
pandora_console_upgrade
…
pandoradb.sql Changed sql files 2019-03-08 10:01:55 +01:00
pandoradb_data.sql Changed sql files 2019-03-08 10:01:55 +01:00