Rafael Ameijeiras
|
ec772f592d
|
Merge branch 'ent-10803-no-hay-formulario-de-perfiles-al-crear-usuario' into 'develop'
fix profiles and users pandora_enterprise#10803
See merge request artica/pandorafms!5721
|
2023-04-17 12:44:16 +00:00 |
Matias Didier
|
75a40d3c5a
|
Merge branch 'ent-10898-error-en-la-asignacion-de-grupo-secundario' into 'develop'
Ent 10898 error en la asignacion de grupo secundario
See merge request artica/pandorafms!5697
|
2023-04-17 12:27:23 +00:00 |
daniel
|
976633bc4f
|
fix profiles and users pandora_enterprise#10803
|
2023-04-14 10:02:41 +02:00 |
Daniel Rodriguez
|
895b1bea7c
|
Merge branch 'ent-10945-timestamp-desconocido-en-vista-de-eventos' into 'develop'
Ent 10945 timestamp desconocido en vista de eventos
See merge request artica/pandorafms!5717
|
2023-04-13 14:53:45 +00:00 |
|
Rafael Ameijeiras
|
357893d2c0
|
Merge branch 'ent-10911-icono-de-borrar-enorme-en-edicion-de-elementos-de-custom-report' into 'develop'
Ent 10911 icono de borrar enorme en edicion de elementos de custom report
See merge request artica/pandorafms!5718
|
2023-04-13 13:06:07 +00:00 |
Jonathan
|
85052a948d
|
#10911 fix visual delete icon size
|
2023-04-13 12:30:07 +02:00 |
Daniel Maya
|
a8277dc19f
|
#10945 Fix timestamp
|
2023-04-13 12:25:18 +02:00 |
|
Jonathan
|
7d9fb5c77a
|
#10730 Regular expresion inventory reports
|
2023-04-13 10:42:37 +02:00 |
|
Daniel Rodriguez
|
7ae8f185b0
|
Merge branch 'ent-10909-se-han-roto-los-iconos-de-grupo-de-agentes-en-v770' into 'develop'
Ent 10909 se han roto los iconos de grupo de agentes en v770
See merge request artica/pandorafms!5701
|
2023-04-12 15:29:44 +00:00 |
|
Daniel Maya
|
a42c235cab
|
#10917 Fix icon
|
2023-04-12 14:44:01 +02:00 |
|
Daniel Maya
|
2bb016474a
|
#10909 Fix icon group 2
|
2023-04-12 13:37:51 +02:00 |
|
Matias Didier
|
5a38024e25
|
Merge branch 'ent-10320-no-pide-confirmacion-al-eliminar-usuario' into 'develop'
Ent 10320 no pide confirmacion al eliminar usuario
See merge request artica/pandorafms!5678
|
2023-04-12 11:03:01 +00:00 |
|
Daniel Maya
|
d006bc3c3a
|
#10909 Fix icon group
|
2023-04-12 12:23:54 +02:00 |
|
Matias Didier
|
ad3f1dd8d6
|
Merge branch 'ent-10526-derivado-del-trabajo-de-q-a-en-ticket-https-brutus-artica-es-8081-artica-pandora_enterprise' into 'develop'
Ent 10526 derivado del trabajo de q a en ticket https brutus artica es 8081 artica pandora enterprise
See merge request artica/pandorafms!5691
|
2023-04-12 10:16:24 +00:00 |
|
Jonathan
|
1a05c71e78
|
#10526 fix create module dialog
|
2023-04-12 10:44:20 +02:00 |
|
Matias Didier
|
310496f135
|
Merge branch 'ent-10258-bug-en-edicion-de-accion-mail-to-admin' into 'develop'
Ent 10258 bug en edicion de accion mail to admin
See merge request artica/pandorafms!5680
|
2023-04-12 07:47:35 +00:00 |
Pablo Aragon
|
c21397476e
|
10898-Assign secondary groups in agent view
|
2023-04-12 08:21:26 +02:00 |
|
Jonathan
|
2164e0d9a2
|
#10526 tree view modal show on create agent
|
2023-04-11 14:57:53 +02:00 |
|
Daniel Rodriguez
|
57c6788a19
|
Merge branch 'ent-10891-no-tenemos-local-components-en-open' into 'develop'
Ent 10891 no tenemos local components en open
See merge request artica/pandorafms!5685
|
2023-04-11 12:26:31 +00:00 |
|
Jonathan
|
f98303b3ba
|
#10891 Local components for enterprise menu
|
2023-04-11 12:14:18 +02:00 |
alejandro.campos@artica.es
|
db663be86d
|
minor fix
|
2023-04-11 10:30:40 +02:00 |
|
Pablo Aragon
|
564085ee01
|
10258-Event mail to admin
|
2023-04-11 09:52:49 +02:00 |
|
Pablo Aragon
|
a3ed2b1f6b
|
10320-Confirm delete user
|
2023-04-10 16:10:44 +02:00 |
|
Jonathan
|
55fc0c57ad
|
Merge branch 'develop' into ent-10864-conflicto-mergeo-fichero-ver_agentes-php
|
2023-04-10 09:24:30 +02:00 |
|
Daniel Rodriguez
|
ccadd5157a
|
Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' into 'develop'
Ent 7427 nexcon datos de monitorizacion con origen en netflow
See merge request artica/pandorafms!5604
|
2023-04-05 11:55:20 +00:00 |
|
Jonathan
|
17a9d6020f
|
#10864 Solution conflict files removed
|
2023-04-05 12:52:44 +02:00 |
Jimmy Olano
|
89aa227b98
|
Merge branch 'ent-10734-sistema-de-favoritos-no-actualiza-nombre-en-el-menu-lateral-del-objeto-favorito-consola-visual' into 'develop', JJOS.
Ent 10734 sistema de favoritos no actualiza nombre en el menu lateral del objeto favorito consola visual
See merge request artica/pandorafms!5613
|
2023-04-04 11:57:45 +00:00 |
|
Jonathan
|
99b07a2fb2
|
Conflict solution
|
2023-04-04 11:35:26 +02:00 |
|
Pablo Aragon
|
e4c8097e9c
|
10402 remove passwords box & 10856 vcard
|
2023-04-04 09:24:29 +02:00 |
|
Matias Didier
|
e4b718a468
|
Merge branch 'ent-10839-problema-con-buscador-agentes' into 'develop'
Ent 10839 problema con buscador agentes
See merge request artica/pandorafms!5642
|
2023-04-03 06:58:55 +00:00 |
|
Jonathan
|
8d950c3672
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-31 13:37:59 +02:00 |
|
Jonathan
|
e8e7dcc5ec
|
Actions select bulk operations view
|
2023-03-31 13:37:43 +02:00 |
|
daniel
|
c315a7f8c5
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-31 13:31:39 +02:00 |
|
Pablo Aragon
|
2f619d1ef6
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-31 10:45:43 +02:00 |
|
Pablo Aragon
|
426690bc35
|
10843 & 10844
|
2023-03-31 10:44:51 +02:00 |
|
Daniel Rodriguez
|
ca16c5dd61
|
Merge branch 'ent-10441-control-de-cache-en-actualizaciones' into 'develop'
Ent 10441 control de cache en actualizaciones
See merge request artica/pandorafms!5623
|
2023-03-31 07:33:26 +00:00 |
|
daniel
|
d6a1155dbb
|
fixed styles
|
2023-03-31 08:45:54 +02:00 |
|
daniel
|
24e5fca884
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-30 17:34:06 +02:00 |
|
Pablo Aragon
|
3a2cbb7a62
|
Datatables & styles fix
|
2023-03-30 16:50:30 +02:00 |
|
Matias Didier
|
9344bd16c9
|
Merge branch 'ent-10525-15104-netflow-no-esta-mostrando-correctamente-todos-los-datos' into 'develop'
Unified default netflow interval and deleted from console setup
See merge request artica/pandorafms!5614
|
2023-03-30 12:39:06 +00:00 |
|
Daniel Maya
|
6bfdfa5a3b
|
10839 Fixed search
|
2023-03-30 14:09:02 +02:00 |
|
daniel
|
f2e1b2ef57
|
fixed styles
|
2023-03-30 12:36:05 +02:00 |
|
Pablo Aragon
|
e03e1e45ed
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-30 12:26:06 +02:00 |
|
Pablo Aragon
|
5e24706f71
|
Style fix
|
2023-03-30 12:25:45 +02:00 |
Daniel Cebrian
|
f442272177
|
Merge branch 'develop' into ent-10633-pantalla-de-timeout
|
2023-03-30 09:30:38 +02:00 |
|
Daniel Cebrian
|
b9fc352578
|
merge develop into ent-10633-pantalla-de-timeout
|
2023-03-30 09:15:10 +02:00 |
|
daniel
|
2c1301f542
|
fixed styles
|
2023-03-30 08:59:40 +02:00 |
|
daniel
|
1262fee2e8
|
fixed styles
|
2023-03-30 08:43:23 +02:00 |
|
daniel
|
8458716ba9
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-29 17:27:57 +02:00 |
|
Pablo Aragon
|
2b121a2fd2
|
New qrcode.js version & vcard
|
2023-03-29 15:34:03 +02:00 |