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

874 Commits

Author SHA1 Message Date
Daniel Cebrian 21435b32c3 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-28 13:39:22 +02:00
Daniel Cebrian 2c9f7e026e Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-26 15:58:26 +02:00
Daniel Cebrian 001ffc1799 Merge branch 'develop' into ent-11326-security-hardening-console 2023-07-26 10:55:49 +02:00
Daniel Cebrian 62a70dee2c #11326 added new section and validated if exist plugin 2023-07-24 18:42:27 +02:00
Pablo Aragon 8389169e16 Merge branch 'develop' into ent-10640-meter-programador-de-informes-en-la-vista-de-edicion-de-un-informe-en-una-nueva-solapa 2023-07-24 08:40:33 +02:00
Daniel Cebrian 2d0fe4b149 #11326 added design 2023-07-20 15:13:58 +02:00
daniel 3e2c2990df Merge remote-tracking branch 'origin/develop' into ent-11471-integracion-pandora-integria 2023-07-20 08:28:36 +02:00
Rafael Ameijeiras 9ff13234be Merge branch 'ent-10696-nuevo-widget-netflow' into 'develop' 
Ent 10696 nuevo widget netflow

See merge request artica/pandorafms!5890
 2023-07-19 11:54:01 +00:00
daniel 5cf31fc77e ITSM fixed pandora_enterprise#11471 2023-07-19 11:36:03 +02:00
Daniel Cebrian 41a03a7a49 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-07-18 09:27:14 +02:00
Rafael Ameijeiras dffb9d5bbf Merge branch 'ent-11493-nuevo-widget-colmena-de-agentes-agent-hive' into 'develop' 
Ent 11493 nuevo widget colmena de agentes agent hive

See merge request artica/pandorafms!6085
 2023-07-18 05:30:04 +00:00
Daniel Maya a0dc60a49f #11493 Added png 2023-07-17 14:57:54 +02:00
Daniel Cebrian 42540065cd #11490 new widget group status map 2023-07-17 08:30:47 +02:00
Rafael Ameijeiras d860d613d6 Merge branch 'ent-10598-nuevo-wizard-de-bienvenida' into 'develop' 
Ent 10598 nuevo wizard de bienvenida

See merge request artica/pandorafms!6043
 2023-07-17 05:57:29 +00:00
miguel angel rasteu e3496a44b6 #11206 Add custom field view in nodes 2023-07-11 16:52:39 +02:00
Jorge Rincon 12c538421a #11543 added the pandora FMS logo in black 2023-07-05 09:53:05 +02:00
Matias Didier 321a048d80 Merge branch 'ent-11162-bugs-visuales-en-vista-de-servicios' into 'develop' 
Ent 11162 bugs visuales en vista de servicios

See merge request artica/pandorafms!5876
 2023-07-03 15:23:52 +00:00
Jonathan 1c7e7e8ee1 #11162 new service icon 2023-07-03 15:12:47 +02:00
Daniel Cebrian d2413ed461 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-06-26 13:15:09 +02:00
Daniel Cebrian cc20640acd #11316 new modal help 2023-06-26 09:19:26 +02:00
Pablo Aragon 6ad77676c4 11620-Login background 772 2023-06-19 15:50:05 +02:00
Daniel Cebrian 363f29d333 Merge branch 'develop' into ent-9771-discovery-2-0-sistema-de-extensiones-disco-para-el-discovery 2023-06-14 11:23:32 +02:00
Daniel Cebrian 308879fe05 #9771 moved discovery to open 2023-06-14 11:09:08 +02:00
Daniel Cebrian 81991cc4fe #10696 new icon netflow 2023-06-12 10:48:10 +02:00
Jonathan ae526d5df0 #10598 New wizard welcome 2023-05-23 16:54:40 +02:00
Rafael Ameijeiras 7089b12256 Merge branch 'ent-10994-icono-borroso-en-edicion-de-custom-graph' into 'develop' 
Ent 10994 icono borroso en edicion de custom graph

See merge request artica/pandorafms!5740
 2023-05-22 16:00:55 +00:00
miguel angel rasteu 404c606243 #10994 Add graph container svg 2023-05-22 13:22:05 +02:00
Daniel Cebrian e737cb4f01 #10696 added image netflow widget 2023-05-16 13:36:32 +02:00
Matias Didier 0d15fe4721 Merge branch 'ent-11123-cambiar-imagen-de-no-hay-datos-por-defecto' into 'develop' 
Ent 11123 cambiar imagen de no hay datos por defecto

See merge request artica/pandorafms!5842
 2023-05-16 08:25:54 +00:00
miguel angel rasteu 9659f58b31 #11123 Add same image with other name 2023-05-16 09:47:23 +02:00
Pablo Aragon 7ed61cca75 10640-Report task 2023-05-10 08:43:29 +02:00
miguel angel rasteu d522c8ad97 #11123 Change image no_data_toshow 2023-05-08 09:01:41 +02:00
Pablo Aragon 7cf69ae101 11058-New welcome message 2023-05-08 08:49:35 +02:00
Daniel Rodriguez 9b69ec4393 Merge branch 'ent-10179-wizard-deploy-agentes' into 'develop' 
Ent 10179 wizard deploy agentes

See merge request artica/pandorafms!5692
 2023-05-04 14:37:48 +00:00
Matias Didier 1d81b67082 Merge branch 'ent-10530-giss-demasiados-modulos-en-cola-en-vista-de-servidores' into 'develop' 
Ent 10530 giss demasiados modulos en cola en vista de servidores

See merge request artica/pandorafms!5688
 2023-05-03 09:25:04 +00:00
Daniel Maya 87a55dd26a #10530 Added img 2023-05-03 09:32:52 +02:00
Alejandro Campos 539ff07aec Merge branch 'develop' into 'ent-10179-wizard-deploy-agentes' 
# Conflicts:
#   pandora_console/include/styles/pandora.css
 2023-04-28 08:07:10 +00:00
Rafael Ameijeiras 2dc910005f Merge branch 'ent-9555-revision-visual-ui-de-la-vista-movil' into 'develop' 
Ent 9555 revision visual ui de la vista movil

See merge request artica/pandorafms!5684
 2023-04-24 11:16:30 +00:00
daniel 31a3ceb0d3 add image widget BasicChart pandora_enterprise#10692 2023-04-21 08:13:19 +02:00
Pablo Aragon 6f6a4f6e2e 9555-Styles 2023-04-20 17:20:08 +02:00
alejandro.campos@artica.es a3e1923849 changed icons 2023-04-20 10:02:45 +02:00
miguel angel rasteu 77b1212076 add new icon svg 2023-04-19 10:53:52 +02:00
Jonathan 1efc9dab8e #10959 change style message info header 2023-04-18 16:47:44 +02:00
Pablo Aragon 49d82698b1 9555-Events style & fix scroll pagination 2023-04-18 10:21:17 +02:00
Pablo Aragon bfd00726bf 9555-Header and tactical view 2023-04-17 20:02:16 +02:00
Daniel Rodriguez ccadd5157a Merge branch 'ent-7427-nexcon-datos-de-monitorizacion-con-origen-en-netflow' into 'develop' 
Ent 7427 nexcon datos de monitorizacion con origen en netflow

See merge request artica/pandorafms!5604
 2023-04-05 11:55:20 +00:00
Pablo Aragon be9be17398 10748 2023-03-31 13:24:20 +02:00
Ramon Novoa 4ff27a09ae Add a new icon for the Netflow Server. 2023-03-31 11:51:25 +02:00
Ramon Novoa 112de35eeb Add Netflow Server information (needs a new icon). 2023-03-31 10:54:48 +02:00
daniel e7d08fe6d3 fixed styles 2023-03-29 14:48:47 +02:00
Diego Muñoz-Reja 6bdecc43e7 Merge branch 'ent-8642-nuevo-widget-heatmap' into 'develop' 
Ent 8642 nuevo widget heatmap

See merge request artica/pandorafms!5557
 2023-03-27 10:43:48 +00:00
Daniel Maya 52231615f6 Merge branch 'develop' into ent-8642-nuevo-widget-heatmap 2023-03-23 11:51:54 +01:00
Pablo Aragon f32c886167 10712-login 2023-03-23 11:51:21 +01:00
Jose Gonzalez 0bbf8d0344 New dot icon 2023-03-17 08:58:25 +01:00
Jose Gonzalez 6ac41ed907 Icon added 2023-03-15 11:15:04 +01:00
Daniel Maya feff8668be #8642 added img 2023-03-14 16:49:12 +01:00
Daniel Maya 62d1249fe0 #8642 Added heatmap widget 4 2023-03-14 12:47:10 +01:00
Daniel Cebrian e36bb1d065 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-14 08:36:12 +01:00
daniel d092495482 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-13 19:31:26 +01:00
Jose Gonzalez 3b36545cec New icon 2023-03-13 17:50:36 +01:00
Daniel Cebrian 64cc261483 Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 16:48:47 +01:00
daniel 503a1b2c22 Merge remote-tracking branch 'origin/develop' into ent-9680-widget-para-mostrar-modulos-por-estados 
Conflicts:
	pandora_console/include/lib/Dashboard/Widget.php
 2023-03-13 10:43:38 +01:00
daniel 80c81daafa Merge remote-tracking branch 'origin/develop' into ent-985t push 
9-nuevos-widgets-para-mostrar-datos-en-dashboard-avg-sum-max-min

Conflicts:
	pandora_console/operation/agentes/estado_agente.php
 2023-03-13 09:23:53 +01:00
Daniel Cebrian dfa2ab818e Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-13 08:53:35 +01:00
daniel dcfaaea016 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-10 14:50:31 +01:00
Jose Gonzalez a065833117 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-10 12:48:50 +01:00
Pablo Aragon 000874ea6e CSV button datatable. IPAM fix 2023-03-10 12:29:13 +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 5b748d8ec0 Added images 2023-03-10 11:12:26 +01:00
Pablo Aragon 4ebe7ee790 9680-Conflict 2023-03-10 09:38:55 +01:00
Jose Gonzalez ac1db7820c Minor fixes 2023-03-09 17:41:29 +01:00
Daniel Cebrian 3ec11f4c9d Merge branch 'develop' into ent-10324-sistema-de-favoritos 2023-03-08 12:55:53 +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
Pablo Aragon 62afce562f Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-07 08:28:22 +01:00
Pablo Aragon 5aac1a6152 Alerts 2023-03-07 08:28:10 +01:00
Daniel Cebrian 6a54b814f3 #9073 added arrow images and fixed format php 2023-03-06 13:07:39 +01:00
Daniel Cebrian 135793454c #9073 added images 2023-03-06 12:20:08 +01:00
Jose Gonzalez 6a35eb9950 Network map minor fixes 2023-03-06 11:12:59 +01:00
Pablo Aragon daf179f1f6 Conflit resolved 2023-03-06 08:32:28 +01:00
daniel 5d7738a05e Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/extras/mr/62.sql
	pandora_console/include/ajax/module.php
	pandora_console/include/functions_ui.php
	pandora_console/operation/agentes/estado_agente.php
	pandora_console/operation/agentes/status_monitor.php
	pandora_console/operation/events/events.php
 2023-03-03 08:20:44 +01:00
Diego Muñoz-Reja 873334fd97 Merge branch 'ent-9622-omnishell-en-la-vista-solapa-de-agente' into 'develop' 
Ent 9622 omnishell en la vista solapa de agente

See merge request artica/pandorafms!5508
 2023-03-02 14:52:45 +00:00
daniel a5e6e569e8 Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 2023-03-02 08:04:00 +01:00
daniel 7b1d8a535a fixed styles 2023-03-01 13:19:12 +01:00
Jose Gonzalez 4c3fa9ade8 Changed info icon color 2023-03-01 12:44:22 +01:00
Jonathan c4a0dc1934 SNMP views 2023-02-24 09:51:55 +01:00
Jose Gonzalez d7c70bd8a8 Tree view fixes 2023-02-23 14:30:31 +01:00
Jose Gonzalez 3ba9b752fe Clean unused items 2023-02-20 17:43:42 +01:00
Jose Gonzalez 91393d7ce5 Ticket 10431 Header icons added 2023-02-20 17:22:42 +01:00
Jose Gonzalez da58e4b9e0 Ticket 10484 Fixed List Operating Systems 2023-02-20 13:02:24 +01:00
Pablo Aragon 4ee6cf7e28 9662-Fix login meta 2023-02-20 09:54:48 +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
Jose Gonzalez 1520b8c62f Menu improvements 2023-02-16 14:37:30 +01:00
Jose Gonzalez 4a535b14a2 Fully integrated principal action-buttons 2023-02-15 13:43:42 +01:00
Pablo Aragon 87c3bee756 9666-New widget Event cardboard 2023-02-15 11:23:36 +01:00
Daniel Maya b8de74837e #9662 Added menu images 2023-02-13 17:42:37 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Daniel Maya 44bee67f36 #9663 menu redesing 6 2023-02-13 09:31:33 +01:00
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Pablo Aragon b439ed684e 9859-Widget AvgSumMaxMinModule 2023-02-10 10:31:41 +01:00