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

260 Commits

Author SHA1 Message Date
Daniel Barbero Martin 9f01029520 Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-26 08:12:20 +01:00
vgilc 4b85e93490 Merge branch 'ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma' into 'develop' 
Ent 8222 nueva grafica desde la vista de modulos histograma

See merge request artica/pandorafms!4637
 2022-01-25 10:28:18 +00:00
vgilc b547278930 Merge branch 'ent-7988-no-se-puede-cambiar-la-skin-de-pandora-en-entorno-meta-nodo-sincronizados' into 'develop' 
Ent 7988 no se puede cambiar la skin de pandora en entorno meta nodo sincronizados

See merge request artica/pandorafms!4633
 2022-01-25 10:27:25 +00:00
Daniel Barbero Martin 9a799a838d Merge remote-tracking branch 'origin/develop' into ent-8290-Crear-nueva-seccion-Operaciones-Masivas-borrado-agentes-en-Metaconsola 2022-01-25 10:34:43 +01:00
Daniel Barbero Martin 83970932ce bulk operations agents in meta #8290 2022-01-24 16:57:42 +01:00
Daniel Barbero Martin 4f46da6633 Merge remote-tracking branch 'origin/develop' into ent-8222-Nueva-grafica-desde-la-vista-de-modulos-Histograma 
Conflicts:
	pandora_console/include/styles/pandora.css
 2022-01-18 10:17:19 +01:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
Jose Gonzalez f1fd4926a7 Merge branch 'ent-8409-bug-widget-agent-module-view' of brutus.artica.es:artica/pandorafms into ent-8409-bug-widget-agent-module-view 2022-01-13 13:15:39 +01:00
Jose Gonzalez 3596ee35df Perform correct visualization of information tiles 2022-01-13 12:30:04 +01:00
José González f18e0693da Merge branch 'develop' into 'ent-8409-bug-widget-agent-module-view' 
# Resolve Conflicts:
#   pandora_console/include/javascript/pandora_dashboards.js
 2022-01-13 08:58:21 +00:00
Daniel Maya ffc468fce8 Added message 2022-01-12 13:59:46 +01:00
Jose Gonzalez 70d8c5177a Fix issues in node 2022-01-12 13:50:27 +01:00
Daniel Rodriguez 8e9c3184a8 Merge branch 'ent-8186-Bug-en-widget-General-visual-maps-report-Dashboard-metaconsola' into 'develop' 
Ent 8186 bug en widget general visual maps report dashboard metaconsola

See merge request artica/pandorafms!4626
 2022-01-12 09:45:59 +00:00
Jose Gonzalez 9519e00992 Fix issues with select agents modules control 2022-01-11 16:06:58 +01:00
Daniel Maya 191f17b7d6 Fixed url in metaconsole 2022-01-11 15:40:49 +01:00
Jose Gonzalez 4ce90a70eb Fixed visual issue 2022-01-10 10:22:59 +01:00
Jose Gonzalez 4f52e1192c Fixed missing code 2022-01-07 12:22:15 +01:00
Calvo f9dceb9e10 Fix not init color 2021-12-28 12:38:22 +01:00
Daniel Rodriguez f8b90c21ed Merge branch 'ent-8180-Bug-en-widget-Network-map-Dashboard-metaconsola' into 'develop' 
Ent 8180 bug en widget network map dashboard metaconsola

See merge request artica/pandorafms!4573
 2021-12-23 10:02:24 +00:00
Daniel Barbero Martin f705cc0fba wip chart histogram list modules #8222 2021-12-14 13:21:34 +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
fbsanchez e37cdc4459 Improvements in Entity class 2021-12-09 14:57:37 +01:00
Daniel Maya 765a36f913 #8180 Fix map select in metaconsole 2021-12-07 15:48:49 +01:00
fbsanchez 19643cd685 report for ncm simple 2021-11-29 15:26:19 +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 Rodriguez 3efcc8d30f Merge branch 'ent-8146-Bug-en-filtro-de-eventos-de-widget-List-of-latest-events-Dashboard' into 'develop' 
Ent 8146 bug en filtro de eventos de widget list of latest events dashboard

See merge request artica/pandorafms!4504
 2021-11-22 15:53:16 +00: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 cc859f3978 Entity, allow to duplicate objects 2021-11-15 19:29:37 +01:00
Daniel Rodriguez 4eb40382dd Merge branch 'ent-8049-Bug-en-widget-Visual-console-de-Dasboards-metaconsola' into 'develop' 
Ent 8049 bug en widget visual console de dasboards metaconsola

See merge request artica/pandorafms!4450
 2021-11-15 11:20:21 +00:00
Daniel Rodriguez 650607067e Merge branch 'ent-7688-conteo-monitores-vista-tactica' into 'develop' 
Include modules not init in total monitors count on tactical view

See merge request artica/pandorafms!4309
 2021-11-15 11:00:07 +00:00
Daniel Barbero Martin bd75912a0d wip special days alerts 2021-11-04 09:55:37 +01:00
Daniel Barbero Martin fdca5e4a78 wip special days alerts 2021-11-03 17:30:54 +01:00
Daniel Barbero Martin 1e976a8605 alerts special days wip 2021-11-03 10:59:00 +01:00
Daniel Barbero Martin 25268ec9b4 color 2021-11-02 17:49:45 +01:00
Daniel Barbero Martin 9d776feb41 dashboard widget tree fix in metaconsole only groups type 2021-10-29 11:50:41 +02:00
Daniel Maya 3b49b28d9e #8146 Fixed max hours 2021-10-27 09:18:28 +02:00
fbsanchez 6781e513c8 NCM WIP 2021-10-06 19:52:46 +02:00
Daniel Maya eab82aa6d1 #8049 Fixed get visual console with selected node 2021-10-06 16:49:21 +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 3f86528c80 Merge branch 'ent-7910-pandora-db-con-db-encriptada' into 'develop' 
Fix issue with encrypted password

Closes pandora_enterprise#7910

See merge request artica/pandorafms!4433
 2021-10-06 12:42:12 +00:00
fbsanchez e11d8f3766 minor schema update 2021-10-04 19:43:57 +02:00
fbsanchez 9dff230b65 Allow enable or disable cache in Entity and some minor fixes 2021-09-30 12:23:37 +02:00
Jose Gonzalez d68328c777 Fix issue with encrypted password 2021-09-28 16:39:22 +02:00
Daniel Rodriguez ddd550ce42 Merge branch 'ent-8022-12445-duplicacion-de-politicas-con-mergeador-de-metaconsola' into 'develop' 
Entity dynamic method calling improved

See merge request artica/pandorafms!4415
 2021-09-28 12:56:00 +00: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 7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00
Daniel Maya 3f91fda888 Fixed module_details_window 2021-09-23 10:59:24 +02:00
Jose Gonzalez 5b40a4f700 Merge remote-tracking branch 'origin' into ent-7514-pasar-networkmaps-a-open 2021-09-23 08:50:50 +02:00
Daniel Rodriguez f78d2e8a4b Merge branch 'ent-7697-varios-bugs-visuales-en-modal-de-configuracion-de-widget-metaconsola' into 'develop' 
Fix widgets style bugs

See merge request artica/pandorafms!4272
 2021-09-22 08:58:51 +00:00