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

21504 Commits

Author SHA1 Message Date
Alejandro Fraguas 3c698abcad Merge branch '205-anadida-ruta-en-appdata-local-temp-por-defecto-para-windows-en-plugin-grep_log' into 'develop' 
Resolve "Añadida ruta en Appdata/Local/TEMP por defecto para windows en plugin grep_log"

See merge request artica/pandorafms!2187
 2019-06-11 10:53:42 +02:00
ismael.moreno f0c3b2feca grep_log binary for windows agents 2019-06-11 10:34:29 +02:00
ismael.moreno 400fab0bcd Merge remote-tracking branch 'origin/develop' into 205-anadida-ruta-en-appdata-local-temp-por-defecto-para-windows-en-plugin-grep_log 2019-06-11 10:03:22 +02:00
Tatiana Llorente 80ed5dc9c1 Removed empty helps - #4183 2019-06-11 09:33:43 +02:00
artica 4a2688d6ac Auto-updated build strings. 2019-06-11 00:01:06 +02:00
Daniel Rodriguez 9d71c10308 Merge branch 'ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info' into 'develop' 
Redolved ticket

See merge request artica/pandorafms!2273
 2019-06-10 18:47:23 +02:00
Alejandro Fraguas cd1f8d0c10 Merge branch 'ent-3760-Error-de-login-LDAP' into 'develop' 
Fixed function ldapsearch

See merge request artica/pandorafms!2301
 2019-06-10 18:08:18 +02:00
alejandro-campos 577ddef8b3 fix bug when adding connection maps in gis map builder 2019-06-10 17:04:36 +02:00
marcos.alconada a40e420de0 Removed , from numer format 2019-06-10 16:59:05 +02:00
Daniel Rodriguez 81ac4e5bef Merge branch 'ent-3466-ad-advanced-perms-fixed' into 'develop' 
Ent 3466 ad advanced perms fixed

See merge request artica/pandorafms!2194
 2019-06-10 16:05:21 +02:00
fbsanchez ef3d299d58 wip event view 2019-06-10 15:18:35 +02:00
marcos.alconada 58ba42cec1 Changed code for conversión 2019-06-10 14:53:47 +02:00
marcos.alconada 55db61bfae Merge branch 'ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info 2019-06-10 12:47:04 +02:00
marcos.alconada cf84c3f579 Merge remote-tracking branch 'origin/develop' into ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info 2019-06-10 12:43:08 +02:00
Marcos Alconada a2c530cccd Merge branch 'develop' into 'ent-3639-bug-mensaje-de-tamano-del-log-de-consola-en-diagnostic-info' 
# Conflicts:
#   pandora_console/extras/pandora_diag.php
 2019-06-10 12:41:08 +02:00
Luis Calvo 8092528742 Fixed reports export to csv meta bugs 2019-06-10 12:27:43 +02:00
Alejandro Fraguas d14ad39785 Merge branch 'ent-3915-7828-servicio-hijo-de-otro-no-borra-todos-los-modulos-del-agente-al-elminarlo' into 'develop' 
Node deleted disapear in tree view

See merge request artica/pandorafms!2486
 2019-06-10 10:51:26 +02:00
artica 7bf087dd25 Auto-updated build strings. 2019-06-10 00:01:06 +02:00
artica ab4039fe5b Auto-updated build strings. 2019-06-09 00:01:06 +02:00
artica 0ee04ecb21 Auto-updated build strings. 2019-06-08 00:01:07 +02:00
fbsanchez bb552226a6 minor fix 2019-06-07 22:58:49 +02:00
fbsanchez f67bf8c2b7 wip event list filters 2019-06-07 22:44:02 +02:00
fbsanchez d4d4509266 wip event view 2019-06-07 21:22:07 +02:00
fbsanchez 419a90d69c wip event list 2019-06-07 17:35:13 +02:00
Alejandro Fraguas 6edd6ac2dd Merge branch 'ent-3626-referencias-log4x-2' into 'develop' 
Ent 3626 referencias log4x 2

See merge request artica/pandorafms!2488
 2019-06-07 11:34:30 +02:00
marcos.alconada 833248991b Add mr 29 2019-06-07 11:24:00 +02:00
marcos.alconada 1e843777bc Delete line with log4x 2019-06-07 10:57:15 +02:00
marcos.alconada c0807af57b Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 2019-06-07 10:25:21 +02:00
Marcos Alconada f89aefa7ab Merge branch 'revert-928f6a79' into 'develop' 
Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'"

See merge request artica/pandorafms!2487
 2019-06-07 10:24:27 +02:00
Marcos Alconada d49d303469 Update pandoradb_data.sql 2019-06-07 10:20:29 +02:00
Marcos Alconada be82afc9c5 Update pandoradb_data.sql 2019-06-07 09:50:49 +02:00
Alejandro Fraguas 021ae9b1cd Merge branch 'ent-3561-error-herramienta-db-schema-check' into 'develop' 
Ticket Resolved

See merge request artica/pandorafms!2227
 2019-06-07 09:48:51 +02:00
Marcos Alconada 241eda5c39 Revert "Merge branch 'ent-3626-referencias-log4x' into 'develop'" 
This reverts merge request !2282
 2019-06-07 09:35:13 +02:00
Marcos Alconada 928f6a797b Merge branch 'ent-3626-referencias-log4x' into 'develop' 
Resolved ticket with sql sentence

See merge request artica/pandorafms!2282
 2019-06-07 09:34:54 +02:00
marcos.alconada 435a7476c7 Merge branch 'ent-3626-referencias-log4x' into develop 2019-06-07 09:25:04 +02:00
marcos.alconada a13dab3f35 resolving merge conflict 2019-06-07 09:22:07 +02:00
artica 2f0aa6c6a1 Auto-updated build strings. 2019-06-07 00:01:07 +02:00
marcos.alconada 73466b9096 Node deleted disapear in tree view 2019-06-06 18:47:10 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
Tatiana Llorente 4f9f9e65c2 Remove autocomplete user and password in the form to create wmi modules - #3437 2019-06-06 16:51:11 +02:00
Luis Calvo e60433591e Added event in process status validation when same extra id 2019-06-06 14:56:28 +02:00
Luis Calvo ac679797a3 Merge remote-tracking branch 'origin/develop' into ent-4073-eventos-en-proceso-no-validan-ni-id-evento-ni-id-extra 2019-06-06 14:53:14 +02:00
Luis Calvo 701c11a457 Added event in process status validation when same extra id 2019-06-06 14:52:39 +02:00
Tatiana Llorente a4ea5e7c77 Added image for unknown and no data status - 4088 2019-06-06 14:16:09 +02:00
Daniel Rodriguez 75872850ce Merge branch 'ent-4153-threads-shared' into 'develop' 
threads-shared returns

See merge request artica/pandorafms!2480
 2019-06-06 13:31:12 +02:00
Alejandro Fraguas 527a9f4a35 Merge branch 'ent-3614-Vista-de-Servicios' into 'develop' 
New styles for Services table view - #3614

See merge request artica/pandorafms!2468
 2019-06-06 12:58:06 +02:00
Tatiana Llorente 2d84081ca7 Add styles for metaconsole - #3614 2019-06-06 12:09:35 +02:00
Tatiana Llorente 334e66aaf1 Export csv from custom field view meta - #3474 2019-06-06 10:39:09 +02:00
Luis Calvo 83743da2f5 Merge remote-tracking branch 'origin/develop' into ent-3429-event-report-options-saving 2019-06-06 10:34:07 +02:00
Luis Calvo c6d1bb6533 Fixed fields not saving in event reports 2019-06-06 10:33:46 +02:00