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 |
|
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 |
|
alejandro.campos@artica.es
|
c9bde8d90a
|
Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query
|
2024-02-23 11:14:17 +01: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 |
|
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 |
|
alejandro.campos@artica.es
|
1991b74b9b
|
Merge remote-tracking branch 'origin/develop' into ent-12829-Cambiar-filtro-Regex-search-para-que-busque-en-la-query
|
2024-02-21 10:05:11 +01:00 |
|
Daniel Cebrian
|
9f000fcc35
|
#12909 fixed macros plugin in policies
|
2024-02-19 12:47:15 +01:00 |
|
alejandro.campos@artica.es
|
df7435132a
|
change regex search in events
|
2024-02-16 10:10:38 +01:00 |
|
Rafael Ameijeiras
|
86b52d6c70
|
Merge branch 'ent-12877-17061-comentario-de-evento-no-se-actualiza-al-cambiar-pestanas' into 'develop'
Ent 12877 [#17061] Comentario de evento no se actualiza al cambiar pestañas
See merge request artica/pandorafms!6929
|
2024-02-15 08:28:57 +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 |
|
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 |
|
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 |
|
Jonathan
|
0dcced8b53
|
#12695 wip removing warnings
|
2024-02-12 17:59:27 +01:00 |
|
Daniel Cebrian
|
e5139436ab
|
#12877 fixed reload comments
|
2024-02-12 17:19:50 +01:00 |
|
alejandro.campos@artica.es
|
405f15f9f0
|
minor fixes
|
2024-02-12 13:52:45 +01:00 |
|
Daniel Maya
|
e8bd4b9e6b
|
#12859 Fixed groups
|
2024-02-12 13:02:11 +01:00 |
|
Daniel Maya
|
15382049b8
|
#12687 Fixed delete file
|
2024-02-12 10:35:01 +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
|
ecfef0da29
|
several changes
|
2024-02-09 18:48:32 +01:00 |
|
Jonathan
|
d590961e69
|
#12695 wip removing warnings
|
2024-02-09 13:51:56 +01:00 |
|
alejandro.campos@artica.es
|
df8c14864c
|
improvements
|
2024-02-09 10:37:04 +01:00 |
|
Rafael Ameijeiras
|
4cdea9d8ef
|
Merge branch 'ent-12460-cientos-de-errores-en-el-log-de-apache' into 'develop'
Ent 12460 Cientos de errores en el log de apache
See merge request artica/pandorafms!6748
|
2024-02-09 09:22:48 +00:00 |
|
Jonathan
|
6e1fb2f061
|
#12695 wip removing warnings
|
2024-02-08 17:17:17 +01:00 |
|
Daniel Maya
|
cf3b8e7359
|
#12687 changes in css
|
2024-02-08 15:42:00 +01:00 |
|
alejandro.campos@artica.es
|
14ae2c5206
|
Merge remote-tracking branch 'origin/ent-12687-sistema-import-export-prd' into ent-12688-Mejoras-sistema-datos-de-demo-y-adaptar-al-nuevo-sistema-PRD
|
2024-02-08 11:06:58 +01:00 |
|
Daniel Maya
|
8675e60c9b
|
#12687 Changes to the export name
|
2024-02-07 15:49:20 +01:00 |
|
Jonathan
|
834635a487
|
Merge remote-tracking branch 'origin/ent-12460-cientos-de-errores-en-el-log-de-apache' into ent-12695-16818-eliminar-warnings-en-console-log
|
2024-02-07 10:39:47 +01:00 |
|
daniel
|
c0a2a4fdeb
|
Merge remote-tracking branch 'origin/develop' into ent-12019-api-2-0
|
2024-02-07 08:55:52 +01:00 |
|
daniel
|
8cfb04d243
|
new api 2.0
|
2024-02-07 08:53:54 +01:00 |
|
Jonathan
|
644308db4f
|
#12845 fix style hover
|
2024-02-06 14:34:34 +01:00 |
|
Enrique Martin
|
d1c6c9843b
|
Added net scan options to welcome wizard
|
2024-02-05 23:26:55 +01:00 |
|
Daniel Cebrian
|
5b7a123086
|
Merge branch 'develop' into ent-12460-cientos-de-errores-en-el-log-de-apache
|
2024-01-30 13:21:44 +01:00 |
|
Daniel Cebrian
|
22598b4bc2
|
#12460 fixed deprecated
|
2024-01-29 17:31:19 +01:00 |
|
alejandro.campos@artica.es
|
2ba5dd767d
|
visual changes in demo view
|
2024-01-26 12:41:32 +01:00 |
|
daniel
|
b84d2aeec9
|
Merge remote-tracking branch 'origin/develop' into ent-12267-dashboard-mejora-del-widget-de-module-status
Conflicts:
pandora_console/include/lib/Dashboard/Widgets/ModulesByStatus.php
|
2024-01-26 08:10:07 +01:00 |
|
Rafael Ameijeiras
|
b271cff73e
|
Merge branch 'ent-12754-widget-modules-by-status-bug-al-filtrar-por-estados' into 'develop'
Ent 12754 widget modules by status bug al filtrar por estados
See merge request artica/pandorafms!6858
|
2024-01-25 13:58:02 +00:00 |
|
Daniel Maya
|
401b1973be
|
#12687 Added import/export prd 2
|
2024-01-24 12:15:16 +01:00 |
|
Rafael Ameijeiras
|
5dc0e35be8
|
Merge branch 'ent-12753-os-command-injection' into 'develop'
Ent 12753 OS Command Injection
See merge request artica/pandorafms!6868
|
2024-01-24 08:15:58 +00:00 |
|
Jonathan
|
fc08e9b9b6
|
#12792 fix 500 change agent inventory
|
2024-01-23 11:27:15 +01:00 |
|
Daniel Maya
|
95f8519d5d
|
#12687 Added import/export prd
|
2024-01-22 17:22:23 +01:00 |
|
Daniel Cebrian
|
5d5bfc654d
|
#12753 fixed os command injection
|
2024-01-22 12:39:43 +01:00 |
|
Daniel Rodriguez
|
cc33e5413a
|
Merge branch 'ent-12202-eastern-egg-asteroids' into 'develop'
Ent 12202 eastern egg asteroids
See merge request artica/pandorafms!6693
|
2024-01-19 11:10:55 +00:00 |
|
Rafael Ameijeiras
|
3386347253
|
Merge branch 'ent-12575-no-se-puede-ordenar-por-columnas-en-la-vista-de-dashboards' into 'develop'
Ent 12575 No se puede ordenar por columnas en la vista de Dashboards
See merge request artica/pandorafms!6756
|
2024-01-19 08:37:12 +00:00 |
|
Rafael Ameijeiras
|
04478bbdfb
|
Merge branch 'ent-12503-cambio-visual-del-boton-unique-ip-de-la-config-de-agentes' into 'develop'
Ent 12503 Cambio Visual del Botón Unique IP de la Config de Agentes
See merge request artica/pandorafms!6820
|
2024-01-18 12:57:08 +00:00 |
|