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

1493 Commits

Author SHA1 Message Date
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
Daniel Cebrian 7d1e06ce30 #12571 resolve conflics 2024-01-18 10:39:07 +01:00
Daniel Maya ae3c9bc2f5 #12754 Fixed status 2024-01-18 10:28:57 +01:00
Jonathan 49784cab5a Merge branch 'develop' into ent-12202-eastern-egg-asteroids 2024-01-17 09:29:21 +01:00
Daniel Cebrian 0627ea07cd #12503 changed unique ip in agent 2023-12-29 13:43:28 +01:00
miguel angel rasteu d6363d37b7 #12684 Fix tree view filter 2023-12-26 13:22:24 +01:00
Rafael Ameijeiras 5bdf1b0766 Merge branch 'ent-12398-actualizar-los-enlaces-de-ayuda-movidos-en-el-12287-2' into 'develop' 
Ent 12398 actualizar los enlaces de ayuda movidos en el 12287 2

See merge request artica/pandorafms!6758
 2023-12-21 12:00:44 +00:00
Jonathan 158a52a1ce #12398 fix url 2023-12-21 12:36:54 +01:00
Diego Muñoz-Reja 6114c6a37a Merge branch 'ent-12236-varios-bugs-en-modulos-predictivos-de-politica' into 'develop' 
Policy capacity planning modules. JS errors

See merge request artica/pandorafms!6650
 2023-12-21 10:57:42 +00:00
Rafael Ameijeiras 8658dbc938 Merge branch 'ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center' into 'develop' 
fix error js load modal filter sound events pandora_enterprise#12607

See merge request artica/pandorafms!6739
 2023-12-20 10:21:51 +00:00
Calvo 421eb1fe23 Merge remote-tracking branch 'origin/develop' into ent-12236-varios-bugs-en-modulos-predictivos-de-politica 2023-12-19 18:59:07 +01:00
Calvo e41dc13ac2 WIP: Policy synthetic op: Creating modules 2023-12-19 18:37:49 +01:00
Daniel Rodriguez d4e6c09acb Merge branch 'ent-10906-Carga-de-datos-de-demo' into 'develop' 
implement demo data feature

See merge request artica/pandorafms!6606
 2023-12-19 15:40:09 +00:00
daniel d57f0971b6 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 
Conflicts:
	pandora_console/include/javascript/pandora.js
 2023-12-19 14:41:12 +01:00
Enrique Martin 321a0075f9 Fixed report custom graph search 2023-12-18 16:12:08 +01:00
Alejandro Campos c700633fce Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-18 10:54:27 +00:00
Daniel Cebrian 8df792f11b #12571 custom graphs refactored 2023-12-15 10:41:21 +01:00
daniel 9e3c17bf2c Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-14 16:32:33 +01:00
daniel ea97bb8f60 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-12-14 13:27:03 +01:00
Diego Muñoz-Reja 60a2557878 Merge branch 'ent-10116-14775-service-view-widget-no-tiene-filtro-de-grupos-y-recursion' into 'develop' 
Ent 10116 14775 service view widget no tiene filtro de grupos y recursion

See merge request artica/pandorafms!6451
 2023-12-14 11:19:25 +00:00
daniel 2890fd3dab 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-14 11:05:29 +01:00
daniel af99c10b19 fix events sound pandora_enterprise#12607 2023-12-13 13:03:58 +01:00
daniel f4d2a40f13 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center 2023-12-13 10:58:57 +01:00
daniel cc12c77008 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-13 10:39:48 +01:00
Jonathan c593161525 #12398 change urls wiki 2023-12-12 12:22:51 +01:00
Daniel Cebrian 276cf73e49 #12575 fixed order columns in dashboard 2023-12-12 10:23:47 +01:00
miguel angel rasteu fec7bf8b90 Merge branch 'develop' into ent-11495-nuevo-tipo-de-informe-service-level-detailed 2023-12-12 09:45:36 +01:00
Enrique Martin 9f98710248 Set default agents to create 2023-12-11 12:15:53 +01:00
Enrique Martin 93293f41ef Removed debug default agents to create value 2023-12-11 12:14:19 +01:00
Enrique Martin 00a0fa8eae Fixed reports generation 2023-12-11 11:53:46 +01:00
Enrique Martin 5a5674f3b4 Set default agents to create to 30 2023-12-11 10:33:03 +01:00
miguel angel rasteu d034116dd3 #11495 Fix report 2023-12-11 09:26:57 +01:00
Alejandro Campos 0bdc6978e6 Merge branch 'develop' into 'ent-10906-Carga-de-datos-de-demo' 
# Conflicts:
#   pandora_console/extras/mr/67.sql
#   pandora_console/pandoradb.sql
 2023-12-05 15:30:06 +00:00
alejandro.campos@artica.es cfc1992d26 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-05 12:20:58 +01:00
alejandro.campos@artica.es 9622b61557 Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-05 12:20:40 +01:00
Enrique Martin 2d1b2bf6d2 Added new dashboard widgets 2023-12-05 12:11:25 +01:00
alejandro.campos@artica.es e7f18709b7 optimization 2023-12-05 12:07:23 +01:00
daniel 34784752b7 fix error js load modal filter sound events pandora_enterprise#12607 2023-12-05 11:47:37 +01:00
daniel 1d36d8a436 fix error 500 and warnings pandora_enterprise#12605 2023-12-05 09:14:02 +01:00
alejandro.campos@artica.es c9c3426b16 minor change 2023-12-05 08:30:00 +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
Enrique Martin e833499dc3 Improvements, fixes and new demo elements 2023-12-04 16:58:08 +01:00
daniel 8a92b39eee add new filters widget modules status pandora_enterprise#12267 2023-12-04 11:59:31 +01:00
alejandro.campos@artica.es 4a64f023fe Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-04 11:37:41 +01:00
alejandro.campos@artica.es 75ddb3b934 minor changes in demo data functionality 2023-12-04 11:37:12 +01:00
Enrique Martin 55aee67df3 Added GIS maps creation 2023-12-03 23:23:57 +01:00
Enrique Martin b14c77862e Added new items to visual consoles 2023-12-03 21:43:00 +01:00
Enrique Martin 14fc8ef2b1 Added new items to visual consoles and fixed unknown modules on creation 2023-12-03 21:30:17 +01:00
miguel angel rasteu 5ee6eb7306 #12052 Resolve conflicts 2023-12-01 10:19:39 +01:00
alejandro.campos@artica.es cb60581bcf Merge branch 'ent-10906-Carga-de-datos-de-demo' of brutus.artica.es:artica/pandorafms into ent-10906-Carga-de-datos-de-demo 2023-12-01 09:49:37 +01:00
alejandro.campos@artica.es d6e107ea95 performance improvement 2023-12-01 09:48:45 +01:00
Daniel Rodriguez 39c6420d2c Merge branch 'ent-11763-15982-regex-en-busqueda-de-eventos' into 'develop' 
Ent 11763 15982 regex en busqueda de eventos

See merge request artica/pandorafms!6512
 2023-12-01 08:44:46 +00:00
Enrique Martin 3807baa8ef Added GIS random data to agents 2023-11-30 17:41:01 +01:00
Matias Didier 8cfb0353dd Merge branch 'ent-12378-alertas-sonoras-en-vista-de-eventos' into 'develop' 
fix sound alerts severity filter pandora_enterprise#12378

See merge request artica/pandorafms!6663
 2023-11-30 11:41:30 +00:00
Rafael Ameijeiras c60c75475b Merge branch 'ent-10316-hover-para-mostrar-ip-no-funciona-si-se-utiliza-una-macro' into 'develop' 
Ent 10316 hover para mostrar ip no funciona si se utiliza una macro

See merge request artica/pandorafms!6523
 2023-11-30 09:23:16 +00:00
Enrique Martin 76327c6d73 Fixed demo graphs generation 2023-11-30 08:54:21 +01:00
alejandro.campos@artica.es dc2ac2a1b3 implement load demo data 2023-11-29 18:13:56 +01:00
alejandro.campos@artica.es ca17eef68a implement load demo data 2023-11-29 18:09:32 +01:00
alejandro.campos@artica.es a290203847 implement demo data load 2023-11-29 16:57:38 +01:00
alejandro.campos@artica.es 6f96087d90 implement demo data load 2023-11-29 11:30:48 +01:00
Jonathan f86a3e60e8 #11763 save filter regex on bbdd 2023-11-29 11:14:40 +01:00
alejandro.campos@artica.es 7240bbf934 implement demo data load 2023-11-29 09:00:45 +01:00
daniel 730cfb30ff Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos 
Conflicts:
	pandora_console/include/styles/pandora.css
 2023-11-28 08:40:07 +01:00
Jonathan 9819c3a5ff Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-28 08:30:23 +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
Rafael Ameijeiras 8e68198ab5 Merge branch 'ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion' into 'develop' 
Ent 11679 15855 nombres de modulos no tienen link a su edicion

See merge request artica/pandorafms!6422
 2023-11-27 14:39:14 +00:00
Matias Didier d544ef4ac5 Merge branch 'ent-8686-13248-anadir-buscador-de-grupos-en-agent-management-tree-group-de-metaconsola' into 'develop' 
Ent 8686 13248 anadir buscador de grupos en agent management tree group de metaconsola

See merge request artica/pandorafms!6539
 2023-11-27 12:24:22 +00:00
Rafael Ameijeiras d6e613ca8b Merge branch 'ent-11791-any-user-can-change-any-other-user-s-notification-settings' into 'develop' 
Ent 11791 any user can change any other user s notification settings

See merge request artica/pandorafms!6400
 2023-11-27 11:19:14 +00:00
Diego Muñoz-Reja a0db8f5755 Merge branch 'ent-12204-visualizar-icono-de-los-modulso-pendientes-de-ejecucion-porque-se-han-forzado' into 'develop' 
Ent 12204 visualizar icono de los modulso pendientes de ejecucion porque se han forzado

See merge request artica/pandorafms!6550
 2023-11-27 10:34:56 +00:00
Diego Muñoz-Reja 59bed70175 Merge branch 'ent-12153-grafica-de-eventos-a-lo-largo-del-tiempo-en-vista-de-eventos' into 'develop' 
Ent 12153 grafica de eventos a lo largo del tiempo en vista de eventos

See merge request artica/pandorafms!6532
 2023-11-27 10:32:34 +00:00
alejandro.campos@artica.es a1916dc4b9 implement demo data load 2023-11-24 12:56:21 +01:00
alejandro.campos@artica.es c7770ec4f1 implement demo data load 2023-11-23 17:59:22 +01:00
Jonathan fafe4bc9b4 #10316 new function return_agent_macros 2023-11-23 17:21:37 +01:00
daniel 305f8c7658 Merge remote-tracking branch 'origin/develop' into ent-12378-alertas-sonoras-en-vista-de-eventos 2023-11-23 14:18:44 +01:00
Jonathan 4f707a5a1b Merge branch 'develop' into ent-11705-15916-campo-editable-en-vista-de-eventos 2023-11-23 09:27:46 +01:00
Jorge Rincon b6582b7f7e #12202 added Asteroids game 2023-11-22 13:30:44 +01:00
Daniel Maya 300e01c186 #12502 Fixed filter 2023-11-22 10:10:35 +01:00
alejandro.campos@artica.es 0868c0c995 implement demo data load 2023-11-21 14:26:33 +01:00
alejandro.campos@artica.es 31e4e872c1 implement demo data load 2023-11-21 08:29:33 +01:00
alejandro.campos@artica.es d6bffbade1 implement demo data load 2023-11-20 16:52:49 +01:00
Gorka Sanchez 7748b59694 Merge branch 'ent-9946-meter-busqueda-en-listado-de-dashboard' into 'develop' 
Ent 9946 meter busqueda en listado de dashboard

See merge request artica/pandorafms!6398
 2023-11-20 15:20:46 +00:00
daniel 0aece464f8 fix sound alerts severity filter pandora_enterprise#12378 2023-11-14 13:38:09 +01:00
alejandro.campos@artica.es 1fcc263046 implemented demo data load 2023-11-10 11:24:34 +01:00
miguel angel rasteu 748238a7ea #11791 Prevent any user from changing another user's notification settings in AJAX 2023-11-10 10:03:13 +01:00
miguel angel rasteu c2b3eb14bf Merge branch 'develop' into ent-11679-15855-nombres-de-modulos-no-tienen-link-a-su-edicion 2023-11-03 09:43:04 +01:00
Daniel Maya 287b983ce9 #12371 Fixed events 2023-11-02 15:39:55 +01:00
alejandro.campos@artica.es 1fd45fb95f implement demo data feature 2023-10-26 19:05:07 +02:00
Calvo 715f6abc69 Merge remote-tracking branch 'origin/develop' into ent-11931-made-selector-de-modulo-donde-se-activa-made-monitoring-anomaly-detection-engine 2023-10-24 14:02:36 +02:00
daniel d8dfaf0fe3 Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo 2023-10-23 17:02:51 +02:00
daniel ef70444d71 add sliced mode simple graph widget pandora_enterprise#9640 2023-10-23 17:02:08 +02:00