fd7cbf14cd
Merge remote-tracking branch 'origin/develop' into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 91bbd1dac954b151482546b3a75065ab80f19687
2019-04-10 10:15:15 +02:00
30c5f2b243
Merge branch 'ent-3707-Nuevo-diseño-para-las-tablas' of brutus.artica.lan:artica/pandorafms into ent-3707-Nuevo-diseño-para-las-tablas
...
Former-commit-id: 77343765f8b254939406fc320fc64dce86672b6f
2019-04-10 10:09:21 +02:00
2a37224653
New design for the tables - #3707
...
Former-commit-id: 3ff7435a5edbbd736d56df4c7fc02d21209c3d96
2019-04-10 10:06:27 +02:00
765ca945a0
Auto-updated build strings.
...
Former-commit-id: d69449b4f4ca214bdd3e37e660e0c8d7f0dc9817
2019-04-10 00:01:25 +02:00
5494a6129f
Merge branch 'ent-3855-Problemas_grupos_secundarios_en_input_auto_completado_de_modulos' into 'develop'
...
fixed error autocomplete input module
See merge request artica/pandorafms!2345
Former-commit-id: 76a7c4aa1d611a21b307d0d6367a1f15dc40b323
2019-04-09 13:14:38 +02:00
c313629080
Merge branch 'ent-3445-Solucionar_problematica_flip_flop' into 'develop'
...
flip flop keep counters
See merge request artica/pandorafms!2308
Former-commit-id: b3da4d57bb1c122e1a6040c9b4d35bc7c171043e
2019-04-09 12:04:54 +02:00
351b7218ee
Merge branch 'ent-3683-entities-appear-on-event-comment-api-call' into 'develop'
...
Removed unnecesary io_safe_inpunt on from functions_api.php
See merge request artica/pandorafms!2256
Former-commit-id: 870cdc2ea85241945628ac4a41864a0d54a57bea
2019-04-09 11:19:10 +02:00
6585a4736b
fixed minor error local companent with keep counters
...
Former-commit-id: f9864be72f448885b2da118585f1bbb92319bd18
2019-04-09 10:19:51 +02:00
8404450458
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Former-commit-id: 2809d31ae616b11dc1a210415ecb1c54e201fada
2019-04-09 09:53:31 +02:00
3e4a7bfdbf
fixed error autocomplete input module
...
Former-commit-id: c9fca2ba51b3b0872d39e658f18c5d3c5e917dbd
2019-04-09 09:51:03 +02:00
0d05d5c842
Auto-updated build strings.
...
Former-commit-id: dc883b86ccb845e022637413e334d4886805bc6b
2019-04-09 00:01:31 +02:00
41ea1a4c66
Fixed minor visual bug - #3707
...
Former-commit-id: 963b3e5385bddb1726d87c57d6ee24c5ad437d1b
2019-04-08 11:31:27 +02:00
9fd5d3bf5a
Auto-updated build strings.
...
Former-commit-id: 0ec578931463f0c72468bd36a22842e1c3ada363
2019-04-08 00:01:23 +02:00
d35e9dbaae
Auto-updated build strings.
...
Former-commit-id: 007ce79a077f515323355d6656c9e14dd9c99c73
2019-04-07 00:01:25 +02:00
1ddb5ebff4
Auto-updated build strings.
...
Former-commit-id: 4b2eb28f3aa59b694fe9347111e626dc25d5b207
2019-04-06 00:01:32 +02:00
49d925d96a
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Conflicts:
pandora_console/extras/mr/27.sql
Former-commit-id: 67c41a5bd6a4c95647b097171578c5af67b491fa
2019-04-05 16:48:58 +02:00
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
447655409d
fixed minor error keep counters local and network components
...
Former-commit-id: 8d57bede6ea7c6f44d51a696a3257600410734fe
2019-04-05 09:27:46 +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
33db6d2f0c
If is metaconsole, param meta is setted to true
...
Former-commit-id: d652754fc131a0024c0c7846335a4362767e5f1d
2019-04-04 18:13:29 +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
a0a250bef7
fixed error add ff_type
...
Former-commit-id: b270ec363b84bbfafcea5418b6007aba8217680b
2019-04-02 16:45:01 +02:00
1fd40447e1
Custom fields in availability report type
...
Former-commit-id: 1f04e5728cf7d0ed5079c16488493188379d536c
2019-04-02 16:24:29 +02:00
c679751f94
fixed error add ff_type
...
Former-commit-id: 177e40f655f309eed3e7d877ffb00172b0105095
2019-04-02 16:01:24 +02:00
Tatiana Llorente
artica
Daniel Rodriguez
Alejandro Fraguas
Daniel Barbero Martin
Manuel Montes
Luis Calvo
fbsanchez
Daniel Maya
fermin831