daniel
|
7db8c17823
|
api change path v1 to v2 pandora_enterprise#13019
|
2024-03-13 09:07:58 +01:00 |
Jonathan
|
bcd31a10bc
|
#12497 dots new links
|
2024-03-12 13:16:16 +01:00 |
Rafael Ameijeiras
|
5941aac339
|
Merge branch 'ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD' into 'develop'
visual changes in demo view
See merge request artica/pandorafms!6916
|
2024-03-05 07:59:04 +00:00 |
|
Rafael Ameijeiras
|
bfee610b4f
|
Merge branch 'ent-12621-meter-tips-de-ayuda-en-la-interfaz' into 'develop'
Ent 12621 meter tips de ayuda en la interfaz
See merge request artica/pandorafms!6904
|
2024-02-26 11:51:37 +00:00 |
alejandro.campos@artica.es
|
06107f4773
|
Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD
|
2024-02-23 10:24:26 +01:00 |
|
Rafael Ameijeiras
|
0cce999c95
|
Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop'
Ent 12695 16818 eliminar warnings en console log
See merge request artica/pandorafms!6919
|
2024-02-22 16:21:32 +00:00 |
|
Jonathan
|
c725624dcb
|
#12621 style tips dialogs
|
2024-02-20 16:16:48 +01:00 |
|
Jonathan
|
51e7d2d423
|
#12497 dots
|
2024-02-20 12:54:35 +01:00 |
|
Jonathan
|
b22ad532b2
|
#12621 new tips
|
2024-02-19 12:07:31 +01:00 |
|
Jonathan
|
42975c7967
|
#12695 wip removing warnings
|
2024-02-14 17:43:20 +01:00 |
|
Jonathan
|
7f580cc388
|
Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log
|
2024-02-13 09:42:00 +01:00 |
|
alejandro.campos@artica.es
|
8ff87ec93a
|
Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD
|
2024-02-13 09:36:36 +01:00 |
|
alejandro.campos@artica.es
|
405f15f9f0
|
minor fixes
|
2024-02-12 13:52:45 +01:00 |
|
alejandro.campos@artica.es
|
df8c14864c
|
improvements
|
2024-02-09 10:37:04 +01:00 |
|
Jonathan
|
6e1fb2f061
|
#12695 wip removing warnings
|
2024-02-08 17:17:17 +01:00 |
|
Rafael Ameijeiras
|
06a3fa3f27
|
Merge branch 'ent-12636-error-con-los-iconos-y-cabecera-de-sistemas-operativos' into 'develop'
Ent 12636 error con los iconos y cabecera de sistemas operativos
See merge request artica/pandorafms!6872
|
2024-02-08 14:50:49 +00:00 |
|
Jonathan
|
9084a34514
|
#12695 wip removing warnings
|
2024-02-08 12:31:55 +01:00 |
Enrique Martin
|
bff917bdaf
|
Remove console.log() entries
|
2024-02-06 15:30:39 +01:00 |
Daniel Cebrian
|
5feb11c547
|
9992 added email test dialog in metaconsole
|
2024-01-31 16:34:25 +01:00 |
|
alejandro.campos@artica.es
|
2ba5dd767d
|
visual changes in demo view
|
2024-01-26 12:41:32 +01:00 |
Matias Didier
|
e47b8eb364
|
Merge branch 'ent-12323-campo-para-configurar-rotado-de-netflow_interval' into 'develop'
Ent 12323 Campo para configurar rotado de netflow_interval
See merge request artica/pandorafms!6824
|
2024-01-23 12:51:28 +00:00 |
|
Jonathan
|
a747308b26
|
#12636 fix errors
|
2024-01-22 16:21:51 +01:00 |
|
Rafael Ameijeiras
|
4705aefb83
|
Merge branch 'ent-12692-anadir-informacion-i-al-token-event-storm-protection-del-setup-para-evitar-confusiones' into 'develop'
Ent 12692 anadir informacion i al token event storm protection del setup para evitar confusiones
See merge request artica/pandorafms!6819
|
2024-01-19 08:19:48 +00:00 |
|
Matias Didier
|
78652c0009
|
Merge branch 'ent-12192-enlace-a-pandora-itsm-en-idioma-espanol' into 'develop'
Ent 12192 enlace a pandora itsm en idioma espanol
See merge request artica/pandorafms!6558
|
2024-01-18 08:36:38 +00:00 |
|
Daniel Cebrian
|
110d7f4842
|
#12323 added netflow interval select
|
2024-01-02 12:57:02 +01:00 |
miguel angel rasteu
|
87f1346ee1
|
#12692 Add help tip in Event storm protection token
|
2023-12-29 09:58:20 +01:00 |
Calvo
|
421eb1fe23
|
Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica
|
2023-12-19 18:59:07 +01:00 |
|
Alejandro Campos
|
c700633fce
|
Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
# pandora_console/extras/mr/67.sql
# pandora_console/pandoradb.sql
|
2023-12-18 10:54:27 +00:00 |
|
daniel
|
4c11595899
|
fix name token easter eggs pandora_enterprise#12201
|
2023-12-14 16:48:10 +01:00 |
|
daniel
|
27a83a8eb5
|
Merge remote-tracking branch 'origin/develop' into ent-12201-eastern-egg-setup
Conflicts:
pandora_console/include/functions_config.php
|
2023-12-14 16:36:11 +01:00 |
|
Jonathan
|
5fa9cd5877
|
Merge branches 'develop' and 'ent-8365-ncm-fase-3' of brutus.artica.es:artica/pandorafms into ent-8365-ncm-fase-3
|
2023-12-13 11:19:32 +01:00 |
|
Jonathan
|
6e60d19193
|
#8365 ftp server ip
|
2023-12-12 15:46:42 +01:00 |
|
Rafael Ameijeiras
|
a2436cf60e
|
Merge branch 'ent-12620-elementos-de-lista-negra-de-deteccion-de-cambios-en-inventario-en-el-setup-no-funciona' into 'develop'
Ent 12620 elementos de lista negra de deteccion de cambios en inventario en el setup no funciona
See merge request artica/pandorafms!6745
|
2023-12-11 14:46:27 +00:00 |
|
Enrique Martin
|
28d6b73bd8
|
Removed services and plugin agents setup for demo
|
2023-12-11 12:12:47 +01:00 |
|
Rafael Ameijeiras
|
ce298c1e8f
|
Merge branch 'ent-12353-URL-de-Pandora-RC-en-Pandora-FMS-continua-siendo-ehorus-en-el-Setup' into 'develop'
change url pandorarc name
See merge request artica/pandorafms!6649
|
2023-12-11 08:24:46 +00:00 |
Jorge Rincon
|
725c5d964c
|
#12620 fixed blacklist items in setup
|
2023-12-07 13:09:42 +01:00 |
|
Alejandro Campos
|
0bdc6978e6
|
Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo'
# Conflicts:
# pandora_console/extras/mr/67.sql
# pandora_console/pandoradb.sql
|
2023-12-05 15:30:06 +00:00 |
|
alejandro.campos@artica.es
|
4a64f023fe
|
Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo
|
2023-12-04 11:37:41 +01:00 |
|
alejandro.campos@artica.es
|
75ddb3b934
|
minor changes in demo data functionality
|
2023-12-04 11:37:12 +01:00 |
|
Enrique Martin
|
55aee67df3
|
Added GIS maps creation
|
2023-12-03 23:23:57 +01:00 |
|
Matias Didier
|
874e60bf55
|
Merge branch 'ent-12248-mover-token-de-configuracion-s-flow-a-la-seccion-de-netflow' into 'develop'
Ent 12248 mover token de configuracion s flow a la seccion de netflow
See merge request artica/pandorafms!6621
|
2023-11-30 13:05:46 +00:00 |
|
Jonathan
|
75d57337af
|
#11705 Fix merge conflict
|
2023-11-30 08:10:32 +01:00 |
Daniel Rodriguez
|
7f4a928f35
|
Merge branch 'ent-12243-no-funciona-integracion-pandora-pitsm-a-nivel-usuario' into 'develop'
Hide test button and setup in ITSM pandora_enterprise#12243
See merge request artica/pandorafms!6629
|
2023-11-29 17:52:26 +00:00 |
|
alejandro.campos@artica.es
|
a290203847
|
implement demo data load
|
2023-11-29 16:57:38 +01:00 |
|
Matias Didier
|
e7ad23c477
|
Merge branch 'ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico' into 'develop'
Ent 11127 poner el aviso de cantidad de modulos en cola dinamico
See merge request artica/pandorafms!6489
|
2023-11-29 09:30:08 +00:00 |
|
alejandro.campos@artica.es
|
7240bbf934
|
implement demo data load
|
2023-11-29 09:00:45 +01:00 |
|
Matias Didier
|
bda55cc3a5
|
Merge branch 'ent-11894-editor-de-links-no-actualiza-la-pagina-al-crear-o-borrar-enlaces' into 'develop'
Ent 11894 editor de links no actualiza la pagina al crear o borrar enlaces
See merge request artica/pandorafms!6373
|
2023-11-28 08:22:37 +00:00 |
|
Jonathan
|
9819c3a5ff
|
Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos
|
2023-11-28 08:30:23 +01:00 |
|
Matias Didier
|
746eb298ea
|
Merge branch 'ent-11831-literales-de-opciones-de-menu-no-coinciden' into 'develop'
Ent 11831 literales de opciones de menu no coinciden
See merge request artica/pandorafms!6437
|
2023-11-28 07:07:58 +00:00 |
|
Jorge Rincon
|
34f9e0df49
|
Merge branch 'develop' into ent-11127-poner-el-aviso-de-cantidad-de-modulos-en-cola-dinamico
|
2023-11-27 15:52:41 +01:00 |