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

1441 Commits

Author SHA1 Message Date
Daniel Rodriguez cb498a9fe9 Merge branch 'ent-7441-Tree-View-Widget-no-coge-los-no-inicializados' into 'develop' 
Ent 7441 tree view widget no coge los no inicializados

See merge request artica/pandorafms!4277
 2021-08-10 07:00:12 +00:00
Daniel Rodriguez 46b17e5156 Merge branch 'ent-7657-Vulnerabilidad-xss-en-nombre-de-modulos' into 'develop' 
fixed xss vulnerability

See merge request artica/pandorafms!4196
 2021-08-09 08:59:44 +00:00
Daniel Rodriguez 604ef4bc89 Merge branch 'ent-7442-Metaconsole-Dashboard-WUX-Transaction-Stats-no-encuentra-trans' into 'develop' 
Ent 7442 metaconsole dashboard wux transaction stats no encuentra trans

Closes pandora_enterprise#7442

See merge request artica/pandorafms!4295
 2021-08-06 12:53:06 +00:00
Daniel Maya 77f5ad2a6d Fixed odometer in dashboard 2021-08-05 11:57:31 +02:00
José González 8968d6abb9 Fixed leafs for modules 2021-07-19 18:04:25 +02:00
José González 950ca956a3 Fixed issues with subgroups in Tree view 2021-07-19 11:17:36 +02:00
José González 3263ef8b9a Fix issue with WUX Trans Stats 2021-07-13 17:26:03 +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
Daniel Maya a4203aaee2 Ent 7272 nuevos elementos consola visual odómetro 2021-07-12 10:27:10 +00:00
Daniel Maya a73a8ff926 show not init agents in tree 2021-07-07 17:17:36 +02:00
fbsanchez 8365b47be7 MQ exceptions, warning message on mq issues 2021-07-05 20:56:40 +02:00
fbsanchez 074fbf916c Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-29 20:03:07 +02:00
Daniel Maya b37bbcd944 Ent 7143 autoajuste de la consola visual 2021-06-29 10:02:13 +00: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
fbsanchez 771c51ef5d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 10:13:51 +02:00
Luis 14e69c5c07 Ent 7644 mapa servicio tree view muestra elementos deshabilitados 2021-06-25 09:37:09 +00: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
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
Daniel Rodriguez 19579c0801 Merge branch 'ent-7505-11819-Bug-en-widget-Tree-view' into 'develop' 
Ent 7505 11819 bug en widget tree view

See merge request artica/pandorafms!4125
 2021-06-21 13:58:57 +00:00
fbsanchez 94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02: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
alejandro.campos@artica.es 98f0bc9fac fixed xss vulnerability 2021-06-11 08:54:00 +02:00
alejandro.campos@artica.es cb5905b000 fixed xss vulnerability 2021-06-11 08:52:10 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +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
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Daniel Barbero Martin 8b7c5c08c6 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-07 08:32:15 +02:00
Marcos Alconada 3bc2844b4d fixed visual error black theme 2021-06-04 11:03:35 +00:00
Daniel Barbero Martin 337450a1f8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/ajax.php
	pandora_console/extras/delete_files/delete_files.txt
 2021-05-24 17:41:28 +02:00
fbsanchez 4711ca4856 Avoid connection accumulation 2021-05-19 17:44:07 +02:00
fbsanchez 538e7beb48 Public access using PublicLogin interface 2021-05-19 11:57:17 +02:00
fbsanchez 09ccaf254e Fixed public access and added PublicLogin interface, including code style fixex 2021-05-19 11:31:52 +02:00
Daniel Maya a869e0749c #7505 fixed fixed Hirearchy 2021-05-13 10:11:58 +02:00
Daniel Barbero Martin ad03bc41aa Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-12 08:41:00 +02:00
Luis b9398604f6 Fixed visual bug on event modal event responses 2021-05-11 13:49:40 +00:00
Daniel Barbero Martin f7f4591ab1 WIP command center 2021-05-07 11:19:47 +02:00
Daniel Barbero Martin 77693b6c6d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-07 08:33:56 +02:00
Daniel Rodriguez 6db71ec0fb Merge branch 'ent-7176-no-se-ven-los-valores-de-la-columna-de-intervlos-en-creacion-de-modulos-black-theme' into 'develop' 
set labels white color on module interval svg

See merge request artica/pandorafms!3993
 2021-05-06 12:23:47 +00:00
Daniel Barbero Martin e1847c76ee WIP command center 2021-04-29 15:59:12 +02:00
Daniel Barbero Martin 2cd40a80fe Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-28 08:13:10 +02:00
Daniel Barbero Martin bdf6c9f258 WIP command center 2021-04-26 17:20:00 +02:00
Daniel Barbero Martin 6548e9e210 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-22 18:29:47 +02:00
marcos 733087f704 fixed error with modal cluster view 2021-04-22 13:23:49 +02:00
Daniel Barbero Martin eb5704a660 Fixed errors widgets background black-theme and required group 2021-04-21 08:57:12 +02:00
Daniel Barbero Martin 741ec6a144 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-04-15 17:41:56 +02:00
marcos 24099644be remove log 2021-04-15 11:22:24 +02:00
marcos 48cc1283cc add black theme to widget dashboard 2021-04-14 15:09:19 +02:00