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

24657 Commits

Author SHA1 Message Date
fbsanchez 94a7b625fb Merge remote-tracking branch 'origin/develop' into ent-6012-servicios-dinamicos 
Conflicts:
	pandora_console/extras/mr/39.sql
 2020-06-22 14:06:13 +02:00
Daniel Rodriguez cd261fa629 Merge branch 'ent-5709-Fallo-refresh-consola-visual' into 'develop' 
Fixed error time refresh initial page CV

See merge request artica/pandorafms!3223
 2020-06-22 13:53:38 +02:00
Daniel Rodriguez fbfb667548 Merge branch 'ent-5809-message-delete-not-working' into 'develop' 
Ent 5809 message delete not working

See merge request artica/pandorafms!3247
 2020-06-22 13:52:54 +02:00
Luis efb69c18bc Ent 5809 message delete not working 2020-06-22 13:52:54 +02:00
Alejandro Fraguas 382dca14c9 Merge branch 'ent-5759-intervalo-de-oracle-discovery-sale-mal' into 'develop' 
Time selector adjustment

See merge request artica/pandorafms!3238
 2020-06-22 12:44:40 +02:00
fbsanchez 166978f3aa Merge remote-tracking branch 'origin/develop' into ent-5759-intervalo-de-oracle-discovery-sale-mal 2020-06-22 12:25:04 +02:00
Daniel Rodriguez 30ce7fbc97 Merge branch 'ent-5726-Colors-severity-Eventos' into 'develop' 
fixed bad constants

See merge request artica/pandorafms!3246
 2020-06-22 11:20:59 +02:00
Daniel Rodriguez 5632607227 Merge branch 'ent-5837-historico-imagenes-informes-modulos' into 'develop' 
Fixed image modules historic report

See merge request artica/pandorafms!3215
 2020-06-22 11:20:26 +02:00
Luis bbf6fe8beb Fixed image modules historic report 2020-06-22 11:20:26 +02:00
Alejandro Fraguas 01c72e09b4 Merge branch 'ent-5997-marca-horaria-graficas-modulos' into 'develop' 
Returned timestamp message for graphs

Closes pandora_enterprise#5997

See merge request artica/pandorafms!3306
 2020-06-22 10:30:32 +02:00
Alejandro Fraguas ed7c51e685 Merge branch 'ent-5958-xss-event-view' into 'develop' 
ignore keys on xss event comments

See merge request artica/pandorafms!3324
 2020-06-22 09:56:28 +02:00
marcos 1eb3891e94 Merge remote-tracking branch 'origin/develop' into ent-5958-xss-event-view 2020-06-22 09:44:34 +02:00
Alejandro Fraguas 7be71080eb Merge branch 'ent-5959-xxs-special-day' into 'develop' 
ignore keys xss special days

See merge request artica/pandorafms!3323
 2020-06-22 09:37:07 +02:00
Alejandro Fraguas 487ab4e86a Merge branch 'ent-5956-xss-manage-agent-group' into 'develop' 
ignore keys on xss manage angent groups

See merge request artica/pandorafms!3322
 2020-06-22 09:25:05 +02:00
artica 6103e55287 Auto-updated build strings. 2020-06-22 01:00:13 +02:00
artica f601d43bb7 Auto-updated build strings. 2020-06-21 01:00:13 +02:00
artica 112f2cc25c Auto-updated build strings. 2020-06-20 01:00:19 +02:00
fbsanchez 9bae4f8a17 MR change - minor 2020-06-19 12:14:09 +02:00
marcos 7cfc68a3d6 ignore keys on xss event comments 2020-06-19 10:59:43 +02:00
marcos 1f4de3ee4d ignore keys xss special days 2020-06-19 10:53:14 +02:00
marcos 415a8aa8b6 ignore keys on xss manage angent groups 2020-06-19 10:44:43 +02:00
Alejandro Fraguas 71c8451727 Merge branch 'ent-4973-Numero-de-estados-muestras-en-Availability-graph' into 'develop' 
Fixed SLA error counter check

See merge request artica/pandorafms!3225
 2020-06-19 10:05:41 +02:00
artica 9beb1ce22f Auto-updated build strings. 2020-06-19 01:00:15 +02:00
Alejandro Fraguas 1e745c927c Merge branch 'ent-5905-10107-AD-Fallback-to-local-authentication-activo-siempre' into 'develop' 
fixed ad authentication

See merge request artica/pandorafms!3269
 2020-06-18 17:40:31 +02:00
Alejandro Fraguas 5524b1b300 Merge branch 'ent-5473-report-template-inventory' into 'develop' 
Ent 5473 report template inventory

See merge request artica/pandorafms!3303
 2020-06-18 13:19:04 +02:00
Luis 28da2b9afb Ent 5473 report template inventory 2020-06-18 13:19:04 +02:00
fbsanchez 6c5484baf0 MR change smart services 2020-06-18 12:35:52 +02:00
artica c6c9b63338 Auto-updated build strings. 2020-06-18 01:00:14 +02:00
Alejandro Fraguas dbdf5edd0c Merge branch 'ent-636-Campos-Target-IP-y-Export-target-en-politicas' into 'develop' 
Changed target ip selector in WMI server policy modules

See merge request artica/pandorafms!3186
 2020-06-17 17:49:12 +02:00
alejandro-campos 9f4fed57b1 Merge branch 'develop' into ent-636-Campos-Target-IP-y-Export-target-en-politicas 2020-06-17 15:27:14 +02:00
Alejandro Fraguas 7b9d65f7d8 Merge branch 'ent-5778-9834-db2-para-discovery' into 'develop' 
DB2 discovery

See merge request artica/pandorafms!3300
 2020-06-17 13:50:30 +02:00
fbsanchez 225b82233c Merge remote-tracking branch 'origin/develop' into ent-5778-9834-db2-para-discovery 2020-06-17 10:13:28 +02:00
Alejandro Fraguas 3e35da50b4 Merge branch 'ent-5951-XSS-SNMP-Browser' into 'develop' 
fixed XSS

See merge request artica/pandorafms!3291
 2020-06-17 10:02:40 +02:00
alejandro-campos e78cd2b581 Merge branch 'develop' into ent-5951-XSS-SNMP-Browser 2020-06-17 09:46:41 +02:00
alejandro-campos f724b51512 Merge branch 'develop' into ent-5951-XSS-SNMP-Browser 2020-06-17 09:44:15 +02:00
artica 5d01c0976b Auto-updated build strings. 2020-06-17 01:00:15 +02:00
Alejandro Fraguas 92b2316d00 Merge branch 'ent-5527-cambio-discovery-sap-para-hacerlo-personalizable' into 'develop' 
Allowed toggled rows

See merge request artica/pandorafms!3280
 2020-06-16 14:28:45 +02:00
fbsanchez c9457b2df3 Merge remote-tracking branch 'origin/develop' into ent-5527-cambio-discovery-sap-para-hacerlo-personalizable 2020-06-16 11:39:17 +02:00
Alejandro Fraguas b2084e3a1e Merge branch 'ent-5978-actualizacion-eventos-mediante-api' into 'develop' 
Added api function for update events

Closes pandora_enterprise#5978

See merge request artica/pandorafms!3305
 2020-06-16 10:23:09 +02:00
Jose Gonzalez e3fa68aef6 Correct event get for metaconsole 2020-06-16 10:03:22 +02:00
Jose Gonzalez 370bd8e34f Stablished correct invalid keys 2020-06-16 09:45:00 +02:00
Jose Gonzalez 40569d2092 Added change for metaconsole 2020-06-16 08:55:54 +02:00
Alejandro Fraguas ee577cff35 Merge branch 'ent-5947-Mala-representacion-de-graficas-en-PDF-Availability-graph-y-Module-histogram-graph' into 'develop' 
Fixed sla graph in pdf

See merge request artica/pandorafms!3279
 2020-06-16 08:29:10 +02:00
artica 90cc854ea5 Auto-updated build strings. 2020-06-16 01:00:16 +02:00
Alejandro Fraguas 8ebf7b34f2 Merge branch 'ent-5910-bug-sql-query-report-illegal-words' into 'develop' 
Modified match for forbidden words. Now not allows spaces or scaped chars....

Closes pandora_enterprise#5910

See merge request artica/pandorafms!3277
 2020-06-15 18:03:36 +02:00
fbsanchez 1eea17f9b9 Merge remote-tracking branch 'origin/develop' into ent-5527-cambio-discovery-sap-para-hacerlo-personalizable 2020-06-15 17:41:53 +02:00
Jose Gonzalez cdf4109ad4 Returned timestamp message for graphs 2020-06-15 16:14:34 +02:00
Alejandro Fraguas 4e6528bd3b Merge branch 'ent-5973-fallo-en-la-pantalla-de-inicio-de-usuario-cuando-es-un-dashboard' into 'develop' 
fixed error with dashboard home page

See merge request artica/pandorafms!3301
 2020-06-15 12:38:02 +02:00
Alejandro Fraguas 495b13f387 Merge branch 'ent-5959-xxs-special-day' into 'develop' 
fixed vulnerability on special days

See merge request artica/pandorafms!3286
 2020-06-15 12:14:42 +02:00
Alejandro Fraguas aaa1ae6650 Merge branch 'ent-5958-xss-event-view' into 'develop' 
fixed vulnerabilty on events comments

See merge request artica/pandorafms!3287
 2020-06-15 11:38:01 +02:00