74cb6970dc
Updated version and build strings.
...
Former-commit-id: f5c1433f1fcbc61ab069c275f72673b029b98af4
2019-03-27 16:36:00 +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
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
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
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
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
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
f880d9202a
Adde no popup configuration token to avoid to show tooltips
...
Former-commit-id: d5b6260a065b40dfbc498db077a610c35a9e0fb3
2019-03-26 15:27:45 +01:00
c25143c27e
Add a notification for 'limited mode'.
...
Former-commit-id: dce72c7a9ea452029e5650a2012ff35cc6eca9b8
2019-03-26 11:53:03 +01:00
d740b32810
Add support for DESTDIR.
...
Former-commit-id: 0252a660a3d8250657cd5f7b8fcfd620172c8a65
2019-03-26 11:47:20 +01:00
c1536b7978
Do not crash if an extension cannot be loaded.
...
Former-commit-id: f303be21ceabe052545e53e1a4b6bcd08a4526c2
2019-03-26 11:46:50 +01:00
d05b78520f
minor style fix tasklist popup
...
Former-commit-id: 628e94f56a92558e3af648520ca13d4fb658d184
2019-03-26 11:09:17 +01:00
174256ab70
minor approach csv report
...
Former-commit-id: a875a42dc53c85942dd8f80f0b5a0f788fb39ca5
2019-03-26 10:55:50 +01:00
a2f5b8502a
Merge branch 'develop' into ent-3409-pandora-network-traffic-analyzer-ntop-fork-fase-1
...
Conflicts:
pandora_console/include/styles/pandora.css
Former-commit-id: ad45f5bd3f07d6ef7a6d8d6a291d6a2fd75fda78
2019-03-26 10:11:13 +01:00
5b0555e7cb
Merge branch 'ent-3754-Ajustes-menú-lateral' into 'develop'
...
Ent 3754 ajustes menú lateral
See merge request artica/pandorafms!2291
Former-commit-id: 2cfa456d9e49aa262f08c690426bcbabb180392b
2019-03-26 09:42:29 +01:00
c3f7dd38d0
Merge branch 'ent-3342-SLA-status-transalation-error-fail' into 'develop'
...
Added translation files with string Fail
See merge request artica/pandorafms!2290
Former-commit-id: 0ba45f1aad523dcf45585a2bb44becd3e92b2747
2019-03-26 09:33:39 +01:00
189d4864dc
[Network usage map] Refactorized some code
...
Former-commit-id: 83fe7cedef01b4d4d38045b15c6b37ec936d5fb3
2019-03-26 09:10:28 +01:00
58e74c1db1
Fixed minor warning
...
Former-commit-id: 38278d285faa6aea5f61d0933543b7e24926ae79
2019-03-26 08:40:22 +01:00
90a2e28247
Auto-updated build strings.
...
Former-commit-id: b835fca52692b4696092f9cd5c5737705b7c8153
2019-03-26 00:01:25 +01:00
4031ae9bf7
minor update in notification viewer
...
Former-commit-id: 990993ee0c2df7d9fb39a358b94c27b7df968426
2019-03-25 20:23:07 +01:00
436e60c736
Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
...
Former-commit-id: 49dc95bbeca973fe13b0c82dc205778294c6066f
2019-03-25 20:14:24 +01:00
3d0f25cd6e
discovery task status overview
...
Former-commit-id: 5eeb3a3220c05f30f0559d50620aa29389fb145c
2019-03-25 20:00:05 +01:00
6cc6f6f125
discovery task status overview
...
Former-commit-id: 329d03c109b9e09788302212752f372647b19c56
2019-03-25 19:58:01 +01:00
079f578830
fix bad behavior of pandoras side menu on page load
...
Former-commit-id: b1d4eb3e2464fa441f16190d29b2d57cfaa9e3c5
2019-03-25 19:37:45 +01:00
5a38be13ea
Added translation files with string Fail
...
Former-commit-id: a0176a1fd734b7bdc1d5ffa49d29c059eb96acda
2019-03-25 18:22:42 +01:00
dcf40fed3d
Merge branch 'ent-3610-Vista-Edicion-de-Usuario' into 'develop'
...
Ent 3610 vista edicion de usuario
See merge request artica/pandorafms!2278
Former-commit-id: bf55b5206e79b5747b4215a05569b58ae70a35b0
2019-03-25 18:16:07 +01:00
1238f15190
discovery task advanced summary support
...
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
2019-03-25 17:32:18 +01:00
85474c6037
[Network usage map] Minor changes
...
Former-commit-id: 0dcbfaa911fad7d6ca6179689695d6829fd3822d
2019-03-25 16:40:07 +01:00
c682e5f326
Remove new font in edit user
...
Former-commit-id: dc7da7f1fe9df0abacfb267fb7b5c6773f35df2c
2019-03-25 16:27:25 +01:00
artica
Daniel Rodriguez
fbsanchez
fermin831
Alejandro Fraguas
artica
Daniel Barbero Martin
alejandro-campos
Ramon Novoa
Luis Calvo
Tatiana Llorente