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

1669 Commits

Author SHA1 Message Date
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
Daniel Rodriguez 4b5719c1da Merge branch 'ent-7781-black-theme-botones-blancos-en-filtro-de-eventos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4283
 2021-10-05 09:22:35 +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
fbsanchez 31f329a833 Merge remote-tracking branch 'origin/develop' into ent-7060-gestion-basica-de-configuracion-de-equipos-de-red 
Conflicts:
	pandora_console/vendor/composer/autoload_classmap.php
	pandora_console/vendor/composer/autoload_static.php
 2021-10-05 10:57:00 +02:00
marcos aa43caee23 resolved mrege conflicts 2021-10-04 14:22:11 +02:00
Jose Gonzalez 6deaee84ac Merge 2021-10-04 10:00:15 +02:00
Daniel Rodriguez 7904c61df5 Merge branch 'ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica' into 'develop' 
Ent 7273 consola visual nuevo elemento gráfica básica

See merge request artica/pandorafms!4304
 2021-10-01 12:48:09 +00:00
fbsanchez 696c59b258 WIP NCM 2021-09-29 20:56:39 +02:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
Daniel Rodriguez 04d683286f Merge branch 'ent-5193-IPAM-Supernet-Map-Tree-View' into 'develop' 
implemented supernet treeview

See merge request artica/pandorafms!4431
 2021-09-29 10:10:26 +00:00
alejandro.campos@artica.es 87ec5970a1 implemented supernet treeview 2021-09-28 13:44:12 +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 7bfe699802 Fixes minor issues 2021-09-23 17:01:22 +02:00
Daniel Maya 8fa834fb9b resolved conflict 2021-09-22 17:27:18 +02:00
Daniel Rodriguez 68b3255143 Merge branch 'ent-7583-traduccion-traduccion-del-apartado-de-la-consola-alerts-alert-correlation' into 'develop' 
Css content moved to js to allow translation

See merge request artica/pandorafms!4400
 2021-09-22 09:07:42 +00:00
Daniel Rodriguez a252bbedac Merge branch 'ent-7371-comportamiento-extrano-editor-ace' into 'develop' 
Fixed monospaced

Closes pandora_enterprise#7371

See merge request artica/pandorafms!4273
 2021-09-21 13:18:43 +00:00
Calvo 82e5b649d6 Css content moved to js to allow translation 2021-09-10 15:10:20 +02:00
Daniel Rodriguez 93b4d81264 Merge branch 'ent-7730-visualizacion-update-manager-en-tema-oscuro' into 'develop' 
add update manager black background update manager

See merge request artica/pandorafms!4270
 2021-09-10 11:11:24 +00:00
Marcos Alconada 2ed5be71d6 Resolve conflict 2021-09-10 08:04:23 +00:00
Marcos Alconada 99a47b0739 set style on um-last and next button 2021-09-10 07:49:40 +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
Daniel Rodriguez 3b5545cde4 Merge branch 'ent-7720-bug-visual-en-correlacion-de-alertas' into 'develop' 
fixed error

See merge request artica/pandorafms!4244
 2021-09-08 13:35:45 +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
marcos 3547c09a16 add black theme on update manager online 2021-09-02 12:05:54 +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
marcos 1bec5014c7 resoled conflcits 2021-09-01 16:58:36 +02:00
Daniel Rodriguez 4d5926e427 Merge branch 'ent-7612-implementar-sistema-de-mensajeria-en-la-meta' into 'develop' 
Ent 7612 implementar sistema de mensajeria en la meta

See merge request artica/pandorafms!4353
 2021-08-24 08:13:02 +00:00
Jose Gonzalez 20c0d87165 Fix issue with initial visual problems 2021-08-19 08:18:06 +02:00
Daniel Maya 0fd076810d Added services view widget 2 2021-08-17 13:32:54 +02:00
José González 66ebe2ebf4 Merge branch 'develop' into 'ent-7531-menu-lateral-no-se-oculta-correctamente' 
# Conflicts:
#   pandora_console/index.php
 2021-08-16 08:12:40 +00:00
Daniel Maya d70752baa1 Added services view widget 2021-08-13 14:12:21 +02:00
fbsanchez 3109975e7d Notifications in MC 2021-08-12 12:01:24 +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 089b981f7f Merge branch 'ent-7397-Bug-en-item-module-graph-de-cv' into 'develop' 
fixed several issues in item module graph of visual consoles

See merge request artica/pandorafms!4279
 2021-08-11 07:16:19 +00:00
Daniel Rodriguez 00ed8233d0 Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop' 
set default font size on graph modules when is send in mails

See merge request artica/pandorafms!4264
 2021-08-10 12:19:54 +00: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 Maya f1f7291b5e Added basic chart 4 2021-08-04 11:11:28 +02:00
Daniel Maya f9c95e0145 oMerge branch 'develop' into ent-7273-Consola-Visual-nuevo-elemento-Gráfica-básica 2021-08-04 09:57:57 +02: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
fbsanchez 0cec3afba0 Deactivated nodes if not unified 2021-07-19 13:47:43 +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
Daniel Maya 71767a3f11 Added basic chart 2021-07-16 14:16:45 +02:00
fbsanchez 9b31906bdf Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
 2021-07-13 10:01:59 +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
Daniel Maya a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00:00
marcos 201e9c7216 fixed visual error 2021-07-12 11:10:41 +02:00
marcos 1b6001d380 fixed visual error 2021-07-12 10:55:28 +02:00
fbsanchez 554a32b567 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-09 14:40:44 +02:00
alejandro.campos@artica.es a484fb2408 fixed several issues in item module graph of visual consoles 2021-07-08 10:03:57 +02:00
marcos 6252da395c Merge remote-tracking branch 'origin/develop' into ent-7730-visualizacion-update-manager-en-tema-oscuro 2021-07-07 14:15:03 +02:00
José González a079edcf1a Fixed monospaced 2021-07-07 12:58:08 +02:00
marcos 7a4224cef6 add update manager black background update manager 2021-07-06 12:49:20 +02:00
alejandro.campos@artica.es 2bf5e16bb1 visual fix 2021-07-06 10:37:47 +02:00
marcos ea57c58f40 set default font size on graph modules when is send in mails 2021-07-05 11:34:32 +02:00
marcos a2c9004c09 fixed error 2021-06-28 15:20:16 +02:00
marcos 7ff1277fb3 fixed icon button position 2021-06-28 14:40:32 +02:00
fbsanchez 760522aeff Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 11:03:09 +02:00
fbsanchez 36f6ad4ee2 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 
Conflicts:
	pandora_console/include/styles/meta_dashboards.css
 2021-06-28 10:37:49 +02:00
Daniel Rodriguez 174b0a0a60 Merge branch 'ent-7752-Bug-en-vista-dashboards-metaconsola' into 'develop' 
fixed visual bug in meta dashboards

See merge request artica/pandorafms!4237
 2021-06-28 08:33:56 +00:00
fbsanchez 771c51ef5d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 10:13:51 +02:00
alejandro.campos@artica.es 9ec25a7cfb fixed visual bug in meta dashboards 2021-06-25 14:44:14 +02:00
Luis 14e69c5c07 Ent 7644 mapa servicio tree view muestra elementos deshabilitados 2021-06-25 09:37:09 +00: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
fbsanchez be09c1c64d Some changes, multibox fixes for metaconsole 2021-06-23 14:24:16 +02:00
fbsanchez de03486134 Merge remote-tracking branch 'origin/develop' into ent-6661-giss-agregar-elementos-en-servicios 2021-06-23 09:48:01 +02:00
fbsanchez 390bf14761 cover for bulk service operations in mc/node 2021-06-22 15:32:15 +02:00
Daniel Rodriguez 7dfae672d5 Merge branch 'ent-7673-scroll-horizontal-en-moda-test' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4199
 2021-06-21 14:06:29 +00:00
Marcos Alconada d6ecce1ce9 fixed visual error 2021-06-21 14:06:29 +00:00
José González 00d4f0c57d Clean code and fix issue with lateral main menu 2021-06-16 15:29:28 +02:00
fbsanchez 9ed895d457 Fixes in pie coauth: daniel 2021-06-16 11:41:57 +02:00
Daniel Rodriguez 08011d60b2 Merge branch 'ent-7122-nuevo-update-manager' into 'develop' 
Embebed UMC in Pandora FMS

See merge request artica/pandorafms!3894
 2021-06-14 11:56:43 +00:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
marcos 1165ea11b9 cambio de fuentes css 2021-06-10 17:42:39 +02:00
marcos 45667da362 cambio de fuentes css 2021-06-10 16:21:06 +02:00
marcos e75abd1d2f cambio de fuentes css 2021-06-10 16:13:45 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Daniel Rodriguez d58e9f634a Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop' 
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4132
 2021-06-09 13:59:29 +00:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Marcos Alconada 8814b1f971 changed icons for black theme 2021-06-09 13:12:47 +00:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
marcos 29f1a8a720 resolve merge conflcit 2021-05-28 08:10:14 +02:00
Daniel Rodriguez 791f007ff6 Merge branch 'ent-7502-11735-problemas-visuales-tema-oscuro' into 'develop' 
fixed visual error on alerts black theme

See merge request artica/pandorafms!4113
 2021-05-27 16:22:19 +00:00
Marcos Alconada e2cfc5d615 fixed visual error on alerts black theme 2021-05-27 16:22:19 +00:00
Daniel Rodriguez f93ff84123 Merge branch 'ent-7474-boton-descolocado-en-modal-de-update-online-open' into 'develop' 
fixed visual error with update manager online open

See merge request artica/pandorafms!4105
 2021-05-27 16:17:47 +00:00
Marcos Alconada 87dd11f99c fixed visual error with update manager online open 2021-05-27 16:17:47 +00:00
marcos 403f326f55 resolve merge conflcit 2021-05-27 09:57:06 +02:00
Luis 8c100e8809 Resize vertical on textarea web/data server modules css 2021-05-26 13:39:25 +00:00
Daniel Rodriguez 305941bb1d Merge branch 'ent-7361-fallos-visuales-agent-alerts' into 'develop' 
Fixed visual issues

Closes pandora_enterprise#7361

See merge request artica/pandorafms!4061
 2021-05-25 15:52:22 +00:00
Daniel Rodriguez d4dceb0a6c Merge branch 'ent-7344-Selector-de-Dashboards-desplazado' into 'develop' 
Ent 7344 selector de dashboards desplazado

See merge request artica/pandorafms!4089
 2021-05-25 15:51:16 +00:00
Daniel Maya e6713c2f2c #6917 metaconsole config changes 2021-05-25 09:58:18 +00:00
fbsanchez 26acafac47 Alert correlatioin some improvements 2021-05-21 12:57:48 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
Daniel Rodriguez 13fa1159ce Merge branch 'ent-6858-Goliat-opensource' into 'develop' 
Backup upload

See merge request artica/pandorafms!3936
 2021-05-12 13:10:48 +00:00
Daniel Rodriguez ed4e89a4d0 Merge branch 'ent-7517-11735-fallo-graficas-snmp-interface-en-vista-de-agente-con-black-theme' into 'develop' 
fixed visual error on snmp interfaces agent graphs  black theme

See merge request artica/pandorafms!4119
 2021-05-12 12:52:44 +00:00
Marcos Alconada f8eafa5015 fixed visual error on snmp interfaces agent graphs black theme 2021-05-12 12:52:44 +00:00
Daniel Rodriguez 858adb2628 Merge branch 'ent-7345-Bugs-en-el-apartado-de-Diagnosticos' into 'develop' 
Fixed errors diagnostic

See merge request artica/pandorafms!4047
 2021-05-11 13:48:55 +00:00
José González 5aa5e9eab4 Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-05-11 13:11:51 +00:00
Daniel Rodriguez f77d774a32 Merge branch 'ent-7476-black-theme-color-letra-en-el-control-de-busqueda-de-usuarios-no-se-ve' into 'develop' 
fixed visual error black theme

See merge request artica/pandorafms!4100
 2021-05-11 07:39:58 +00:00
Daniel Rodriguez de58f0533b Merge branch 'ent-6618-giss-nombres-de-servicios-aleatorios' into 'develop' 
Ent 6618 giss nombres de servicios aleatorios

See merge request artica/pandorafms!4039
 2021-05-11 07:37:49 +00:00
Marcos Alconada 8f324b942b fixed visual error black theme event modal 2021-05-10 09:16:19 +00:00
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
marcos 25867a0fd7 fixed visual error black theme 2021-05-05 09:36:16 +02:00
Marcos Alconada c5fe67ddb5 fixed visual error black theme 754 LTS 2021-04-30 10:43:22 +00:00
Daniel Maya 588e06d357 #7344 fixed select 2021-04-29 12:45:35 +02:00
Marcos Alconada b00e7eff8b fixed size with select2 in module component 2021-04-28 10:48:32 +00:00
marcos f818b86827 fixed minnor error black theme 7376 2021-04-23 09:56:06 +02:00
José González b922de7a8e Fixed visual issues 2021-04-22 17:10:59 +02:00
Daniel Barbero Martin 998ad91b69 Fixed errors diagnostic 2021-04-21 11:07:20 +02:00
Daniel Barbero Martin eb5704a660 Fixed errors widgets background black-theme and required group 2021-04-21 08:57:12 +02:00
marcos 3ab970ced9 fixed visual error on tm 2021-04-20 12:41:21 +02:00
Daniel Maya a05c5cf555 #6618 Added random name css 2021-04-20 11:46:33 +02:00
vgilc 3c7fc18abb Merge branch 'ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas' into 'develop' 
reviewing correlated alerts

See merge request artica/pandorafms!4024
 2021-04-20 07:56:04 +00:00
fbsanchez 0a6fd37913 minor style change 2021-04-19 14:51:22 +02:00
fbsanchez 50f580c112 Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-19 14:35:59 +02:00
marcos 6ebb6f6843 fixeed visual error vc legacy mode 2021-04-19 12:59:52 +02:00
Daniel Rodriguez 8cc4ddc9e0 Merge branch 'ent-7293-bug-visual-selector-ip-agente' into 'develop' 
Agent conf ip selector visual fix

See merge request artica/pandorafms!4030
 2021-04-15 14:53:32 +00:00
fbsanchez 3bc8f6c4ac Merge remote-tracking branch 'origin/develop' into ent-7288-correlacion-eventos-no-permite-crear-condiciones-complejas 2021-04-15 15:33:14 +02:00
Daniel Rodriguez 4c46caac72 Merge branch 'ent-4263-idgets-dashboard-en-black-them-que-falta-por-adaptar' into 'develop' 
Ent 4263 idgets dashboard en black them que falta por adaptar

See merge request artica/pandorafms!4031
 2021-04-15 12:36:58 +00:00
marcos 48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02:00
marcos b6ea565118 add black theme to widget dashboard 2021-04-14 12:07:38 +02:00
Daniel Rodriguez 1d6c7c6eed Merge branch 'ent-6782-revision-general-de-la-consola-movil' into 'develop' 
SAML login in mobile console

See merge request artica/pandorafms!3733
 2021-04-14 07:39:29 +00:00
Calvo 3396af66b0 Agent conf ip selector visual fix 2021-04-14 09:26:19 +02:00
fbsanchez 1b4251cf49 minor improvement, disabledElements 2021-04-12 20:10:58 +02:00
fbsanchez 6a220208b4 reviewing correlated alerts 2021-04-12 19:16:39 +02:00
Marcos Alconada dafa88c27d Ent 7266 black theme mala implementacion de vista de ticket integracion integria 2021-04-09 10:00:11 +00:00
Marcos Alconada 225f183e75 set black theme custom graph colors 2021-04-09 09:52:28 +00:00
Daniel Rodriguez ae655da711 Merge branch 'ent-7270-black-theme-vista-servicios' into 'develop' 
add black theme style on visual map

See merge request artica/pandorafms!4008
 2021-04-09 09:34:59 +00:00
Daniel Rodriguez bda9cbe3e8 Merge branch 'ent-7256-modal-de-aviso-de-perdida-de-soporte-ha-perdido-los-estilos' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3994
 2021-04-09 09:28:25 +00:00
fbsanchez cf6ad584d4 Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 2021-04-07 17:46:43 +02:00
Daniel Rodriguez b62dc5c0c2 Merge branch 'ent-6982-Bug-al-crear-Agent-event-report-a-traves-de-wizard' into 'develop' 
fixed visual error report wizard

See merge request artica/pandorafms!3896
 2021-04-07 15:10:32 +00:00
daniel d78c276721 fixed visual error report wizard 2021-04-07 15:10:32 +00:00
marcos 4395f21e4e add black theme style on visual map 2021-04-07 13:27:24 +02:00
Daniel Rodriguez ed6fa1a803 Merge branch 'ent-2685-7938-aadcm-dashboards-en-metaconsola' into 'develop' 
dashboards meta

See merge request artica/pandorafms!3840
 2021-04-07 10:53:31 +00:00
Daniel Rodriguez f0870e6e08 Merge branch 'ent-7028-giss-implementar-dropdown-buscador-para-custom-fields' into 'develop' 
select2 on select items

See merge request artica/pandorafms!3836
 2021-04-07 10:52:07 +00:00
fbsanchez 6e4212129b Merge remote-tracking branch 'origin/develop' into ent-6782-revision-general-de-la-consola-movil 
Conflicts:
	pandora_console/include/styles/dashboards.css
	pandora_console/mobile/operation/visualmap.php
	pandora_console/mobile/operation/visualmaps.php
 2021-04-07 10:28:44 +02:00
Daniel Rodriguez 0fc3cb8714 Merge branch 'ent-6271-mejoras-de-ui-en-setup' into 'develop' 
Multicolumn setup for performance and visual settings

See merge request artica/pandorafms!3921
 2021-04-06 17:47:39 +00:00
fbsanchez 5143bbdfdb networkmaps in dashboards MC 2021-04-06 16:47:32 +02:00
marcos 78ce8660c9 fixed visual error 2021-04-05 17:27:40 +02:00
fbsanchez 700817acaf Merge branch 'develop' into 'ent-2685-7938-aadcm-dashboards-en-metaconsola' 
Conflicts:
   pandora_console/include/functions_html.php
 2021-03-31 10:12:36 +00:00
marcos 063bbb4433 resolved conflict merge 2021-03-30 11:31:29 +02:00
Daniel Rodriguez 17c923a68b Merge branch 'ent-7204-error-visual-en-agents-module' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3954
 2021-03-26 09:32:08 +00:00
Daniel Barbero Martin 9dd7ee7cbc fixed minor error 2021-03-26 09:15:05 +01:00
Daniel Rodriguez 6413f6d551 Merge branch 'ent-4755-base-de-datos-historico-revision' into 'develop' 
DBMainainer, fixed Websockets library placement

See merge request artica/pandorafms!3797
 2021-03-25 14:33:31 +00:00
Daniel Rodriguez 26577095d7 Merge branch 'ent-7193-submenu-ocultado-en-arbol-de-discovery' into 'develop' 
fixed visual error

See merge request artica/pandorafms!3939
 2021-03-25 14:08:35 +00:00
marcos b8a72f0583 fixed visual error 2021-03-25 14:42:34 +01:00
marcos ec4f23e502 fixed visual error 2021-03-25 14:36:51 +01:00
marcos b7f845a64d fixed visual error 2021-03-25 14:27:41 +01:00
fbsanchez f046069de1 old-school style setup 2021-03-24 17:49:42 +01:00
José González 9918e7c3cd Merge branch 'develop' into 'ent-6858-Goliat-opensource' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
 2021-03-24 15:50:12 +00:00
fbsanchez 0179e89740 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-24 13:16:54 +01:00
marcos eaed8aa09a fixed visual error 2021-03-24 13:10:29 +01:00
daniel 774fc9ebe5 Command center 2021-03-24 11:43:51 +00:00
Daniel Rodriguez 61ae461ffe Merge branch 'ent-6660-vistas-de-servicios-por-nombre-o-descripcion' into 'develop' 
add tooltip service name

See merge request artica/pandorafms!3783
 2021-03-23 15:55:28 +00:00
Marcos Alconada 302df228cc add tooltip service name 2021-03-23 15:55:28 +00:00
Jose Gonzalez d43c51cc66 WIP: Backup upload 2021-03-22 17:37:15 +01:00
marcos b6c02bd95c fixed visual error 2021-03-22 15:21:09 +01:00
Daniel Rodriguez 390d9df706 Merge branch 'ent-7173-Iconos-de-creacion-de-items-en-consolas-visuales-apenas-se-ven' into 'develop' 
fixed visuals errors black theme

See merge request artica/pandorafms!3937
 2021-03-22 12:48:39 +00:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
Daniel Barbero Martin 6d6b9fe5b9 fixed visuals errors black theme 2021-03-18 17:32:21 +01:00
marcos bfaaba9dbd fixed spinner bug 2021-03-18 12:08:02 +01:00
marcos 13575a457c fixed visual error 2021-03-18 10:35:19 +01:00
Daniel Rodriguez 3eb6a8b3c4 Merge branch 'ent-7125-bug-visual-en-group-view' into 'develop' 
fixed visual error group view

See merge request artica/pandorafms!3897
 2021-03-17 15:22:01 +00:00
fbsanchez 2862afb7f5 Multicolumn setup for performance and visual settings 2021-03-16 13:00:24 +01:00
marcos de716ddc4a fixed visual error group view 2021-03-12 11:55:54 +01:00
Jose Gonzalez 5b1517f767 Merge 2021-03-12 11:07:44 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
fbsanchez 95f1a2abcc Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-03-11 10:00:17 +01:00
José González 69e1f1fb33 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
#   pandora_console/include/styles/pandora.css
 2021-03-09 14:39:15 +00:00
Daniel Rodriguez ea7c7c88b2 Merge branch 'ent-7025-operaciones-masivas-error' into 'develop' 
Ent 7025 operaciones masivas error

Closes pandora_enterprise#7025

See merge request artica/pandorafms!3833
 2021-03-05 12:49:13 +00:00
Daniel Rodriguez d6b7b46139 Merge branch 'ent-6925-vista-previa-en-acciones-de-alertas-recuperadas' into 'develop' 
action_details avoid overlapping colors

See merge request artica/pandorafms!3792
 2021-03-04 10:43:29 +00:00
daniel 6db07e5fe0 fixed errors CV dashboards 2021-03-03 12:42:02 +00:00
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
Daniel Rodriguez 4fbfc14479 Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop' 
Fix loading charts modules and interfaces

See merge request artica/pandorafms!3700
 2021-03-01 12:16:27 +00:00
Daniel Rodriguez 0243740ab1 Merge branch 'ent-6136-fallos-visuales-en-la-correlacion-de-alertas' into 'develop' 
add new style

See merge request artica/pandorafms!3789
 2021-03-01 10:02:19 +00:00
Marcos Alconada 0d4761b63d add new style 2021-03-01 10:02:18 +00:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
fbsanchez 0fb3ba9232 System status notifications filtered by subtype 2021-02-19 13:36:29 +01:00
fbsanchez ef16ef4281 Dashboards in metaconsole 2021-02-18 12:47:42 +01:00
Jose Gonzalez ed6c6dfad5 Hide OK button meanwhile is loading data 2021-02-16 13:43:10 +01:00
fbsanchez 210017b162 minor style fix select2 2021-02-16 13:41:03 +01:00
Jose Gonzalez e727f7c276 Added modals and fixed some bugs 2021-02-12 11:28:13 +01:00
Jose Gonzalez 2521b32f13 WIP: Backup upload 2021-02-08 16:33:54 +01:00
fbsanchez 9a439a96e5 filtering interfaces in wizard 2021-02-05 12:37:27 +01:00
fbsanchez 380c77be02 Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red 
Conflicts:
	pandora_console/include/lib/Module.php
	pandora_console/include/visual-console-client/vc.main.css.map
 2021-02-02 12:15:24 +01:00
fbsanchez 96c218f21e Some updates and minor fixes DBMaintainer 2021-02-01 13:31:42 +01:00
fbsanchez dbc48852aa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
 2021-01-28 16:12:47 +01:00
fbsanchez c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +01:00
fbsanchez 192a635599 WIP setup.hdb 2021-01-25 19:29:22 +01:00
fbsanchez 4aba3b7753 action_details avoid overlapping colors 2021-01-21 15:58:20 +01:00
Daniel Rodriguez fc9eb947c8 Merge branch 'ent-6355-Cambio-de-mensaje-de-Widget-dashboard-sin-permisos' into 'develop' 
fix remove acl widget agent/module

See merge request artica/pandorafms!3637
 2021-01-14 14:46:52 +01:00
daniel a470658543 remove IPAM to extension 2021-01-14 14:42:18 +01:00
Jose Gonzalez 1fc1752b01 Solved merge 2021-01-12 13:26:48 +01:00