tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-22 10:18:51 +02:00
Code Issues Packages Projects Releases Wiki Activity
33,160 Commits 34 Branches 30 Tags
Commit Graph

2020 Commits

Author SHA1 Message Date
fbsanchez
cad0c6cea6 Merge remote-tracking branch 'origin/develop' into ent-8130-ncm-fase-2 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-12-02 10:43:30 +01:00
Daniel Barbero Martin
6d9b3d209c Merge remote-tracking branch 'origin/develop' into ent-8075-Informe-de-acciones-de-alerta 2021-11-30 14:45:07 +01:00
Daniel Barbero Martin
40fc8c7308 wip reports alert actions 2021-11-30 13:07:37 +01:00
Daniel Maya
c289f67395 #8307 Added contextmenu in supernet map 2021-11-29 15:54:45 +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
Calvo
5464a73a12 Merge remote-tracking branch 'origin/develop' into ent-8303-formularios-en-modulos-para-nueva-funcionalidad-incremento-de-valor 2021-11-24 13:28:36 +01:00
Calvo
4dd931f277 Modules percentage threshold form 2021-11-24 11:33:36 +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 Rodriguez
13835582d2 Merge branch 'ent-8210-Bug-al-editar-acciones-ya-configuradas-en-alertas' into 'develop' 
Ent 8210 bug al editar acciones ya configuradas en alertas

See merge request artica/pandorafms!4536
 2021-11-22 12:44:51 +00: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
Daniel Barbero Martin
c52e11e91a Merge remote-tracking branch 'origin/develop' into ent-7503-Calendarios-para-dias-especiales 
Conflicts:
	pandora_console/extras/mr/51.sql
 2021-11-19 08:12:22 +01:00
fbsanchez
ed4f5845d7 some minor changes 2021-11-16 14:11:54 +01:00
fbsanchez
75f4e86f9e Code highlight 2021-11-16 14:05:02 +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
Daniel Rodriguez
07135a4174 Merge branch 'ent-7904-cabeceras-fondo-blanco-items-vista-tag' into 'develop' 
Fixed issue with class

Closes pandora_enterprise#7904

See merge request artica/pandorafms!4481
 2021-11-15 10:07:30 +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
Daniel Barbero Martin
2d4c949113 add metaconsole calendars special days alerts 2021-11-08 13:07:31 +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
c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
Jose Gonzalez
932d42e8da Fixed colours 2021-11-04 15:44:40 +01:00
Daniel Barbero Martin
fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
Daniel Barbero Martin
c2cce3990a special days template alerts 2021-10-28 17:30:03 +02:00
fbsanchez
5ae3bbc4fe Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-25 10:28:31 +02:00
fbsanchez
98c43ea1e7 WIP NCM 2021-10-19 21:11:09 +02:00
Jose Gonzalez
9699b368ef Fixed visual issues and handle browser zoom 2021-10-19 16:56:54 +02:00
Jose Gonzalez
05e352e9cf Fixed issue with class 2021-10-19 11:11:58 +02:00
Daniel Rodriguez
704403fd52 Merge branch 'ent-7972-funcionalidad-historico-de-alertas-lanzadas' into 'develop' 
Ent 7972 funcionalidad historico de alertas lanzadas

See merge request artica/pandorafms!4465
 2021-10-18 11:36:19 +00:00
Jose Gonzalez
304a4b5687 Fix size of event detail tabs 2021-10-15 09:36:22 +02:00
fbsanchez
8652648824 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-08 15:51:05 +02:00
fbsanchez
1cb2f77945 WIP NCM 2021-10-08 15:12:23 +02:00
marcos
85037693b2 fixed visual black theme error 2021-10-07 16:45:56 +02:00
Marcos Alconada
4378c3d6f5 Merge branch 'develop' into 'ent-8084-elementos-deshabilitados-irreconocibles-con-black-theme' 
# Conflicts:
#   pandora_console/include/styles/pandora_black.css
 2021-10-07 13:42:14 +00:00
marcos
34350c92a0 fixed visual black theme error 2021-10-07 13:43:46 +02:00
marcos
afb9cea67f add new filter fot litghbulb_off 2021-10-07 12:42:58 +02:00
marcos
52f87757d6 set bg transparent on images black theme 2021-10-07 10:30:05 +02:00
marcos
795d5c055a merge conflict 2021-10-07 09:56:17 +02:00
fbsanchez
6781e513c8 NCM WIP 2021-10-06 19:52:46 +02:00
fbsanchez
dae8a9ba14 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 2021-10-06 14:50:13 +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
6cbf83b2e2 Merge branch 'ent-7780-error-black-theme-en-transaccional-maps' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4285
 2021-10-05 09:23:14 +00:00