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

826 Commits

Author SHA1 Message Date
Pablo Aragon 95db6bc705 13403-Fix styles configuration widget Block histogram 2024-04-15 09:42:17 +02:00
Pablo Aragon 1696eab24f Merge branch 'develop' into ent-13191-mejorar-la-visualizacion-de-los-traps-segun-su-severidad 2024-04-10 11:20:59 +02:00
Matias Didier 731adf3300 Merge branch 'ent-12941-Tiempos-de-intervalo-1-min' into 'develop' 
Ent 12941 tiempos de intervalo 1 min

See merge request artica/pandorafms!6974
 2024-04-09 14:32:44 +00:00
Jose Martin 95d25eab2c Merge branch 'ent-13059-mejorar-visualizacion-de-modulos-en-widget-de-agent-module-view' into 'develop' 
Ent 13059 mejorar visualizacion de modulos en widget de agent module view

See merge request artica/pandorafms!7116
 2024-04-09 13:32:35 +00:00
Félix Suárez 3952cfefde Changes to center report 2024-04-08 23:47:19 -06:00
Jonathan 0838afe8b1 #13059 fix bugs chose modules, chose agents, css, save and print data 2024-04-08 14:05:05 +02:00
Jonathan 5824d52ff3 #13059 fix bugs agent module view 2024-04-05 11:11:13 +02:00
Pablo Aragon 0d11040641 Merge branch 'develop' into ent-12941-Tiempos-de-intervalo-1-min 2024-04-05 08:59:42 +02:00
Jonathan 1a58501af9 #13059 fix bugs dashboard agent module view 2024-04-04 18:21:10 +02:00
Jonathan 7cdca7e622 #13059 new view widget agent module dashboard 2024-04-02 12:41:53 +02:00
Pablo Aragon fa064dd2be 13182-Fix styles in Agents bulk operations 2024-03-22 14:14:12 +01:00
alejandro.campos@artica.es 8ff51b3679 implemented agent module custom selectors 2024-02-27 18:46:34 +01:00
alejandro.campos@artica.es 1363072405 implemented agent module custom selectors 2024-02-27 18:38:37 +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
Jonathan 260fcfe62b #12695 remove warnings 2024-02-22 10:07:47 +01:00
Jonathan 51e7d2d423 #12497 dots 2024-02-20 12:54:35 +01:00
Jonathan 5dd9acb02b #12524 disable auto start alerts 2024-02-15 13:54:14 +01:00
Jonathan 42975c7967 #12695 wip removing warnings 2024-02-14 17:43:20 +01:00
Jonathan da2bef45f2 #12695 wip removing warnings 2024-02-13 17:06:48 +01:00
Jonathan 0dcced8b53 #12695 wip removing warnings 2024-02-12 17:59:27 +01:00
Daniel Cebrian 5feb11c547 9992 added email test dialog in metaconsole 2024-01-31 16:34:25 +01:00
daniel 00f9098f56 Merge remote-tracking branch 'origin/develop' into ent-12352-integrar-tablas-de-merge-en-el-pandoradb-sql 
Conflicts:
	pandora_console/extras/mr/68.sql
	pandora_console/pandoradb.sql
 2024-01-25 15:57:20 +01:00
Rafael Ameijeiras d2bdbc9e42 Merge branch 'ent-12767-passwords-de-ldap-no-se-pueden-visualizar' into 'develop' 
Ent 12767 passwords de ldap no se pueden visualizar

See merge request artica/pandorafms!6856
 2024-01-23 15:45:23 +00:00
Daniel Maya 6948306d82 #12767 Fixed password 3 2024-01-22 17:29:51 +01:00
Daniel Cebrian 7d1e06ce30 #12571 resolve conflics 2024-01-18 10:39:07 +01:00
Daniel Cebrian 8df792f11b #12571 custom graphs refactored 2023-12-15 10:41:21 +01:00
daniel 77cf0ce6ca Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-12-05 08:02:55 +01:00
Jonathan 6e71cb8b7a Merge branch 'develop' into ent-12387-bug-edicion-item-agent-module-view 2023-11-28 09:03:49 +01:00
daniel f6f0f15731 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/godmode/reporting/reporting_builder.item_editor.php
	pandora_console/include/graphs/fgraph.php
	pandora_console/include/lib/Dashboard/Widgets/single_graph.php
	pandora_console/include/styles/pandora.css
 2023-11-28 08:29:10 +01:00
Daniel Rodriguez c7fcf7c168 Merge branch 'ent-11815-Modificar-creacion-de-modulos-predictivos-en-politicas-e-individualmente' into 'develop' 
changed behavior of prediction modules creation

See merge request artica/pandorafms!6540
 2023-11-27 16:01:57 +00:00
Rafael Ameijeiras cf65c66c38 Merge branch 'ent-12177-en-gestion-de-versiones-obsolescencia-planeada-al-subir-una-supuesta-imagen-guarda-y-se-va-al' into 'develop' 
Ent 12177 en gestion de versiones obsolescencia planeada al subir una supuesta imagen guarda y se va al

See merge request artica/pandorafms!6560
 2023-11-27 11:55:29 +00:00
Rafael Ameijeiras 538a3448e8 Merge branch 'ent-12400-errores-de-formato-en-la-seleccion-de-fechas-de-log-viewer' into 'develop' 
Ent 12400 errores de formato en la seleccion de fechas de log viewer

See merge request artica/pandorafms!6653
 2023-11-27 11:41:02 +00:00
Daniel Cebrian 134da0c646 #12475 fixed alias agent 2023-11-16 15:31:10 +01:00
Daniel Maya d312b0d813 #12400 Fixed date format 2023-11-13 13:08:28 +01:00
Jonathan 05be3e143e #12387 bug agent module widget edit agent 2023-11-03 11:27:27 +01:00
miguel angel rasteu 84bc687d5d #12177 Fix conflict 2023-10-30 09:53:00 +01:00
daniel 04a8717aed Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 
Conflicts:
	pandora_console/include/lib/Dashboard/Widgets/single_graph.php
 2023-10-25 15:58:10 +02:00
daniel 868700f9f1 add sliced mode simple graph reports and CV pandora_enterprise#9640 2023-10-25 15:55:54 +02:00
Daniel Cebrian 638ba75894 #12288 fixed spinner in empty page 2023-10-24 14:18:48 +02:00
Daniel Rodriguez 9aee38aa0b Merge branch 'ent-11391-pandora-indexer-cambios-en-el-collector-de-logs' into 'develop' 
#11391 Fixed ace editor and log viewer

See merge request artica/pandorafms!6461
 2023-10-23 07:19:51 +00:00
alejandro.campos@artica.es e90497df61 minor fix 2023-10-18 20:17:18 +02:00
miguel angel rasteu 2062169f2f #12177 Fix upload os icon 2023-10-13 12:55:58 +02:00
Alejandro Campos 0f381b0db7 Merge branch 'develop' into 'ent-11114-Gestion-de-versiones-Obsolescencia-planeada' 
# Conflicts:
#   pandora_console/extras/mr/66.sql
 2023-10-03 13:11:09 +00:00
Rafael Ameijeiras b0d12c8a18 Merge branch 'ent-12081-añadir-el-lapso-de-tiempo-none-para-el-filtro-de-los-informes-en-la-vista-HTML-por-defecto' into 'develop' 
Ent 12081 añadir el lapso de tiempo none para el filtro de los informes en la vista html por defecto

See merge request artica/pandorafms!6496
 2023-10-02 11:23:35 +00:00
Daniel Maya 06e42de207 #11391 Fixed date 2023-10-02 12:39:40 +02:00
Daniel Rodriguez 05cd8142bf Merge branch 'ent-11471-integracion-pandora-integria' into 'develop' 
wip integration integriaIMS pandora_enterprise#11471

Closes pandora_enterprise#11471

See merge request artica/pandorafms!6131
 2023-09-28 10:05:15 +00:00
Rafael Ameijeiras 6acbc5b684 Merge branch 'ent-12050-security-hardening-console-widget-dashboard' into 'develop' 
Ent 12050 Security hardening: Console - Widget dashboard

See merge request artica/pandorafms!6450
 2023-09-27 14:07:04 +00:00
Jorge Rincon db7a5e121d Add the None option to the date filter to prioritize the period of the report items. 2023-09-25 17:10:43 +02:00
daniel 91393c9e39 Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-09-25 17:06:08 +02:00