Daniel Cebrian
|
e4d6737192
|
#10324 fixed system fav in meta
|
2023-03-14 09:42:26 +01:00 |
|
Daniel Cebrian
|
e36bb1d065
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-14 08:36:12 +01:00 |
artica
|
cf23817a7f
|
Auto-updated build strings.
|
2023-03-14 01:00:35 +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 |
Jonathan
|
fcdd585042
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-13 17:36:11 +01:00 |
|
Jonathan
|
4f2ab51252
|
UI Reporting PDF Changes
|
2023-03-13 17:36:04 +01:00 |
|
Daniel Cebrian
|
90f0c3771f
|
#10324 fixed deleted element fav menu
|
2023-03-13 17:21:28 +01:00 |
Diego Muñoz-Reja
|
fa2918e8ed
|
Merge branch 'ent-10229-AXITY-Update-jquery-para-solventar-vulnerabilidades' into 'develop'
updated jquery-ui library
See merge request artica/pandorafms!5564
|
2023-03-13 16:03:04 +00:00 |
|
Daniel Cebrian
|
64cc261483
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-13 16:48:47 +01:00 |
Jose Gonzalez
|
3ebfee9ccb
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-13 16:21:35 +01:00 |
|
Jose Gonzalez
|
c2ba5cfdd3
|
Agent status
|
2023-03-13 16:21:14 +01:00 |
Pablo Aragon
|
51ab985784
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-13 16:14:02 +01:00 |
|
Pablo Aragon
|
6450100f23
|
Manage agent, setup view
|
2023-03-13 16:13:49 +01:00 |
|
Jose Gonzalez
|
1c85038ffa
|
Discovery progress bars
|
2023-03-13 15:44:55 +01:00 |
|
Jose Gonzalez
|
3ae465c1fe
|
Fix header help icons
|
2023-03-13 14:33:42 +01:00 |
|
Jose Gonzalez
|
0624f16ce9
|
Minor fix
|
2023-03-13 14:23:54 +01:00 |
|
Jonathan
|
a0bffb79bd
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-13 14:21:17 +01:00 |
|
Jonathan
|
10c0d95f34
|
Reports PDFS changes
|
2023-03-13 14:21:10 +01:00 |
Calvo
|
8bdc528dc4
|
Merge remote-tracking branch 'origin/develop' into ent-10485-fix-inconsistency-between-lag-calculation-on-server-and-cosole
|
2023-03-13 12:58:14 +01:00 |
|
daniel
|
0643b4e0ba
|
fixed styles
|
2023-03-13 12:19:27 +01:00 |
|
Pablo Aragon
|
0203e5eba9
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-13 12:03:43 +01:00 |
|
Pablo Aragon
|
2cd09d7618
|
Datatable message info
|
2023-03-13 12:03:33 +01:00 |
|
Jose Gonzalez
|
590e7a3978
|
Netflow improvements
|
2023-03-13 11:25:43 +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 |
|
Jonathan
|
80076434b3
|
SNMP visual fix staticts
|
2023-03-13 10:29:03 +01:00 |
|
Jose Gonzalez
|
bbec6a92a4
|
Minor fixes
|
2023-03-13 09:35:12 +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
|
3c614c7c46
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-13 09:01:59 +01:00 |
|
Daniel Cebrian
|
dfa2ab818e
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-13 08:53:35 +01:00 |
|
daniel
|
60f8c9bc95
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-13 07:55:43 +01:00 |
|
artica
|
87e165ff80
|
Auto-updated build strings.
|
2023-03-13 01:00:18 +01:00 |
|
artica
|
ef04e54058
|
Auto-updated build strings.
|
2023-03-12 01:00:40 +01:00 |
|
Jose Gonzalez
|
d449179765
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-11 02:10:23 +01:00 |
|
Jose Gonzalez
|
f553019a40
|
Minor fixes
|
2023-03-11 02:10:16 +01:00 |
|
artica
|
a4d1d2c9b2
|
Auto-updated build strings.
|
2023-03-11 01:00:20 +01:00 |
|
daniel
|
dcfaaea016
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-10 14:50:31 +01:00 |
|
daniel
|
8778fcea93
|
fixed styles
|
2023-03-10 14:49:38 +01:00 |
|
Jose Gonzalez
|
f875fe674e
|
Fix main_menu_icons
|
2023-03-10 12:52:18 +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 |
|
Jose Gonzalez
|
bb6bf85537
|
Minor visual fixes
|
2023-03-10 12:48:31 +01:00 |
|
Jose Gonzalez
|
dc216ff788
|
Tree view black
|
2023-03-10 12:47:44 +01:00 |
|
daniel
|
3be507ca7e
|
fixed styles
|
2023-03-10 12:40:21 +01:00 |
|
Pablo Aragon
|
b785696acd
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-10 12:29:24 +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
|
3f884d9aff
|
Tree View fixed
|
2023-03-10 11:09:36 +01:00 |
|
Pablo Aragon
|
4ebe7ee790
|
9680-Conflict
|
2023-03-10 09:38:55 +01:00 |
|
Pablo Aragon
|
92e5c4efa0
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-10 08:40:48 +01:00 |
|
Pablo Aragon
|
ae6159c7a1
|
Events
|
2023-03-10 08:40:38 +01:00 |