Jonathan
|
8c3b5d650d
|
tree view dashboard metaconsole
|
2023-03-29 16:50:17 +02:00 |
Alejandro Campos
|
e909686ddc
|
Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob'
# Conflicts:
# pandora_console/extras/mr/62.sql
|
2023-03-28 14:09:33 +00: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
|
56e4770b93
|
fixed styles
|
2023-03-23 14:20:54 +01:00 |
Daniel Maya
|
52231615f6
|
Merge branch 'develop' into ent-8642-nuevo-widget-heatmap
|
2023-03-23 11:51:54 +01:00 |
Pablo Aragon
|
e2820d1ad7
|
9680-Fix widget
|
2023-03-23 09:18:39 +01:00 |
|
Jonathan
|
30538265e8
|
Cluster wizzard visual fix
|
2023-03-15 16:06:42 +01:00 |
|
Pablo Aragon
|
00a5e8e84b
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-15 11:30:40 +01:00 |
|
Pablo Aragon
|
938e8cd777
|
Dashboards widgets
|
2023-03-15 11:30:22 +01:00 |
|
daniel
|
cec81f1cc2
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
Conflicts:
pandora_console/extras/mr/62.sql
|
2023-03-14 18:17:54 +01:00 |
|
Pablo Aragon
|
620bff28af
|
Dashboards widgets
|
2023-03-14 15:59:20 +01:00 |
|
Pablo Aragon
|
658f2853f7
|
Dashboards widgets
|
2023-03-14 14:56:33 +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 |
|
daniel
|
c96ac79726
|
fixed styles
|
2023-03-13 19:30:51 +01:00 |
|
Daniel Cebrian
|
90f0c3771f
|
#10324 fixed deleted element fav menu
|
2023-03-13 17:21:28 +01:00 |
|
Daniel Cebrian
|
64cc261483
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-13 16:48:47 +01:00 |
|
Daniel Maya
|
0e4d423825
|
Merge branch 'develop' into ent-8642-nuevo-widget-heatmap
|
2023-03-13 15:17:18 +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 |
|
alejandro.campos@artica.es
|
39a119d150
|
Merge remote-tracking branch 'origin/develop' into ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob
|
2023-03-10 13:29:20 +01:00 |
|
Daniel Maya
|
030a37a5da
|
Merge branch 'develop' into ent-8642-nuevo-widget-heatmap
|
2023-03-10 12:19:00 +01:00 |
|
Pablo Aragon
|
4ebe7ee790
|
9680-Conflict
|
2023-03-10 09:38:55 +01:00 |
Jose Gonzalez
|
edbc9d8f6b
|
Icons review
|
2023-03-09 23:31:40 +01:00 |
|
Jonathan
|
1e2657fed3
|
Chart generator bug solution
|
2023-03-09 14:15:18 +01:00 |
|
Daniel Cebrian
|
3ec11f4c9d
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-08 12:55:53 +01:00 |
|
Daniel Cebrian
|
fdc73be979
|
Merge branch 'develop' into ent-10347-vista-tactica-de-grupo
|
2023-03-07 13:19:52 +01:00 |
|
Jose Gonzalez
|
5ecc3470e2
|
Tree View in dashboard minor fixes
|
2023-03-06 23:48:06 +01:00 |
|
daniel
|
5ba9e0e9aa
|
fixed styles
|
2023-03-06 16:21:10 +01:00 |
|
Jose Gonzalez
|
e33a9bc3e4
|
Services TreeView
|
2023-03-06 13:32:21 +01:00 |
|
Pablo Aragon
|
daf179f1f6
|
Conflit resolved
|
2023-03-06 08:32:28 +01:00 |
|
daniel
|
f6e063b981
|
Merge remote-tracking branch 'origin/develop' into ent-9662-Restyling-fuentes-colores-botones
Conflicts:
pandora_console/include/class/SnmpConsole.class.php
|
2023-03-06 08:09:29 +01:00 |
Jimmy Olano
|
6b55c65330
|
Merge branch 'ent-10092-14739-peticion-de-filtro-en-widget-tree-view' into 'develop', JJOS.
Ent 10092 14739 peticion de filtro en widget tree view
See merge request artica/pandorafms!5532
|
2023-03-05 22:56:35 +00:00 |
|
daniel
|
ff3b7001c3
|
fixed styles
|
2023-03-04 13:22:52 +01:00 |
|
Daniel Cebrian
|
7562a9253a
|
#10347 refactoring and add link to events in graph
|
2023-03-03 13:13:49 +01:00 |
|
Alejandro Campos
|
3ddb3c1034
|
Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob'
# Conflicts:
# pandora_console/extras/mr/62.sql
# pandora_console/pandoradb.sql
|
2023-03-03 08:12:57 +00:00 |
|
daniel
|
310ad88707
|
fixed styles
|
2023-03-02 19:25:31 +01:00 |
|
Daniel Cebrian
|
af5a620883
|
#10347 fixed urls monitors and added name group
|
2023-03-02 16:22:25 +01:00 |
|
Daniel Cebrian
|
dc6256058f
|
#10347 added list agents in tactical view groups
|
2023-03-02 13:48:14 +01:00 |
|
Daniel Cebrian
|
a4a5650a01
|
#10347 added modal in heatmap agent
|
2023-03-02 11:10:37 +01: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 Cebrian
|
ea51399460
|
#10347 create view tactic for groups with monitoring and alerts
|
2023-03-01 17:27:32 +01:00 |
|
Daniel Cebrian
|
08fb4e3396
|
#10324 fixed delete element in favmenu
|
2023-02-27 10:07:35 +01:00 |
|
Daniel Cebrian
|
728991ad9a
|
#10324 delete fav menu when delete element
|
2023-02-24 13:36:13 +01:00 |
|
alejandro.campos@artica.es
|
6c64ccd6d6
|
implemented consoles management
|
2023-02-21 15:32:45 +01:00 |
|
Daniel Maya
|
d4f6baa9bb
|
#8642 Added heatmap widget 2
|
2023-02-21 15:06:58 +01:00 |
|
Daniel Maya
|
6efaa2bbc6
|
#8642 Added heatmap widget
|
2023-02-21 15:06:15 +01:00 |
|
Jonathan
|
005fbd27c1
|
Tree view meta fix
|
2023-02-21 11:20:17 +01:00 |