tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
39,132 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

787 Commits

Author SHA1 Message Date
Jorge Rincon 1bd9e14e8f #13313 Fixed translation formatting 2024-04-25 09:07:58 +02:00
Jorge Rincon c6b28f5061 #13313 Validations are added for the template field in goal alerts. It is not redirected in case of errors in the meta form 2024-04-24 13:46:01 +02:00
Matias Didier 4345253689 Merge branch 'ent-13296-boton-next-en-alert-templates-roto' into 'develop' 
Ent 13296 boton next en alert templates roto

See merge request artica/pandorafms!7134
 2024-04-03 15:23:12 +00:00
Juan Antonio Loarte 8f4386f658 Merge branch 'ent-13215-17310-no-se-puede-escribir-en-el-cuadro-de-busqueda-de-accion-al-editar-una-accion-de-alerta' into 'develop' 
Ent 13215 17310 no se puede escribir en el cuadro de busqueda de accion al editar una accion de alerta

See merge request artica/pandorafms!7121
 2024-04-03 14:20:16 +00:00
Pablo Aragon a23978e541 13296-Fix next button with same name in Alerts->Templates 2024-04-03 15:08:06 +02:00
Pablo Aragon 22b53d2cb1 13215-Fix select2 into modal in Alerts actions 2024-04-03 14:55:41 +02:00
Jose Martin 3d8ed92430 Merge branch 'ent-13009-mejorar-como-ensenamos-la-accion-por-defecto-de-las-alertas' into 'develop' 
Ent 13009 mejorar como ensenamos la accion por defecto de las alertas

See merge request artica/pandorafms!7101
 2024-04-03 10:39:35 +00:00
Pablo Aragon 22c1e5a9ed 13215-Fix select2 into modal in Alerts actions 2024-04-02 15:03:26 +02:00
Carlos Pozuelo fbec8c0a05 Merge branch 'ent-12953-unificar-los-iconos-de-politicas-en-agentes' into 'develop' 
Ent 12953 unificar los iconos de politicas en agentes

See merge request artica/pandorafms!7051
 2024-04-02 12:50:49 +00:00
Pablo Aragon 88bd4b1bb0 13226-Close select2 on select in Alerts->Templates step 2 2024-04-01 12:58:15 +02:00
Pablo Aragon eae3d5af69 13009-Change actions in Alerts view and List of alerts 2024-04-01 12:04:06 +02:00
Pablo Aragon 423511def2 12953-Change policies icons to svg 2024-03-20 12:56:30 +01:00
Jonathan 42975c7967 #12695 wip removing warnings 2024-02-14 17:43:20 +01:00
Rafael Ameijeiras 574db2befe Merge branch 'ent-12128-en-alert-details-no-se-muestra-el-nombre-de-la-accion-correspondiente-a-la-alerta-al-usar' into 'develop' 
Ent 12128 en alert details no se muestra el nombre de la accion correspondiente a la alerta al usar

See merge request artica/pandorafms!6802
 2024-01-25 13:57:05 +00:00
Jonathan a0ad52b75f #12128 action alert no show when empty 2023-12-21 13:13:31 +01:00
Jonathan d68daca985 #11900 counter items 2023-12-19 16:50:36 +01:00
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