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

25319 Commits

Author SHA1 Message Date
Daniel Rodriguez a17fb4997f Merge branch 'ent-6193-Omnishell-ejecuciones-y-timeout' into 'develop' 
Solve issue with timeout executions

Closes pandora_enterprise#6193

See merge request artica/pandorafms!3404
 2020-08-14 14:41:51 +02:00
Daniel Rodriguez 42c6989d5e Merge branch 'ent-5685-Historico-de-eventos-en-Metaconsola-no-tiene-paginacion-correcta' into 'develop' 
fix event pagination when events history is activated

See merge request artica/pandorafms!3401
 2020-08-14 11:47:19 +02:00
Daniel Rodriguez 4ada69a804 Merge branch 'ent-6201-10495-macro-en-event-response-no-funciona' into 'develop' 
Ent 6201 10495 macro en event response no funciona

See merge request artica/pandorafms!3403
 2020-08-14 11:47:11 +02:00
Daniel Rodriguez b7968305cc Merge branch 'ent-6171-xss-name' into 'develop' 
fixed vulnerability

See merge request artica/pandorafms!3395
 2020-08-14 11:42:49 +02:00
Marcos Alconada 77142a0c1a fixed vulnerability 2020-08-14 11:42:49 +02:00
Daniel Rodriguez e5d4208ac9 Merge branch 'ent-5355-9422-9700-actualizacion-de-umbrales-mediante-xml' into 'develop' 
Forced thresholds ENT

See merge request artica/pandorafms!3314
 2020-08-14 09:22:47 +02:00
Jose Gonzalez dedfe518af Solve issue with timeout executions 2020-08-14 08:51:02 +02:00
artica 177341e6af Auto-updated build strings. 2020-08-14 01:00:18 +02:00
Kevin 3a878ccc4f a bit of order 2020-08-13 15:38:01 +02:00
Kevin fb407b9b14 Changes to auto-update build strings 2020-08-13 15:36:58 +02:00
alejandro-campos 8f96ca0805 fix parameter macros in event responses 2020-08-13 14:13:12 +02:00
alejandro-campos 90ea61f753 fix parameter macros in event responses 2020-08-13 14:10:57 +02:00
Kevin e9baab9d82 dmg installer for MacOS 2020-08-13 14:01:00 +02:00
Kevin 09859ab6fb Changes to avoid installation issues in MacOS 2020-08-13 13:04:30 +02:00
Kevin 29468da8a4 Merge branch 'develop' of brutus.artica.es:artica/pandorafms into ent-5873-agente-para-macos-con-instalador-grafico 2020-08-13 12:49:52 +02:00
Kevin 910a5cef1f modified installer to fix Darwin issues 2020-08-13 12:49:45 +02:00
Kevin 2380925e8e Modified build build_src file to omit dmg folder in tarball creation 2020-08-13 12:47:41 +02:00
Ramon Novoa dff74b63e2 Merge remote-tracking branch 'github/develop' into develop 2020-08-13 10:54:22 +02:00
alejandro-campos 6b989109d8 fix event pagination when events history is activated 2020-08-13 10:34:31 +02:00
artica e510d517f2 Auto-updated build strings. 2020-08-13 01:00:18 +02:00
Alejandro Fraguas 4a99b2dfac Merge branch 'ent-6228-Cambiar-dependencias-fileutils-y-textutils-por-coreutils-en-spec-para-RPM' into 'develop' 
change fileutils and textutils by coreutils

See merge request artica/pandorafms!3400
 2020-08-12 13:28:17 +02:00
Daniel Rodriguez 183c314787 Merge branch 'ent-6147-cambios-gestion-de-usuarios' into 'develop' 
changes on user list

See merge request artica/pandorafms!3398
 2020-08-12 13:20:53 +02:00
Marcos Alconada 86bfcbcd90 changes on user list 2020-08-12 13:20:53 +02:00
Daniel Rodriguez 8d0a7985df Merge branch 'ent-5961-quitar-dependencia-obligatoria-perl-yaml-tiny-del-agente' into 'develop' 
Ent 5961 quitar dependencia obligatoria perl yaml tiny del agente

See merge request artica/pandorafms!3284
 2020-08-12 11:07:19 +02:00
artica 1c20cbd197 Auto-updated build strings. 2020-08-12 01:00:18 +02:00
rafael da655832c6 change fileutils and textutils by coreutils 2020-08-11 14:31:57 +02:00
Daniel Rodriguez ee61425bbf Merge branch 'ent-6170-xss-en-incidents' into 'develop' 
fixed vilnerability with filename incidents

See merge request artica/pandorafms!3399
 2020-08-11 12:40:22 +02:00
jose.almendros d11ed6d534 Merge remote-tracking branch 'origin/develop' into ent-6039-systemd-en-rpm 2020-08-11 12:36:46 +02:00
rafael 1989a08c58 Merge branch 'develop' of https://brutus.artica.es:8081/artica/pandorafms into ent-5961-quitar-dependencia-obligatoria-perl-yaml-tiny-del-agente 2020-08-11 12:29:29 +02:00
Alejandro Fraguas 9a28cf9692 Merge branch 'ent-6070-10321-cambio-en-el-plugin-grep_log-para-orlando' into 'develop' 
nodatalist parameter added and parameters explained on help

See merge request artica/pandorafms!3342
 2020-08-11 11:36:02 +02:00
jose.almendros 014a094644 Merge remote-tracking branch 'origin/develop' into ent-6070-10321-cambio-en-el-plugin-grep_log-para-orlando 2020-08-11 11:18:36 +02:00
Alejandro Fraguas c33e4bcd32 Merge branch 'ent-6196-error-htaccess' into 'develop' 
change htacces to be compatible with php-fpm

See merge request artica/pandorafms!3390
 2020-08-11 10:14:45 +02:00
Daniel Rodriguez 5deb7e6297 Merge branch 'ent-6167-fallo-wizard-procesos' into 'develop' 
Fixed wizard snmp process module process field

See merge request artica/pandorafms!3396
 2020-08-11 09:59:43 +02:00
rafael 682841b84c Merge branch 'master' of https://brutus.artica.es:8081/artica/pandorafms into ent-5961-quitar-dependencia-obligatoria-perl-yaml-tiny-del-agente 2020-08-11 09:21:33 +02:00
marcos 41249220df fixed vilnerability with filename incidents 2020-08-11 09:11:37 +02:00
Rafael Ameijeiras e6d81a76d2 Update .htaccess 2020-08-11 09:04:25 +02:00
artica 9b3909e5d0 Auto-updated build strings. 2020-08-11 01:00:18 +02:00
Jose Gonzalez 83cfcf162d Merge resolve 2020-08-10 15:11:32 +02:00
Jose Gonzalez 3c0ea8b08a Solved issues with DB 2020-08-10 15:10:17 +02:00
rafael 9cbf3d1306 Merge remote-tracking branch 'origin/develop' into ent-6196-error-htaccess 2020-08-10 14:55:28 +02:00
Jose Gonzalez 35644a367f Added ttag modifies 2020-08-10 14:53:07 +02:00
José González 0b21adf150 Fix 41.sql 2020-08-10 10:18:50 +02:00
José González 69410815fb Update 40.sql 2020-08-10 10:06:51 +02:00
Daniel Rodriguez f43dc364de Merge branch 'ent-5821-bug-en-configuracion-de-notificaciones-de-la-console' into 'develop' 
show hidden title on setup notifications

See merge request artica/pandorafms!3377
 2020-08-10 09:46:54 +02:00
artica a60715a985 Auto-updated build strings. 2020-08-10 01:00:13 +02:00
artica 6902c61669 Auto-updated build strings. 2020-08-09 01:00:13 +02:00
artica 725b880d5e Auto-updated build strings. 2020-08-08 01:00:18 +02:00
Luis Calvo 18e6b26db8 Fixed wizard snmp process module process field 2020-08-07 16:46:35 +02:00
Daniel Rodriguez 9e9db89390 Merge branch 'ent-6027-error-cli-create-agent' into 'develop' 
CLI create agent fixed add address to taddress

See merge request artica/pandorafms!3358
 2020-08-07 14:09:26 +02:00
Jose Gonzalez 7300ccd185 Merge branch 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' of brutus.artica.es:artica/pandorafms into ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola 2020-08-07 13:29:25 +02:00