tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-08-15 23:08:44 +02:00
Code Issues Packages Projects Releases Wiki Activity
35,128 Commits 34 Branches 30 Tags
Commit Graph

1452 Commits

Author SHA1 Message Date
Daniel Rodriguez
ce286f2654 Merge branch 'ent-8003-bung-en-despliegue-de-tags-en-tree-view' into 'develop' 
Fix tag treeview level2

See merge request artica/pandorafms!4407
 2021-09-22 09:09:11 +00:00
Daniel Rodriguez
1ac070d35d Merge branch 'ent-7339-warning-module-templates' into 'develop' 
Improve pen list handling

Closes pandora_enterprise#7339

See merge request artica/pandorafms!4263
 2021-09-21 13:16:44 +00:00
Daniel Maya
30ab96003c #6296 Fixed info popup and status images 2021-09-21 13:22:37 +02:00
fbsanchez
8f7e49b0d1 CS fix in memory_limit detection (MC) 2021-09-14 18:59:15 +02:00
Calvo
e30fb70f11 Fix tag treeview level2 2021-09-14 13:03:38 +02:00
Jose Gonzalez
423bd106d5 Fix issues 2021-09-01 16:57:48 +02:00
fbsanchez
88e4a804f5 Fix map styles 2021-08-31 11:05:41 +02:00
Daniel Rodriguez
3be0c18165 Merge branch 'ent-7889-vulnerabilidad-xss-en-elementos-de-servicios' into 'develop' 
Ent 7889 vulnerabilidad xss en elementos de servicios

See merge request artica/pandorafms!4360
 2021-08-30 08:45:13 +00:00
Daniel Rodriguez
e6c5d1a6ef Merge branch 'ent-7392-aviso-configuracion-cron' into 'develop' 
Change time check for cron

Closes pandora_enterprise#7392

See merge request artica/pandorafms!4296
 2021-08-25 12:57:40 +00:00
José González
357b47a6d5 Merge remote-tracking branch 'origin' into ent-7666-boxes-relations-nodo-mapa-red-no-funcionan 2021-08-25 10:27:56 +02:00
José González
64982ee292 Fix issues with select inputs 2021-08-24 11:52:37 +02:00
Daniel Maya
fc4074b70b Fixed xss vulnerability 2021-08-18 13:57:47 +02:00
fbsanchez
3109975e7d Notifications in MC 2021-08-12 12:01:24 +02:00
Junichi Satoh
cadaca669f Fixed SNMP interfaces wizard against 32bit counter devices. 2021-08-10 12:08:28 +09:00
Daniel Rodriguez
0c4b5619f5 Merge branch 'ent-7738-Pandora-recien-instalado-via-cloud-enlaces-a-mensajes-del-sistema-son-url-invalida' into 'develop' 
set urls as macros in console supervisor

See merge request artica/pandorafms!4234
 2021-08-06 12:53:54 +00:00
Calvo
7890c4269c Added checkbox for group recursion in network maps 2021-07-14 18:00:07 +02:00
José González
4c962cd25c Change time check for cron 2021-07-14 11:31:54 +02:00
fbsanchez
d3fe504241 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-13 13:14:01 +02:00
fbsanchez
cc23b8310f Avoid check for UM messages more often than 2h 2021-07-12 17:41:58 +02:00
marcos
640c81b487 fallo critico del swich regordete 2021-07-12 13:06:30 +02:00
fbsanchez
198e4bf6a3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-07-05 20:56:48 +02:00
vgilc
2be851ef83 Merge branch 'ent-7625-eliminar-traza-tree-class' into 'develop' 
trace deleted

See merge request artica/pandorafms!4163
 2021-07-05 15:21:59 +00:00
José González
d219e004df Improve pen list handling 2021-07-02 16:39:59 +02:00
José González
350f34ebf5 Fixed type mismatch 2021-07-02 13:29:00 +02:00
fbsanchez
b3d88e6f6e Some general fixes, deprecated rrdir (use Files::rmrf) 2021-07-01 00:37:13 +02:00
fbsanchez
771c51ef5d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-28 10:13:51 +02:00
Daniel Rodriguez
a13256043c Merge branch 'ent-7644-mapa-servicio-tree-view-muestra-elementos-deshabilitados' into 'develop' 
Ent 7644 mapa servicio tree view muestra elementos deshabilitados

See merge request artica/pandorafms!4193
 2021-06-25 09:37:09 +00:00
Luis
14e69c5c07 Ent 7644 mapa servicio tree view muestra elementos deshabilitados 2021-06-25 09:37:09 +00:00
Daniel Rodriguez
cb101d5540 Merge branch 'ent-7707-wizard-de-interfaz-snmp-no-soporta-determinados-caracteres' into 'develop' 
Fixed SNMP interface wizard modules with special chars

See merge request artica/pandorafms!4215
 2021-06-25 09:15:55 +00:00
fbsanchez
4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
 2021-06-24 14:37:30 +02:00
Daniel Rodriguez
040010d169 Merge branch 'ent-7670-reemplazar-url-en-ayuda-contextual' into 'develop' 
Changed new wiki url on helps

See merge request artica/pandorafms!4205
 2021-06-24 12:31:15 +00:00
Luis
497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
Marcos Alconada
4bbd0ae508 fixed error with block current value 2021-06-24 12:28:49 +00:00
alejandro.campos@artica.es
fec0114801 set urls as macros in console supervisor 2021-06-24 13:22:25 +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
f134377b37 Merge branch 'ent-7547-Tree-view-no-filtra-bien-Dashboard' into 'develop' 
Ent 7547 tree view no filtra bien dashboard

See merge request artica/pandorafms!4136
 2021-06-21 14:01:32 +00:00
Daniel Maya
878a5321e8 Ent 7547 tree view no filtra bien dashboard 2021-06-21 14:01:32 +00:00
Daniel Rodriguez
f5221083b1 Merge branch 'ent-7244-Errores-network-tools' into 'develop' 
Solved issues with double quotes and improve the code

Closes pandora_enterprise#7244

See merge request artica/pandorafms!4101
 2021-06-21 09:13:35 +00:00
Calvo
06f3b0ea36 Fixed SNMP interface wizard modules with special chars 2021-06-16 16:30:45 +02: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
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
Daniel Barbero Martin
a7c1c49636 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-14 08:42:31 +02:00
José González
e17b63e6fc Fixed issue with single line 2021-06-14 08:16:35 +02:00
fbsanchez
ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Calvo
e0b3536d1b Fix treeview modules sql inner condition 2021-06-10 18:00:53 +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