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

770 Commits

Author SHA1 Message Date
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 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
Jose Gonzalez 175d4b7341 Fixes in Event view and other fixes 2023-02-09 16:13:30 +01:00
Pablo Aragon 971fc84a47 9680-Create widget ModulesByStatus 2023-02-09 10:12:59 +01:00
Jose Gonzalez e99ad97e17 Fixes and improvements 2023-02-07 15:33:29 +01:00
Pablo Aragon 6d85b912e2 9962-Omnishell in agent view 2023-02-06 16:34:40 +01:00