3da2f267a2
New design for the tables - #3707
...
Former-commit-id: 6b2550344a7748e210fdb81a26751e9e94cbbfa4
2019-04-05 13:51:35 +02:00
aa640efc44
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 43e5f9f044a351f1c6cf1c192b9f92cba6d1b0b3
2019-04-05 13:19:42 +02:00
d91631e0e1
New design for the tables - #3707
...
Former-commit-id: 08bb5008c402afa0d5e75d7f8ade167843a22499
2019-04-05 13:18:38 +02:00
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
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
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
8d0e53924d
Auto-updated build strings.
...
Former-commit-id: 015143b34e644f24b26d36fba4b78525d39ff2e0
2019-04-05 00:01:32 +02:00
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
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
fdb13c1d1f
rhel dependencies
...
Former-commit-id: dd8eccf5d3476dc01ec2d409558483c90f20f499
2019-04-04 17:35:27 +02:00
49c913c6de
Added custom fields to report templates
...
Former-commit-id: 525d21d17835a3bb08f47df273128e658a35bcd9
2019-04-04 17:31:11 +02:00
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
21294807f4
forced dependencies 7.2 spec pandora_console rhel
...
Former-commit-id: 6cc644ccbf3afd341d9aafe0bd3cbd6ca3210f0f
2019-04-04 17:12:08 +02:00
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
a1a4ae51e2
added +x permissions to build_rpm_rhel7
...
Former-commit-id: 4d1c78a1443ecaa138b861092f0c98ad1496b193
2019-04-04 12:30:50 +02:00
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
f64835dca9
Auto-updated build strings.
...
Former-commit-id: fd545daafd448831b9e29eff8629dc3b7c6a630b
2019-04-04 00:01:27 +02:00
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
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
8923c53ec4
Fixed problem with fixed header
...
Former-commit-id: 9bf6d824b94f301a804511c106f6465ce9dff0fa
2019-04-03 16:48:28 +02:00
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
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
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
faecabb1cc
Fixed problem with openlayer
...
Former-commit-id: 91eb396d550cd6a90c9c3ba4cbb0ec12c2c51c6e
2019-04-03 12:54:36 +02:00
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
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
1dcdc1bc79
Added alias to windows configuration file
...
Former-commit-id: 52b7462f8b8192a1d9de636a3b13eb7ee3fb9871
2019-04-03 09:53:17 +02:00
30e9b67062
Auto-updated build strings.
...
Former-commit-id: 64d58c7568e01fecd9c4c97a49eeb9df7d55c5dc
2019-04-03 00:01:33 +02:00
11d8edd88b
RHEL specs and build orders (update version)
...
Former-commit-id: 582d1bea42bc41a23fc773cf1d411bb4bdad50aa
2019-04-02 18:04:33 +02:00
1fd40447e1
Custom fields in availability report type
...
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
2019-04-02 16:24:29 +02:00
490aa2ac0f
Merge branch 'ent-3783-Error-date-last-contact-snmp-interfaces-view' into 'develop'
...
Ent 3783 error date last contact snmp interfaces view
See merge request artica/pandorafms!2316
Former-commit-id: 6959931add69ebb7b1b43c23cd7758024c31a886
2019-04-02 14:33:14 +02:00
b50901bfd3
Merge branch 'revert-39b80d2c' into 'develop'
...
Revert "fixed IPAM config"
See merge request artica/pandorafms!2323
Former-commit-id: 00caaac9361782698f23ae47aad9740927045b0e
2019-04-02 14:10:00 +02:00
89bbbd2893
Revert "fixed IPAM config"
...
This reverts commit 1fe1beb930
2019-04-02 14:06:05 +02:00
9fe8dcdda3
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: db7ea3ebe40521488888cf74b6e6ab6563ab6104
2019-04-02 13:49:51 +02:00
f497d3bd2e
Added class to action buttons and moved checkbox to the left side
...
Former-commit-id: 1d7ba8fa06e734a3e45f7bc1ca2f78d0d8978122
2019-04-02 13:42:30 +02:00
7af141258e
Add a missing configuration option.
...
Former-commit-id: 4a516f1507cba486defb0c6be7b63b12cebc383e
2019-04-02 10:30:53 +02:00
2461f826ce
Merge branch 'ent-3715-Pete_sql_en_mr_del_ipam' into 'develop'
...
fixed IPAM config
See merge request artica/pandorafms!2274
Former-commit-id: 95786e5f3fa31e8d8c663ee8f3488336c59d9b3c
2019-04-02 09:41:02 +02:00
f67c3d5fc0
Auto-updated build strings.
...
Former-commit-id: 5e2eef78f8e98e69b43dd409c6ba0740c0e7a959
2019-04-02 00:01:31 +02:00
ee6d8642f3
Merge branch 'ent-3805-nombre-agente-guarda-sin-guion' into 'develop'
...
Fix agent name input to allow '-'
See merge request artica/pandorafms!2319
Former-commit-id: 9496fa004ee36b8d09c875a77cf3f19bec45a130
2019-04-01 18:49:11 +02:00
6733182b5d
Merge branch 'ent-3757-Errores-en-diagnostic-info' into 'develop'
...
Fixed errors in Diagnostic tool
See merge request artica/pandorafms!2292
Former-commit-id: 62fafd92e852c65136c50a3c0ff6d80a3edf72b8
2019-04-01 18:39:12 +02:00
2afc16c8dc
Merge branch 'ent-1901-Enviar-reportes-por-mail-en-otros-formatos-que-no-sean-PDF' into 'develop'
...
Ent 1901 enviar reportes por mail en otros formatos que no sean pdf
See merge request artica/pandorafms!2272
Former-commit-id: 590eddf946623393d02a8c88db33fde2af022937
2019-04-01 17:51:37 +02:00
343c6a6edf
Fix agent name input to allow '-'
...
Former-commit-id: 8b69d89daa3baeca5126c88c53dbe8323860f95d
2019-04-01 15:18:56 +02:00
c07319fb70
Insert zero into fires_min an fires_max when null
...
Former-commit-id: de1197159053155d4f962d74179933c46189460e
2019-04-01 12:56:10 +02:00
ad80b5b562
Merge remote-tracking branch 'origin/develop' into ent-3783-Error-date-last-contact-snmp-interfaces-view
...
Former-commit-id: 9c82f920608289d3f4fb49d4295c6356b7551f56
2019-04-01 10:36:27 +02:00
2d26a74f9e
Auto-updated build strings.
...
Former-commit-id: 8b0e13150ea9a6f7f482953aa07b57793359cad1
2019-03-31 00:01:22 +01:00
69df187ae5
Auto-updated build strings.
...
Former-commit-id: 644e5f18004d4faf84b27558b3e3ada13a872dcc
2019-03-30 00:01:27 +01:00
59300bd757
Changed field for last contact to timestamp
...
Former-commit-id: 41678b6c2541a05a92bcb4631eff00e6b60d5660
2019-03-29 13:24:22 +01:00
26451c41a1
New design for the tables - #3707
...
Former-commit-id: 17d66da1d4d0365db38923e15e9c261c12d23544
2019-03-29 11:05:52 +01:00
2a96b610d9
Auto-updated build strings.
...
Former-commit-id: eef26e4d622c8068249de564ee37638343f22dc0
2019-03-29 00:01:24 +01:00
783417cab5
rollback agent_get_agents
...
Former-commit-id: 95627afdb87777d0703fe57a82f7a3e0ec82b286
2019-03-28 12:20:15 +01:00
Tatiana Llorente
Daniel Rodriguez
Manuel Montes
artica
fbsanchez
Alejandro Fraguas
Daniel Maya
fermin831
daniel
Ramon Novoa
Luis Calvo