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
|
6e4fe7bc48
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-14 14:56:52 +01:00 |
|
Pablo Aragon
|
658f2853f7
|
Dashboards widgets
|
2023-03-14 14:56:33 +01:00 |
Jonathan
|
9f953809a0
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-14 13:26:31 +01:00 |
|
Jonathan
|
00ba02e23e
|
Visual changes PDFs slicebar
|
2023-03-14 13:26:21 +01:00 |
Daniel Cebrian
|
e36bb1d065
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-14 08:36:12 +01:00 |
Jose Gonzalez
|
3ab0b1c4cb
|
Minor fixes
|
2023-03-14 08:04:48 +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 |
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 |
|
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 |
|
daniel
|
0643b4e0ba
|
fixed styles
|
2023-03-13 12:19:27 +01:00 |
|
Pablo Aragon
|
2cd09d7618
|
Datatable message info
|
2023-03-13 12:03:33 +01:00 |
|
Jonathan
|
80076434b3
|
SNMP visual fix staticts
|
2023-03-13 10:29:03 +01:00 |
|
Daniel Cebrian
|
dfa2ab818e
|
Merge branch 'develop' into ent-10324-sistema-de-favoritos
|
2023-03-13 08:53:35 +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 |
|
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
|
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
|
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 |
|
daniel
|
8736629954
|
fixed styles
|
2023-03-10 08:38:44 +01:00 |
|
daniel
|
9aa5d76963
|
Merge remote-tracking branch 'origin/develop' into ent-9662-second-round
|
2023-03-09 20:00:32 +01:00 |
|
daniel
|
89b3be06f9
|
fixed styles
|
2023-03-09 19:57:37 +01:00 |
|
daniel
|
6d0b0039c5
|
fixed styles
|
2023-03-09 19:25:14 +01:00 |
|
Pablo Aragon
|
188ad07be0
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-09 17:21:29 +01:00 |
|
Pablo Aragon
|
d3ed5a93fc
|
Admin tools
|
2023-03-09 17:21:18 +01:00 |
|
Jose Gonzalez
|
a41811ee58
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-09 16:37:49 +01:00 |
|
Jose Gonzalez
|
a9abda1fd4
|
Network maps adjust
|
2023-03-09 16:37:43 +01:00 |
Rafael Ameijeiras
|
bcc1775b1b
|
Merge branch 'ent-10350-GISS-Pierden-acceso-a-Metaconsola-mientras-dura-la-ejecucion-de-pandoradb' into 'develop'
handling synchronizer instantiation when metaconsole is merging
See merge request artica/pandorafms!5580
|
2023-03-09 15:28:20 +00:00 |
|
Pablo Aragon
|
cbc05f7ea0
|
Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round
|
2023-03-09 15:15:06 +01:00 |