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

8320 Commits

Author SHA1 Message Date
Rafael Ameijeiras 5941aac339 Merge branch 'ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD' into 'develop' 
visual changes in demo view

See merge request artica/pandorafms!6916
 2024-03-05 07:59:04 +00:00
Gorka Sanchez e9e7bca39a Merge branch 'ent-12950-500-al-crear-agente' into 'develop' 
minor fix

See merge request artica/pandorafms!6977
 2024-03-01 11:42:48 +00:00
alejandro.campos@artica.es 3800adb1e7 minor fix 2024-02-28 10:05:08 +01:00
daniel 9771639318 Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-02-27 17:27:10 +01:00
Rafael Ameijeiras 355652eb52 Merge branch 'ent-12923-Bug-busqueda-en-filtrado-de-listado-de-informes-con-la-consola-en-Español' into 'develop' 
fix report search

See merge request artica/pandorafms!6968
 2024-02-27 08:58:13 +00:00
alejandro.campos@artica.es eebd2bb2c6 fix report search 2024-02-26 13:18:06 +01:00
Rafael Ameijeiras bfee610b4f Merge branch 'ent-12621-meter-tips-de-ayuda-en-la-interfaz' into 'develop' 
Ent 12621 meter tips de ayuda en la interfaz

See merge request artica/pandorafms!6904
 2024-02-26 11:51:37 +00:00
alejandro.campos@artica.es 06107f4773 Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-23 10:24:26 +01:00
Rafael Ameijeiras 0cce999c95 Merge branch 'ent-12695-16818-eliminar-warnings-en-console-log' into 'develop' 
Ent 12695 16818 eliminar warnings en console log

See merge request artica/pandorafms!6919
 2024-02-22 16:21:32 +00:00
Rafael Ameijeiras f9b6008296 Merge branch 'ent-12497-usabilidad-implementar-boton-mas-operaciones' into 'develop' 
Ent 12497 usabilidad implementar boton mas operaciones

See merge request artica/pandorafms!6955
 2024-02-22 16:20:13 +00:00
Matias Didier 9e312890bd Merge branch 'ent-12783-errores-al-borrar-modulos-que-se-usan-en-safe-operation-mode' into 'develop' 
Ent 12783 Errores al borrar módulos que se usan en Safe operation mode

See merge request artica/pandorafms!6921
 2024-02-22 14:03:32 +00:00
Jonathan 9082fbf798 #12621 tips and size window 2024-02-22 10:49:57 +01:00
Jonathan 260fcfe62b #12695 remove warnings 2024-02-22 10:07:47 +01:00
Jonathan 50187a8c15 #12695 wip remove warnings 2024-02-21 17:07:25 +01:00
Jonathan d0f347cea9 #12621 add more tips 2024-02-21 11:09:44 +01:00
alejandro.campos@artica.es 8f02fe3d62 Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-21 10:30:20 +01:00
Jonathan c725624dcb #12621 style tips dialogs 2024-02-20 16:16:48 +01:00
Jonathan 1bdddac95e #12497 dots agent view 2024-02-20 13:33:36 +01:00
Jonathan 51e7d2d423 #12497 dots 2024-02-20 12:54:35 +01:00
Daniel Cebrian 9f000fcc35 #12909 fixed macros plugin in policies 2024-02-19 12:47:15 +01:00
Jonathan b22ad532b2 #12621 new tips 2024-02-19 12:07:31 +01:00
Daniel Maya ef3bfb35f0 #12350 resolved conflict 2024-02-16 09:25:55 +01:00
Daniel Maya 12eca2dbd4 #12350 added agent name editing 3 2024-02-16 09:14:34 +01:00
Daniel Maya 151808b6bf #12350 added agent name editing 2 2024-02-15 17:00:55 +01:00
Rafael Ameijeiras 80991a32f9 Merge branch 'ent-12884-item-module-histogram-graph' into 'develop' 
Ent 12884 Item "module histogram graph"

See merge request artica/pandorafms!6939
 2024-02-15 12:07:05 +00:00
Matias Didier 768855c1bb Merge branch 'ent-10419-15082-cabecera-vista-agentes-identificar-nombre-de-agente-y-alias' into 'develop' 
Ent 10419 [#15082]Cabecera vista agentes , identificar nombre de agente y alias

See merge request artica/pandorafms!6940
 2024-02-15 08:45:00 +00:00
Rafael Ameijeiras 62ce18e4dc Merge branch 'ent-12317-mejora-del-discovery-host-scan-y-el-wizard-de-discovery-de-bienvenida' into 'develop' 
Net scan improvements

See merge request artica/pandorafms!6908
 2024-02-15 08:28:12 +00:00
Jonathan e6e98aeb39 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-15 09:08:25 +01:00
Jonathan 42975c7967 #12695 wip removing warnings 2024-02-14 17:43:20 +01:00
Daniel Cebrian bb93542257 #10419 changed name column in list agent 2024-02-14 17:14:09 +01:00
Daniel Cebrian 30893762a3 #12884 fixed histogram-graph 2024-02-14 16:58:52 +01:00
alejandro.campos@artica.es f9ffde3253 Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-14 14:21:53 +01:00
Enrique Martin cb63c27d2a Merge branch 'ent-12687-sistema-import-export-prd' into 'develop' 
Ent 12687 sistema import export prd

See merge request artica/pandorafms!6874
 2024-02-14 12:11:16 +00:00
Matias Didier 5ff738eec4 Merge branch 'ent-12879-problema-con-validacion-acl' into 'develop' 
Ent 12879 Problema con validación ACL

See merge request artica/pandorafms!6935
 2024-02-14 10:55:28 +00:00
Daniel Cebrian e0b751b57f #12879 fixed message and button with acl in group list 2024-02-14 11:04:14 +01:00
Jonathan da2bef45f2 #12695 wip removing warnings 2024-02-13 17:06:48 +01:00
Daniel Cebrian 66f8e31824 #12783 enabled correct modules when safe mode module is active in agent 2024-02-13 16:55:46 +01:00
Daniel Cebrian d471845178 Merge branch 'ent-12195-15835-Safe-operation-mode-habilita-modulos-deshabilitados-en-los-modulos-al-recuperarse' into ent-12783-errores-al-borrar-modulos-que-se-usan-en-safe-operation-mode 2024-02-13 16:12:59 +01:00
Daniel Cebrian a432ae4d2d #12879 fixed problem with validation acl in delete group 2024-02-13 15:58:54 +01:00
Daniel Maya fdb8d68336 #12862 Fixed css table 2024-02-13 12:58:47 +01:00
Jonathan 7f580cc388 Merge branch 'develop' into ent-12695-16818-eliminar-warnings-en-console-log 2024-02-13 09:42:00 +01:00
alejandro.campos@artica.es 8ff87ec93a Merge remote-tracking branch 'origin/develop' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD 2024-02-13 09:36:36 +01:00
Rafael Ameijeiras 8422aba9d7 Merge branch 'ent-12851-Se-ha-roto-el-token-Enable-log-collection-de-agente-software-linux-desde-la-consola' into 'develop' 
fix toggling log in linux agent

See merge request artica/pandorafms!6923
 2024-02-13 08:19:48 +00:00
Jonathan 0dcced8b53 #12695 wip removing warnings 2024-02-12 17:59:27 +01:00
alejandro.campos@artica.es 405f15f9f0 minor fixes 2024-02-12 13:52:45 +01:00
Daniel Maya 15382049b8 #12687 Fixed delete file 2024-02-12 10:35:01 +01:00
Daniel Maya 35713c358b #12687 Added info message 2024-02-12 09:37:18 +01:00
Enrique Martin d382ca4066 Merge remote-tracking branch 'origin/develop' into ent-12317-mejora-del-discovery-host-scan-y-el-wizard-de-discovery-de-bienvenida 
Conflicts:
	pandora_console/extras/mr/68.sql
 2024-02-12 09:29:28 +01:00
daniel 851b046add Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0 2024-02-12 08:05:36 +01:00
alejandro.campos@artica.es df8c14864c improvements 2024-02-09 10:37:04 +01:00