Jose Gonzalez
|
d45a631ea5
|
Final merge with new menu
|
2023-02-13 10:37:37 +01:00 |
|
Jose Gonzalez
|
98736c1ab4
|
Merge
|
2023-02-13 10:24:07 +01:00 |
|
Jose Gonzalez
|
d6eedf07aa
|
Merge
|
2023-02-13 10:03:09 +01:00 |
|
Jose Gonzalez
|
6a46af495d
|
Fix issue with dev environment starting and added button fixed id parameter
|
2023-02-10 13:38:47 +01:00 |
Daniel Maya
|
be3c7bca6c
|
resolved conflict
|
2023-02-10 11:55:45 +01:00 |
|
Jose Gonzalez
|
175d4b7341
|
Fixes in Event view and other fixes
|
2023-02-09 16:13:30 +01:00 |
|
Jose Gonzalez
|
4b592b6610
|
Minor fixes
|
2023-02-08 17:20:52 +01:00 |
Daniel Cebrian
|
bcfa977f56
|
#10335 fixed plugin select in edit modules in bulk
|
2023-02-08 15:23:13 +01:00 |
|
Jose Gonzalez
|
4d9c6ab33a
|
Minor fixes
|
2023-02-08 12:58:23 +01:00 |
|
Jose Gonzalez
|
f14d324490
|
Minor fixes and improves
|
2023-02-08 12:43:08 +01:00 |
|
Jose Gonzalez
|
3a741f8ed9
|
Update icons and improve tables
|
2023-02-07 16:22:52 +01:00 |
|
Jose Gonzalez
|
ab1d2f38f6
|
Changed function name
|
2023-02-07 15:39:53 +01:00 |
|
Jose Gonzalez
|
e99ad97e17
|
Fixes and improvements
|
2023-02-07 15:33:29 +01:00 |
|
Daniel Maya
|
758f906616
|
#9663 menu redesing 4
|
2023-02-07 15:22:51 +01:00 |
|
Jose Gonzalez
|
8f78f89aa3
|
Improve views and forms
|
2023-02-07 13:19:40 +01:00 |
|
Daniel Cebrian
|
5927687ad3
|
#10321 create token events_per_query for limit consult sql
|
2023-02-07 09:49:46 +01:00 |
|
Jose Gonzalez
|
dfdcb688d4
|
Improve code
|
2023-02-06 23:10:28 +01:00 |
|
Daniel Cebrian
|
aedf6986b3
|
#10253 added console alert for control variables performance
|
2023-02-06 15:22:39 +01:00 |
|
Daniel Cebrian
|
fecee4895f
|
#10259 fixed bug in agentaccess token
|
2023-02-06 11:04:08 +01:00 |
|
Daniel Cebrian
|
aaae7454fa
|
#10259 create control for token agentaccess if agents morte than 200
|
2023-02-06 10:37:01 +01:00 |
|
Jose Gonzalez
|
ac144de6d6
|
WIP: Minor fixes
|
2023-02-06 10:17:51 +01:00 |
|
Daniel Cebrian
|
31acafc00f
|
#10253 Enforcement options in setup visuals and general setup
|
2023-02-06 09:06:34 +01:00 |
|
Jose Gonzalez
|
a9df7e2ec5
|
WIP: Improve somethings
|
2023-02-03 16:36:04 +01:00 |
|
Jose Gonzalez
|
e3b2ec529a
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2023-02-03 14:16:47 +01:00 |
Jonathan
|
0437e46b5b
|
#10217 CSRF for enable/disable users
|
2023-02-03 14:14:44 +01:00 |
|
Daniel Cebrian
|
af6f5efdd8
|
#10253 Enforcement options in configuration
|
2023-02-03 14:12:49 +01:00 |
|
Jose Gonzalez
|
0a61f6dcc7
|
WIP: User management View and BL
|
2023-02-03 14:10:26 +01:00 |
|
Jose Gonzalez
|
b9992c5a67
|
Minor fixes for solve visual issues
|
2023-02-03 12:37:09 +01:00 |
Pablo Aragon
|
54e4da7aad
|
Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2
|
2023-02-03 10:48:42 +01:00 |
Rafael Ameijeiras
|
30a0e2abe8
|
Merge branch 'ent-10076-anadir-un-acceso-mas-directo-a-attachments-plugins' into 'develop'
Ent 10076 anadir un acceso mas directo a attachments plugins
See merge request artica/pandorafms!5441
|
2023-02-03 09:36:53 +00:00 |
Daniel Rodriguez
|
67a4e2b04b
|
Merge branch 'ent-9600-Estado-erroneo-de-servidor-cuando-hay-un-TZ-distinto-entre-servidor-consola' into 'develop'
fix server status when distinct timezones
See merge request artica/pandorafms!5439
|
2023-02-02 16:07:02 +00:00 |
|
Jonathan
|
925880dbdb
|
#9523 dialog title plugins
|
2023-02-02 17:06:28 +01:00 |
|
Rafael Ameijeiras
|
3bc593e58a
|
Merge branch 'ent-10219-stored-cross-site-scripting-in-syslog-section' into 'develop'
Ent 10219 stored cross site scripting in syslog section
See merge request artica/pandorafms!5464
|
2023-02-02 10:02:32 +00:00 |
|
Rafael Ameijeiras
|
ccb93c0918
|
Merge branch 'ent-10163-Remote-Code-Execution-via-Unrestricted-File-Upload' into 'develop'
fixed vulnerability
See merge request artica/pandorafms!5476
|
2023-02-02 10:02:15 +00:00 |
Diego Muñoz-Reja
|
acb7416148
|
Merge branch 'ent-10236-14934-module-bulk-operations-anade-dynamic-interval-a-los-modulos-a-pesar-de-estar-en-none' into 'develop'
Ent 10236 14934 module bulk operations anade dynamic interval a los modulos a pesar de estar en none
See merge request artica/pandorafms!5471
|
2023-02-01 14:17:15 +00:00 |
Jimmy Olano
|
c4659f0c58
|
Merge branch 'ent-10126-no-permite-editar-etiqueta-en-elemento-de-consola-visual' into 'develop'
Ent 10126 no permite editar etiqueta en elemento de consola visual
https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/10126
See merge request artica/pandorafms!5407
|
2023-02-01 10:56:25 +00:00 |
alejandro.campos@artica.es
|
a69f3eb0dc
|
minor change
|
2023-02-01 10:24:35 +01:00 |
|
Jose Gonzalez
|
0363a90e1f
|
Resolve merge issues
|
2023-01-31 17:35:44 +01:00 |
|
Daniel Cebrian
|
dcb69c2cf4
|
Merge branch 'develop' into 'ent-10236-14934-module-bulk-operations-anade-dynamic-interval-a-los-modulos-a-pesar-de-estar-en-none'
# Conflicts:
# pandora_console/godmode/massive/massive_edit_modules.php
|
2023-01-31 15:10:26 +00:00 |
|
Jose Gonzalez
|
fbdd91e4ff
|
Improve user profile list view
|
2023-01-31 12:59:49 +01:00 |
|
Daniel Cebrian
|
bbb249d031
|
#10126 clear log
|
2023-01-31 12:13:57 +01:00 |
|
Jonathan
|
b88f26500b
|
#9819 Change labels Accoustic console
|
2023-01-31 08:35:47 +01:00 |
|
Jonathan
|
7923a5919c
|
Merge branch 'develop' into ent-9819-crear-tip-en-consola-sonora-de-eventos
|
2023-01-31 08:18:17 +01:00 |
|
alejandro.campos@artica.es
|
a0c311c110
|
fixed vulnerability
|
2023-01-30 19:47:02 +01:00 |
|
Jose Gonzalez
|
891e485781
|
Fixed users list view
|
2023-01-30 16:14:05 +01:00 |
|
Jose Gonzalez
|
0162767f6d
|
Clean debug
|
2023-01-30 13:39:58 +01:00 |
|
Rafael Ameijeiras
|
4984599132
|
Merge branch 'ent-9175-13829-visualizacion-de-contrasenas-en-texto-plano-dentro-del-inspector-onenet-pakistan' into 'develop'
Ent 9175 13829 visualizacion de contrasenas en texto plano dentro del inspector onenet pakistan
See merge request artica/pandorafms!5392
|
2023-01-30 11:24:39 +00:00 |
|
Rafael Ameijeiras
|
24528f29e4
|
Merge branch 'ent-10210-14895-Valor-seleccionado-por-defecto-para-el-intervalo-dinamico-se-establece-en-5-min-cuando-aparece-como-none' into 'develop'
fixed default value
See merge request artica/pandorafms!5459
|
2023-01-30 10:31:57 +00:00 |
|
Jonathan
|
624463d573
|
#9819 change setcion menu configuration sound
|
2023-01-30 08:27:03 +01:00 |
|
Daniel Cebrian
|
0bf97acf50
|
#10236 fixed typed control
|
2023-01-27 13:39:41 +01:00 |
|
Jonathan
|
27b42d3137
|
#10076 add easy acces on directorys
|
2023-01-27 13:23:48 +01:00 |
|
Daniel Cebrian
|
f62df0253f
|
#10236 fixed dynamic_interval in bulk operations
|
2023-01-27 13:18:57 +01:00 |
|
Jonathan
|
34fede2ce1
|
#9819 New section configuration sound event
|
2023-01-27 12:42:23 +01:00 |
|
Daniel Cebrian
|
c2a16eb311
|
#10219 added db_escape_string_sql for control quotes
|
2023-01-26 16:34:35 +01:00 |
|
Daniel Cebrian
|
9282aa2319
|
#10219 fixed xss injection in syslog
|
2023-01-26 16:20:25 +01:00 |
|
Rafael Ameijeiras
|
7c379062cf
|
Merge branch 'ent-10160-stored-cross-site-scripting-vulnerability-in-visual-console-module' into 'develop'
Ent 10160 stored cross site scripting vulnerability in visual console module
See merge request artica/pandorafms!5447
|
2023-01-26 12:55:15 +00:00 |
|
Rafael Ameijeiras
|
7bdfb1a096
|
Merge branch 'ent-10055-introducir-aviso-de-borrado-de-modulos-hijos' into 'develop'
Added child module delete warning
See merge request artica/pandorafms!5429
|
2023-01-26 12:53:03 +00:00 |
|
alejandro.campos@artica.es
|
8e8db9c666
|
fixed default value
|
2023-01-26 12:36:33 +01:00 |
|
Alejandro Campos
|
87d09d47ca
|
Merge branch 'develop' into 'ent-9600-Estado-erroneo-de-servidor-cuando-hay-un-TZ-distinto-entre-servidor-consola'
# Conflicts:
# pandora_console/extras/mr/61.sql
|
2023-01-26 09:53:51 +00:00 |
|
Rafael Ameijeiras
|
8f88827c0b
|
Merge branch 'ent-7936-12354-anadir-opcion-dashboard-en-home-screen-de-usuario-en-meta' into 'develop'
Added home page dashboard to metaconsole
See merge request artica/pandorafms!5452
|
2023-01-25 14:40:20 +00:00 |
|
Pablo Aragon
|
0ec58067ab
|
9220 Cast config['license_nms']
|
2023-01-24 14:45:42 +01:00 |
Calvo
|
91e8cc2633
|
Added home page dashboard to metaconsole
|
2023-01-24 14:22:33 +01:00 |
|
Rafael Ameijeiras
|
2be4dc7960
|
Merge branch 'ent-9069-schedule-downtime-poner-decente-el-filtro' into 'develop'
Ent 9069 schedule downtime poner decente el filtro
See merge request artica/pandorafms!5398
|
2023-01-24 12:03:10 +00:00 |
|
Rafael Ameijeiras
|
1ed1b19cd0
|
Merge branch 'ent-9829-listado-de-dashboards-en-pantalla-de-inicio' into 'develop'
Fix list all private dashboards on user edition
See merge request artica/pandorafms!5320
|
2023-01-24 11:59:23 +00:00 |
|
Calvo
|
5d0826f412
|
Delete modules with children message
|
2023-01-24 12:26:49 +01:00 |
|
Pablo Aragon
|
d2c286fc4c
|
9220 Conflict resolved
|
2023-01-24 09:50:34 +01:00 |
|
Daniel Cebrian
|
7163b3d853
|
#10160 fixed xss vulnerability in visual console name
|
2023-01-23 16:47:27 +01:00 |
|
Daniel Rodriguez
|
0a4ddc480a
|
Merge branch 'ent-10106-borrar-sesion-de-usuario-cuando-se-borra-un-usuario' into 'develop'
Ent 10106 borrar sesion de usuario cuando se borra un usuario
See merge request artica/pandorafms!5397
|
2023-01-23 15:28:19 +00:00 |
|
Jonathan
|
60756ebb18
|
#10076 attachments-plugins icon tab
|
2023-01-23 13:01:31 +01:00 |
|
Jonathan
|
aacf069acf
|
#10076 attachments-plugins access
|
2023-01-23 11:19:59 +01:00 |
|
Jonathan
|
c380a588ea
|
#10076 attachments-plugins access
|
2023-01-23 11:07:34 +01:00 |
|
alejandro.campos@artica.es
|
a2076ffd0c
|
fix server status when distinct timezones
|
2023-01-20 13:11:49 +01:00 |
|
Calvo
|
8c071532e9
|
Added child module delete warning
|
2023-01-19 10:34:13 +01:00 |
|
Jose Gonzalez
|
8510629781
|
Treeview improvement
|
2023-01-19 00:31:11 +01:00 |
|
Calvo
|
2fc1abc893
|
Merge remote-tracking branch 'origin/develop' into ent-9829-listado-de-dashboards-en-pantalla-de-inicio
|
2023-01-18 11:33:21 +01:00 |
|
Jose Gonzalez
|
8c1bd2c1ee
|
Agent module manager fixed and improve action buttons
|
2023-01-17 15:21:07 +01:00 |
|
Daniel Rodriguez
|
a165eec2a1
|
Merge branch 'ent-8558-inventario-pasa-de-enterprise-open' into 'develop'
Move inventory to open
See merge request artica/pandorafms!5105
|
2023-01-16 13:43:19 +00:00 |
|
Jose Gonzalez
|
8c852fb3df
|
Agent improvements
|
2023-01-16 01:28:53 +01:00 |
|
Jose Gonzalez
|
7277e026cd
|
New notifications and added autoclose function
|
2023-01-13 14:23:48 +01:00 |
|
Pablo Aragon
|
4392bd7fa8
|
9220 Restrict access to collections with nms license
|
2023-01-13 12:09:15 +01:00 |
|
Calvo
|
d8428a46a7
|
Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API
|
2023-01-13 10:12:21 +01:00 |
|
Calvo
|
ce224d67ba
|
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
|
2023-01-13 09:08:17 +01:00 |
|
Daniel Rodriguez
|
29624c92e8
|
Merge branch 'ent-9618-ver-la-ip-contra-la-que-se-esta-ejecutado-un-modulo-remoto-en-la-vista-de-agente' into 'develop'
Ent 9618 ver la ip contra la que se esta ejecutado un modulo remoto en la vista de agente
See merge request artica/pandorafms!5393
|
2023-01-12 12:25:35 +00:00 |
|
Daniel Cebrian
|
aff91aa1b2
|
#10126 added button save in visual console
|
2023-01-12 12:42:48 +01:00 |
|
Pablo Aragon
|
c503836634
|
Restrict access to collections with nms license
|
2023-01-12 12:28:40 +01:00 |
|
Daniel Cebrian
|
31d0cceecc
|
#10131 fixed error 500 in module templates
|
2023-01-11 17:00:39 +01:00 |
|
Daniel Cebrian
|
0f7ffec6aa
|
#9069 fixed style in SCHEDULED DOWNTIME form
|
2023-01-11 13:57:46 +01:00 |
|
Jose Gonzalez
|
a9c4dd625c
|
Merge develop branch
|
2023-01-11 13:46:15 +01:00 |
|
Jose Gonzalez
|
118099cd24
|
Minor fixes and solve issues with module templates
|
2023-01-11 13:02:18 +01:00 |
|
Daniel Cebrian
|
a7fccc2f77
|
#10106 deleted session when user is deleted
|
2023-01-11 10:59:52 +01:00 |
|
Daniel Rodriguez
|
1ce72edf0f
|
Merge branch 'ent-9878-meta-anadir-multiselector-de-servidores-a-la-edicion-de-filtros-de-eventos' into 'develop'
add new field for filters events pandora_enterprise#9878
See merge request artica/pandorafms!5391
|
2023-01-11 09:38:11 +00:00 |
|
Daniel Rodriguez
|
c6f522d2bf
|
Merge branch 'ent-9984-orden-snmp-v3-en-recon-discovery' into 'develop'
Ent 9984 orden snmp v3 en recon discovery
See merge request artica/pandorafms!5386
|
2023-01-10 16:19:29 +00:00 |
|
Daniel Rodriguez
|
2f4758009b
|
Merge branch 'ent-9817-duplicado-de-perfiles-al-crear-agente' into 'develop'
Ent 9817 duplicado de perfiles al crear agente
See merge request artica/pandorafms!5377
|
2023-01-10 16:18:24 +00:00 |
|
Jose Gonzalez
|
4cb5055488
|
TODO added
|
2023-01-10 15:16:58 +01:00 |
|
Daniel Cebrian
|
df87c122af
|
added ip in modules list
|
2023-01-10 10:50:47 +01:00 |
|
Pablo Aragon
|
72acbae5a6
|
Hide module password value
|
2023-01-10 10:23:09 +01:00 |
|
Jose Gonzalez
|
60685cdccc
|
Table fixes
|
2023-01-10 10:18:37 +01:00 |
daniel
|
c5ed1418e0
|
add new field for filters events pandora_enterprise#9878
|
2023-01-10 09:57:04 +01:00 |
|
Daniel Cebrian
|
a4d23f5c59
|
#9984 changed order inputs in snmp v3
|
2023-01-09 12:10:48 +01:00 |
Enrique Martin
|
2cf0e301c5
|
Merge branch 'ent-9758-14470-alertas-triggereadas-deshabilitadas-cuentan-en-el-group-view' into 'develop'
Ent 9758 14470 alertas triggereadas deshabilitadas cuentan en el group view
See merge request artica/pandorafms!5369
|
2023-01-05 11:46:53 +00:00 |
|
Enrique Martin
|
502f43df9c
|
Merge branch 'ent-10034-acl-enterprise-pfms-error-al-crear-perfil' into 'develop'
Ent 10034 acl enterprise pfms error al crear perfil
See merge request artica/pandorafms!5376
|
2023-01-05 11:43:05 +00:00 |
|
Daniel Cebrian
|
d3136a8be5
|
#9817 fixed input_json_profile hidden in update user
|
2023-01-05 09:01:06 +01:00 |
|
Calvo
|
c8bbf1e2dc
|
Fix minor bug
|
2023-01-05 08:56:07 +01:00 |
|
Diego Muñoz-Reja
|
14e703d1c3
|
Merge branch 'ent-10074-content-type-cannot-be-modified-on-snmp-alert-with-email-action' into 'develop'
Ent 10074 content type cannot be modified on snmp alert with email action
See merge request artica/pandorafms!5362
|
2023-01-04 16:06:16 +00:00 |
|
Jose Gonzalez
|
8421fb49ca
|
Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones
|
2023-01-04 15:54:16 +01:00 |
|
Jose Gonzalez
|
8728551c08
|
Agent details modules table upgraded
|
2023-01-04 15:46:32 +01:00 |
|
Daniel Cebrian
|
5fb435796b
|
#10034 fixed option blank in ENTERPRISE ACL SETUP
|
2023-01-04 12:14:59 +01:00 |
|
Jonathan
|
b9d6898639
|
#9758 update_alert_count on enable/disable alerts
|
2023-01-03 15:09:18 +01:00 |
|
Jose Gonzalez
|
03226b1f23
|
Polishing agent main view
|
2023-01-02 16:50:13 +01:00 |
|
Calvo
|
19fe7ffe73
|
Fix minor bug
|
2022-12-30 15:04:07 +01:00 |
|
Calvo
|
867749f9d3
|
Fix inventory blacklist open
|
2022-12-29 18:14:43 +01:00 |
|
Calvo
|
6d9149e11b
|
Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API
|
2022-12-29 17:39:12 +01:00 |
|
Pablo Aragon
|
ab54a26815
|
9868 Remove footer and create About section
|
2022-12-29 16:21:36 +01:00 |
|
Jonathan
|
707763f5e2
|
#10074 snmp alert edit content_type
|
2022-12-29 14:55:30 +01:00 |
|
Calvo
|
fc7187ed0c
|
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
|
2022-12-28 18:32:49 +01:00 |
|
Calvo
|
0e2829eca0
|
Fix inventory blacklist js
|
2022-12-28 18:28:03 +01:00 |
|
Rafael Ameijeiras
|
6b4bc8b9b0
|
Merge branch 'ent-9903-no-permitir-nombres-de-perfiles-duplicados' into 'develop'
Ent 9903 no permitir nombres de perfiles duplicados
See merge request artica/pandorafms!5321
|
2022-12-28 10:01:46 +00:00 |
|
Calvo
|
566344ef0e
|
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
|
2022-12-28 11:00:44 +01:00 |
|
Rafael Ameijeiras
|
7c0b6330bd
|
Merge branch 'ent-9997-quitar-using-module-component-de-la-edicion-de-modulo' into 'develop'
Ent 9997 quitar using module component de la edicion de modulo
See merge request artica/pandorafms!5354
|
2022-12-28 09:49:42 +00:00 |
|
Rafael Ameijeiras
|
fa034e4ae2
|
Merge branch 'ent-9664-14349-modulos-pendingdelete-se-muestran-en-el-selector-de-modulos-en-paradas-planificadas' into 'develop'
Ent 9664 14349 modulos pendingdelete se muestran en el selector de modulos en paradas planificadas
See merge request artica/pandorafms!5359
|
2022-12-28 09:42:23 +00:00 |
|
Rafael Ameijeiras
|
db7205fed3
|
Merge branch 'ent-9996-descripcion-incorrecta-al-crear-modulo-ssh' into 'develop'
Ent 9996 descripcion incorrecta al crear modulo ssh
See merge request artica/pandorafms!5351
|
2022-12-28 09:37:04 +00:00 |
|
Pablo Aragon
|
bbdc5b3e93
|
9664 Exclude pendingdelete modules from scheduled downtime
|
2022-12-27 15:22:39 +01:00 |
|
Calvo
|
f8b3183ad3
|
Moved inventory blacklist to open
|
2022-12-27 13:02:03 +01:00 |
|
daniel
|
69e3203317
|
Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3
|
2022-12-27 09:06:20 +01:00 |
|
Daniel Rodriguez
|
05687a9ef2
|
Merge branch 'ent-1841-filtro-por-so-en-politicas-cepsa' into 'develop'
SO filter on policy
See merge request artica/pandorafms!5331
|
2022-12-23 09:38:29 +00:00 |
|
Jonathan
|
c89d80e7e7
|
#9997 Module agent on edit don't show template
|
2022-12-23 09:44:15 +01:00 |
|
Calvo
|
8f53ec448f
|
Fix button delete inventory modules
|
2022-12-22 17:48:37 +01:00 |
|
Calvo
|
fd59061800
|
Fix wrong link to inventory modules form
|
2022-12-22 17:43:49 +01:00 |
|
Calvo
|
b46f9c9319
|
Move inventory to open
|
2022-12-22 12:47:03 +01:00 |
|
Calvo
|
2ad8fac652
|
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
|
2022-12-22 11:35:25 +01:00 |
|
Rafael Ameijeiras
|
925749dc5f
|
Merge branch 'ent-9052-lista-de-modulos-de-un-agente-ordenar-filtros-y-controles' into 'develop'
Ent 9052 lista de modulos de un agente ordenar filtros y controles
See merge request artica/pandorafms!5327
|
2022-12-22 09:35:41 +00:00 |
|
Pablo Aragon
|
d83abafaaa
|
9996 Edit description when create ssh module
|
2022-12-21 17:05:01 +01:00 |
|
Rafael Ameijeiras
|
64510a6e31
|
Merge branch 'ent-9059-vista-de-grupos-de-agentes-acortar-y-ordenar-filtro' into 'develop'
Ent 9059 vista de grupos de agentes acortar y ordenar filtro
See merge request artica/pandorafms!5322
|
2022-12-21 13:41:31 +00:00 |
|
daniel
|
47c503bdab
|
Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3
|
2022-12-21 12:51:18 +01:00 |
|
Rafael Ameijeiras
|
9ad2556201
|
Merge branch 'ent-1270-borrado-de-modulos-hijos-automatico' into 'develop'
Ent 1270 borrado de modulos hijos automatico
See merge request artica/pandorafms!5340
|
2022-12-21 11:49:39 +00:00 |
|
Daniel Rodriguez
|
cc2da2d4a4
|
Merge branch 'ent-8535-Monitorizacion-de-clusters-Pasar-de-Enterprise-a-Open' into 'develop'
implement cluster in open project
See merge request artica/pandorafms!5204
|
2022-12-21 09:05:01 +00:00 |
|
Jonathan
|
f62116bf92
|
#1270 deleche children modules on checked
|
2022-12-21 08:44:11 +01:00 |
|
Rafael Ameijeiras
|
5934b02738
|
Merge branch 'ent-10018-Vulnerabilidad-CSRF' into 'develop'
fixed csrf
See merge request artica/pandorafms!5336
|
2022-12-20 17:50:21 +00:00 |
|
Rafael Ameijeiras
|
7091654e65
|
Merge branch 'ent-9844-bug-en-el-filtro-de-alertas' into 'develop'
Fix alert list view search bug
See merge request artica/pandorafms!5319
|
2022-12-20 17:49:07 +00:00 |
|
Jose Gonzalez
|
ffa4ec756c
|
Agent Group icons adding
|
2022-12-20 17:22:35 +01:00 |
|
Rafael Ameijeiras
|
e0b5abba31
|
Merge branch 'ent-9738-14457-Cambio-de-nodo-en-Informe-SQL-no-funciona-tras-edicion-META' into 'develop'
fixed report update
See merge request artica/pandorafms!5334
|
2022-12-20 13:38:54 +00:00 |
|
alejandro.campos@artica.es
|
47cb138d9b
|
path fix
|
2022-12-20 14:15:33 +01:00 |
|
Rafael Ameijeiras
|
96d08a3c7a
|
Merge branch 'ent-9978-permission-for-massive-operation-in-enterpriseacl-does-not-work' into 'develop'
Ent 9978 permission for massive operation in enterpriseacl does not work
See merge request artica/pandorafms!5316
|
2022-12-20 11:49:08 +00:00 |
|
Rafael Ameijeiras
|
9e0cff685a
|
Merge branch 'ent-9953-No-se-puede-añadir-informacion-GIS-de-los-agentes-manualmente-desde-a-consola-php8' into 'develop'
minor fix
See merge request artica/pandorafms!5333
|
2022-12-20 11:47:43 +00:00 |
|
Daniel Barbero
|
3e071a7d33
|
remove phamtomjs pandora_enterprise#9554
|
2022-12-20 12:23:18 +01:00 |
|
Calvo
|
f84f9733e3
|
Merge remote-tracking branch 'origin/develop' into ent-7386-Ocultar-credenciales-de-acceso-a-la-API
|
2022-12-20 12:15:10 +01:00 |
|
Jonathan
|
e694d6468f
|
1270 Delete modules on cascade
|
2022-12-19 17:04:49 +01:00 |
|
Jose Gonzalez
|
b0997850f4
|
Fix server type icon definition
|
2022-12-19 16:38:47 +01:00 |
|
Jose Gonzalez
|
977c358fa0
|
Grouped somethings
|
2022-12-19 15:08:53 +01:00 |
|
Calvo
|
63840b1d55
|
Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open
|
2022-12-19 11:31:02 +01:00 |