1202 Commits

Author SHA1 Message Date
Daniel Cebrian
cacb524ece #12376 changed label in new token 2023-11-07 13:28:35 +01:00
Daniel Cebrian
8f8e5ecf45 #12376 multiple changes in general tactical view 2023-11-07 13:18:44 +01:00
daniel
f71479033d Hide test button and setup in ITSM pandora_enterprise#12243 2023-11-06 13:06:38 +01:00
Jonathan
54514b043d #12248 move nflow to netflow config 2023-11-03 11:35:22 +01:00
Jonathan
1362ff0967 Revert "#12248 change setup netflow tab"
This reverts commit 1412480b4dd571b6c80208c75b2215aa5e97960c.
2023-11-03 11:32:54 +01:00
Jonathan
1412480b4d #12248 change setup netflow tab 2023-11-03 09:54:56 +01:00
miguel angel rasteu
84bc687d5d #12177 Fix conflict 2023-10-30 09:53:00 +01:00
alejandro.campos@artica.es
1fd45fb95f implement demo data feature 2023-10-26 19:05:07 +02:00
Daniel Cebrian
5e497db840 #11126 moved token vulnerabilities to enterprise 2023-10-25 11:48:49 +02:00
Daniel Cebrian
a862a8018c #11126 added token in config agent and setup 2023-10-24 18:02:14 +02:00
miguel angel rasteu
35efc20fc7 #12177 Fix message 2023-10-13 12:58:21 +02:00
miguel angel rasteu
2062169f2f #12177 Fix upload os icon 2023-10-13 12:55:58 +02:00
miguel angel rasteu
5060398661 #11206 Fix conflict 2023-10-13 09:00:03 +02:00
miguel angel rasteu
9a57cc550e #12192 Fix pandora itsm url 2023-10-11 16:31:48 +02:00
Rafael Ameijeiras
dda7c2a0c0 Merge branch 'ent-12205-interfaz-configuracion-ehorus-pandora-rc-a-nivel-de-usuario-ha-desaparecido' into 'develop'
Ent 12205 interfaz configuracion ehorus pandora rc a nivel de usuario ha desaparecido

See merge request artica/pandorafms!6544
2023-10-11 07:18:34 +00:00
miguel angel rasteu
f22fd10659 #12205 Fix url 2023-10-10 13:44:57 +02:00
miguel angel rasteu
23c5836ddc #12205 Change ehorus images 2023-10-10 11:34:11 +02:00
miguel angel rasteu
133826b498 #12205 Fix ehorus conf interfaz 2023-10-10 09:57:09 +02:00
alejandro.campos@artica.es
0e0b5bba43 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-10-09 14:17:25 +02:00
Alejandro Campos
0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada'
# Conflicts:
#   pandora_console/extras/mr/66.sql
2023-10-03 13:11:09 +00:00
Matias Didier
9e4903e545 Merge branch 'ent-12145-16086-gis-no-carga-en-mapas' into 'develop'
Ent 12145 16086 gis no carga en mapas

See merge request artica/pandorafms!6514
2023-10-03 08:52:21 +00:00
alejandro.campos@artica.es
0771094e85 minor changes 2023-10-02 16:42:32 +02:00
miguel angel rasteu
3f41e4f32b #12138 delete agent access graph 2023-10-02 16:24:23 +02:00
alejandro.campos@artica.es
85598d5012 Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual 2023-09-28 16:36:59 +02:00
Jonathan
6db13cc55a merge conflict solution 2023-09-28 13:14:49 +02:00
Jonathan
a1d170cf0f #12145 remove maxlength 2023-09-28 11:47:58 +02:00
Jonathan
c577fedff4 #12145 remove maxlength 2023-09-28 11:46:15 +02:00
alejandro.campos@artica.es
3f2caf9404 some gotty changes 2023-09-27 18:28:12 +02:00
miguel angel rasteu
d6faec76d7 #12121 Clear html tag characters to prevent XSS attacks 2023-09-26 09:57:39 +02:00
alejandro.campos@artica.es
19a9f82fe1 gotty changes 2023-09-25 19:08:24 +02:00
Jonathan
70e3707b64 #11705 group extra id heredity event custom id 2023-09-25 12:22:10 +02:00
Jorge Rincon
01bf91f213 #11127 Added token Number of modules in queue 2023-09-22 13:13:06 +02:00
alejandro.campos@artica.es
6f8212ed40 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-20 15:46:47 +02:00
daniel
802f0bf83b Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-12 12:37:31 +02:00
daniel
5093d54137 ITSM pandora_enterprise#11471 2023-09-11 18:14:32 +02:00
Jorge Rincon
2c430929cb #11831 Fixed menu option literals 2023-09-11 16:53:52 +02:00
miguel angel rasteu
99f92b9bec #10676 Fix truncate text 2023-09-11 10:09:34 +02:00
daniel
3d5a5c856b ITSM pandora_enterprise#11471 2023-09-08 13:09:03 +02:00
miguel angel rasteu
4b5dcff3cc #10529 Fix token session timeout 2023-09-08 09:26:08 +02:00
alejandro.campos@artica.es
318fa38721 Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada 2023-09-07 17:44:51 +02:00
alejandro.campos@artica.es
753851410e implemented os version management 2023-09-06 17:02:15 +02:00
alejandro.campos@artica.es
f8911bcf9c implemented os version management 2023-09-06 17:00:16 +02:00
Jorge Rincon
0cd43b8315 fixed web console erratas 2023-09-06 15:45:35 +02:00
daniel
fce86cb2ac Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-06 07:50:27 +02:00
daniel
a059f18b4b ITSM pandora_enterprise#11471 2023-09-04 16:36:58 +02:00
Jorge Rincon
aead8d006e #11894 Fixed links does not update the page when creating or deleting links 2023-08-29 14:11:32 +02:00
Jonathan
d9e897568a Merge branch 'develop' into ent-10639-unificacion-de-controles-de-fecha 2023-08-24 10:06:19 +02:00
Jonathan
ab50a519ea #10639 version 2 datepicker 2023-08-24 09:36:15 +02:00
daniel
512d5331d3 ITSM pandora_enterprise#11471 2023-08-23 18:52:06 +02:00
daniel
5a61f074d7 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-08-22 09:22:11 +02:00