1013 Commits

Author SHA1 Message Date
Diego Muñoz-Reja
57058c4f9c Merge branch 'ent-11266-no-se-habilita-el-log-de-consola-en-770-ni-771' into 'develop'
Ent 11266 no se habilita el log de consola en 770 ni 771

See merge request artica/pandorafms!6001
2023-07-13 07:55:47 +00:00
Matias Didier
a575c3028f Merge branch 'ent-11037-modificar-etiqueta' into 'develop'
Ent 11037 modificar etiqueta

See merge request artica/pandorafms!5795
2023-07-07 11:57:33 +00:00
Daniel Cebrian
496058e144 Merge branch 'develop' into ent-11437-automatic-logout-mechanism-has-been-disabled 2023-07-06 12:12:23 +02:00
miguel angel rasteu
8ad4e8261e #10563 Fix config enable feedback 2023-07-03 10:22:22 +02:00
miguel angel rasteu
ac92b5979c #10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality 2023-06-30 08:35:37 +02:00
alejandro.campos@artica.es
087c0c18cc Merge remote-tracking branch 'origin/develop' into ent-9781-14477-Control-reportes-SQL-Query-en-PDF 2023-06-29 12:00:44 +02:00
Rafael Ameijeiras
520f0c77d1 Merge branch 'ent-10266-tip-sobre-opcion-de-setup-en-version-opensource-setup-visual-precision-de-datos' into 'develop'
Ent 10266 tip sobre opcion de setup en version opensource setup visual precision de datos

See merge request artica/pandorafms!5703
2023-06-27 11:26:02 +00:00
Matias Didier
fde3857674 Merge branch 'ent-11476-cambiar-headers-de-copyright' into 'develop'
Ent 11476 cambiar headers de copyright

See merge request artica/pandorafms!6069
2023-06-22 13:24:47 +00:00
Pablo Aragon
cbbf675d82 11620-Login background 772 2023-06-20 11:40:40 +02:00
Daniel Cebrian
1980458572 #11437 added new control session 2023-06-08 14:06:15 +02:00
miguel angel rasteu
db62a91cb6 #11476 Fix https url 2023-06-08 13:19:01 +02:00
miguel angel rasteu
1f8752ee63 #11476 Fix pandora url 2023-06-08 13:10:16 +02:00
miguel angel rasteu
64204b6ff7 #11476 Fix ascci art 2023-06-08 12:42:10 +02:00
miguel angel rasteu
933f69f2ab #11476 Change copyright header 2023-06-08 11:53:13 +02:00
Jorge Rincon
0658282306 #11406 Fixed the bug that allows to show the delete icon of the OS component 2023-05-31 15:10:01 +02:00
miguel angel rasteu
80aeaebfad #11266 Add hint 2023-05-31 09:26:42 +02:00
miguel angel rasteu
08a4c28953 #11266 Fix location of console.log 2023-05-31 09:22:16 +02:00
Daniel Rodriguez
dbf7d4dcfe Merge branch 'ent-11054-15466-modo-legacy-con-problemas' into 'develop'
fixed visual errors in legacy VC pandora_enterprise#11054

See merge request artica/pandorafms!5829
2023-05-23 10:07:14 +00:00
Rafael Ameijeiras
b3f37f8bb4 Merge branch 'ent-10991-15445-usuario-estandar-con-perfil-pandora-administrator-no-puede-ver-vista-authentication' into 'develop'
Ent 10991 15445 usuario estandar con perfil pandora administrator no puede ver vista authentication

See merge request artica/pandorafms!5751
2023-05-17 14:42:27 +00:00
Daniel Rodriguez
dbd0e435e1 Merge branch 'ent-11128-mejor-usabilidad-en-los-botones-de-test-de-conexion-con-integraciones' into 'develop'
Ent 11128 mejor usabilidad en los botones de test de conexion con integraciones

See merge request artica/pandorafms!5848
2023-05-16 10:12:11 +00:00
Jorge Rincon
257954c026 #11128 Fixed the usability of test connection buttons with integrations 2023-05-08 12:16:12 +02:00
Pablo Aragon
7cf69ae101 11058-New welcome message 2023-05-08 08:49:35 +02:00
Calvo
4f48fa4450 Fix ws test button 2023-05-05 11:25:33 +02:00
Calvo
fb7a94ddd4 Fix ws exceptions on socket close event 2023-05-04 14:34:50 +02:00
daniel
5b0092c019 fix legacy VC pandora_enterprise#11054 2023-05-04 12:55:52 +02:00
Calvo
c74ed4914b Websocket engine test button 2023-05-04 11:37:16 +02:00
alejandro.campos@artica.es
f2cbfd930c implement sql query item limit 2023-05-03 13:44:58 +02:00
Daniel Rodriguez
191c7d3098 Merge branch 'ent-10820-15230-Mantener-el-estado-del-evento-anterior-con-Extra-ID' into 'develop'
Ent 10820 15230 mantener el estado del evento anterior con extra

See merge request artica/pandorafms!5709
2023-04-28 06:07:10 +00:00
miguel angel rasteu
822bd7df8b #11037 Fix label 2023-04-26 16:24:05 +02:00
Daniel Rodriguez
af80e204de Merge branch 'ent-10255-14940-Funcionalidad-cuadro-naranja-en-las-consolas-visuales-cuando-hay-una-alerta' into 'develop'
setup check to enable/disable vc item alert frame

See merge request artica/pandorafms!5668
2023-04-20 17:22:57 +00:00
Daniel Rodriguez
f5a7dd40e9 Merge branch 'ent-10490-theme-base-de-tinymce' into 'develop'
Ent 10490 theme base de tinymce

See merge request artica/pandorafms!5649
2023-04-20 11:51:13 +00:00
Daniel Cebrian
e05a19dc7f #10991 fixed acl in auth view 2023-04-20 12:24:52 +02:00
Daniel Maya
a8277dc19f #10945 Fix timestamp 2023-04-13 12:25:18 +02:00
alejandro.campos@artica.es
23f0ffdf9e Keep In process status for new events with same extra id 2023-04-12 17:46:10 +02:00
alejandro.campos@artica.es
2ca27ae15d Keep In process status for new events with same extra id 2023-04-12 17:32:52 +02:00
Daniel Maya
a42c235cab #10917 Fix icon 2023-04-12 14:44:01 +02:00
Jorge Rincon
32c8109cbe #10266 added tip visual setup option in Open version 2023-04-12 14:17:10 +02:00
alejandro.campos@artica.es
d0aa931f46 setup check to enable/disable vc item alert frame 2023-04-05 16:24:46 +02:00
Jonathan
000ab68327 #10490 TinyMCE Upgrade V6 2023-04-04 11:24:49 +02:00
daniel
d6a1155dbb fixed styles 2023-03-31 08:45:54 +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 Cebrian
b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
Jonathan
665976e011 Bulks masive visual action buttons 2023-03-27 11:10:51 +02:00
Jonathan
f8aefa6e34 Merge conflict solution 2023-03-27 08:31:00 +02:00
Rafael Ameijeiras
a30ba4cf27 Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop'
Ent 9624 meter soporte a sflow en nuestro gestor de flujos

See merge request artica/pandorafms!5587
2023-03-24 07:25:52 +00:00
Pablo Aragon
0fa79e44f1 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-23 17:44:16 +01:00
Pablo Aragon
122f45fcaa Metasetup 2023-03-23 17:44:04 +01:00
daniel
95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Pablo Aragon
8b163cd100 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 16:42:15 +01:00
Pablo Aragon
b0b2778c4a 10760-Setup 2023-03-22 16:42:03 +01:00