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

874 Commits

Author SHA1 Message Date
Calvo f9dceb9e10 Fix not init color 2021-12-28 12:38:22 +01:00
fbsanchez 54576be543 Warn if different MR on centralised environments 2021-12-16 17:46:45 +01:00
fbsanchez f852df2f1c Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-14 11:03:04 +01:00
Daniel Barbero Martin 5a3e5aaac4 wip reports alert actions 2021-12-02 16:57:31 +01:00
fbsanchez 11c18d9379 minor style changes 2021-12-02 11:10:18 +01:00
Daniel Barbero Martin 40fc8c7308 wip reports alert actions 2021-11-30 13:07:37 +01:00
fbsanchez 5197d08aa3 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/install.php
 2021-11-29 09:54:55 +01:00
Daniel Barbero Martin f7233604fe Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-25 08:19:35 +01:00
Daniel Barbero Martin 8746db24c9 demo 2021-11-25 08:19:05 +01:00
Daniel Barbero Martin 7a5f91188b Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 
Conflicts:
	pandora_console/include/functions_html.php
 2021-11-24 08:39:03 +01:00
fbsanchez a9485024f4 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-23 14:29:23 +01:00
Daniel Maya 3bfce928c4 #7902 Fixed add and update actions 2021-11-23 10:53:51 +01:00
Daniel Maya 8ce1a500ea #8210 Fixed dialog 2021-11-19 14:57:56 +01:00
fbsanchez 582cb9a082 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 10:51:46 +01:00
fbsanchez 9ff3c8eee1 wip ncm2 2021-11-15 18:58:57 +01:00
Daniel Rodriguez 68d416626d Merge branch 'ent-7351-Vista-Module-Library-sale-de-margenes' into 'develop' 
Fix module library

Closes pandora_enterprise#7351

See merge request artica/pandorafms!4335
 2021-11-15 10:17:38 +00:00
Daniel Rodriguez b36318c450 Merge branch 'ent-7959-problemas-visualizacion-alertas-sonoras' into 'develop' 
Fixed visual issues and handle browser zoom

Closes pandora_enterprise#7959

See merge request artica/pandorafms!4484
 2021-11-15 10:12:37 +00:00
fbsanchez ee09470962 wip ncm2 2021-11-12 16:55:35 +01:00
Daniel Barbero Martin e70ecd461e WIP new report alert fired actions 2021-11-12 13:11:49 +01:00
fbsanchez 94e8a35613 minor change 2021-11-10 17:14:12 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez 9699b368ef Fixed visual issues and handle browser zoom 2021-10-19 16:56:54 +02:00
Daniel Rodriguez 961522218e Merge branch 'ent-7694-imagen-pequena-en-sap-view' into 'develop' 
fixed size sap logo

See merge request artica/pandorafms!4289
 2021-10-05 09:25:35 +00:00
Daniel Rodriguez 1595b99e09 Merge branch 'ent-7748-fallo-visual-en-snmp-interfaces-wizard' into 'develop' 
fallo critico del swich regordete

See merge request artica/pandorafms!4288
 2021-10-05 09:24:51 +00:00
Daniel Rodriguez 086761b7b6 Merge branch 'ent-7822-vista-agents-modules-descuadra-cuando-la-ventana-no-esta-maximizada' into 'develop' 
fixed visual error with modules agents

See merge request artica/pandorafms!4390
 2021-10-05 09:22:05 +00:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Daniel Rodriguez 49961ed261 Merge branch 'ent-6296-10650-Añadir-widget-de-lista-de-servicios' into 'develop' 
Ent 6296 10650 añadir widget de lista de servicios

See merge request artica/pandorafms!4355
 2021-09-24 09:09:28 +00:00
Jose Gonzalez 316611f432 Fix name for css 2021-09-10 09:25:01 +02:00
Daniel Rodriguez a18fd6ab0f Merge branch 'ent-7706-descuadre-texto-e-icono-de-los-botones' into 'develop' 
fixed icon button position

See merge request artica/pandorafms!4243
 2021-09-08 14:40:34 +00:00
Calvo 44663c914a Log viewer graph capture model visual bug 2021-09-08 10:44:57 +02:00
marcos 1b4a137579 fixed visual error with modules agents 2021-09-06 17:16:49 +02:00
José González 6b90b33a26 Merge branch 'develop' into 'ent-7804-modificar-comportamiento-file-manager' 
# Conflicts:
#   pandora_console/include/functions_filemanager.php
 2021-09-01 15:33:44 +00:00
Daniel Maya 0fd076810d Added services view widget 2 2021-08-17 13:32:54 +02:00
Daniel Maya d70752baa1 Added services view widget 2021-08-13 14:12:21 +02:00
fbsanchez 6c8d002b12 Fix in style table with images limited to dashboard agent_module widget 2021-08-12 10:38:44 +02:00
fbsanchez 3afeb47676 Width-height auto for images in tables - agent_module widget improvement 2021-08-11 14:09:18 +02:00
Daniel Rodriguez dca52dca6a Merge branch 'ent-7702-vista-de-agentes-sin-color-en-grafica-circulo-estado-agente' into 'develop' 
Fixes in pie coauth: daniel

See merge request artica/pandorafms!4210
 2021-08-10 06:59:29 +00:00
Daniel Rodriguez f93b7fcd7a Merge branch 'ent-7817-ventana-de-registro-pequena' into 'develop' 
fixed licence modal size

See merge request artica/pandorafms!4308
 2021-08-05 11:59:01 +00:00
Daniel Rodriguez 6071bfc29b Merge branch 'ent-7440-metaconsola-nodo-dashboard-group-status-no-pinta-los-colores-bien' into 'develop' 
Ent 7440 metaconsola nodo dashboard group status no pinta los colores bien

See merge request artica/pandorafms!4229
 2021-08-03 14:56:12 +00:00
José González ce765a5dbd Fix module library 2021-07-29 10:36:16 +02:00
marcos 4afa72223e fixed licence modal size 2021-07-19 11:42:41 +02:00
José González 96fccb01b9 Created token for hande file creation 2021-07-16 16:54:43 +02:00
marcos 37b8541fa6 fixed size sap logo 2021-07-12 17:26:01 +02:00
marcos 640c81b487 fallo critico del swich regordete 2021-07-12 13:06:30 +02:00
marcos 7ff1277fb3 fixed icon button position 2021-06-28 14:40:32 +02:00
fbsanchez 1d66993d84 Some minor style improvements in error boxes 2021-06-25 11:10:56 +02:00
fbsanchez 92d84e4cda some minor style fix 2021-06-25 11:05:26 +02:00
Daniel Maya 077d6ba313 Fixed color 2021-06-23 15:34:52 +02:00
Marcos Alconada d6ecce1ce9 fixed visual error 2021-06-21 14:06:29 +00:00
fbsanchez 9ed895d457 Fixes in pie coauth: daniel 2021-06-16 11:41:57 +02:00