Marcos Alconada
|
34cdcdfd6e
|
Merge branch 'develop' into 'ent-3837-7848-campo-id_source_event-en-vista-de-eventos-y-poder-filtrar-por-este'
# Conflicts:
# pandora_console/extras/mr/29.sql
# pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
# pandora_console/include/functions_events.php
|
2019-11-21 10:13:00 +01:00 |
|
fbsanchez
|
e9432aaaa5
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-20 15:51:47 +01:00 |
|
alejandro-campos
|
4d332f2bef
|
fix duplicated operation in migrate file
|
2019-11-20 12:43:08 +01:00 |
|
fbsanchez
|
446d6c3507
|
Fix windows commands
|
2019-11-20 12:35:55 +01:00 |
|
fbsanchez
|
79a135b077
|
Fix errata DESC => COMMENT
|
2019-11-20 11:36:15 +01:00 |
|
alejandro-campos
|
33b11af3c1
|
fix missing line in migrate
|
2019-11-20 11:26:28 +01:00 |
|
fbsanchez
|
43ecba3bbb
|
operator fields for event_rule
|
2019-11-20 10:40:52 +01:00 |
|
fbsanchez
|
471389a72a
|
Merge branch 'develop' into 'ent-4769-modulos-ssh-php-perl'
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-19 14:11:38 +01:00 |
|
Daniel Barbero Martin
|
1b5dcc3e28
|
Fixed errors in remote command
|
2019-11-19 12:35:52 +01:00 |
|
alejandro-campos
|
070fe32d1e
|
Merge remote-tracking branch 'origin/develop' into ent-4841-8948-Errores-migrate_pandora-6-a-7
|
2019-11-18 16:27:12 +01:00 |
|
fbsanchez
|
443eb1168c
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
|
2019-11-18 12:48:31 +01:00 |
|
fbsanchez
|
9440570548
|
Merge remote-tracking branch 'origin/ent-4772-omnishell' into ent-EDF
|
2019-11-15 13:08:09 +01:00 |
|
fbsanchez
|
990ad339d3
|
db schema
|
2019-11-15 09:45:49 +01:00 |
|
fbsanchez
|
f69b86663a
|
Merge remote-tracking branch 'origin/ent-4226-mejoras-plugin-sap' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/godmode/wizards/Wizard.main.php
|
2019-11-14 21:40:35 +01:00 |
|
fbsanchez
|
3c87efe113
|
Merge remote-tracking branch 'origin/develop' into ent-EDF
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-14 17:13:38 +01:00 |
|
fbsanchez
|
94d87c2a3c
|
Avoid welcome window on updates.
|
2019-11-14 14:14:50 +01:00 |
|
Daniel Barbero Martin
|
c17acefc49
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4610-Alertas-de-logs
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-14 12:22:11 +01:00 |
|
fbsanchez
|
b0920d93af
|
Merge branch 'ent-4772-omnishell' into ent-EDF
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-11-13 18:15:19 +01:00 |
|
fbsanchez
|
b9633933e1
|
Merge remote-tracking branch 'origin/develop' into ent-4774-welcome-to-pandorafms
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/general/header.php
|
2019-11-12 14:17:45 +01:00 |
|
Daniel Barbero Martin
|
0213bc675e
|
add changes bbdd
|
2019-11-08 11:28:37 +01:00 |
|
Daniel Barbero Martin
|
c68a5b57dd
|
fixed Change bbdd
|
2019-11-05 16:04:48 +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
|
276fc82556
|
Merge branch 'ent-EDF' into ent-4226-mejoras-plugin-sap
Conflicts:
pandora_console/extras/mr/33.sql
|
2019-11-05 15:39:18 +01:00 |
|
Daniel Barbero Martin
|
e5f24ca884
|
Merge develop
|
2019-11-05 15:27:06 +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 |
|
fbsanchez
|
115c884cd4
|
Discovery SAP
|
2019-10-31 21:13:18 +01:00 |
|
Daniel Barbero Martin
|
7bfa076263
|
fixed error bbdd
|
2019-10-30 14:52:10 +01:00 |
|
Daniel Barbero Martin
|
d37410ed8c
|
fixed error bbdd
|
2019-10-30 14:43:10 +01:00 |
|
Daniel Barbero Martin
|
b7710a6562
|
fix remove mr34 to mr33
|
2019-10-30 08:04:13 +01:00 |
|
Daniel Barbero Martin
|
2bb81a839a
|
Merge remote-tracking branch 'origin/ent-EDF' into ent-4772-omnishell
Conflicts:
pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
pandora_console/godmode/menu.php
pandora_console/pandoradb_data.sql
|
2019-10-29 17:15:19 +01:00 |
|
fbsanchez
|
383967f68a
|
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
|
2019-10-29 16:56:01 +01:00 |
|
fbsanchez
|
f3fdcb4de0
|
MR update
|
2019-10-29 16:06:34 +01:00 |
|
alejandro-campos
|
049c3c2476
|
fix migrate missing content
|
2019-10-28 13:46:37 +01:00 |
|
Daniel Barbero Martin
|
3056c6741a
|
changes bbdd mr34
|
2019-10-28 12:20:55 +01:00 |
|
fbsanchez
|
74007ebf70
|
33 => 34, cleanup
|
2019-10-28 12:18:56 +01:00 |
|
fbsanchez
|
d6681cedd1
|
33 => 34
|
2019-10-28 12:18:13 +01:00 |
|
Daniel Barbero Martin
|
f06a55c6bb
|
continue feedback mail
|
2019-10-23 19:50:57 +02:00 |
|
Tatiana Llorente
|
30caad5a6c
|
Added column cache_expiration in tlayout_template_data in MR, migrate, and pandoradb.sql - #4810
|
2019-10-15 16:50:05 +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 |
|
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 |
|
fbsanchez
|
6def88472a
|
Merge branch 'develop' into 'ent-4190-mejoras-para-el-menu-de-gestionar-ha'
# Conflicts:
# pandora_console/extras/mr/32.sql
|
2019-09-19 10:18:15 +02:00 |
|
Daniel Rodriguez
|
d939bf9e93
|
Merge branch 'ent-3878-Report-type-summation-not-working-properly-migratesql' into 'develop'
Ent 3878 report type summation not working properly migratesql
See merge request artica/pandorafms!2738
|
2019-09-18 17:54:17 +02:00 |
|
Alejandro Fraguas
|
4adf584827
|
Merge branch 'ent-4655-nomenclatura-licencia' into 'develop'
Changed caption Expires
See merge request artica/pandorafms!2736
|
2019-09-18 16:49:55 +02:00 |
|
Luis
|
0c72fe718c
|
Update pandoradb_migrate_6.0_to_7.0.mysql.sql
|
2019-09-18 16:42:09 +02:00 |
|
Luis Calvo
|
4628e41f69
|
Added missing changes to pandora_migratte
|
2019-09-18 16:39:05 +02:00 |
|