Rafael Ameijeiras
|
d072187a2c
|
Merge branch 'ent-12605-vista-de-agentes-error-500-en-develop' into 'develop'
fix error 500 and warnings pandora_enterprise#12605
See merge request artica/pandorafms!6738
|
2023-12-11 14:27:39 +00: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 |
alejandro.campos@artica.es
|
d601103df3
|
fix url
|
2023-12-05 11:49:43 +01:00 |
daniel
|
1d36d8a436
|
fix error 500 and warnings pandora_enterprise#12605
|
2023-12-05 09:14:02 +01:00 |
|
Rafael Ameijeiras
|
707f85ed7f
|
Merge branch 'ent-11511-cambiar-el-apartado-de-tools-a-seccion-management' into 'develop'
Ent 11511 cambiar el apartado de tools a seccion management
See merge request artica/pandorafms!6403
|
2023-11-27 14:36:38 +00:00 |
Daniel Rodriguez
|
1f8554e8d1
|
Merge branch 'ent-11914-editor-de-alertas-de-logs' into 'develop'
Ent 11914 editor de alertas de logs
See merge request artica/pandorafms!6505
|
2023-10-23 12:34:32 +00: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 |
|
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 |
miguel angel rasteu
|
133826b498
|
#12205 Fix ehorus conf interfaz
|
2023-10-10 09:57:09 +02:00 |
Daniel Maya
|
030ffc55f9
|
resolved conflict
|
2023-10-06 09:15:38 +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 |
|
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
|
3f2caf9404
|
some gotty changes
|
2023-09-27 18:28:12 +02:00 |
|
Daniel Maya
|
d096fa263d
|
#11914 Added log_alerts
|
2023-09-27 11:05:06 +02:00 |
|
alejandro.campos@artica.es
|
19a9f82fe1
|
gotty changes
|
2023-09-25 19:08:24 +02:00 |
|
Calvo
|
a2baea5710
|
Migration legacy apps to discovery 2.0
|
2023-09-14 12:24:12 +02:00 |
|
miguel angel rasteu
|
bf4ef92610
|
#11511 Move tools from operation to management
|
2023-09-04 13:44:44 +02:00 |
|
daniel
|
1a1087e311
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/66.sql
|
2023-09-04 08:16:48 +02:00 |
Gorka Sanchez
|
0d4a097a48
|
Merge branch 'ent-10622-anadir-acciones-sobre-alertas-y-alertas-externas-en-politicas-de-manera-masiva' into 'develop'
Ent 10622 anadir acciones sobre alertas y alertas externas en politicas de manera masiva
See merge request artica/pandorafms!6331
|
2023-08-31 06:48:45 +00:00 |
|
daniel
|
98a5355c94
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
|
2023-08-14 13:33:35 +02:00 |
Jonathan
|
df91ea25b5
|
#10622 massive policies alerts and external
|
2023-08-11 09:18:50 +02:00 |
Jorge Rincon
|
ed9b70725d
|
#11843 Added word legacy in the discovery. It is added only for version 1.0 of discovery.
|
2023-08-09 14:40:56 +02:00 |
|
daniel
|
7f82273dc4
|
Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
pandora_console/extras/mr/65.sql
|
2023-08-09 08:59:01 +02:00 |
|
Rafael Ameijeiras
|
9ce383d2ec
|
Merge branch 'ent-11739-compatibilidad-php-8-2' into 'develop'
Ent 11739 compatibilidad php 8 2
See merge request artica/pandorafms!6286
|
2023-07-27 09:17:24 +00:00 |
|
Daniel Maya
|
bee65bc575
|
#11739 Fixed deprecated functions
|
2023-07-26 14:18:20 +02:00 |
|
daniel
|
1bf7f1e36e
|
ITSM pandora_enterprise#11471
|
2023-07-21 14:23:42 +02:00 |
|
daniel
|
9a72d0740c
|
ITSM fixed pandora_enterprise#11471
|
2023-07-18 15:13:08 +02:00 |
Daniel Cebrian
|
41a03a7a49
|
Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery
|
2023-07-18 09:27:14 +02:00 |
|
Rafael Ameijeiras
|
d860d613d6
|
Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop'
Ent 10598 nuevo wizard de bienvenida
See merge request artica/pandorafms!6043
|
2023-07-17 05:57:29 +00:00 |
|
Gorka Sanchez
|
28f99d2c27
|
Merge branch 'ent-10741-15263-cuadro-de-busqueda-de-modulos-en-agente-limitado-a-5-caracteres' into 'develop'
Ent 10741 15263 cuadro de busqueda de modulos en agente limitado a 5 caracteres
See merge request artica/pandorafms!5713
|
2023-06-30 11:39:50 +00:00 |
|
Daniel Cebrian
|
eac3cf409b
|
#9771 new input for select mode of interval and changes in database
|
2023-06-27 17:37:41 +02:00 |
|
Daniel Cebrian
|
d2413ed461
|
Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery
|
2023-06-26 13:15:09 +02: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 |
|
Daniel Cebrian
|
363f29d333
|
Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery
|
2023-06-14 11:23:32 +02:00 |
|
Daniel Cebrian
|
308879fe05
|
#9771 moved discovery to open
|
2023-06-14 11:09:08 +02:00 |
|
Daniel Maya
|
6e56d680ba
|
#11553 fixed acl
|
2023-06-13 16:19:26 +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 |
|
Jonathan
|
ebdc735bd4
|
#10598 V2 wizard welcome
|
2023-06-02 13:32:47 +02:00 |
|
miguel angel rasteu
|
4e1e9a1d99
|
#11431 Fix alert conditional table and menu
|
2023-06-01 12:27:58 +02:00 |
|
Daniel Cebrian
|
2a7eb1e069
|
#11280 fixed acoustic console name
|
2023-05-30 17:17:34 +02:00 |
|
Jonathan
|
ae526d5df0
|
#10598 New wizard welcome
|
2023-05-23 16:54:40 +02:00 |
|
Daniel Cebrian
|
ea1ace2c71
|
#9771 added new discovery in menu
|
2023-04-18 12:48:14 +02:00 |
|
miguel angel rasteu
|
c26db22fa5
|
#10563 Move menu item Links from Management to Operation. Add button in setup to global disable the Feedback functionality
|
2023-04-13 11:07:09 +02:00 |
|
Jonathan
|
f98303b3ba
|
#10891 Local components for enterprise menu
|
2023-04-11 12:14:18 +02:00 |
|
Alejandro Campos
|
e909686ddc
|
Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob'
# Conflicts:
# pandora_console/extras/mr/62.sql
|
2023-03-28 14:09:33 +00:00 |
|
Daniel Cebrian
|
9dea38f440
|
Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos
|
2023-03-21 09:38:56 +01:00 |
|
Daniel Cebrian
|
ca78f069f6
|
#9624 added support sflow
|
2023-03-10 17:12:38 +01:00 |