Commit Graph

1042 Commits

Author SHA1 Message Date
Daniel Maya baecac1efb Next mr 2020-01-29 15:51:39 +01:00
artica 2f6fed368d Updated version and build strings. 2020-01-29 10:13:37 +01:00
Alejandro Campos 0468c85a4d Merge branch 'develop' into 'ent-4967-9083-Valores-unidades-en-graficas-no-son-por-1024'
# Conflicts:
#   pandora_console/godmode/setup/setup_visuals.php
2020-01-07 12:00:27 +01:00
daniel 3dbdfdb6eb Fix Landscape reports 2019-12-11 15:07:38 +01:00
Luis 6ba4a26564 Added timeoout option to command event responses 2019-12-10 11:54:30 +01:00
alejandro-campos 5880bec88a changes in module data formatting when printed across the application and new setup options 2019-12-05 17:41:44 +01:00
daniel 960326b980 Add menu omnishell 2019-11-21 18:21:46 +01:00
fbsanchez 446d6c3507 Fix windows commands 2019-11-20 12:35:55 +01:00
Daniel Barbero Martin 1b5dcc3e28 Fixed errors in remote command 2019-11-19 12:35:52 +01:00
fbsanchez f4f618c1da Merge remote-tracking branch 'origin/ent-EDF' into ent-4769-modulos-ssh-php-perl 2019-11-05 15:40:14 +01:00
fbsanchez 58cbc3c738 Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
	pandora_console/extras/mr/33.sql
	pandora_console/pandoradb_data.sql
2019-11-05 15:17:09 +01:00
fbsanchez ec3c7ba559 Some remote command examples 2019-11-04 20:36:03 +01:00
Alejandro Fraguas 777bbdd180 Merge branch '4581-sample-agent-nueva-funcionalidad' into 'develop'
Added feature sample_agent

See merge request artica/pandorafms!2826
2019-11-04 17:54:33 +01:00
fbsanchez 383967f68a Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF 2019-10-29 16:56:01 +01:00
fbsanchez 6478c7a51f minor tips quickshell 2019-10-29 15:55:39 +01:00
fbsanchez 7accbc97c4 Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl 2019-10-28 12:36:19 +01:00
artica 3094d5af05 Updated version and build strings. 2019-10-28 12:35:59 +01:00
Jose Gonzalez b0db7c729d Solved minor issues 2019-10-24 16:23:58 +02:00
Jose Gonzalez 29bcd379f7 Added changes for liking with visual consoles 2019-10-24 11:53:35 +02:00
fbsanchez 6bf3772690 remote cmd => remote execution 2019-10-09 19:20:58 +02:00
Daniel Barbero 8af72c1c9d add Remote CMD 2019-10-09 17:26:06 +02:00
Daniel Barbero Martin 2ee725b204 fixed minor error 2019-09-26 16:43:31 +02:00
artica 574d9b13d6 Updated version and build strings. 2019-09-26 16:32:58 +02:00
alejandro-campos 96622933fc added new section in integria setup to configure different options for event responses and alert created tickets 2019-09-26 13:22:10 +02:00
Alejandro Campos 20cebbe988 Merge branch 'develop' into 'ent-4461-Configuracion-integracion-integria'
# Conflicts:
#   pandora_console/extras/mr/32.sql
2019-09-23 17:16:15 +02:00
alejandro-campos 9bf2980f01 fix minor bugs in integria integration 2019-09-23 12:48:20 +02:00
Marcos Alconada 6107d141c0 Update pandoradb_data.sql 2019-09-19 12:40:53 +02:00
Marcos Alconada a468c79a67 Changed visual console ID 2019-09-04 10:05:44 +02:00
marcos.alconada b18f72dcdd Add new visual console Host Alive Keep Alive 2019-09-03 13:04:12 +02:00
Daniel Maya 5ad22620b9 mr power up 2019-08-28 12:49:41 +02:00
Alejandro Fraguas 23cdc419a9 Merge branch 'ent-4397-visual-console-racks-branch2' into 'develop'
Ent 4397 visual console racks branch2

See merge request artica/pandorafms!2650
2019-08-19 13:55:51 +02:00
artica c0588d95ca Updated version and build strings. 2019-08-13 12:27:44 +02:00
Luis Calvo 72c4b55477 Corregida errata comentario 2019-08-09 10:52:25 +02:00
Luis Calvo 4fe4e58874 Re-uploaded visual-console rack images and db data 2019-08-09 10:46:47 +02:00
Luis Calvo 0cb0a63a8f Re-uploaded visual-console rack images and db data 2019-08-09 10:42:44 +02:00
Alejandro Campos 12eacc1933 Merge branch 'develop' into 'ent-4388-Nuevos-eventos'
# Conflicts:
#   pandora_console/extras/mr/31.sql
#   pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
2019-08-05 09:26:18 +02:00
alejandro-campos 927b1fa37f removed all deprecated references to integria from code and db data 2019-07-31 16:46:26 +02:00
alejandro-campos b4bd7f0f63 fixed problems in event view and event view custom fields 2019-07-30 16:10:34 +02:00
Daniel Barbero Martin 0064bc0cba fixed errors 2019-07-01 17:07:39 +02:00
Daniel Barbero Martin a10cf51b1b update current package 2019-06-26 15:37:04 +02:00
marcos.alconada 1e843777bc Delete line with log4x 2019-06-07 10:57:15 +02:00
Marcos Alconada d49d303469 Update pandoradb_data.sql 2019-06-07 10:20:29 +02:00
Marcos Alconada be82afc9c5 Update pandoradb_data.sql 2019-06-07 09:50:49 +02:00
Marcos Alconada 241eda5c39 Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'"
This reverts merge request !2282
2019-06-07 09:35:13 +02:00
marcos.alconada a13dab3f35 resolving merge conflict 2019-06-07 09:22:07 +02:00
fbsanchez 5e9b2479eb Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager 2019-05-20 13:11:39 +02:00
fbsanchez ec60a3193a removed all group from communications target
Former-commit-id: 797a467fed8eff0f9a81c9bbe72780f4e91faa67
2019-05-16 12:52:41 +02:00
fbsanchez 3bf06f0b72 MR minor updates
Former-commit-id: 55105f3858b8ec659c67bf906b09afeb61a1d39c
2019-05-15 00:00:21 +02:00
fbsanchez 8004e096fd MR 28 and minor fixes
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
2019-05-14 18:09:34 +02:00
fbsanchez 920786216b UM notifications MR update
Former-commit-id: 61be93c1174fbff4242e261caac591725d7ef4c5
2019-05-14 17:17:04 +02:00