tyler.durden/pandorafms
1
0
Fork 0
mirror of https://github.com/pandorafms/pandorafms.git synced 2025-07-29 08:45:12 +02:00
Code Issues Packages Projects Releases Wiki Activity
26,768 Commits 34 Branches 30 Tags
Commit Graph

26768 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
marcos
137a2c31ad fixed visual fails 2021-03-15 15:30:56 +01:00
fbsanchez
02b2eec65d Modules alphabetically sorted in Discovery review 2021-03-15 15:16:49 +01:00
marcos
95787e2fe8 fixed visual style error 2021-03-15 14:38:20 +01:00
fbsanchez
c20c206a5f Fixed task edit url when nof fully defined (custom-script) 2021-03-15 14:37:08 +01:00
Daniel Maya
e4e3007def Fixed img 2021-03-15 13:32:25 +01:00
Daniel Barbero Martin
bf4710ba93 fixed error events reports 2021-03-15 13:26:29 +01:00
Daniel Rodriguez
971f86601a Merge branch 'ent-5276-AADCM-creacion-de-paradas-planificadas' into 'develop' 
Refactored downtime editor

See merge request artica/pandorafms!3879
 2021-03-15 11:29:04 +00:00
alejandro.campos@artica.es
88b4b4920f Merge remote-tracking branch 'origin/develop' into ent-5276-AADCM-creacion-de-paradas-planificadas 2021-03-15 12:13:05 +01:00
marcos
09e94bd0e9 resolved merge conflict 2021-03-15 11:43:36 +01:00
fbsanchez
1762e758fa forced no display_errors 2021-03-15 10:09:02 +01:00
fbsanchez
b63f1ad681 Removed extra verbosity 2021-03-15 10:07:36 +01:00
artica
fc29160c91 Auto-updated build strings. 2021-03-15 01:00:15 +01:00
artica
0f848d48e8 Auto-updated build strings. 2021-03-14 01:00:14 +01:00
artica
5fca622b3b Auto-updated build strings. 2021-03-13 01:00:19 +01:00
Daniel Rodriguez
5bae2be954 Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop' 
Ent 6898 integracion integria en pandora

See merge request artica/pandorafms!3898
 2021-03-12 13:18:25 +00:00
alejandro.campos@artica.es
b4927d6071 minor fix 2021-03-12 12:46:27 +01:00
alejandro.campos@artica.es
3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
marcos
ac3587208b fixed visual error 2021-03-12 12:10:56 +01:00
Daniel Rodriguez
7723ef6e23 Merge branch 'ent-6846-Network-tools-al-setup-general' into 'develop' 
Ent 6846 network tools al setup general

Closes pandora_enterprise#6846

See merge request artica/pandorafms!3735
 2021-03-12 11:01:05 +00:00
marcos
de716ddc4a fixed visual error group view 2021-03-12 11:55:54 +01:00
Daniel Rodriguez
54ae1db8de Merge branch 'ent-6781-revision-de-estilos-visuales-y-eliminacion-de-sistemas-skins-errores' into 'develop' 
fixed error with snmpbrower modal

See merge request artica/pandorafms!3895
 2021-03-12 10:12:46 +00:00
Jose Gonzalez
6a427cfa8a Fixed 2021-03-12 11:09:34 +01:00
Jose Gonzalez
5b1517f767 Merge 2021-03-12 11:07:44 +01:00
Daniel Rodriguez
41ef1d41ff Merge branch 'ent-7031-Problemas-2FA' into 'develop' 
Fixed forced 2FA

Closes pandora_enterprise#7031

See merge request artica/pandorafms!3855
 2021-03-12 09:13:59 +00:00
Daniel Rodriguez
d0234314a0 Merge branch 'ent-6052-revision-parametros-binario-server' into 'develop' 
Solved issue with verbosity parameters

Closes pandora_enterprise#6052

See merge request artica/pandorafms!3790
 2021-03-12 09:11:53 +00:00
marcos
7f46d078c0 fixed error with snmpbrower modal 2021-03-12 09:32:07 +01:00
artica
d4bf4b9cad Auto-updated build strings. 2021-03-12 01:00:20 +01:00
alejandro.campos@artica.es
2f7a826253 minor fixes 2021-03-11 17:54:20 +01:00
fbsanchez
b48af30d96 Merge remote-tracking branch 'origin/develop' into ent-6753-consistencia-en-el-selector-de-grupos 
Conflicts:
	pandora_console/godmode/reporting/create_container.php
	pandora_console/godmode/reporting/graph_builder.main.php
	pandora_console/godmode/reporting/reporting_builder.main.php
	pandora_console/godmode/reporting/visual_console_builder.data.php
	pandora_console/include/javascript/pandora_ui.js
	pandora_console/views/dashboard/formDashboard.php
 2021-03-11 17:47:27 +01:00
Daniel Rodriguez
16ee65ba95 Merge branch 'ent-6781-revision-de-estilos-visuales-y-eliminacion-de-sistemas-skins' into 'develop' 
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins

See merge request artica/pandorafms!3699
 2021-03-11 14:40:24 +00:00
Marcos Alconada
d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Daniel Rodriguez
1f64b598c8 Merge branch 'ent-7098-Solucion-para-mostar-datos-de-estado-warning' into 'develop' 
new report histogram

See merge request artica/pandorafms!3875
 2021-03-11 14:22:28 +00:00
daniel
54fc2e89d3 new report histogram 2021-03-11 14:22:28 +00:00
Jose Gonzalez
ba997dd13f Fixed 2021-03-11 14:49:39 +01:00
fbsanchez
6df9870f92 Merge remote-tracking branch 'origin/develop' into ent-2561-llamadas-api-para-modulos-de-politicas 
Conflicts:
	pandora_console/include/functions_api.php
	visual_console_client/src/Item.ts
 2021-03-11 14:37:06 +01:00
Jose Gonzalez
e7d509cc74 Merge remote-tracking branch 'origin' into ent-7031-Problemas-2FA 2021-03-11 13:18:30 +01:00
Daniel Rodriguez
8f5f9b09da Merge branch 'ent-7119-11478-Ticket-GUARDIA-SNMPBrowser-falla-a-la-hora-de-visualizar-datos' into 'develop' 
Ent 7119 11478 ticket guardia snmp browser falla a la hora de visualizar datos

See merge request artica/pandorafms!3890
 2021-03-11 11:18:13 +00:00
Daniel Maya
c7b33c9c9c Ent 7119 11478 ticket guardia snmp browser falla a la hora de visualizar datos 2021-03-11 11:18:13 +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
d79d1a1262 Merge branch 'develop' into 'ent-6052-revision-parametros-binario-server' 
# Conflicts:
#   pandora_server/lib/PandoraFMS/Config.pm
 2021-03-11 08:16:50 +00:00
Jose Gonzalez
cf1c460a9d Fixed all issues 2021-03-11 09:12:53 +01:00
artica
74fb084ba5 Auto-updated build strings. 2021-03-11 01:00:18 +01:00
Daniel Rodriguez
988b6826fc Merge branch 'ent-7065-Modificar-scripts-generacion-y-publicacion-de-paquetes' into 'develop' 
cambio de dominio

See merge request artica/pandorafms!3888
 2021-03-10 16:01:39 +00:00
Daniel Rodriguez
2422813a29 Merge branch 'ent-7085-11447-No-se-visualizan-nombres-de-modulos-en-graficas-combinadas-en-el-agente' into 'develop' 
visual fixes in agent view graphs

See merge request artica/pandorafms!3884
 2021-03-10 15:56:15 +00:00
Daniel Rodriguez
05a133bf77 Merge branch 'ent-4659-AADCM-Opcion-de-deshabilitar-mediante-checks-varios-modulos-desde-la-vista-de-agente' into 'develop' 
added option to disable selected agents massively

See merge request artica/pandorafms!3874
 2021-03-10 15:55:07 +00:00
Daniel Rodriguez
38cc8d2ab9 Merge branch 'ent-5284-Granular-los-permisos-de-alerta' into 'develop' 
permissions limitation for command management

See merge request artica/pandorafms!3872
 2021-03-10 15:54:31 +00:00
Daniel Rodriguez
3db990ba36 Merge branch 'ent-6559-Cambio-en-el-target-ip-al-crear-módulos-desde-el-browser-snmp' into 'develop' 
Ent 6559 cambio en el target ip al crear módulos desde el browser snmp

See merge request artica/pandorafms!3751
 2021-03-10 15:53:55 +00:00
Daniel Rodriguez
96d5555ed2 Merge branch 'ent-6464-Discovery-id_recon_server-no-cambia-si-no-existe' into 'develop' 
Ent 6464 discovery id recon server no cambia si no existe

Closes pandora_enterprise#6464

See merge request artica/pandorafms!3788
 2021-03-10 15:53:28 +00:00
Jose Gonzalez
92d654763f Fixed some issues 2021-03-10 16:20:45 +01:00
Jose Gonzalez
d86bfa8e7a Updated 2021-03-10 14:00:29 +01:00