fbsanchez
|
970a10ba50
|
fixes in non agent per database
Former-commit-id: 7b34ea990bf52c96d4d6f65f11cf2949c199f2db
|
2019-04-05 10:41:37 +02:00 |
|
fbsanchez
|
db9068e25a
|
fixes in non agent per database
Former-commit-id: 180cf7269886787b17dc359bf941b5ce5e1b1313
|
2019-04-05 10:41:09 +02:00 |
|
fbsanchez
|
e76a5af441
|
minor fix parent link
Former-commit-id: a2330dd0159ad58c454a06b7efe16699f7cee84a
|
2019-04-04 18:20:26 +02:00 |
|
fbsanchez
|
143c501a6e
|
minor fixes
Former-commit-id: 8d8c891a963b0e03838c2bf184b5da6bed01b2a9
|
2019-04-04 17:08:31 +02:00 |
|
fbsanchez
|
1274380270
|
minor fix
Former-commit-id: a012c8155cd1d950044bc2c0531ee2abd9e89d07
|
2019-04-04 16:07:50 +02:00 |
|
fbsanchez
|
56f2acbbf1
|
discovery.app.mysql rc1
Former-commit-id: 51304e872d375b480cbbf88d058b1804106afb98
|
2019-04-04 16:05:16 +02:00 |
|
fbsanchez
|
ce9f9eab4e
|
rc1 mysql recon
Former-commit-id: 51e000229d6c2c94e59e8eeb8ef77d539ee6c775
|
2019-04-04 16:00:08 +02:00 |
|
fbsanchez
|
fcafe76943
|
wip discovery f34
Former-commit-id: bb08450d3304ff140c4bae37e77b20a2329c600b
|
2019-04-04 12:28:17 +02:00 |
|
fbsanchez
|
9e83f139e1
|
WIP discovery f3
Former-commit-id: cee7ee096e0a0c065bc4312a149ee223303224fc
|
2019-04-03 22:52:37 +02:00 |
|
fbsanchez
|
654e0c28f6
|
WIP discovery F3 app db my multiserver
Former-commit-id: a85c048a6d4e755b76a7e042e04cfebdfe69b6f4
|
2019-04-03 22:44:06 +02:00 |
|
fbsanchez
|
74303168ac
|
WIP discovery F3
Former-commit-id: 493d05714a31c2f91f7b8ea5445397ebf1c526d7
|
2019-04-03 21:55:11 +02:00 |
|
fbsanchez
|
60f37eac57
|
removed unused folders
Former-commit-id: 4c1870e836e7f05dd5a312e41c4f1f86bff26e22
|
2019-04-03 21:08:52 +02:00 |
|
fbsanchez
|
798a2aad16
|
WIP discovery F3
Former-commit-id: 19570468cf4de9f600ab9a01468d1e59c69e6939
|
2019-04-03 18:13:19 +02:00 |
|
fbsanchez
|
11b2fbc245
|
WIP db
Former-commit-id: 3c231b9d90dc6c9fae5e7e398e829c8c28ffeed9
|
2019-04-02 16:25:29 +02:00 |
|
fbsanchez
|
b0a6ea7415
|
WIP atomic JS map. Minor fix to keep working
Former-commit-id: fee809008311942f1d9ad14aea70ba78e3d6eb3a
|
2019-03-29 20:52:51 +01:00 |
|
fbsanchez
|
4854d4b2df
|
WIP atomic JS map
Former-commit-id: 95736d11295948e5dc20aefcf1293b7882729588
|
2019-03-29 20:31:55 +01:00 |
artica
|
2a96b610d9
|
Auto-updated build strings.
Former-commit-id: eef26e4d622c8068249de564ee37638343f22dc0
|
2019-03-29 00:01:24 +01:00 |
|
artica
|
98a9c62de9
|
Auto-updated build strings.
Former-commit-id: 84db7098e01d25e6f503f49f9170215880e74088
|
2019-03-28 00:01:30 +01:00 |
|
fbsanchez
|
1299d6c7d6
|
Merge branch 'fix/netmap' into 'develop'
minor fix
See merge request artica/pandorafms!2307
Former-commit-id: cd6071765c1e9be5d05ed7283f0a49146ac46cb7
|
2019-03-27 18:34:35 +01:00 |
|
fbsanchez
|
086ee0620e
|
minor fix
Former-commit-id: ada4bf4a5cea2a2e534248e924996a4db0810bb2
|
2019-03-27 18:31:02 +01:00 |
|
fbsanchez
|
c85a84673f
|
Merge branch 'fix/mr26' into 'develop'
fix mr 26
See merge request artica/pandorafms!2306
Former-commit-id: d90f41df35dfbe7655af56648ca40ec9e9b3cc43
|
2019-03-27 17:57:24 +01:00 |
|
fbsanchez
|
128a97d254
|
fix mr 26
Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef
|
2019-03-27 17:38:08 +01:00 |
|
fbsanchez
|
0f30633094
|
Merge branch 'fix/mr' into 'develop'
minor fix
See merge request artica/pandorafms!2304
Former-commit-id: f24ca3e2617a696adb9de32ad5fd1bd5f5b14111
|
2019-03-27 17:27:39 +01:00 |
|
fbsanchez
|
144cf1177d
|
fix tasklist map
Former-commit-id: 4f1195c265f4298b7303597be43b3399fa32f4e3
|
2019-03-27 17:12:38 +01:00 |
|
fbsanchez
|
66b2102052
|
Merge remote-tracking branch 'origin/develop' into fix/mr
Former-commit-id: a95ef0c2110e1c0b7be3e9c6cd93543f79e0f230
|
2019-03-27 17:09:46 +01:00 |
|
fbsanchez
|
6ebbe54448
|
minor fix
Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97
|
2019-03-27 17:06:14 +01:00 |
|
fbsanchez
|
160a72d780
|
Merge branch 'fix/delete' into 'develop'
errata fix
See merge request artica/pandorafms!2303
Former-commit-id: 2dc2834075b9491712dbd37ac087b9e20c274059
|
2019-03-27 16:51:19 +01:00 |
|
fbsanchez
|
2dd427100e
|
errata fix
Former-commit-id: 3e4ce53635dc02387ec1d2d46698fa4a81372dd0
|
2019-03-27 16:44:08 +01:00 |
artica
|
74cb6970dc
|
Updated version and build strings.
Former-commit-id: f5c1433f1fcbc61ab069c275f72673b029b98af4
|
2019-03-27 16:36:00 +01:00 |
Daniel Rodriguez
|
8426374776
|
Merge branch 'ent-3776-Menú-lateral-debe-aparecer-desplegado-por-defecto-2' into 'develop'
fix pandora logo image path
See merge request artica/pandorafms!2302
Former-commit-id: 7b4fbefe53b68c12ad8c4daf8e6d0c4dd283e2d1
|
2019-03-27 16:30:55 +01:00 |
alejandro-campos
|
082e5f06d6
|
fix pandora logo image path
Former-commit-id: 92bc151f8e988758af7381ca95b8055ec7a23d5e
|
2019-03-27 16:26:47 +01:00 |
|
Daniel Rodriguez
|
f7cf7c65ac
|
Merge branch 'fix/menu' into 'develop'
minor fix menu
See merge request artica/pandorafms!2300
Former-commit-id: d40a7d3a84f1de2de7283ff134bc720ed14a59ca
|
2019-03-27 16:00:56 +01:00 |
|
fbsanchez
|
fb818064ed
|
minor fix menu
Former-commit-id: 6d0ca2d3d86af083c91a098326dc073d90187ab0
|
2019-03-27 14:39:02 +01:00 |
|
Daniel Rodriguez
|
2aaa1b1412
|
Merge branch 'ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1' into 'develop'
Ent 3409 pandora network traffic analyzer ntop fork fase 1
See merge request artica/pandorafms!2152
Former-commit-id: 104e4bef1196931bce49c535ac7eb4dbe68b1802
|
2019-03-27 13:47:23 +01:00 |
fermin831
|
7b901be5fa
|
Changed default font size name on NetworkMap class
Former-commit-id: b1437a7e03eba758d83386166db0063a5fcaf12f
|
2019-03-27 12:42:54 +01:00 |
|
fermin831
|
39a69dffde
|
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Former-commit-id: ed8c38ad5988ffd5fab62ede1b7ea22b24398f8f
|
2019-03-27 12:26:11 +01:00 |
Alejandro Fraguas
|
edefd16a21
|
Merge branch 'ent-3595-discovery-fase-2' into 'develop'
Ent 3595 discovery fase 2
See merge request artica/pandorafms!2230
Former-commit-id: 2d5e2e4ff57612c727f20357bfb9de5b8c29ae72
|
2019-03-27 12:13:06 +01:00 |
|
fermin831
|
b2f046e4d6
|
Merge remote-tracking branch 'origin/ent-3595-discovery-fase-2' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/extras/mr/26.sql
pandora_console/include/class/ConsoleSupervisor.php
pandora_console/include/class/NetworkMap.class.php
pandora_console/include/styles/pandora.css
pandora_console/operation/menu.php
Former-commit-id: 2a0661a65772d4a91f95587d77b0d1287fb66b18
|
2019-03-27 12:11:23 +01:00 |
|
fermin831
|
9ee095406b
|
Merge remote-tracking branch 'origin/develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
Former-commit-id: 7bdd1bfbcbc43410fb05465418979f4d085fa230
|
2019-03-27 11:59:25 +01:00 |
|
Daniel Rodriguez
|
eacdf6ffc9
|
Merge branch 'ent-3666-fallo-rendimiento-informes-sla-disponibilidad-carrefour' into 'develop'
removed old useless code
See merge request artica/pandorafms!2241
Former-commit-id: 53aecf83239855335278d2b7068fd32dfe856c96
|
2019-03-27 11:52:55 +01:00 |
|
fbsanchez
|
3c853ff508
|
widget networkmap simple working
Former-commit-id: 7a922350fbedefae374f89517e69863d60a8fbee
|
2019-03-27 11:47:09 +01:00 |
|
fbsanchez
|
3038de3a9d
|
minor fixes
Former-commit-id: 73dbbaa42f3b6120400da688dee7a0499bf31796
|
2019-03-27 11:06:57 +01:00 |
|
fbsanchez
|
c717baafc0
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 70601a390ebca2a1530b77c86a83c19e29e98261
|
2019-03-27 10:53:46 +01:00 |
|
artica
|
8160983e36
|
Auto-updated build strings.
Former-commit-id: 00a94a2b9b56bbb245f3389855c734f7af14d874
|
2019-03-27 00:01:24 +01:00 |
|
fbsanchez
|
ca5c214472
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 8952ebd872b4030cb8e1bd4ad3f0425afd13fd09
|
2019-03-26 19:30:55 +01:00 |
|
fbsanchez
|
94bb818e6d
|
Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
Former-commit-id: 9e6ab3e90c11a0849550bca777aead3a25ee7bdd
|
2019-03-26 19:30:40 +01:00 |
|
fbsanchez
|
ba0ddfb826
|
style revission
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
|
2019-03-26 19:29:48 +01:00 |
|
Daniel Rodriguez
|
b7267dfafa
|
Merge branch 'ent-3774-Autorefresh_no_se_deshabilita' into 'develop'
fixed minor error header disabled
See merge request artica/pandorafms!2297
Former-commit-id: ffc6904ecfa47e41ea87b867f8650c237ee1877a
|
2019-03-26 18:49:27 +01:00 |
Daniel Barbero Martin
|
5504741a9d
|
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Conflicts:
pandora_console/include/class/ConsoleSupervisor.php
Former-commit-id: d734637dea22b18b1d30a3d8575cd45500558e29
|
2019-03-26 18:48:49 +01:00 |
|
Daniel Barbero Martin
|
4cd06539a2
|
fixed minor error refresh header
Former-commit-id: 5fd75dd4fe634760c37fb06a16cc127c9cbfc71d
|
2019-03-26 18:37:49 +01:00 |