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

1080 Commits

Author SHA1 Message Date
alejandro.campos@artica.es 23f0ffdf9e Keep In process status for new events with same extra id 2023-04-12 17:46:10 +02:00
alejandro.campos@artica.es 2ca27ae15d Keep In process status for new events with same extra id 2023-04-12 17:32:52 +02:00
Daniel Maya a42c235cab #10917 Fix icon 2023-04-12 14:44:01 +02:00
Jorge Rincon 32c8109cbe #10266 added tip visual setup option in Open version 2023-04-12 14:17:10 +02:00
alejandro.campos@artica.es d0aa931f46 setup check to enable/disable vc item alert frame 2023-04-05 16:24:46 +02:00
Jonathan 000ab68327 #10490 TinyMCE Upgrade V6 2023-04-04 11:24:49 +02:00
daniel d6a1155dbb fixed styles 2023-03-31 08:45:54 +02:00
Matias Didier 9344bd16c9 Merge branch 'ent-10525-15104-netflow-no-esta-mostrando-correctamente-todos-los-datos' into 'develop' 
Unified default netflow interval and deleted from console setup

See merge request artica/pandorafms!5614
 2023-03-30 12:39:06 +00:00
Daniel Cebrian b9fc352578 merge develop into ent-10633-pantalla-de-timeout 2023-03-30 09:15:10 +02:00
Jonathan 665976e011 Bulks masive visual action buttons 2023-03-27 11:10:51 +02:00
Jonathan f8aefa6e34 Merge conflict solution 2023-03-27 08:31:00 +02:00
Rafael Ameijeiras a30ba4cf27 Merge branch 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' into 'develop' 
Ent 9624 meter soporte a sflow en nuestro gestor de flujos

See merge request artica/pandorafms!5587
 2023-03-24 07:25:52 +00:00
Pablo Aragon 0fa79e44f1 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-23 17:44:16 +01:00
Pablo Aragon 122f45fcaa Metasetup 2023-03-23 17:44:04 +01:00
daniel 95834b2de7 fixed styles 2023-03-23 12:41:39 +01:00
Pablo Aragon 8b163cd100 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 16:42:15 +01:00
Pablo Aragon b0b2778c4a 10760-Setup 2023-03-22 16:42:03 +01:00
Jonathan c52ca613b2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-22 14:22:08 +01:00
Jonathan a063c7a0ac Fix header and menu 2023-03-22 14:21:56 +01:00
daniel e82de5d6aa fixed styles 2023-03-22 14:08:03 +01:00
Rafael Ameijeiras 87421e772d Merge branch 'develop' into 'ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos' 
# Conflicts:
#   pandora_console/install.php
 2023-03-22 08:23:07 +00:00
Jonathan 93f5b62bd2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-21 14:23:15 +01:00
Jonathan a960644975 Omnishell fix view 2023-03-21 14:23:12 +01:00
Pablo Aragon e8744b5d12 10712-New login 2023-03-21 13:31:11 +01:00
Daniel Cebrian 563e9e15c4 #9624 fixed conflics 2023-03-21 10:30:35 +01:00
Daniel Cebrian 9dea38f440 Merge branch 'develop' into ent-9624-meter-soporte-a-sflow-en-nuestro-gestor-de-flujos 2023-03-21 09:38:56 +01:00
Jonathan a1144ce7ab Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-17 13:35:46 +01:00
Jonathan de538a10cb setup Performance visual changes 2023-03-17 13:35:43 +01:00
daniel 594d34931c fixed styles 2023-03-17 13:20:58 +01:00
Calvo 284e20fc8a Unified default netflow interval and deleted from console setup 2023-03-17 10:58:58 +01:00
daniel 3f09fd16a7 fixed styles 2023-03-16 18:51:54 +01:00
Jose Gonzalez 211f29c0f9 Websocket engine and quickshell 2023-03-16 17:49:57 +01:00
Jose Gonzalez bbb1855d81 External Tools 2023-03-16 17:38:51 +01:00
Jose Gonzalez 6d37781255 Minor fixes visual styles 2023-03-16 16:33:08 +01:00
Jose Gonzalez 8d7620e88d Setup updates 2023-03-16 13:11:11 +01:00
Jose Gonzalez 21c263c7c4 Setup views 2023-03-16 11:58:35 +01:00
Jose Gonzalez d2a807636e General Setup view 2023-03-15 17:43:35 +01:00
Jose Gonzalez 84fe5695d8 Visual styles Setup view 2023-03-15 16:34:18 +01:00
Daniel Cebrian d315d4cda7 #10633 added token for control check conexion interval 2023-03-14 13:16:58 +01:00
Daniel Cebrian be6c15fc58 #9624 change icon sflow 2023-03-14 10:46:50 +01:00
Jose Gonzalez 1c85038ffa Discovery progress bars 2023-03-13 15:44:55 +01:00
Daniel Cebrian ca78f069f6 #9624 added support sflow 2023-03-10 17:12:38 +01:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
daniel 3be507ca7e fixed styles 2023-03-10 12:40:21 +01:00
Daniel Cebrian 841478a86c Merge branch 'develop' into 'ent-9073-nuevo-sistema-de-tips-de-bienvenida' 
# Conflicts:
#   pandora_console/pandoradb.sql
 2023-03-10 10:41:08 +00:00
Jose Gonzalez edbc9d8f6b Icons review 2023-03-09 23:31:40 +01:00
Pablo Aragon 2a97b26cfe Admin tools 2023-03-09 15:14:47 +01:00
Pablo Aragon bb1d9c323d Admin tools 2023-03-08 17:12:15 +01:00
Daniel Cebrian a4634717d8 Merge branch 'develop' into ent-9073-nuevo-sistema-de-tips-de-bienvenida 2023-03-07 13:49:39 +01:00
Daniel Cebrian 135793454c #9073 added images 2023-03-06 12:20:08 +01:00
daniel ff3b7001c3 fixed styles 2023-03-04 13:22:52 +01:00
daniel 5f8e9a3e3c fixed styles 2023-03-02 12:46:47 +01:00
daniel a758528968 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/class/AuditLog.class.php
 2023-03-01 07:56:32 +01:00
daniel f00f974c60 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/alerts/alert_commands.php
	pandora_console/godmode/alerts/alert_templates.php
	pandora_console/godmode/groups/configure_modu_group.php
	pandora_console/godmode/groups/modu_group_list.php
	pandora_console/godmode/modules/manage_network_components.php
	pandora_console/godmode/users/user_list.php
 2023-02-28 07:32:43 +01:00
Daniel Cebrian c8096d73b2 Merge branch 'develop' into ent-10253-enforcement-de-opciones-de-configuracion-aviso-en-consola 2023-02-27 14:58:25 +01:00
Jose Gonzalez 6c97fd16a2 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 14:34:52 +01:00
Jose Gonzalez 4e2af1d5f2 Fixes 2023-02-24 14:34:32 +01:00
daniel 7602ec1bd8 fixed styles 2023-02-24 14:28:07 +01:00
Daniel Cebrian b367284d72 Merge branch 'develop' into 'ent-10259-control-de-configuracion-en-tagent_acess' 
# Conflicts:
#   pandora_console/include/class/ConsoleSupervisor.php
 2023-02-24 11:09:16 +00:00
daniel e514a0efb5 fixed styles 2023-02-22 17:41:19 +01:00
Jose Gonzalez 0380e8a10c Ticket 10394 Black theme fixes 2023-02-22 16:24:11 +01:00
Jose Gonzalez 2fd52eff48 Sprint 2025Feb Improve UI-UX and Resources views 2023-02-21 14:14:13 +01:00
Jose Gonzalez da58e4b9e0 Ticket 10484 Fixed List Operating Systems 2023-02-20 13:02:24 +01:00
Daniel Cebrian 35a1a67006 #9073 refactoring 2023-02-17 12:53:35 +01:00
Pablo Aragon 46a4ee9af2 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-17 12:53:12 +01:00
Pablo Aragon a065f4578c 9662-Login 2023-02-17 12:52:13 +01:00
Daniel Cebrian 63a23799a4 #9073 fixed image size 2023-02-16 14:17:05 +01:00
Jonathan ce45469f83 Fix setup visual bugs 2023-02-16 13:16:31 +01:00
Daniel Cebrian e0b75f9829 #9073 added system profiles in tips 2023-02-16 13:14:59 +01:00
Daniel Cebrian 8ea9a0fc7e #9073 added system system for edit images in edit tip 2023-02-15 16:41:14 +01:00
Jose Gonzalez 8673ea57b1 Fix issues with view button in setup view 2023-02-15 16:28:40 +01:00
Daniel Cebrian 1b82af24e8 #9073 added view edit tip 2023-02-15 15:14:17 +01:00
Daniel Cebrian 35e1e46a31 #9073 added delete tip 2023-02-15 13:11:02 +01:00
Daniel Cebrian 09d703f981 #9073 added images input in create tips 2023-02-15 11:58:34 +01:00
Daniel Cebrian 1ab8767c34 #9073 added section welcome tips in menu 2023-02-15 08:56:03 +01:00
Jose Gonzalez 6a46af495d Fix issue with dev environment starting and added button fixed id parameter 2023-02-10 13:38:47 +01:00
Daniel Cebrian 5927687ad3 #10321 create token events_per_query for limit consult sql 2023-02-07 09:49:46 +01:00
Daniel Cebrian aedf6986b3 #10253 added console alert for control variables performance 2023-02-06 15:22:39 +01:00
Daniel Cebrian fecee4895f #10259 fixed bug in agentaccess token 2023-02-06 11:04:08 +01:00
Daniel Cebrian aaae7454fa #10259 create control for token agentaccess if agents morte than 200 2023-02-06 10:37:01 +01:00
Daniel Cebrian 31acafc00f #10253 Enforcement options in setup visuals and general setup 2023-02-06 09:06:34 +01:00
Jose Gonzalez e3b2ec529a Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-02-03 14:16:47 +01:00
Daniel Cebrian af6f5efdd8 #10253 Enforcement options in configuration 2023-02-03 14:12:49 +01:00
alejandro.campos@artica.es a69f3eb0dc minor change 2023-02-01 10:24:35 +01:00
Jose Gonzalez 0363a90e1f Resolve merge issues 2023-01-31 17:35:44 +01:00
alejandro.campos@artica.es a0c311c110 fixed vulnerability 2023-01-30 19:47:02 +01:00
Jose Gonzalez 7277e026cd New notifications and added autoclose function 2023-01-13 14:23:48 +01:00
Jose Gonzalez a9c4dd625c Merge develop branch 2023-01-11 13:46:15 +01:00
Calvo c8bbf1e2dc Fix minor bug 2023-01-05 08:56:07 +01:00
Jose Gonzalez 8421fb49ca Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2023-01-04 15:54:16 +01:00
Calvo 19fe7ffe73 Fix minor bug 2022-12-30 15:04:07 +01:00
Calvo 867749f9d3 Fix inventory blacklist open 2022-12-29 18:14:43 +01:00
Calvo 0e2829eca0 Fix inventory blacklist js 2022-12-28 18:28:03 +01:00
Calvo 566344ef0e Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-28 11:00:44 +01:00
Calvo f8b3183ad3 Moved inventory blacklist to open 2022-12-27 13:02:03 +01:00
Calvo 2ad8fac652 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-22 11:35:25 +01:00
daniel 47c503bdab Merge remote-tracking branch 'origin/develop' into ent-9554-nuevas-graficas-de-tarta-que-reemplazar-a-las-actuales-3 2022-12-21 12:51:18 +01:00
Rafael Ameijeiras 5934b02738 Merge branch 'ent-10018-Vulnerabilidad-CSRF' into 'develop' 
fixed csrf

See merge request artica/pandorafms!5336
 2022-12-20 17:50:21 +00:00
Daniel Barbero 3e071a7d33 remove phamtomjs pandora_enterprise#9554 2022-12-20 12:23:18 +01:00
Calvo 63840b1d55 Merge remote-tracking branch 'origin/develop' into ent-8558-inventario-pasa-de-enterprise-open 2022-12-19 11:31:02 +01:00
alejandro.campos@artica.es 4ca220a3a7 Merge remote-tracking branch 'origin/develop' into ent-9323-14021-Modificar-el-display-de-valores-de-informe 2022-12-15 15:28:58 +01:00
alejandro.campos@artica.es 26426c1bfa fixed csrf 2022-12-15 08:48:48 +01:00
jose.gonzalez@pandorafms.com 445a8161cf Merge 2022-12-05 09:44:35 +01:00
Daniel Maya 5bca791021 #9954 Fixed table 2022-11-30 15:57:49 +01:00
jose.gonzalez@pandorafms.com dccd950e9e Changes 2022-11-30 10:14:42 +01:00
jose.gonzalez@pandorafms.com a688182062 Merge remote-tracking branch 'origin' into ent-9662-Restyling-fuentes-colores-botones 2022-11-22 17:47:02 +01:00
jose.gonzalez@pandorafms.com f99a7dc511 Adaptations 2022-11-07 14:04:07 +01:00
jose.gonzalez@pandorafms.com 195611a3c1 Adapt views and refactor 2022-10-28 15:01:00 +02:00
jose.gonzalez@pandorafms.com 97b249d5a5 Improved color picker 2022-10-28 10:54:30 +02:00
alejandro.campos@artica.es 8d611a8e7f implemented float formatting and option in reports to change visualization format 2022-10-26 18:25:16 +02:00
jose.gonzalez@pandorafms.com c7aa456d60 Adapt views 2022-10-26 10:51:12 +02:00
jose.gonzalez@pandorafms.com 70d0e38382 Adapt views 2022-10-25 11:46:28 +02:00
jose.gonzalez@pandorafms.com 15f2a6ae88 Testing with links 2022-10-25 09:08:34 +02:00
jose.gonzalez@pandorafms.com 4cf92cc995 Adapted views 2022-10-24 13:13:56 +02:00
Diego Muñoz-Reja 92c01531e7 Merge branch 'ent-9178-13815-alto-tiempo-de-espera-si-el-ldap-secundario-no-esta-disponible' into 'develop' 
Added ldap timeout

See merge request artica/pandorafms!5134
 2022-10-21 10:28:04 +00:00
José González 9f800df034 Added default definition for SNMP Interface Wizard 2022-10-03 12:41:55 +02:00
Daniel Rodriguez 1b8f9a613e Merge branch 'ent-9143-implementar-sistema-de-identificacion-de-satelite-para-descarga-del-key' into 'develop' 
Ent 9143 implementar sistema de identificacion de satelite para descarga del key

See merge request artica/pandorafms!5120
 2022-09-29 09:58:45 +00:00
Daniel Maya c650e7df6c #9143 Fixed empty license encryption key 2022-09-29 11:46:29 +02:00
Calvo 8a1740ddfb Added ldap timeout 2022-09-22 09:27:08 +02:00
Daniel Maya 197fa4c69a #9143 Added help tip 2022-09-20 15:16:56 +02:00
Daniel Maya 737f27f782 #9143 Added license_encryption_key 2022-09-20 11:37:07 +02:00
edu.corral 881e0914f0 ent 9149 password mail validation 2022-09-14 16:20:13 +02:00
José González b07a161fb0 Added control for clean not initialized modules 2022-08-29 14:05:30 +02:00
Diego Muñoz-Reja 56e2648c59 Merge branch 'ent-9046-mover-setup-edit-os-a-resources-operating-systems' into 'develop' 
Ent 9046 mover setup edit os a resources operating systems

See merge request artica/pandorafms!5068
 2022-08-26 13:06:27 +00:00
Jimmy Olano db6a76f005 Merge branch 'ent-9091-vista-setup-no-se-ve-bien' into 'develop' 
Ent 9091 vista setup no se ve bien

#9091 https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/9091

See merge request artica/pandorafms!5008
 2022-08-25 20:52:28 +00:00
edu.corral 3d084c8da9 #9046 move edit os from setup to resources 2022-08-25 14:01:08 +02:00
Daniel Barbero Martin 01ba149280 new console report pandora_enterprise#6367 2022-07-08 13:40:20 +02:00
edu.corral 36e2043102 ent-9091 setup view 2022-07-06 10:58:16 +02:00
Jimmy Olano c074cd81bf Merge branch 'ent-8302-Añadir-opción-de-mostrar-solo-grupos-con-datos-en-Group-view' into 'develop' 
Ent 8302 añadir opción de mostrar solo grupos con datos en group view

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/8302

See merge request artica/pandorafms!4949
 2022-07-01 10:47:27 +00:00
José González 2d69ea4be5 Merge branch 'develop' into 'ent-9043-cambiar-mensaje-error-no-poder-mostrar-fichero-file-manager' 
# Conflicts:
#   pandora_console/index.php
 2022-06-28 14:39:37 +00:00
Daniel Rodriguez 4dd65c20a8 Merge branch 'ent-8888-consolas-visuales-vista-movil-carrefour' into 'develop' 
Not orientation CV view mobile pandora_enterprise#8888

See merge request artica/pandorafms!4886
 2022-06-23 10:07:24 +00:00
Daniel Rodriguez c0509a798c Merge branch 'ent-8812-Adaptar-WMI-Wizard-nuevo-binario-pandorawmic' into 'develop' 
Added control for WMI binary

See merge request artica/pandorafms!4884
 2022-06-23 08:27:11 +00:00
edu.corral 22d9c267af ent-9041 input text style 2022-06-21 13:29:50 +02:00
José González 275fd2ed19 Fix minor issues related with pandorawmic 2022-06-20 16:20:49 +02:00
Daniel Barbero Martin 1bf1a83782 Merge remote-tracking branch 'origin/develop' into ent-8888-consolas-visuales-vista-movil-carrefour 2022-06-15 19:49:31 +02:00
Daniel Maya 3e15ed2726 #8302 Added show_empty_groups 2022-06-08 15:17:03 +02:00
José González 67ade2fccd Improved error message 2022-06-06 16:35:02 +02:00
Daniel Rodriguez ff9d50f593 Merge branch 'ent-8788-Setup-Performance-e-Historical-database' into 'develop' 
Ent 8788 setup performance e historical database

See merge request artica/pandorafms!4798
 2022-06-02 07:05:38 +00:00
Daniel Rodriguez b132449c57 Merge branch 'ent-8949-PHP8-Error500-Netflow' into 'develop' 
Fix issue for php8

See merge request artica/pandorafms!4870
 2022-05-19 06:20:39 +00:00
Daniel Barbero Martin ececdca0b6 Not orientation CV view mobile pandora_enterprise#8888 2022-05-13 12:54:58 +02:00
José González 4589a7c298 Added control for WMI binary 2022-05-12 18:31:24 +02:00
José González 94d86af645 Fix issue for php8 2022-05-06 11:19:44 +02:00
Daniel Maya e39200f1dc #8924 Fixed XSS 2022-05-03 12:52:37 +02:00
Daniel Rodriguez b290e6c896 Merge branch 'ent-8332-post-configurar-un-segundo-servidor-ldap' into 'develop' 
Ent 8332 post configurar un segundo servidor ldap

See merge request artica/pandorafms!4823
 2022-04-19 12:42:43 +00:00
Daniel Maya 8ccd5ad8cb #8788 min number limit 2022-04-04 17:43:19 +02:00
Daniel Maya 55e847a5c9 #8541 Added file customer_key 2022-03-31 16:52:50 +02:00
Ramon Novoa a94f729237 Write the customer key to disk. 
Writing the customer key to disk allows other components without access
to the database to download it. Ref. pandora_enterprise#8541.
 2022-03-31 13:21:22 +02:00
Calvo 7f0dbb0476 Added secondary ldap server 2022-03-29 18:59:27 +02:00
Daniel Rodriguez ecd2f7e35e Merge branch 'ent-8651-fallos-menores-de-usabilidad-en-setup' into 'develop' 
Fix console setup visual issues

See merge request artica/pandorafms!4756
 2022-03-25 10:39:05 +00:00
Calvo 84261fcc82 Fix menu header visual issues 2022-03-23 18:03:27 +01:00