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

27797 Commits

Author SHA1 Message Date
Daniel Barbero Martin 452d5d0b73 Wip command center, error merge 2021-06-16 19:37:09 +02:00
fbsanchez 81254cf3fb WIP Plugins sync 2021-06-16 18:18:38 +02:00
fbsanchez b032beb559 Merge branch 'ent-7074-Command-Center' of brutus.artica.es:artica/pandorafms into ent-7074-Command-Center 2021-06-16 17:27:06 +02:00
Daniel Barbero Martin c6877154fb Wip command center, Plugins in meta 2021-06-16 17:26:19 +02:00
Calvo 06f3b0ea36 Fixed SNMP interface wizard modules with special chars 2021-06-16 16:30:45 +02:00
fbsanchez b701b2be32 Plugin sync 2021-06-16 15:53:05 +02:00
Daniel Rodriguez 02dad9a27d Merge branch 'ent-7705-error-500-en-vista-de-licence-management' into 'develop' 
Minor CDE (bonus)

See merge request artica/pandorafms!4211
 2021-06-16 12:38:44 +00:00
fbsanchez b8d3d962a0 Minor CDE 2021-06-16 12:44:03 +02:00
José González 39f3e1987e Fixed bye bye 2021-06-16 10:15:53 +02:00
Daniel Barbero Martin 841842da59 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/pandoradb_migrate_6.0_to_7.0.mysql.sql
	pandora_console/pandoradb_data.sql
 2021-06-16 08:46:21 +02:00
artica 90905d72f5 Auto-updated build strings. 2021-06-16 01:00:23 +02:00
Daniel Barbero Martin 5b1498e08c Wip command center, Plugins in meta 2021-06-15 17:40:48 +02:00
Daniel Barbero Martin 64dd4f2c2b Wip command center, Plugins in meta 2021-06-15 17:24:03 +02:00
Daniel Maya 38ad3574f3 scape meta characters 2021-06-15 15:57:13 +02:00
Daniel Rodriguez 9fcde88ebf Merge branch 'ent-7698-revision-pandora-ha-open-caracteristicas-enterprise' into 'develop' 
pandora_ha enterprise components fixed

See merge request artica/pandorafms!4202
 2021-06-15 13:11:21 +00:00
Daniel Rodriguez b64f15e4d7 Merge branch 'ent-7703-error-en-update-manager-online-en-open' into 'develop' 
Avoid using old data when parsing progress

See merge request artica/pandorafms!4206
 2021-06-15 12:55:26 +00:00
fbsanchez 04e2919497 Avoid using old data when parsing progress 2021-06-15 14:43:11 +02:00
fbsanchez c009451d62 Fulfill all variables FX from SNMPTRAP alerts 2021-06-15 13:06:23 +02:00
fbsanchez 14495ebdc3 Current package updates 2021-06-15 11:06:46 +02:00
Daniel Barbero Martin 9e6f3f7b46 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-15 10:35:50 +02:00
Daniel Barbero Martin f9bbc132a6 Wip command center, collections merge restore 2021-06-15 10:35:34 +02:00
artica 2f0cebe979 Auto-updated build strings. 2021-06-15 01:00:51 +02:00
fbsanchez 7e5a082e22 pandora_ha enterprise components fixed 2021-06-14 19:29:24 +02:00
fbsanchez 04a9b10904 Pandora HA verified 2021-06-14 19:18: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 b110fde614 Merge branch 'ent-6280-firmar-instalador-de-agente-macos' into 'develop' 
Added signing and notarizing process

See merge request artica/pandorafms!4156
 2021-06-14 14:30:46 +00:00
Daniel Rodriguez 31871bb792 Merge branch 'ent-7687-modificar-image-um-2' into 'develop' 
new background image UM

See merge request artica/pandorafms!4201
 2021-06-14 14:18:10 +00:00
marcos 2e5073e1ba new background image UM 2021-06-14 16:12:48 +02:00
Daniel Rodriguez 9d57f181f9 Merge branch 'ent-7687-modificar-image-um' into 'develop' 
changed UM image background

See merge request artica/pandorafms!4198
 2021-06-14 13:31:37 +00:00
Marcos Alconada 42274e7252 changed UM image background 2021-06-14 13:31:37 +00:00
fbsanchez 4db0f75763 Refresh & delete collections Async - synchronization 2021-06-14 14:54:07 +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 Rodriguez 42f5727b18 Merge branch 'ent-7510-muchas-conexiones-sobre-la-bbdd-too-many-connections-mysql' into 'develop' 
Avoid die while decoding erroneus json data

See merge request artica/pandorafms!4116
 2021-06-14 11:39:41 +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
artica 595fabb232 Auto-updated build strings. 2021-06-14 01:00:18 +02:00
artica e7a204d6d8 Auto-updated build strings. 2021-06-13 01:00:16 +02:00
artica 8272eb4f5b Auto-updated build strings. 2021-06-12 01:00:21 +02:00
José González 6db03d943d Merge branch 'develop' into 'ent-7594-custom-profile-acl-enterprise' 
# Conflicts:
#   pandora_console/index.php
 2021-06-11 13:57:10 +00:00
José González b3aa47877d Fixed issue with meta 2021-06-11 15:54:04 +02:00
fbsanchez 86f2beb587 Agent collection synchronization aysnc some improvements 2021-06-11 13:55:18 +02:00
fbsanchez 9c314bcd39 Files reviewed & tested 2021-06-11 13:04:06 +02:00
fbsanchez 085e0ba300 Added Files class to handle zip/unzip/rmrf and more 2021-06-11 10:48:58 +02:00
Daniel Rodriguez 81c2ebc43b Merge branch 'ent-7678-treeview-modules-no-funciona' into 'develop' 
Fix treeview modules sql inner condition

See merge request artica/pandorafms!4195
 2021-06-11 08:44:44 +00:00
Daniel Rodriguez 0adcf5aac2 Merge branch 'ent-7671-cambiar-enlaces-a-documentacion' into 'develop' 
add new link documentation

See merge request artica/pandorafms!4188
 2021-06-11 08:32:06 +00:00
Daniel Rodriguez d0c122c193 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!4194
 2021-06-11 08:24:27 +00:00
Daniel Barbero Martin 75b889875e Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-11 08:41:23 +02:00
artica 876e776d29 Auto-updated build strings. 2021-06-11 01:00:09 +02:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00