Alejandro Gallardo Escobar
|
62792c078f
|
Visual Console Refactor: refactored the events history item to return its HTML representation
Former-commit-id: 8b29503a24b1877c645a3b9856d09ee2db947f99
|
2019-04-02 13:00:49 +02:00 |
|
Alejandro Gallardo Escobar
|
6c53833484
|
Visual Console Refactor: changed the visibility of a pair of functions
Former-commit-id: 8c42603b455cfda671a5eee5a3054a77c3eda845
|
2019-04-02 13:00:03 +02:00 |
|
Alejandro Gallardo Escobar
|
73a7842ac1
|
Merge branch 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' into 'visual-console-refactor'
created item class and test
See merge request artica/pandorafms!2277
Former-commit-id: db7ad849637af4fb2839625078b51c511a4b564f
|
2019-04-01 13:05:28 +02:00 |
|
Alejandro Gallardo Escobar
|
8c1076453f
|
Visual Console Refactor: added the events history item to the visual console container
Former-commit-id: 0105d2cc1a93a24e0d53df8fe057ef233d8a2843
|
2019-04-01 11:50:30 +02:00 |
|
Alejandro Gallardo Escobar
|
ae0ca5a204
|
Visual Console Refactor: finished the events history item and added new lib functions
Former-commit-id: b54534b7e5a44764622e2f99c18f4f5edc6703f6
|
2019-04-01 11:16:46 +02:00 |
|
Alejandro Gallardo Escobar
|
ebbd131941
|
Visual Console Client: Upgraded the dependencies
Former-commit-id: cec7459402c6f3f6558c8a64918ad377ca0ea8f3
|
2019-04-01 09:56:33 +02:00 |
Alejandro Gallardo Escobar
|
8be5cc6a38
|
Visual Console Item: removed some warning messages
Former-commit-id: e498e29eda0f790669a3343265c7b923773482b0
|
2019-03-29 11:57:14 +01:00 |
|
Alejandro Gallardo Escobar
|
470d0b71d1
|
Visual Console Refactor: finished the label support
Former-commit-id: d09e3ac1a35722d6531817e5c935e4b582a5e0eb
|
2019-03-29 11:54:01 +01:00 |
|
Alejandro Gallardo Escobar
|
129c4ad3dd
|
Visual Console Refactor: WIP
Former-commit-id: f201bf5320f460fe1c57bd31c683a0cb7c7293b0
|
2019-03-28 17:59:35 +01:00 |
Daniel Maya
|
58f6fac29e
|
Added colorCloud and changes in clock item
Former-commit-id: 19a053332ae6a30a60f2fb88611a0ad74d447bb5
|
2019-03-28 17:55:32 +01:00 |
|
Daniel Maya
|
4c08987ece
|
Merge branch 'develop' into ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual
Former-commit-id: f235e3324cbf60afc015a870b9464b6bcf7bd89a
|
2019-03-28 09:52:14 +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 |
|
Daniel Maya
|
f516c6d36a
|
Added EventsHistory, SimpleValue and StaticGraph
Former-commit-id: 9e56eb3df9997f0d601db774a7131f783cc3dfe9
|
2019-03-27 13:42:40 +01:00 |
|
Alejandro Gallardo Escobar
|
faf2332329
|
Visual Console Refactor: added the label and simple value items to the client
Former-commit-id: d13d210abf0dcfaf2cb2567bc05b143a128cbd55
|
2019-03-27 13:37:00 +01:00 |
|
Alejandro Gallardo Escobar
|
e76fe00345
|
Visual Console Refactor: style fix
Former-commit-id: 0d6fca07daa192d98cf4e20e325b9dfe09c112bd
|
2019-03-27 13:36:22 +01:00 |
|
Alejandro Gallardo Escobar
|
7c9fb73c82
|
Visual Console Refactor: upgraded the dependencies
Former-commit-id: ddef1f1a126c4aa06559c548889a0d4a9efb4f5b
|
2019-03-27 13:35:50 +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 |
|
Alejandro Gallardo Escobar
|
8d95afc9ea
|
Merge branch 'ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3733-Crear-modelos-de-los-distintos-recursos-de-la-Consola-Visual
Former-commit-id: 40a12a5a5331fb53fed7fcfce30ba1e327494c59
|
2019-03-26 18:46:52 +01:00 |
|
Alejandro Gallardo Escobar
|
ab793257ad
|
Visual Console Refactor: minor fix
Former-commit-id: 4350b8342f0a813c7283bd8a2bf2a3a76b677c5a
|
2019-03-26 18:46:48 +01:00 |
|
Daniel Barbero Martin
|
4cd06539a2
|
fixed minor error refresh header
Former-commit-id: 5fd75dd4fe634760c37fb06a16cc127c9cbfc71d
|
2019-03-26 18:37:49 +01:00 |