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

1170 Commits

Author SHA1 Message Date
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
Calvo 8cae675841 Hide menu title when screen is too small 2022-03-23 17:55:52 +01:00
Calvo c9cea837fa Fix setup header visual issues 2022-03-23 10:16:35 +01:00
Calvo 24b6394c83 Merge remote-tracking branch 'origin/develop' into ent-8651-fallos-menores-de-usabilidad-en-setup 2022-03-23 09:25:17 +01:00
fbsanchez 82c5cbb929 PJ scheduler only enterprise 2022-03-21 12:07:14 +01:00
fbsanchez 2796d3c4e2 Merge remote-tracking branch 'origin/develop' into ent-8399-borrado-contenido-cache 2022-03-21 11:30:32 +01:00
José González 73838ef843 Fix upload of not wanted files in File Manager 2022-03-09 17:27:08 +01:00
Calvo f06c90e692 Fix console setup visual issues 2022-03-09 17:20:24 +01:00
fbsanchez c5d648677d phantomjs cache auto-clean 2022-02-28 18:56:01 +01:00
Jose Gonzalez 40efaa157d Merge remote-tracking branch 'origin' into ent-8422-Revision-completa-audit-logs 2022-02-01 13:42:30 +01:00
Jose Gonzalez d81e6571ec New audit logs 2022-02-01 13:39:18 +01:00
Jose Gonzalez 3252832cc7 WIP: Check audit logs 2022-01-20 10:55:23 +01:00
Daniel Maya e8d3d93f7f Fixed pandora_black in metaconsole 2022-01-17 10:22:30 +01:00
Daniel Barbero Martin 02b3bc8574 fix setup centraliced active directory 2021-11-23 10:18:20 +01:00
José González bdc4d0a8b1 Revert "Merge branch 'ent-7662-rebranding-meta' into 'develop'" 
This reverts merge request !4302
 2021-11-04 16:28:15 +01:00
Jose Gonzalez c0abe5edb9 Fix merge 2021-11-04 16:00:05 +01:00
marcos 85037693b2 fixed visual black theme error 2021-10-07 16:45:56 +02:00
Daniel Rodriguez 6cbf83b2e2 Merge branch 'ent-7780-error-black-theme-en-transaccional-maps' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4285
 2021-10-05 09:23:14 +00:00
Jose Gonzalez 8696d21a42 Fixed any minor bugs 2021-09-29 17:03:13 +02:00
fbsanchez fe42a8782b Updated messages in centralised environment status check 2021-09-23 11:16:48 +02:00
Marcos Alconada 2ed5be71d6 Resolve conflict 2021-09-10 08:04:23 +00:00
Jose Gonzalez fa101db3b6 Fix vulnerability 2021-09-03 13:30:15 +02:00
José González 6b90b33a26 Merge branch 'develop' into 'ent-7804-modificar-comportamiento-file-manager' 
# Conflicts:
#   pandora_console/include/functions_filemanager.php
 2021-09-01 15:33:44 +00:00
Jose Gonzalez 945c29d1bc Fix issues 2021-08-26 11:15:02 +02:00
José González 6358f3fc9b Fixed issues with files upload 2021-08-23 15:35:47 +02:00
José González 96fccb01b9 Created token for hande file creation 2021-07-16 16:54:43 +02:00
marcos 201e9c7216 fixed visual error 2021-07-12 11:10:41 +02:00
fbsanchez eec373e896 Added link to MC place where user must manage the stuff when in centralised environment and ui_get_meta_url 2021-06-24 19:48:07 +02:00
fbsanchez 4c2ac234b8 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/mr/48.sql
	pandora_console/godmode/servers/plugin.php
 2021-06-24 14:37:30 +02:00
Luis 497ecb329d Changed new wiki url on helps 2021-06-24 12:31:15 +00:00
fbsanchez faa9fee273 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_agents/unix/Darwin/dmg/resources/text/conclusion.html
	pandora_agents/unix/Darwin/dmg/resources/text/license.html
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/extras/mr/48.sql
 2021-06-21 17:33:45 +02:00
Daniel Rodriguez 7dfae672d5 Merge branch 'ent-7673-scroll-horizontal-en-moda-test' into 'develop' 
fixed visual error

See merge request artica/pandorafms!4199
 2021-06-21 14:06:29 +00:00
Marcos Alconada d6ecce1ce9 fixed visual error 2021-06-21 14:06:29 +00:00
fbsanchez 94cd4c96dd Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/javascript/pandora_ui.js
 2021-06-14 17:37:01 +02:00
fbsanchez cdad04f9cd Update the DB schema when upgrading from RPMs. 
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
 2021-06-14 11:56:42 +00:00
fbsanchez ae34209f52 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 21:45:50 +02:00
Marcos Alconada 665efa4fb7 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-10 08:19:11 +00:00
Daniel Barbero Martin 9e27843b19 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-10 08:51:48 +02:00
Daniel Rodriguez 4b819360ff Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'" 
This reverts merge request !4132
 2021-06-09 18:09:43 +02:00
Daniel Rodriguez d58e9f634a Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop' 
Ent 7519 cambio de fuentes en la consola a nivel global

See merge request artica/pandorafms!4132
 2021-06-09 13:59:29 +00:00
Marcos Alconada 2334eccd01 Ent 7519 cambio de fuentes en la consola a nivel global 2021-06-09 13:59:28 +00:00
Marcos Alconada 8814b1f971 changed icons for black theme 2021-06-09 13:12:47 +00:00
Daniel Barbero Martin ca59034cf3 Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-06-04 08:13:20 +02:00
Daniel Rodriguez b5802d41c7 Merge branch 'ent-7604-Vulnerabilidad-file-manager-images' into 'develop' 
Fix vulnerability with directories created in upper levels

Closes pandora_enterprise#7604

See merge request artica/pandorafms!4158
 2021-06-03 11:36:22 +00:00
Jose Gonzalez 897a98eab6 Handle directory paths for file upload 2021-06-02 13:17:34 +02:00
Daniel Barbero Martin 3a85c69043 Wip command center 2021-05-31 14:58:36 +02:00
Daniel Barbero Martin 8c7654cd2d Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 
Conflicts:
	pandora_console/godmode/setup/os.php
	pandora_console/include/styles/pandora.css
	pandora_console/operation/users/user_edit.php
 2021-05-28 08:26:19 +02:00
Daniel Rodriguez 3f8d3a883f Merge branch 'ent-7002-Revision-cabeceras-tabs' into 'develop' 
Ent 7002 revision cabeceras tabs

Closes pandora_enterprise#7002

See merge request artica/pandorafms!4094
 2021-05-27 16:21:48 +00:00
José González 57eeb9a1db Fix vulnerability with directories created in upper levels 2021-05-27 16:19:51 +02:00
Daniel Barbero Martin a1ca4abe8f Merge remote-tracking branch 'origin/develop' into ent-7074-Command-Center 2021-05-27 08:22:43 +02:00
Daniel Rodriguez 44ea35bb69 Merge branch 'ent-7300-email-test-solo-envia-datos-guardados' into 'develop' 
Email test working with data in text fields

See merge request artica/pandorafms!4090
 2021-05-26 13:30:36 +00:00
José González 76628117fa Merge branch 'develop' into 'ent-7002-Revision-cabeceras-tabs' 
# Conflicts:
#   pandora_console/operation/messages/message_edit.php
 2021-05-25 13:50:17 +00:00
Daniel Barbero Martin 5d70226b13 fix category, Os, tags, user_edit synch 2021-05-18 11:02:00 +02:00
Daniel Barbero Martin ec6cb4d532 fix category, Os, tags, user_edit synch 2021-05-18 10:57:21 +02:00
Alejandro Campos caaa9c407e Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' 
# Conflicts:
#   pandora_console/extras/mr/47.sql
#   pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
 2021-05-13 11:39:24 +00:00
alejandro.campos@artica.es 9cde8c345f removed deprecated incident permissions 2021-05-13 13:33:45 +02:00
Daniel Maya 9c234eef85 Ent 7087 mensaje duplicado en los test mails 2021-05-11 13:48:09 +00:00
Daniel Rodriguez 89dcde6ca7 Merge branch 'ent-7477-Campos-de-integracion-con-Integria' into 'develop' 
minor changes

See merge request artica/pandorafms!4107
 2021-05-11 07:40:24 +00:00
Daniel Rodriguez ac0ef3c61c Merge branch 'ent-7475-Mejor-interfaz-de-configuracion-en-integracion-Integria' into 'develop' 
minor change in integria ims setup

See merge request artica/pandorafms!4104
 2021-05-11 07:39:16 +00:00
Daniel Rodriguez 6faefa4afa Merge branch 'ent-7096-unificar-nombres-downtimes' into 'develop' 
Unified downtime name as scheduled downtime

See merge request artica/pandorafms!4001
 2021-05-10 09:06:43 +00:00
Luis f25256a74d Unified downtime name as scheduled downtime 2021-05-10 09:06:43 +00:00
alejandro.campos@artica.es fdeaf52912 implemented user level authentication for integria ims integration 2021-05-07 14:29:29 +02:00
alejandro.campos@artica.es aa4769d331 minor changes 2021-05-05 13:02:53 +02:00
alejandro.campos@artica.es d358fd894d minor change in integria ims setup 2021-05-05 11:03:32 +02:00
José González dbb7fe364f Added standard headers 2021-04-30 14:35:54 +02:00
Calvo 6ad371e4ab Email test working with data in text fields 2021-04-29 16:04:51 +02:00
Marcos Alconada c57ca2a2b8 fixed error with creation and updating gis maps 2021-04-27 11:44:55 +00:00
alejandro.campos@artica.es ada6bccfd6 changed request protocol 2021-04-15 12:12:06 +02:00
Daniel Rodriguez 0fc3cb8714 Merge branch 'ent-6271-mejoras-de-ui-en-setup' into 'develop' 
Multicolumn setup for performance and visual settings

See merge request artica/pandorafms!3921
 2021-04-06 17:47:39 +00:00
fbsanchez fdc4133eaa Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 2021-03-25 10:20:02 +01:00
Daniel Maya 79914082e9 Ent 6850 quitar nta 2021-03-24 15:16:13 +00:00
fbsanchez e0aa1bfc68 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/extras/delete_files/delete_files.txt
	pandora_console/include/styles/pandora.css
 2021-03-22 09:59:07 +01:00
Marcos Alconada 04bae1b4fb fixed visual errors 2021-03-18 17:05:50 +00:00
fbsanchez 2862afb7f5 Multicolumn setup for performance and visual settings 2021-03-16 13:00:24 +01:00
marcos f765493ce7 revert selector theme 2021-03-16 11:24:05 +01:00
Daniel Rodriguez 5bae2be954 Merge branch 'ent-6898-Integracion-integria-en-pandora' into 'develop' 
Ent 6898 integracion integria en pandora

See merge request artica/pandorafms!3898
 2021-03-12 13:18:25 +00:00
alejandro.campos@artica.es b4927d6071 minor fix 2021-03-12 12:46:27 +01:00
alejandro.campos@artica.es 3c5bf3eeef Merge remote-tracking branch 'origin/develop' into temp 2021-03-12 12:34:47 +01:00
Jose Gonzalez 6a427cfa8a Fixed 2021-03-12 11:09:34 +01:00
Jose Gonzalez 5b1517f767 Merge 2021-03-12 11:07:44 +01:00
Marcos Alconada d8a628b1c4 Ent 6781 revision de estilos visuales y eliminacion de sistemas skins 2021-03-11 14:40:23 +00:00
Jose Gonzalez 92d654763f Fixed some issues 2021-03-10 16:20:45 +01:00
alejandro.campos@artica.es 71e9452988 Merge branch 'ent-6898-Integracion-de-Integria-en-Pandora' of brutus.artica.es:artica/pandorafms into ent-6898-Integracion-de-Integria-en-Pandora 2021-03-10 10:28:45 +01:00
alejandro.campos@artica.es 5913313bae Increased number of possible custom fields for Integria action 2021-03-10 10:28:27 +01:00
José González 69e1f1fb33 Merge branch 'develop' into 'ent-6846-Network-tools-al-setup-general' 
# Conflicts:
#   pandora_console/extras/delete_files/delete_files.txt
#   pandora_console/include/styles/pandora.css
 2021-03-09 14:39:15 +00:00
Alejandro Campos d4054f15d0 Merge branch 'develop' into 'ent-6898-Integracion-de-Integria-en-Pandora' 
# Conflicts:
#   pandora_console/extras/mr/45.sql
#   pandora_console/godmode/alerts/configure_alert_action.php
#   pandora_server/util/pandora_db.pl
 2021-03-04 10:27:07 +00:00
fbsanchez d96590aea5 Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2021-03-02 09:40:15 +01:00
Daniel Rodriguez 07a29fae04 Merge branch 'ent-6608-OPEN-Servidores-SMTP-externos-no-mandan-e-mail-test' into 'develop' 
fixed string

See merge request artica/pandorafms!3870
 2021-03-01 10:05:04 +00:00
alejandro.campos@artica.es 86cd01418f fixed string 2021-02-26 09:41:53 +01:00
alejandro.campos@artica.es 901d12fec0 Integration with Integria 2021-02-25 13:18:04 +01:00
fbsanchez 85f37a91de Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision 
Conflicts:
	pandora_console/include/functions_ui.php
 2021-02-22 12:01:29 +01:00
fbsanchez 0fb3ba9232 System status notifications filtered by subtype 2021-02-19 13:36:29 +01:00
fbsanchez 5a38d31a6d Wizard (interfaces) backend performance improved 2021-02-04 13:11:47 +01:00
Marcos Alconada b7bf265cb4 changed ssl/tls to ssl 2021-02-03 11:09:38 +01:00
fbsanchez bcb2447edb WIP Historical database manager (setup) 2021-01-27 13:03:57 +01:00
fbsanchez c7706a6bfa WIP Historical database manager (setup) 2021-01-27 12:35:37 +01:00
Jose Gonzalez 1fc1752b01 Solved merge 2021-01-12 13:26:48 +01:00
fbsanchez 6667b38729 Merge remote-tracking branch 'origin/develop' into ent-6652-pandora_db-en-historico 
Conflicts:
	pandora_server/util/pandora_db.pl
 2021-01-07 10:42:29 +01:00
José González 02475d25b6 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_console/general/header.php
#   pandora_console/general/sap_view.php
 2020-12-23 06:48:22 +01:00
Jose Gonzalez f8dd8da8c8 Forgotten file 2020-12-18 12:34:39 +01:00
Jose Gonzalez 5f0d686034 Changed Network Tools for External Tools 2020-12-18 12:31:44 +01:00
Daniel Rodriguez 30650abaf0 Merge branch 'ent-6628-Titulo-y-subtitulos-borrados-en-la-open' into 'develop' 
Ent 6628 titulo y subtitulos borrados en la open

See merge request artica/pandorafms!3669
 2020-12-17 17:06:05 +01:00
daniel 76da033775 fix legend pdf chart verticals 2020-12-17 16:58:20 +01:00
Jose Gonzalez 7d5f4f8f65 WIP: Backup upload 2020-12-17 16:51:05 +01:00
Jose Gonzalez 959fbd4764 WIP: Backup upload 2020-12-17 13:04:21 +01:00
Jose Gonzalez 6da8f33e20 WIP 2020-12-16 14:26:32 +01:00
Jose Gonzalez 010dc65dd4 WIP: Backup upload 2020-12-16 14:09:54 +01:00
José González 623b729001 Merge branch 'develop' into 'ent-1175-copyright-actualizados' 
# Conflicts:
#   pandora_agents/pc/Win32/pandora_agent.conf
#   pandora_agents/win32/bin/pandora_agent.conf
#   pandora_console/extensions/realtime_graphs.php
#   pandora_console/godmode/snmpconsole/snmp_alert.php
#   pandora_console/include/functions_ui.php
#   pandora_console/install.php
#   pandora_console/operation/agentes/realtime_win.php
 2020-12-14 11:10:35 +01:00
Daniel Rodriguez 98c5ef7142 Merge branch 'ent-6619-Remote-code-execution' into 'develop' 
fixed security vulnerability

See merge request artica/pandorafms!3591
 2020-12-02 17:16:05 +01:00
Daniel Maya 3a0f14e7bd Ent 5835 9693 error al exportar csv el log view parte 2 2020-12-02 10:13:22 +01:00
Luis aeb7a7e9c6 Add decimal separator to all pandora csv 2020-12-01 11:56:15 +01:00