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

25404 Commits

Author SHA1 Message Date
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
Jose Gonzalez c67d8bd005 Fixed little issues 2020-08-07 13:29:09 +02:00
José González 85d8e1f796 Merge branch 'develop' into 'ent-6102-edicion-nombre-sincronizacion-alertas-metaconsola' 
# Conflicts:
#   pandora_console/extras/mr/40.sql
#   pandora_console/godmode/alerts/configure_alert_template.php
 2020-08-07 13:17:41 +02:00
Daniel Rodriguez f7f60cfaec Merge branch 'ent-6113-modules-per-agent-ent-message-error' into 'develop' 
Fixed modules per agent enterprise message

See merge request artica/pandorafms!3367
 2020-08-07 11:33:42 +02:00
Luis f7f5798ee6 Fixed modules per agent enterprise message 2020-08-07 11:33:42 +02:00
Alejandro Fraguas 2988e67f4e Merge branch 'ent-6078-WMI-columna-no-funciona' into 'develop' 
WMI column now refer to query order WMIServer

See merge request artica/pandorafms!3378
 2020-08-07 09:56:58 +02:00
Luis 3176065ce2 WMI column now refer to query order WMIServer 2020-08-07 09:56:58 +02:00
Daniel Rodriguez 386ab5ef91 Merge branch 'ent-6075-SNMP-Browser-no-muestra-OIDs-con-version-v2' into 'develop' 
fix snmp browser v2

See merge request artica/pandorafms!3354
 2020-08-07 09:47:28 +02:00
Daniel Rodriguez f7854ab633 Merge branch 'ent-6068-snmp-browser-community-spcial-char' into 'develop' 
Fixed snmp community special char

See merge request artica/pandorafms!3352
 2020-08-07 09:46:57 +02:00
Daniel Rodriguez 1ab4e89a14 Merge branch 'ent-6036-Error-en-edicion-de-acciones-de-alerta' into 'develop' 
fix empty check condition

See merge request artica/pandorafms!3359
 2020-08-07 09:46:09 +02:00
Daniel Rodriguez a123eaa18c Merge branch 'ent-5609-link-to-credential-store-from-remote-module-creation' into 'develop' 
Added link to credential store from module creation

See merge request artica/pandorafms!3363
 2020-08-07 09:45:43 +02:00
Daniel Rodriguez ef73e7a73c Merge branch 'ent-6099-bug-al-duplicar-modulo' into 'develop' 
resolved error with duplucated modules

See merge request artica/pandorafms!3357
 2020-08-07 09:42:08 +02:00
Daniel Rodriguez dbe5c19209 Merge branch 'ent-6029-meta-groups-delete-bug' into 'develop' 
Ent 6029 meta groups delete bug

See merge request artica/pandorafms!3355
 2020-08-07 09:40:46 +02:00
Luis 7b09c1e943 Ent 6029 meta groups delete bug 2020-08-07 09:40:46 +02:00
Daniel Rodriguez c86ec629cd Merge branch 'ent-6054-Dashboard-group-status-mas-de-1-grupo' into 'develop' 
fixed errors in dashboard widget groups status

See merge request artica/pandorafms!3369
 2020-08-07 09:40:12 +02:00
Daniel Rodriguez d1730935d8 Merge branch 'ent-6080-cambiar-text-advertencia-modulos-no-inicializados-en-vista-agente' into 'develop' 
change message in non initialited modules

See merge request artica/pandorafms!3365
 2020-08-07 09:37:35 +02:00
Daniel Rodriguez bfe504b3be Merge branch 'ent-6053-error-envio-informe-mail-vista-informes' into 'develop' 
Fixed report sendmail success message

See merge request artica/pandorafms!3353
 2020-08-07 09:37:10 +02:00
Daniel Rodriguez cd3fe275e7 Merge branch 'ent-6037-configure-alert-actions-help' into 'develop' 
Restored alert actions help (needed for macros)

See merge request artica/pandorafms!3349
 2020-08-07 09:36:43 +02:00