Tatiana Llorente
fc0e4827ea
No change interval if is empty in massive edit - #4784
2019-10-10 13:37:01 +02:00
alejandro-campos
646f2607ab
added condition in agent massive edition
2019-10-07 19:02:19 +02:00
Alejandro Fraguas
3eadb07058
Merge branch 'ent-4166-No-se-añade-module_unit-personalizado' into 'develop'
...
Fixed bug in custom unit #4166
See merge request artica/pandorafms!2675
2019-09-11 16:47:40 +02:00
Tatiana Llorente
d38f1f8aec
Fixed bug in unit in massive operations - #4166
2019-08-27 12:21:00 +02:00
Luis Calvo
2dc084da8a
Merge remote-tracking branch 'origin/develop' into ent-4132-custom-fields-url
2019-08-27 09:11:45 +02:00
Luis Calvo
a8c351d177
Custom fields type hint BBCode updated
2019-08-21 09:55:53 +02:00
Daniel Rodriguez
4dc5ee2fca
Merge branch 'ent-4318-Añadir-buscador-en-operaciones-masivas-vol2' into 'develop'
...
Added filter by agent - #4318
See merge request artica/pandorafms!2588
2019-07-16 14:05:39 +02:00
Alejandro Fraguas
8c55c1b287
Merge branch 'ent-4094-Error-al-cambiar-intervalo-de-agentes-por-masivas' into 'develop'
...
fixed bug: agent interval not being changed in agent config when changing its…
See merge request artica/pandorafms!2601
2019-07-15 16:56:41 +02:00
alejandro-campos
95254341ce
add condition to check if agent interval token should be updated in massive operations based on previous result
2019-07-15 11:53:25 +02:00
alejandro-campos
eb831dbbcd
fixed bug: agent interval not being changed in agent config when changing its value through massive operations
2019-07-15 11:46:35 +02:00
Tatiana Llorente
fd24398219
Fixed several minor visual bugs - #4347
2019-07-11 14:46:41 +02:00
Tatiana Llorente
3b23810323
Added filter by agent in massive copy - #4318
2019-07-10 16:37:24 +02:00
Tatiana Llorente
6d6c8fe197
Added filter by agent - #4318
2019-07-08 17:57:23 +02:00
Alejandro Fraguas
3a76f331c8
Merge branch 'ent-2094-Añadir-buscador-en-operaciones-masivas' into 'develop'
...
Add module filter by text -#2094
See merge request artica/pandorafms!2520
2019-07-02 11:37:01 +02:00
Alejandro Fraguas
ce1231eae6
Merge branch 'ent-3916-bulk-operation-alerts-no-entuentra-alertas' into 'develop'
...
Added option in massive delete alerts to show alerts on disabled modules
See merge request artica/pandorafms!2396
2019-06-24 09:55:44 +02:00
Tatiana Llorente
c084adfa27
Add module filter by text -#2094
2019-06-20 09:31:36 +02:00
Tatiana Llorente
988eb2e257
Add module filter by text -#2094
2019-06-19 17:36:55 +02:00
Alejandro Fraguas
b930588f84
Merge branch 'ent-3892-bug-en-bulk-operations-de-plugins' into 'develop'
...
Ent 3892 bug en bulk operations de plugins
See merge request artica/pandorafms!2389
2019-06-12 13:54:09 +02:00
manuel
bf3ac73feb
Removed empty help icons
2019-05-24 14:26:28 +02:00
Daniel Rodriguez
51f846af05
Merge branch 'ent-3893-Errata-en-Bulk-operation-de-politicas' into 'develop'
...
Fixed visual bug in policies operations actions
See merge request artica/pandorafms!2369
2019-05-23 17:24:59 +02:00
manuel
00b5fc0a2c
Added helps
...
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
2019-05-06 16:59:31 +02:00
Luis Calvo
e9e24505fe
Added option in massive delete alerts to show alerts on disabled modules
...
Former-commit-id: 2ee8db665f9e3ae657887e61e4b99dccd2e6e3a9
2019-04-30 10:29:42 +02:00
manuel
6bd8221bc0
changed helps
...
Former-commit-id: 3319f3d09d695e2b9f2958f1ac013eb2e0a001b4
2019-04-29 14:36:02 +02:00
marcos.alconada
4347502f84
Se arregla error en el editor de plugin
...
Former-commit-id: c2fb78ac02e27cffcefc843a241ed13df2077b92
2019-04-29 11:56:48 +02:00
Daniel Barbero Martin
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
manuel
20058be56a
Fixed visual bug in policies operations actions
...
Former-commit-id: c47606c0c53e74b1ac8610f0be6bd0228e14d42a
2019-04-22 16:37:06 +02:00
Daniel Barbero Martin
c679751f94
fixed error add ff_type
...
Former-commit-id: 177e40f655f309eed3e7d877ffb00172b0105095
2019-04-02 16:01:24 +02:00
Daniel Barbero
b2e16848f9
add new ff type
...
Former-commit-id: b9ff391d6586e5844e78207d44cdf9b80c98ba7e
2019-03-29 14:59:31 +01:00
daniel
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
Daniel Rodriguez
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
manuel
d4f5482e99
Added custom field combo values in agent custom field
...
Former-commit-id: 55ca33d3de14c868e1eec3f32179b33dc3ff589b
2019-03-07 13:37:36 +01:00
daniel
fadf75a626
fixed minor error lenght str.warning and str.critical 1024 charts
...
Former-commit-id: c7c32a48731eff5c786bd0710652a31a64364861
2019-03-01 13:36:38 +01:00
daniel
504a8e9d1a
fixed warnings php
...
Former-commit-id: d21cb02113c65a7f50a5e29f7f536e85ba5cb945
2019-02-25 13:02:39 +01:00
Alejandro Fraguas
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
Ramon Novoa
fa7f519d34
Merged from develop.
...
Former-commit-id: 438c0bfa6cfa77ef0b75df02f3bce020122692b9
2019-02-12 14:52:18 +01:00
Ramon Novoa
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
Daniel Maya
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
Daniel Maya
c1ee43a064
resolved conflicts
...
Former-commit-id: 6934eb56d50cfaa16a978472de044cfe135e906a
2019-02-06 17:00:15 +01:00
manuel.montes
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
artica
b3da2803a4
Changed the format of the .php files
...
Former-commit-id: 4dc926a81de14e27df8be7982406b09d8e808399
2019-01-30 16:18:44 +01:00
Ramon Novoa
2626605030
Validate alerts at the time agents/modules are modified.
...
Former-commit-id: de1f4d5bbf7abda60a99b3a9718727f73657be75
2019-01-30 12:58:31 +01:00
Daniel Maya
0adf941008
Fixed slow query in template item
...
Former-commit-id: 97c9abbd6a4c86bd3de4294e7012ded98ecb5ff1
2019-01-29 15:44:34 +01:00
manuel.montes
e8497bb80c
Changed the order of actions
...
Former-commit-id: ec733bfcf1705552f6257dc14c5a34e0a3e84e66
2019-01-22 11:03:52 +01:00
daniel
ac228a7fad
fixed error in massive operation
...
Former-commit-id: 691f3557d44c686645cfa634eab3630d060def33
2018-12-28 12:14:17 +01:00
daniel
7e2fb25e27
fixed errors in massive operation edit modules
...
Former-commit-id: 2d2fa21660369607e6c206d269b12d2041f74a1a
2018-12-24 08:59:23 +01:00
samucarc
6b940d07d5
Fixed
...
Former-commit-id: b22637cf04af8b09c8b274aa0f5a8d2f66e13f7c
2018-12-13 13:25:37 +01:00
samucarc
eab744f65d
Fixed minor error
...
Former-commit-id: 2af6e231aa20216a4601a8c1a03fa6828c989448
2018-12-12 20:26:38 +01:00
alejandro-campos
a2909db631
Revert "Eliminadas entidades html de vista de auditoria"
...
This reverts commit 530017a79d
.
Former-commit-id: 7318b00afab9bf394f8095a8193fa35c05e52787
2018-12-10 13:42:29 +01:00
daniel
c4eeb3cc76
fixed error edit modules in massive operation php7 error select
2018-11-02 10:18:33 +01:00
daniel
0978be9b51
fixed errors php7
2018-10-30 14:43:27 +01:00