fbsanchez
|
834d5d6c50
|
WIP:Discovery RDS
Former-commit-id: d53eb29ec8e7c70c1c76918c1770f65ad81f8ba0
|
2019-04-10 20:40:03 +02:00 |
|
fbsanchez
|
e59ce5412c
|
WIP Discovery RDS
Former-commit-id: fba3f7dbd44ca131404aa2d3986d3925b9754382
|
2019-04-09 18:33:02 +02:00 |
Daniel Barbero Martin
|
d5b1ac5565
|
fixed map IPAM
Former-commit-id: a1334a1691a3e861f2510ac7d440f5730928ad9a
|
2019-04-08 18:28:27 +02:00 |
|
fbsanchez
|
79bd37ee5b
|
Merge remote-tracking branch 'origin/develop' into ent-3674-discovery-fase-3
Former-commit-id: 8310dd36684192ea6e98d3a0c0a3e7ace69485d7
|
2019-04-08 16:28:26 +02:00 |
|
fbsanchez
|
54bd3bf089
|
Discovery F3
Former-commit-id: 1990149c5f5795f825bc337fd7ae29d360348d45
|
2019-04-08 16:23:32 +02:00 |
artica
|
9fd5d3bf5a
|
Auto-updated build strings.
Former-commit-id: 0ec578931463f0c72468bd36a22842e1c3ada363
|
2019-04-08 00:01:23 +02:00 |
|
artica
|
d35e9dbaae
|
Auto-updated build strings.
Former-commit-id: 007ce79a077f515323355d6656c9e14dd9c99c73
|
2019-04-07 00:01:25 +02:00 |
|
artica
|
1ddb5ebff4
|
Auto-updated build strings.
Former-commit-id: 4b2eb28f3aa59b694fe9347111e626dc25d5b207
|
2019-04-06 00:01:32 +02:00 |
|
fbsanchez
|
8e00fdebb4
|
Merge branch 'ent-3674-discovery-fase-3' of brutus.artica.lan:artica/pandorafms into ent-3674-discovery-fase-3
Former-commit-id: 755d2013c4f25475eb4f38dec9a8974c74f08715
|
2019-04-05 17:20:50 +02:00 |
|
fbsanchez
|
b9db5fdb6f
|
wip discovery f3
Former-commit-id: 6b9f5bc3995a16414e1c1a9201983f33eb6908ad
|
2019-04-05 17:20:45 +02:00 |
|
Daniel Barbero
|
4808e4ae97
|
fixed errors map ipam
Former-commit-id: 9a1e5460ab40d22135edc75f2adf186f8d56f3d4
|
2019-04-05 16:43:36 +02:00 |
Daniel Rodriguez
|
a480e4c73f
|
Merge branch 'ent-3740-Buguillo-en-configuracion-de-ACLs' into 'develop'
ent 3740 buguillo en configuracion de ac ls
See merge request artica/pandorafms!2281
Former-commit-id: 92349a3f4e6b9820606395d06964e64cdecbba9f
|
2019-04-05 13:17:30 +02:00 |
|
Daniel Rodriguez
|
781a6702ad
|
Merge branch 'ent-2232-Checkbox-Opciones-para-los-informes' into 'develop'
Custom fields in availability report type
See merge request artica/pandorafms!2324
Former-commit-id: 66fca18bc387db638fb9ee39c5f21bc5ec1b2069
|
2019-04-05 13:01:09 +02:00 |
|
fbsanchez
|
970a10ba50
|
fixes in non agent per database
Former-commit-id: 7b34ea990bf52c96d4d6f65f11cf2949c199f2db
|
2019-04-05 10:41:37 +02:00 |
|
fbsanchez
|
db9068e25a
|
fixes in non agent per database
Former-commit-id: 180cf7269886787b17dc359bf941b5ce5e1b1313
|
2019-04-05 10:41:09 +02:00 |
Manuel Montes
|
6bd38c6d4c
|
Merge branch 'develop' into 'ent-3740-Buguillo-en-configuracion-de-ACLs'
Conflicts:
pandora_console/include/functions_menu.php
Former-commit-id: 96e46da859b6d05409a8b2166bb2822493fe6558
|
2019-04-05 08:15:48 +02:00 |
|
artica
|
8d0e53924d
|
Auto-updated build strings.
Former-commit-id: 015143b34e644f24b26d36fba4b78525d39ff2e0
|
2019-04-05 00:01:32 +02:00 |
|
fbsanchez
|
e76a5af441
|
minor fix parent link
Former-commit-id: a2330dd0159ad58c454a06b7efe16699f7cee84a
|
2019-04-04 18:20:26 +02:00 |
|
Daniel Rodriguez
|
c52b30fd7e
|
Merge branch 'ent-3784-error-creating-alert-actions-api' into 'develop'
Insert zero into fires_min an fires_max when null
See merge request artica/pandorafms!2318
Former-commit-id: b7d8c6738530e1d842be34ad7f81c31a898d1c76
|
2019-04-04 18:03:53 +02:00 |
|
fbsanchez
|
5e91e3fa50
|
Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop'
rhel dependencies
See merge request artica/pandorafms!2339
Former-commit-id: b75a756a70434f1a25f4a4f0a129681b3f01f19f
|
2019-04-04 17:42:56 +02:00 |
|
fbsanchez
|
fdb13c1d1f
|
rhel dependencies
Former-commit-id: dd8eccf5d3476dc01ec2d409558483c90f20f499
|
2019-04-04 17:35:27 +02:00 |
|
manuel
|
49c913c6de
|
Added custom fields to report templates
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
|
2019-04-04 17:31:11 +02:00 |
|
fbsanchez
|
79074a274e
|
Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop'
forced dependencies 7.2 spec pandora_console rhel
See merge request artica/pandorafms!2338
Former-commit-id: 8f7adb7f4a8ad922a7d27eb44f2a449235b6c405
|
2019-04-04 17:26:10 +02:00 |
|
fbsanchez
|
21294807f4
|
forced dependencies 7.2 spec pandora_console rhel
Former-commit-id: 6cc644ccbf3afd341d9aafe0bd3cbd6ca3210f0f
|
2019-04-04 17:12:08 +02:00 |
|
fbsanchez
|
143c501a6e
|
minor fixes
Former-commit-id: 8d8c891a963b0e03838c2bf184b5da6bed01b2a9
|
2019-04-04 17:08:31 +02:00 |
|
fbsanchez
|
1274380270
|
minor fix
Former-commit-id: a012c8155cd1d950044bc2c0531ee2abd9e89d07
|
2019-04-04 16:07:50 +02:00 |
|
fbsanchez
|
56f2acbbf1
|
discovery.app.mysql rc1
Former-commit-id: 51304e872d375b480cbbf88d058b1804106afb98
|
2019-04-04 16:05:16 +02:00 |
|
fbsanchez
|
ce9f9eab4e
|
rc1 mysql recon
Former-commit-id: 51e000229d6c2c94e59e8eeb8ef77d539ee6c775
|
2019-04-04 16:00:08 +02:00 |
|
fbsanchez
|
f9fd0062e9
|
Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop'
added +x permissions to build_rpm_rhel7
See merge request artica/pandorafms!2335
Former-commit-id: 2c7239c6e533866710eacf7b763586c06d0d07ea
|
2019-04-04 12:38:52 +02:00 |
|
fbsanchez
|
a1a4ae51e2
|
added +x permissions to build_rpm_rhel7
Former-commit-id: 4d1c78a1443ecaa138b861092f0c98ad1496b193
|
2019-04-04 12:30:50 +02:00 |
|
fbsanchez
|
fcafe76943
|
wip discovery f34
Former-commit-id: bb08450d3304ff140c4bae37e77b20a2329c600b
|
2019-04-04 12:28:17 +02:00 |
Alejandro Fraguas
|
ac0ad88e8d
|
Merge branch 'ent-3829-7866-no-se-ve-cabecera-si-tenemos-habilitado-token-"Fixed-header"' into 'develop'
Fixed problem with fixed header
See merge request artica/pandorafms!2331
Former-commit-id: 1cdcf881352c404b25cfcbc8c6b63a2c67dd05e5
|
2019-04-04 10:19:04 +02:00 |
|
artica
|
f64835dca9
|
Auto-updated build strings.
Former-commit-id: fd545daafd448831b9e29eff8629dc3b7c6a630b
|
2019-04-04 00:01:27 +02:00 |
|
fbsanchez
|
9e83f139e1
|
WIP discovery f3
Former-commit-id: cee7ee096e0a0c065bc4312a149ee223303224fc
|
2019-04-03 22:52:37 +02:00 |
|
fbsanchez
|
654e0c28f6
|
WIP discovery F3 app db my multiserver
Former-commit-id: a85c048a6d4e755b76a7e042e04cfebdfe69b6f4
|
2019-04-03 22:44:06 +02:00 |
|
fbsanchez
|
74303168ac
|
WIP discovery F3
Former-commit-id: 493d05714a31c2f91f7b8ea5445397ebf1c526d7
|
2019-04-03 21:55:11 +02:00 |
|
fbsanchez
|
60f37eac57
|
removed unused folders
Former-commit-id: 4c1870e836e7f05dd5a312e41c4f1f86bff26e22
|
2019-04-03 21:08:52 +02:00 |
|
Daniel Rodriguez
|
1c4765f4f5
|
Merge branch 'ent-3688-7704-no-cambia-el-propietario-del-evento-en-event-response' into 'develop'
Resolved
See merge request artica/pandorafms!2251
Former-commit-id: dc092a97b35022dd846775568df9fca1e332022a
|
2019-04-03 18:47:52 +02:00 |
|
fbsanchez
|
798a2aad16
|
WIP discovery F3
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
|
2019-04-03 18:13:19 +02:00 |
|
Daniel Rodriguez
|
25960e65ba
|
Merge branch 'ent-3320-7151-parametros-instalacion-destendida-windows' into 'develop'
Added alias to windows configuration file
See merge request artica/pandorafms!2329
Former-commit-id: 04f3fb87c82d248a6caa197464893aab2973531c
|
2019-04-03 17:07:45 +02:00 |
Daniel Maya
|
8923c53ec4
|
Fixed problem with fixed header
Former-commit-id: 9bf6d824b94f301a804511c106f6465ce9dff0fa
|
2019-04-03 16:48:28 +02:00 |
|
Alejandro Fraguas
|
54f6f595dd
|
Merge branch 'ent-3824-7869-Mapas-GIS-no-funcionan' into 'develop'
Fixed problem with openlayer
See merge request artica/pandorafms!2330
Former-commit-id: 639deee6b66cf43894f4eb093d590d699bb9d37c
|
2019-04-03 16:02:45 +02:00 |
|
Daniel Rodriguez
|
ccf0192547
|
Merge branch 'ent-3731-Bug_en_reports_SLA_mensual' into 'develop'
fixed SLA weekly hourly and monthly
See merge request artica/pandorafms!2271
Former-commit-id: 1335616814937252d57028905596ec3083d2464f
|
2019-04-03 14:23:22 +02:00 |
|
Daniel Rodriguez
|
8f369828c4
|
Merge branch 'ent-3792-northern-instalar-paquetes-consola-en-red-hat' into 'develop'
RHEL specs and build orders (update version)
See merge request artica/pandorafms!2327
Former-commit-id: 8d6acaab90efec5cec698272e98f76ebc40b39df
|
2019-04-03 13:11:25 +02:00 |
|
Daniel Maya
|
faecabb1cc
|
Fixed problem with openlayer
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
|
2019-04-03 12:54:36 +02:00 |
|
Alejandro Fraguas
|
dcd5ab6317
|
Merge branch '3787-agents_get_agents' into 'develop'
rollback agent_get_agents
See merge request artica/pandorafms!2309
Former-commit-id: 7badea15471fa3d7aae787f913c76c8da70472cc
|
2019-04-03 12:04:52 +02:00 |
|
Alejandro Fraguas
|
ee59f4678e
|
Merge branch 'ent-3801-no-funciona-event-storm-protection' into 'develop'
Add a missing configuration option.
See merge request artica/pandorafms!2322
Former-commit-id: 6ccc3926eb2d4fe76e2a60f6f74a242ce7e84051
|
2019-04-03 10:57:26 +02:00 |
fermin831
|
1dcdc1bc79
|
Added alias to windows configuration file
Former-commit-id: 52b7462f8b8192a1d9de636a3b13eb7ee3fb9871
|
2019-04-03 09:53:17 +02:00 |
|
artica
|
30e9b67062
|
Auto-updated build strings.
Former-commit-id: 64d58c7568e01fecd9c4c97a49eeb9df7d55c5dc
|
2019-04-03 00:01:33 +02:00 |
|
fbsanchez
|
11d8edd88b
|
RHEL specs and build orders (update version)
Former-commit-id: 582d1bea42bc41a23fc773cf1d411bb4bdad50aa
|
2019-04-02 18:04:33 +02:00 |