c679751f94
fixed error add ff_type
...
Former-commit-id: 177e40f655f309eed3e7d877ffb00172b0105095
2019-04-02 16:01:24 +02:00
b2e16848f9
add new ff type
...
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
15ca89068d
Merge remote-tracking branch 'origin/develop' into ent-3084-Warnings_en_PHP_7
...
Conflicts:
pandora_console/godmode/servers/manage_recontask_form.php
pandora_console/include/functions_events.php
Former-commit-id: 7ea5c9dcc8efe112ea64e2fcb6eef9670c9af613
2019-03-12 13:07:12 +01:00
b19161ed3c
Merge branch 'ent-2687-Añadir-nuevo-custom-field-de-agente-de-tipo-combo' into 'develop'
...
Added custom field combo values in agent custom field
See merge request artica/pandorafms!2246
Former-commit-id: 3dbf90c17c8964761a53b062a1b9144196ec3cba
2019-03-08 10:34:44 +01:00
d4f5482e99
Added custom field combo values in agent custom field
...
Former-commit-id: 55ca33d3de14c868e1eec3f32179b33dc3ff589b
2019-03-07 13:37:36 +01:00
fadf75a626
fixed minor error lenght str.warning and str.critical 1024 charts
...
Former-commit-id: c7c32a48731eff5c786bd0710652a31a64364861
2019-03-01 13:36:38 +01:00
504a8e9d1a
fixed warnings php
...
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
2019-02-25 13:02:39 +01:00
4c94956b91
Merge branch 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada' into 'develop'
...
Fixed slow query in template item
See merge request artica/pandorafms!2151
Former-commit-id: db1f74b219dcac4180690d56310dcc2a11acd14d
2019-02-14 16:15:01 +01:00
fa7f519d34
Merged from develop.
...
Former-commit-id: 438c0bfa6cfa77ef0b75df02f3bce020122692b9
2019-02-12 14:52:18 +01:00
92e2262440
Merge remote-tracking branch 'origin/develop' into ent-3305-pandora-db-esta-reseteando-alertas-incorrectamente
...
Former-commit-id: 1e778938d7fc1ac575e110503803d8f3ac6b6e83
2019-02-07 11:18:15 +01:00
152d55fa8c
Merge branch 'develop' into 'ent-3459-7439-vista-de-edit-item-report-template-muy-lenta-debido-a-query-no-optimizada'
...
# Conflicts:
# pandora_console/godmode/massive/massive_edit_modules.php
Former-commit-id: 6d14e617f32575291898c9ce1bebde1e8b212691
2019-02-06 17:04:02 +01:00
c1ee43a064
resolved conflicts
...
Former-commit-id: 6934eb56d50cfaa16a978472de044cfe135e906a
2019-02-06 17:00:15 +01:00
0a94ac9eb0
Merge branch 'develop' into ent-3338-Bulk-operations-Module-operations
...
Conflicts:
pandora_console/godmode/massive/massive_operations.php
Former-commit-id: b673fb9521259653d6f0386e6d9ab5add276380f
2019-02-04 11:00:50 +01:00
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
2626605030
Validate alerts at the time agents/modules are modified.
...
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
2019-01-30 12:58:31 +01:00
0adf941008
Fixed slow query in template item
...
Former-commit-id: 97c9abbd6a4c86bd3de4294e7012ded98ecb5ff1
2019-01-29 15:44:34 +01:00
e8497bb80c
Changed the order of actions
...
Former-commit-id: ec733bfcf1705552f6257dc14c5a34e0a3e84e66
2019-01-22 11:03:52 +01:00
ac228a7fad
fixed error in massive operation
...
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
2018-12-28 12:14:17 +01:00
7e2fb25e27
fixed errors in massive operation edit modules
...
Former-commit-id: 2d2fa21660369607e6c206d269b12d2041f74a1a
2018-12-24 08:59:23 +01:00
6b940d07d5
Fixed
...
Former-commit-id: b22637cf04af8b09c8b274aa0f5a8d2f66e13f7c
2018-12-13 13:25:37 +01:00
eab744f65d
Fixed minor error
...
Former-commit-id: 2af6e231aa20216a4601a8c1a03fa6828c989448
2018-12-12 20:26:38 +01:00
a2909db631
Revert "Eliminadas entidades html de vista de auditoria"
...
This reverts commit 530017a79d
2018-12-10 13:42:29 +01:00
c4eeb3cc76
fixed error edit modules in massive operation php7 error select
2018-11-02 10:18:33 +01:00
0978be9b51
fixed errors php7
2018-10-30 14:43:27 +01:00
a1f28480ae
Fixed force_type check in delete/edit modules in bulk
2018-10-23 15:46:48 +02:00
14afe2ff88
Added message 'Please, select an agent first'
2018-10-17 12:35:11 +02:00
2693bbe209
Merge remote-tracking branch 'origin/develop' into 2737-Optimización-de-tags-dev
...
Conflicts:
pandora_console/godmode/massive/massive_delete_modules.php
pandora_console/operation/agentes/ver_agente.php
2018-10-10 19:39:27 +02:00
de10de03f7
[Tags performance] Fixed edit and delete massive delete and edit modules in bulk selecting modules first
2018-10-10 17:42:33 +02:00
052d888ac4
Fixed a minor warning
2018-10-08 18:53:21 +02:00
530017a79d
Eliminadas entidades html de vista de auditoria
2018-10-04 17:02:38 +02:00
b277c71c44
[Tags performance] Check massive operations
2018-10-03 13:02:51 +02:00
7ffeaaf50b
[Tags performance] fermin revision 1
2018-10-03 11:13:52 +02:00
28b879f058
[Tags performance] Added TODOS to revise agents_get_modules
2018-10-02 09:48:29 +02:00
e979de64b3
Merge branch '2454-Borrado-de-modulos-masivo-filtrado-por-no-inicilizado-elimina-todos-los-modulos-con-el-mismo-nombre' into 'develop'
...
fixed bug in modules massive deletion to avoid deletion of modules with the same…
See merge request artica/pandorafms!1629
2018-10-01 10:58:06 +02:00
2dac09435a
Merge branch '2040-Tags-en-operaciones-masivas' into 'develop'
...
fixed bug on bulk delete and bulk update module operation
See merge request artica/pandorafms!1613
2018-09-28 11:05:34 +02:00
8fe3e1606f
Fixed string (avoiding macaronic English)
2018-09-26 10:50:16 +02:00
90bbd31b66
Added tip to disabled radiobutton in agent edition and massive operations
2018-09-25 16:00:37 +02:00
823b32ac63
Added update standby token in massive operations
2018-09-24 17:32:58 +02:00
8247df6d65
Fixed edit snmp modules in bulk
2018-07-27 10:42:45 +02:00
e4b74cffc8
fixed bug in modules massive deletion to avoid deletion of modules with the same name in distinct agents regardless of their status when module status filter has been applied
2018-07-24 13:04:31 +02:00
213a59d26e
fixed bug on bulk delete and bulk update module operation
2018-07-16 18:14:18 +02:00
85897315cd
cascade protection services
2018-06-27 15:03:46 +02:00
76cd718262
add cps for agent, module, policies and bulk opertaion
2018-06-26 13:23:12 +02:00
6152e93a9e
Merge branch '1973-Entities-en-op-masivas-plugins' into 'develop'
...
Implement function io_safe_output
See merge request artica/pandorafms!1499
2018-06-05 09:44:00 +02:00
f0e7a59ae7
Implement function io_safe_output
2018-05-25 14:21:52 +02:00
43447bbee4
[Rebranding] Minor ended fixed
2018-05-23 18:19:24 +02:00
e4f24b2452
Fixed json in audit log
2018-04-05 16:57:26 +02:00
7be55b4427
Merge branch '1735-Faltan-campos-en-edición-de-módulos-en-operaciones-masivas' into 'develop'
...
Add new fileds to massive module edition - #1735
See merge request artica/pandorafms!1295
2018-02-26 10:42:55 +01:00
32fa032faa
Fixed unit in bulk operations
2018-02-14 12:41:32 +01:00
7f7916a18d
Add new fileds to massive module edition - #1735
2018-02-13 12:29:55 +01:00
Daniel Barbero Martin
Daniel Rodriguez
manuel
Alejandro Fraguas
Ramon Novoa
Daniel Maya
artica
samucarc
alejandro-campos
fermin831
vgilc
manuel.montes
enriquecd