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

4918 Commits

Author SHA1 Message Date
Daniel Rodriguez 424c4db9de Merge branch 'ent-10302-errores-de-fecha-con-eventos-y-tz' into 'develop' 
Ent 10302 errores de fecha con eventos y tz

See merge request artica/pandorafms!5524
 2023-03-01 12:31:27 +00:00
Jonathan 472b655ee6 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-03-01 08:18:50 +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 8ac9df14ab fixed styles 2023-02-28 19:01:37 +01:00
Jimmy Olano a8d0f79540 Merge branch 'ent-10257-guardia-14543-no-muestra-modulos-no-init-en-vista-monitor-detail' into 'develop' (^JJOS) 
Fix empty module data list view

See merge request artica/pandorafms!5472
 2023-02-28 17:35:56 +00:00
Pablo Aragon c0ab435f4f Events meta 2023-02-28 17:49:22 +01:00
Pablo Aragon 3dbe668973 Events meta 2023-02-28 17:47:49 +01:00
Jonathan 1dca587455 SNMP Browser modals change visual styles 2023-02-28 17:22:17 +01:00
Alejandro Campos f94c7e2a04 Merge branch 'develop' into 'ent-10008-Gestion-de-busquedas-en-la-vista-de-agentes-y-mejora-de-las-busquedas' 
# Conflicts:
#   pandora_console/extras/mr/62.sql
 2023-02-28 16:11:46 +00:00
alejandro.campos@artica.es a1f172e713 several fixes 2023-02-28 17:06:31 +01:00
Jonathan d5cd9a0ab2 SNMP browser action buttons 2023-02-28 15:26:42 +01:00
Jose Gonzalez 825b937958 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 10:39:42 +01:00
Pablo Aragon 1d28762d22 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:50:50 +01:00
Pablo Aragon 38a05d2a79 Events meta 2023-02-28 09:50:42 +01:00
Jose Gonzalez ce5ccbec5d Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-28 09:36:21 +01:00
daniel f3d7aa9e30 fixed styles 2023-02-27 18:39:10 +01:00
daniel 76b2c8743b Merge remote-tracking branch 'origin/ent-9987-mejoras-de-la-vista-de-inventario' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/include/functions_ui.php
	pandora_console/include/styles/pandora.css
 2023-02-27 18:25:45 +01:00
daniel f38adff73a fixed styles 2023-02-27 18:05:51 +01:00
Jose Gonzalez 973444014a Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-27 16:37:17 +01:00
Jose Gonzalez 5df442e83e Network maps improve 2023-02-27 16:37:00 +01:00
daniel 12212fff02 restyling 2023-02-27 13:41:44 +01:00
Pablo Aragon 936c9bcafb 10454-Events 2023-02-27 10:12:42 +01:00
Pablo Aragon e024658520 10454-Events 2023-02-27 09:57:17 +01:00
daniel 35241e0d38 restyling 2023-02-27 09:55:29 +01:00
daniel 7602ec1bd8 fixed styles 2023-02-24 14:28:07 +01:00
daniel 5477fdbb6c Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-24 13:45:14 +01:00
daniel 65ed10be1a restyling 2023-02-24 13:43:34 +01:00
Jose Gonzalez a6f1037c9a Minor fixes or improvements 2023-02-24 13:37:47 +01:00
daniel 3575e199b0 restyling 2023-02-24 10:46:46 +01:00
Pablo Aragon a28eb59ce0 10454-Fix filters 2023-02-24 10:06:32 +01:00
Pablo Aragon a9d49dea3b 10454-Fix filters 2023-02-24 10:04:23 +01:00
daniel b34515d03c restyling 2023-02-23 17:57:48 +01:00
daniel 1be0fb94b0 restyling 2023-02-23 16:30:18 +01:00
daniel 929680eb17 restyling 2023-02-23 16:00:13 +01:00
daniel fa81a4e744 restyling 2023-02-23 15:44:01 +01:00
Jose Gonzalez f08fc6a8b7 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-23 14:31:59 +01:00
Jose Gonzalez d7c70bd8a8 Tree view fixes 2023-02-23 14:30:31 +01:00
daniel 598a1b1456 restyling 2023-02-23 12:34:41 +01:00
daniel e672ba141b restyling 2023-02-23 11:00:38 +01:00
daniel ff9ee7a4f0 restyling 2023-02-23 10:24:03 +01:00
Jose Gonzalez 6180a42413 More pandora_black fixes 2023-02-22 21:19:28 +01:00
daniel e514a0efb5 fixed styles 2023-02-22 17:41:19 +01:00
Matias Didier f371747619 Merge branch 'ent-9479-gestion-de-modulos-desde-metaconsola-sustitucion-del-wizard' into 'develop' 
Ent 9479 gestion de modulos desde metaconsola sustitucion del wizard

See merge request artica/pandorafms!5509
 2023-02-22 15:09:19 +00:00
Pablo Aragon 1e384fd054 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-22 13:08:27 +01:00
Pablo Aragon 2081459556 10454-Fix event view 2023-02-22 13:08:15 +01:00
daniel 8230ae616b Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones 
Conflicts:
	pandora_console/godmode/users/user_list.php
	pandora_console/operation/events/events.php
 2023-02-22 12:35:34 +01:00
Daniel Cebrian 3d5458ae46 #10302 fixed ack date 2023-02-22 11:36:09 +01:00
Matias Didier cbbb874d7b Merge branch 'ent-10416-no-aplica-los-filtros-de-eventos-desde-servicio' into 'develop' 
Ent 10416 no aplica los filtros de eventos desde servicio

See merge request artica/pandorafms!5551
 2023-02-22 10:36:00 +00:00
alejandro.campos@artica.es b76a4b1a48 fix conflicts 2023-02-22 10:10:14 +01:00
Jonathan 005fbd27c1 Tree view meta fix 2023-02-21 11:20:17 +01:00
Jimmy Olano 016a4b7975 Merge branch 'ent-10267-limitar-bloque-de-pagina-en-la-vista-de-eventos' into 'develop' 
Ent 10267 limitar bloque de pagina en la vista de eventos

See merge request artica/pandorafms!5484
 2023-02-20 23:00:29 +00:00
Daniel Maya a615d2d98f #9662 minor fixed 2023-02-20 17:08:36 +01:00
Daniel Maya c6e32e278b #9662 fixed favourites 2023-02-20 16:41:54 +01:00
Jonathan 934851ae4e Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 15:58:52 +01:00
Jonathan fc68e6ead1 Monitor view meta fix status 2023-02-20 15:58:41 +01:00
Jose Gonzalez 6808fb0655 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-20 14:50:33 +01:00
Jose Gonzalez 8f21229246 Ticket 10467 Improve External Tools view 2023-02-20 14:50:17 +01:00
Jonathan 4bbf750944 Monitor view meta fix 2023-02-20 14:35:32 +01:00
Daniel Cebrian f67bf4d084 #10416 added name agent in filter event 2023-02-20 13:10:00 +01:00
Jose Gonzalez da58e4b9e0 Ticket 10484 Fixed List Operating Systems 2023-02-20 13:02:24 +01:00
Jose Gonzalez b0ee4a203a Ticket 10470 Agent improvements bis 2023-02-17 14:26:41 +01:00
Jose Gonzalez c1f8510563 Merge branch 'ent-9662-Restyling-fuentes-colores-botones' of brutus.artica.es:artica/pandorafms into ent-9662-Restyling-fuentes-colores-botones 2023-02-17 14:21:49 +01:00
Jose Gonzalez a1bf42c9f9 Ticket 10470 Agent improvements 2023-02-17 14:21:29 +01:00
Jose Gonzalez 8a5a25cd65 Ticket 10452 Status monitor view improve 2023-02-17 13:35:42 +01:00
Jonathan e6eed5e471 fix visual module graph and monitor details more details 2023-02-17 11:54:48 +01:00
Daniel Rodriguez 10d275c2a5 Merge branch 'ent-10428-carga-por-defecto-en-vista-de-monitores' into 'develop' 
Fix showing all modules on monitors view on firt load

See merge request artica/pandorafms!5541
 2023-02-15 15:04:30 +00:00
Diego Muñoz-Reja e34677e5f6 Merge branch 'ent-10195-offset-de-mapas' into 'develop' 
Ent 10195 offset de mapas

See merge request artica/pandorafms!5539
 2023-02-15 14:34:17 +00:00
Calvo 70291758c8 Fix showing all modules on monitors view on firt load 2023-02-15 14:25:43 +01:00
Daniel Maya 845a2d08c3 #10118 Changed id_group 2 2023-02-15 13:42:19 +01:00
Daniel Maya cac9f67153 #10195 Fixed minimap drawing 2023-02-15 10:49:31 +01:00
Daniel Maya 856fade86c #10118 Added spinner 2023-02-14 14:45:46 +01:00
Jose Gonzalez be33b2f51a Several visual fixes for fit with mockups 2023-02-14 14:06:51 +01:00
Daniel Maya ccb0cda305 #10118 changed CIDR input 2023-02-14 12:16:38 +01:00
Daniel Maya 5b263981c4 #10118 Added group multiselector 2023-02-13 17:06:09 +01:00
Pablo Aragon feb2f3ffa2 10092-Widget tree view, Not normal status 2023-02-13 15:03:23 +01:00
Daniel Maya b010965caa #9662 Fixed tactical view 2023-02-13 14:44:32 +01:00
Daniel Maya f5044e5673 #9662 Added new user edit link and changed label 2023-02-13 13:16:51 +01:00
Daniel Maya 4cd0820f11 #10118 Changed radio button 2023-02-13 11:44:01 +01:00
Jose Gonzalez d45a631ea5 Final merge with new menu 2023-02-13 10:37:37 +01:00
Jose Gonzalez 98736c1ab4 Merge 2023-02-13 10:24:07 +01:00
Jose Gonzalez d6eedf07aa Merge 2023-02-13 10:03:09 +01:00
Daniel Maya be3c7bca6c resolved conflict 2023-02-10 11:55:45 +01:00
Jose Gonzalez 175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
Daniel Cebrian 50e8b457f8 #10302 fixed tz in event list 2023-02-09 11:42:42 +01:00
Jose Gonzalez 4d9c6ab33a Minor fixes 2023-02-08 12:58:23 +01:00
Jose Gonzalez f14d324490 Minor fixes and improves 2023-02-08 12:43:08 +01:00
Jose Gonzalez 3a741f8ed9 Update icons and improve tables 2023-02-07 16:22:52 +01:00
Daniel Maya 758f906616 #9663 menu redesing 4 2023-02-07 15:22:51 +01:00
Pablo Aragon 5b538920f0 Merge branch 'ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms 2023-02-07 11:22:20 +01:00
Matias Didier 1d9c3a5f29 Merge branch 'ent-10249-guardia-problemas-en-grupos-anidados-para-visualizar-modulos-criticos' into 'develop' 
Ent 10249 guardia problemas en grupos anidados para visualizar modulos criticos

See merge request artica/pandorafms!5486
 2023-02-07 09:57:37 +00:00
Jonathan a2d7573d30 #9479 Create module and edit/delete on metaconsole 2023-02-06 16:44:14 +01:00
Pablo Aragon 6d85b912e2 9962-Omnishell in agent view 2023-02-06 16:34:40 +01:00
alejandro.campos@artica.es 1998829b85 Merge remote-tracking branch 'origin/develop' into ent-9884-Carga-restauracion-de-filtros-en-la-vista-de-monitores 2023-02-06 14:02:39 +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
Jose Gonzalez 0a61f6dcc7 WIP: User management View and BL 2023-02-03 14:10:26 +01:00
Daniel Maya 5d3b21b36d #10249 Fixed groups 2023-02-03 11:07:52 +01:00
Pablo Aragon 54e4da7aad Merge branch 'develop' into ent-9220-verificar-y-capar-en-su-caso-que-las-colecciones-no-funcionan-en-la-nms-2 2023-02-03 10:48:42 +01:00
Pablo Aragon 36fc9b2917 9987-New inventory view 2023-02-03 09:55:46 +01:00
Jose Gonzalez 2c8c1d4593 Minor fixes and improvements 2023-02-01 15:14:32 +01:00
alejandro.campos@artica.es 4d24f281fe fixed minor bug 2023-02-01 14:56:30 +01:00