626aacbf43
Merge remote-tracking branch 'origin/develop' into ent-3445-Solucionar_problematica_flip_flop
...
Former-commit-id: 26e21338ea5e7578a4247771d19df75d01e6234e
2019-03-28 08:49:08 +01:00
98a9c62de9
Auto-updated build strings.
...
Former-commit-id: 84db7098e01d25e6f503f49f9170215880e74088
2019-03-28 00:01:30 +01:00
086ee0620e
minor fix
...
Former-commit-id: ada4bf4a5cea2a2e534248e924996a4db0810bb2
2019-03-27 18:31:02 +01:00
a3865a3181
flip flop keep counters
...
Former-commit-id: 0d39875c7a78f4be07fdffcf76a686007333c626
2019-03-27 18:16:53 +01:00
128a97d254
fix mr 26
...
Former-commit-id: 72c38dbc1bc8ac4973d6f19cf111ce107497e4ef
2019-03-27 17:38:08 +01:00
144cf1177d
fix tasklist map
...
Former-commit-id: 4f1195c265f4298b7303597be43b3399fa32f4e3
2019-03-27 17:12:38 +01:00
66b2102052
Merge remote-tracking branch 'origin/develop' into fix/mr
...
Former-commit-id: a95ef0c2110e1c0b7be3e9c6cd93543f79e0f230
2019-03-27 17:09:46 +01:00
6ebbe54448
minor fix
...
Former-commit-id: 252895bd6c64e5a1cb593ba705fb15a2ec6bed97
2019-03-27 17:06:14 +01:00
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
2dd427100e
errata fix
...
Former-commit-id: 3e4ce53635dc02387ec1d2d46698fa4a81372dd0
2019-03-27 16:44:08 +01:00
74cb6970dc
Updated version and build strings.
...
Former-commit-id: f5c1433f1fcbc61ab069c275f72673b029b98af4
2019-03-27 16:36:00 +01:00
082e5f06d6
fix pandora logo image path
...
Former-commit-id: 92bc151f8e988758af7381ca95b8055ec7a23d5e
2019-03-27 16:26:47 +01:00
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
fb818064ed
minor fix menu
...
Former-commit-id: 6d0ca2d3d86af083c91a098326dc073d90187ab0
2019-03-27 14:39:02 +01:00
7b901be5fa
Changed default font size name on NetworkMap class
...
Former-commit-id: b1437a7e03eba758d83386166db0063a5fcaf12f
2019-03-27 12:42:54 +01:00
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
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
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
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
3c853ff508
widget networkmap simple working
...
Former-commit-id: 7a922350fbedefae374f89517e69863d60a8fbee
2019-03-27 11:47:09 +01:00
3038de3a9d
minor fixes
...
Former-commit-id: 73dbbaa42f3b6120400da688dee7a0499bf31796
2019-03-27 11:06:57 +01:00
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
8160983e36
Auto-updated build strings.
...
Former-commit-id: 00a94a2b9b56bbb245f3389855c734f7af14d874
2019-03-27 00:01:24 +01:00
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
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
ba0ddfb826
style revission
...
Former-commit-id: d223662de64194115cf56264ceda987e732eb79a
2019-03-26 19:29:48 +01:00
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
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
4cd06539a2
fixed minor error refresh header
...
Former-commit-id: 5fd75dd4fe634760c37fb06a16cc127c9cbfc71d
2019-03-26 18:37:49 +01:00
004fec7454
Revert "fixed minor error header disabled"
...
This reverts commit 2cf945a5e3
2019-03-26 18:35:56 +01:00
0982cd61b5
Merge branch 'ent-3568-limitar-acceso-a-la-consola-cuando-se-supere-el-limite-de-agentes' into 'develop'
...
Ent 3568 limitar acceso a la consola cuando se supere el limite de agentes
See merge request artica/pandorafms!2293
Former-commit-id: caedaf6470c3fbea8d76db4b61a5a8d241dc7830
2019-03-26 18:04:56 +01:00
2cf945a5e3
fixed minor error header disabled
...
Former-commit-id: 87ac8d400ac83f316bf8efb1fca6afe2d60e6c8c
2019-03-26 17:59:00 +01:00
08a240746c
breadcrum improvement discovery
...
Former-commit-id: af861b0601e50dbe45ed1cab77ce5ab6f26d3fad
2019-03-26 17:28:31 +01:00
19bf0ae940
Merge branch 'ent-3595-discovery-fase-2' of brutus.artica.lan:artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: f1c63c2e0be43e9c01306375446fc1eaa3c039ef
2019-03-26 17:22:36 +01:00
db39c3921b
fixed minor error tasklist
...
Former-commit-id: 1ee10794b09e17c3b8403dfe5540195047595577
2019-03-26 17:22:14 +01:00
3316d19bd3
minor fix
...
Former-commit-id: ff5da555c29cdde5d632e090f2b9ac779ead262f
2019-03-26 17:00:20 +01:00
ee6ab43a8c
minor fix
...
Former-commit-id: e1a238bd34f4264e6be9c8a826cc1057578dd0a7
2019-03-26 16:54:11 +01:00
a76ad27825
minor fixes
...
Former-commit-id: f885316b4f063daac744ca458fa3d41a16d5d81b
2019-03-26 16:51:09 +01:00
2d1463ee0c
minor fixes networkmaps
...
Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
2019-03-26 16:46:32 +01:00
511295f1c6
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: f43d6ace220a8058f91d115386bdf56e59550cbe
2019-03-26 16:32:19 +01:00
a0f4eb1910
change discovery page title
...
Former-commit-id: 81bf2dc3d489acc1871f6c4cd385fc0f1c1b43aa
2019-03-26 16:10:03 +01:00
0d8322aeda
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: a9ac8888641116a4e98fbe7ac2d99901e771f275
2019-03-26 15:42:47 +01:00
ec999341ba
change discovery headers and add breadcrumbs to them
...
Former-commit-id: 93183474aabaeccfd3893cacd78c4d6ddf764502
2019-03-26 15:42:33 +01:00
e3b0b7ad11
fixed update progress bars task for 3 second
...
Former-commit-id: 7558c33e8540007608f7afd97ebf03e193a08def
2019-03-26 15:38:47 +01:00
fa7cdc020b
Add a countdown to license error messages.
...
Former-commit-id: bba7ccf777c05801731a790351dc9920b1546262
2019-03-26 15:32:57 +01:00
aa0ab53cf3
Clear license errors when logging in.
...
Former-commit-id: 1f68f190ebc84202b0e39b92c12d065f8b52543c
2019-03-26 15:31:51 +01:00
f880d9202a
Adde no popup configuration token to avoid to show tooltips
...
Former-commit-id: d5b6260a065b40dfbc498db077a610c35a9e0fb3
2019-03-26 15:27:45 +01:00
f2e710907a
Normalized network/netflow interval-start ddate switch
...
Former-commit-id: 2cce98339fbcca9e7ef6bf29e7ace2d81c5ff525
2019-03-26 15:01:56 +01:00
d1bd5fbb1a
Merge branch 'ent-3595-discovery-fase-2' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3595-discovery-fase-2
...
Former-commit-id: 914a944b96af8bceb26bbb89dbac25452097e20a
2019-03-26 13:06:12 +01:00
a7ff654826
Removed output in netflow filter
...
Former-commit-id: 4f2cfac6efe1482c86179601bac88826057e7d5c
2019-03-26 11:58:31 +01:00
Daniel Barbero Martin
artica
fbsanchez
artica
alejandro-campos
Daniel Rodriguez
fermin831
Alejandro Fraguas
Ramon Novoa