miguel angel rasteu
|
5060398661
|
#11206 Fix conflict
|
2023-10-13 09:00:03 +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 |
alejandro.campos@artica.es
|
10d94daf30
|
Merge remote-tracking branch 'origin/develop' into ent-11830-reemplazar-sistema-de-websocket-gotty-actual
|
2023-10-10 11:09:53 +02:00 |
Calvo
|
c790b48fd7
|
Fix discovery list network column for disco ext
|
2023-10-10 10:40:37 +02:00 |
|
miguel angel rasteu
|
133826b498
|
#12205 Fix ehorus conf interfaz
|
2023-10-10 09:57:09 +02:00 |
|
Calvo
|
a822f6db86
|
Fix discovery migration bugs
|
2023-10-09 16:52:52 +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 |
|
Calvo
|
d091ee8194
|
Migration dicovery fix bugs and changed script paths
|
2023-10-05 10:52:52 +02:00 |
|
Calvo
|
db291c77f5
|
Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda
|
2023-10-04 16:21:29 +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 |
|
Calvo
|
7e20e6b048
|
Changed migration scripts and migration ini path
|
2023-10-03 12:10:53 +02: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 |
|
Calvo
|
bfe9bcaac0
|
Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda
|
2023-09-29 15:18:08 +02:00 |
|
Calvo
|
33d9badd3e
|
Added md5 check to server path for migrating discovery apps
|
2023-09-29 15:17:43 +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 |
|
alejandro.campos@artica.es
|
70ad1ea986
|
minor changes
|
2023-09-28 13:08:33 +02:00 |
Daniel Rodriguez
|
05cd8142bf
|
Merge branch 'ent-11471-integracion-pandora-integria' into 'develop'
wip integration integriaIMS pandora_enterprise#11471
Closes pandora_enterprise#11471
See merge request artica/pandorafms!6131
|
2023-09-28 10:05:15 +00: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 |
|
alejandro.campos@artica.es
|
831ed2570d
|
implemented cron in open
|
2023-09-27 11:35:57 +02:00 |
|
Rafael Ameijeiras
|
03700d2653
|
Merge branch 'ent-12032-refactoring-visual-de-la-vista-de-clusters' into 'develop'
refactor cluster view pandora_enterprise#12032
See merge request artica/pandorafms!6476
|
2023-09-26 15:15:27 +00:00 |
|
alejandro.campos@artica.es
|
19a9f82fe1
|
gotty changes
|
2023-09-25 19:08:24 +02:00 |
daniel
|
91393c9e39
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/include/styles/pandora.css
|
2023-09-25 17:06:08 +02:00 |
Daniel Maya
|
d4e2fb4fea
|
resolved conflict
|
2023-09-21 18:04:15 +02:00 |
|
daniel
|
f46626e120
|
refactor cluster view pandora_enterprise#12032
|
2023-09-21 10:21:45 +02:00 |
|
alejandro.campos@artica.es
|
dbd418d6dc
|
remove trace
|
2023-09-20 16:01:23 +02:00 |
|
alejandro.campos@artica.es
|
ae74caf7b1
|
Merge remote-tracking branch 'origin/develop' into ent-11114-Gestion-de-versiones-Obsolescencia-planeada
|
2023-09-20 15:52:56 +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 |
felix.suarez
|
976a32617f
|
Add logic to complex alerts
|
2023-09-20 08:18:39 -05:00 |
|
Félix Suárez
|
2de84982cf
|
Updates to save new Complex templates
|
2023-09-20 08:16:22 -05:00 |
Daniel Cebrian
|
592d7ab745
|
#11807 fixed empty field agent
|
2023-09-19 09:21:42 +02:00 |
|
Daniel Cebrian
|
a1fd85f486
|
Merge branch 'develop' into ent-11807-security-hardening-console-informes
|
2023-09-18 16:49:00 +02:00 |
|
Rafael Ameijeiras
|
a75369aeda
|
Merge branch 'ent-11839-error-en-direccion-url-por-correo-electronico-con-incorrect-config-value-y-error-en-causa-raiz' into 'develop'
Ent 11839 error en direccion url por correo electronico con incorrect config value y error en causa raiz
See merge request artica/pandorafms!6381
|
2023-09-18 13:18:36 +00:00 |
|
Daniel Rodriguez
|
6ecd8ca899
|
Merge branch 'ent-10065-post-filtros-de-eventos-privados' into 'develop'
Draft: Ent 10065 post filtros de eventos privados
See merge request artica/pandorafms!6318
|
2023-09-18 07:55:18 +00:00 |
|
Daniel Cebrian
|
ca928bd4a4
|
#11807 new input interval in report hardening
|
2023-09-18 09:41:53 +02:00 |
Pablo Aragon
|
bed83f1406
|
11839-Add max in User->Block size pagination
|
2023-09-18 08:23:05 +02:00 |
|
Daniel Cebrian
|
f1c153231f
|
#11807 added period in evolution
|
2023-09-15 14:55:49 +02:00 |
|
Daniel Cebrian
|
2844dfd4f0
|
#11807 fixed export csv in hardening, fixed interval time in exports report and fixed modal error in reports
|
2023-09-15 13:34:07 +02:00 |
|
daniel
|
09bcedde62
|
ITSM pandora_enterprise#11471
|
2023-09-14 16:36:52 +02:00 |
|
Calvo
|
d0c1fa7db3
|
Merge remote-tracking branch 'origin/develop' into ent-11607-migracion-de-discovery-bajo-demanda
|
2023-09-14 12:24:25 +02:00 |
|
Calvo
|
a2baea5710
|
Migration legacy apps to discovery 2.0
|
2023-09-14 12:24:12 +02:00 |
|
daniel
|
af968b5e13
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-09-14 08:08:05 +02:00 |
|
Daniel Cebrian
|
8ecb57a498
|
#11807 fixed bug in open
|
2023-09-13 13:53:53 +02:00 |
|
Pablo Aragon
|
959a2e9110
|
11806-Add alert icon in Manage agent
|
2023-09-13 08:14:11 +02:00 |
|
miguel angel rasteu
|
91aee79ab2
|
#12037 Resolve conflicts
|
2023-09-12 15:07:00 +02:00 |
|
daniel
|
802f0bf83b
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-09-12 12:37:31 +02:00 |