Commit Graph

771 Commits

Author SHA1 Message Date
miguel angel rasteu ec8d16e49b #11652 Resolve conflicts 2023-12-01 10:07:41 +01:00
Rafael Ameijeiras 6992562178 Merge branch 'ent-12126-al-crear-una-nueva-plantilla-de-alerta-aparece-una-opcion-en-cero-literalmente-en-campo' into 'develop'
Ent 12126 al crear una nueva plantilla de alerta aparece una opcion en cero literalmente en campo

See merge request artica/pandorafms!6500
2023-11-27 11:58:30 +00:00
Rafael Ameijeiras c3af86414f Merge branch 'ent-11650-aviso-emergente-no-acorde-con-la-nueva-interfaz' into 'develop'
Ent 11650 aviso emergente no acorde con la nueva interfaz

See merge request artica/pandorafms!6395
2023-11-27 11:56:57 +00:00
Matias Didier c321165252 Merge branch 'ent-12298-error-en-almacenamiento-de-datos-de-acciones-de-alerta' into 'develop'
Ent 12298 error en almacenamiento de datos de acciones de alerta

See merge request artica/pandorafms!6597
2023-11-27 10:23:58 +00:00
daniel 5486b500f0 Add action ITSM in SNMP alert pandora_enterprise#12327 2023-11-06 13:12:14 +01:00
miguel angel rasteu 0f32550f21 #11650 Fix conflict 2023-10-30 08:35:34 +01:00
miguel angel rasteu 98da82aadf #11652 Fix conflict 2023-10-30 08:30:29 +01:00
Jorge Rincon 1838126354 #12298 clear hidden fields 2023-10-24 09:57:25 +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
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
miguel angel rasteu b9b12b13fe #12126 Fix priority selector 2023-09-26 12:18:05 +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
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 09bcedde62 ITSM pandora_enterprise#11471 2023-09-14 16:36:52 +02:00
daniel af968b5e13 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-09-14 08:08:05 +02:00
miguel angel rasteu 55fa824792 #12037 Fix size of agent text and event text 2023-09-11 11:41:30 +02:00
daniel ce0468b37e Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/include/functions_menu.php
2023-09-08 13:11:52 +02:00
miguel angel rasteu 6323102631 #11652 Fixed fc-calendar size 2023-09-04 08:30:14 +02:00
miguel angel rasteu 083043eaba #11650 Change style for tooltip 2023-09-01 14:06:48 +02:00
miguel angel rasteu 6305d13a86 #11964 Fix snmp alerts editor 2023-08-30 11:57:40 +02:00
daniel ecfa71b43c ITSM pandora_enterprise#11471 2023-08-25 14:15:32 +02:00
daniel 1fecd7d289 ITSM pandora_enterprise#11471 2023-08-17 14:56:55 +02:00
daniel 8bc65474f0 ITSM pandora_enterprise#11471 2023-08-16 16:52:57 +02:00
daniel f0d78a44d1 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
2023-08-11 14:32:54 +02:00
daniel dbf98689c2 ITSM pandora_enterprise#11471 2023-08-11 14:30:18 +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
Daniel Cebrian a72309ffa9 Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales 2023-08-08 17:35:34 +02:00
Daniel Cebrian c45b9fb541 Merge branch 'develop' into ent-11682-no-se-configuran-las-listas-de-dias-especiales 2023-08-08 17:30:16 +02:00
Rafael Ameijeiras d84f69d922 Merge branch 'ent-11651-menu-lateral-se-despista-al-solicitar-detalle-de-alertas' into 'develop'
Ent 11651 menu lateral se despista al solicitar detalle de alertas

See merge request artica/pandorafms!6268
2023-08-07 07:28:55 +00:00
Jonathan 47155513cc #11710 fix error redirect url and pagination 2023-08-04 10:17:59 +02:00
Jonathan 10dd156b16 #11710 redirect meta message 2023-08-04 09:29:47 +02:00
Jonathan 9dabecffce Merge branch 'develop' into ent-11710-fallo-en-la-paginacion-de-el-apartado-de-alert-commands-en-nodos-con-metaconsola 2023-08-04 09:27:24 +02:00
Jonathan 6c4143db10 #11710 change message "go to metaconsole" 2023-08-04 08:40:46 +02:00
miguel angel rasteu 135c6835bd #11713 fix title buttons 2023-08-03 12:51:09 +02:00
daniel 1bf7f1e36e ITSM pandora_enterprise#11471 2023-07-21 14:23:42 +02:00
miguel angel rasteu 88ba679875 #11651 Fix console.log 2023-07-20 12:52:36 +02:00
miguel angel rasteu a4442ce31b #11651 Fix menu 2023-07-20 10:42:22 +02:00
daniel 9a72d0740c ITSM fixed pandora_enterprise#11471 2023-07-18 15:13:08 +02:00
miguel angel rasteu fd56631ae4 #11713 Fix action button title 2023-07-14 13:07:04 +02:00
Jonathan 9a32c0c700 #11710 fix pagination alerts node on centraliced 2023-07-12 14:16:35 +02:00
Jonathan 0f1b8fce02 #11719 fix modules create alert 2023-07-12 12:11:50 +02:00
Matias Didier 02f173e39d Merge branch 'ent-11612-en-alert-templates-se-permite-crear-plantillas-con-nombres-vacios' into 'develop'
Ent 11612 en alert templates se permite crear plantillas con nombres vacios

See merge request artica/pandorafms!6135
2023-07-10 13:07:53 +00:00
miguel angel rasteu a215620f2e #11701 Fix alert view 2023-07-10 11:39:43 +02:00
Daniel Cebrian 1dedb96314 #11682 fixed special days alert 2023-07-06 16:39:21 +02:00
miguel angel rasteu d46edcd49d #11701 Fix alert view 2023-07-06 15:51:15 +02:00
Gorka Sanchez 8fd3ed6650 Merge branch 'ent-9478-creacion-y-edicion-directa-de-alertas-desde-metaconsola' into 'develop'
Ent 9478 creacion y edicion directa de alertas desde metaconsola

See merge request artica/pandorafms!5806
2023-07-06 09:44:33 +00:00
Gorka Sanchez 74191fb94f Merge branch 'ent-11695-15900-no-funciona-el-filtro-de-acciones-de-alerta' into 'develop'
Ent 11695 15900 no funciona el filtro de acciones de alerta

See merge request artica/pandorafms!6213
2023-07-06 09:41:59 +00:00