tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,703 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

11133 Commits

Author SHA1 Message Date
Tatiana Llorente 445cc8aab0 New styles for Services table view - #3614 2019-05-30 10:58:59 +02:00
artica bfef8e61ea Auto-updated build strings. 2019-05-30 00:01:06 +02:00
Alejandro Fraguas bc279e99b0 Merge branch 'fix/styles' into 'develop' 
Fix/styles

See merge request artica/pandorafms!2461
 2019-05-29 18:31:43 +02:00
fbsanchez 48094ffb2e greater icons 2019-05-29 18:24:45 +02:00
fbsanchez c2346842c9 ui_toggle revierw 2019-05-29 18:13:21 +02:00
fbsanchez f16f35ad10 Changes styles 2019-05-29 17:49:09 +02:00
fbsanchez 121ae89b1d dyn style ui_print_help_tip 2019-05-29 17:34:11 +02:00
fbsanchez 3c730fbedf BC updated 2019-05-29 17:10:21 +02:00
fbsanchez 47c9220cbb clippy positions and control overflow 2019-05-29 17:02:01 +02:00
fbsanchez 53f6649a57 tip img sty 2019-05-29 16:49:51 +02:00
fbsanchez e9198af17c multiple changes 2019-05-29 16:45:53 +02:00
Alejandro Fraguas 2e3338b595 Merge branch 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' into 'develop' 
Ent 3961 añadir caché para los elementos de la consola visual

See merge request artica/pandorafms!2443
 2019-05-29 15:48:45 +02:00
Daniel Maya 3083482457 Fixed label cache 2019-05-29 15:30:26 +02:00
fbsanchez 4f27ae1021 minor style fix 2019-05-29 15:25:35 +02:00
fbsanchez f58d1bc6ee Styling review 2019-05-29 15:14:13 +02:00
Daniel Maya 76e6588b7a fixed cache in label, icon, clock, box and line 2019-05-29 13:54:14 +02:00
fbsanchez 72999244c2 pandora_console/operation/agentes/estado_generalagente.php 2019-05-29 13:13:01 +02:00
fbsanchez 7da60b447a Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 13:06:53 +02:00
fbsanchez 505229abe4 minor style change - box 2019-05-29 13:03:58 +02:00
Daniel Rodriguez ad1251052e Merge branch 'ent-4105-fallo-desplegable-snmp-wizard' into 'develop' 
SNMP Browser fix

See merge request artica/pandorafms!2455
 2019-05-29 12:50:09 +02:00
fbsanchez 49dee1e2bc Next contact to seconds 2019-05-29 12:42:55 +02:00
fbsanchez 5131c24772 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 12:24:28 +02:00
fbsanchez ca083556c3 minor alignment select-multiple 2019-05-29 12:23:54 +02:00
fbsanchez 37af0ad612 Styles 2019-05-29 12:06:05 +02:00
Daniel Rodriguez ee7cd68d39 Merge branch 'ent-1668-update-manager' into 'develop' 
UM register, UM newsletter flow improved

See merge request artica/pandorafms!2463
 2019-05-29 11:55:34 +02:00
marcos.alconada d5ac57064b Condition is added to keep the selection color in the main menu 2019-05-29 11:34:23 +02:00
fbsanchez 5ec162e058 Data title events 2019-05-29 11:24:17 +02:00
fbsanchez c8649a8dc4 Styles 2019-05-29 11:21:57 +02:00
Daniel Maya 552467286c Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual' 
# Conflicts:
#   pandora_console/extras/mr/28.sql
 2019-05-29 11:10:31 +02:00
Alejandro Fraguas c0763b86d2 Merge branch 'ent-3924-eHorus-settings' into 'develop' 
Ent 3924 e horus settings

See merge request artica/pandorafms!2417
 2019-05-29 10:51:59 +02:00
fbsanchez 32424ddae1 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 10:50:38 +02:00
fbsanchez 30ce8f65e4 UM register, UM newsletter flow improved 2019-05-29 10:01:21 +02:00
fbsanchez 22de7964c2 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-29 08:52:34 +02:00
artica 8572a13319 Auto-updated build strings. 2019-05-29 00:01:07 +02:00
Alejandro Gallardo Escobar f5d5cbf5b8 VC item cache improvements. 
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
 2019-05-28 18:34:07 +02:00
fbsanchez d64e2cfb8c Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-28 18:05:33 +02:00
Luis Calvo 8e7b769977 Merge branch 'ent-3924-eHorus-settings' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3924-eHorus-settings 2019-05-28 18:04:52 +02:00
Luis Calvo 58a0ef1bf7 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 2019-05-28 18:03:55 +02:00
fbsanchez 70469c4909 Event list agent view 2019-05-28 18:03:01 +02:00
Luis c8297165e8 Undo undesired changes 2019-05-28 17:41:39 +02:00
Luis Calvo e993dcc3a5 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 2019-05-28 17:37:20 +02:00
fbsanchez 99e485e96e toggle updated 2019-05-28 16:24:28 +02:00
fbsanchez 445db7c43b module list agent view 2019-05-28 16:20:24 +02:00
Tatiana Llorente d68bb176cf Merge branch 'develop' into 'ent-4102-Cambios-vista-detalle-de-evento' 
Conflicts:
   pandora_console/include/styles/pandora.css
 2019-05-28 15:56:16 +02:00
Alejandro Fraguas 1df2bd3c21 Merge branch 'ent-4101-Cambios-vista-gráfica-de-módulo' into 'develop' 
Ent 4101 cambios vista gráfica de módulo

See merge request artica/pandorafms!2462
 2019-05-28 13:30:11 +02:00
fbsanchez 348f0c2a65 agent view styling 2019-05-28 13:27:17 +02:00
Luis Calvo 5966367f8f eHorus user level login conf added in user editor 2019-05-28 13:14:42 +02:00
fbsanchez 9a12b34847 Updates styling 2019-05-28 12:13:29 +02:00
Alejandro Fraguas a3591b799a Merge branch 'ent-3983-Informes-SLA-mensuales-de-keepalive-no-se-calculan-bien' into 'develop' 
fix minor bug in reporting functions

See merge request artica/pandorafms!2460
 2019-05-28 12:03:55 +02:00
fbsanchez 92ca217800 minor fixes in style view tasklist 2019-05-28 10:57:36 +02:00
fbsanchez 2cd19aa0cb updates styles 2019-05-28 10:47:31 +02:00
Alejandro Gallardo Escobar 5ea79cdfb8 Now only the Group item of the VC is cached by user 2019-05-28 10:39:34 +02:00
fbsanchez bdd7cc1317 Flex agent view 2019-05-28 09:48:09 +02:00
Tatiana Llorente a6c0a082a7 Merge branch 'ent-4104-Cambios-vista-gráfica-de-módulo' into ent-4101-Cambios-vista-gráfica-de-módulo 2019-05-28 08:55:15 +02:00
fbsanchez 8bfb1e6773 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-28 08:32:53 +02:00
artica 11e5a4ce18 Auto-updated build strings. 2019-05-28 00:01:07 +02:00
fbsanchez e338d5ba95 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-27 22:40:11 +02:00
fbsanchez f57915285f review styles agent view 2019-05-27 22:36:55 +02:00
fbsanchez f1499082fa agent view rebuilt 2019-05-27 21:30:46 +02:00
fbsanchez 954dd0b43a UI_toggle updated 2019-05-27 19:08:41 +02:00
fbsanchez 5be124f315 Styles review 2019-05-27 19:00:48 +02:00
alejandro-campos 58d0dc5dbc fix minor bug in reporting functions 2019-05-27 18:31:20 +02:00
Luis Calvo 588d19102f Resolve merge conflict 2019-05-27 18:30:24 +02:00
fbsanchez f0fb6d7fd9 wip styles 2019-05-27 18:03:56 +02:00
marcos.alconada 91d388c8b3 Changed for create new user with advanced config enabled and forced automaticly disabled 2019-05-27 17:47:45 +02:00
Tatiana Llorente 2fd37b531e Visual changes in module graph - #4104 2019-05-27 17:37:57 +02:00
fbsanchez 556c07ad99 Minor changes in configurar_agente 2019-05-27 17:12:35 +02:00
Alejandro Gallardo Escobar fb8bc48d64 Now the vc item's cache expires when the item is updated 2019-05-27 16:40:09 +02:00
Tatiana Llorente 1eb1120c6e Rename class events_show_more_table to table_modal_alternate - #4102 2019-05-27 16:18:10 +02:00
Tatiana Llorente 016a5b3745 Changed image for severity in modal events window - #4102 2019-05-27 15:51:03 +02:00
Tatiana Llorente 0b4a076798 Changed image for severity in modal events window - #4102 2019-05-27 15:49:10 +02:00
fbsanchez 0280547465 some changes 2019-05-27 15:41:23 +02:00
fbsanchez 9eecc414dd cps changes - switch core touched - test this commit carefully 2019-05-27 14:12:53 +02:00
fbsanchez 7347324601 Minor fixes - discovery styles 2019-05-27 13:19:08 +02:00
Alejandro Gallardo Escobar f8a0fc67f9 Minor improvements 2019-05-27 12:10:05 +02:00
Alejandro Gallardo Escobar ce8ba54e09 Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual 2019-05-27 11:31:24 +02:00
fbsanchez 83602e07b9 Merge remote-tracking branch 'origin/develop' into ent-3881-discovery-fase-4 2019-05-27 11:06:29 +02:00
artica de3464bd02 Auto-updated build strings. 2019-05-27 00:01:05 +02:00
artica ba97da46c6 Auto-updated build strings. 2019-05-26 00:01:04 +02:00
artica a13701ed82 Auto-updated build strings. 2019-05-25 00:01:06 +02:00
fbsanchez 1d403ec2f8 SNMP Browser fix 2019-05-24 13:42:49 +02:00
fbsanchez c5bd3204ab Minor style, avoided duplicated iface names with spaces 2019-05-24 11:42:46 +02:00
Alejandro Fraguas f5586d7b70 Merge branch 'ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas' into 'develop' 
fixed label reports and more fixed

See merge request artica/pandorafms!2413
 2019-05-24 10:47:15 +02:00
artica cc09c257bc Auto-updated build strings. 2019-05-24 00:01:06 +02:00
Daniel Barbero Martin 1386a44e07 fixed errors label report 2019-05-23 17:52:28 +02:00
fbsanchez 9e1de4cbb3 Merge branch 'ent-1668-update-manager' into 'develop' 
rb UM GCv

See merge request artica/pandorafms!2447
 2019-05-23 16:16:26 +02:00
fbsanchez 4ec6aadf7d rb UM GCv 2019-05-23 16:12:40 +02:00
fbsanchez f1c077b753 Merge branch 'ent-1668-update-manager' into 'develop' 
UM GCv

See merge request artica/pandorafms!2446
 2019-05-23 16:09:16 +02:00
fbsanchez 4abbbf6680 UM GCv 2019-05-23 15:55:07 +02:00
fbsanchez 5d4ba6cb01 Merge branch 'ent-1668-update-manager' into 'develop' 
summarized counts

See merge request artica/pandorafms!2445
 2019-05-23 15:47:25 +02:00
fbsanchez 08aa824f97 summarized counts 2019-05-23 15:38:45 +02:00
fbsanchez 1529a04507 Merge branch 'ent-1668-update-manager' into 'develop' 
fixed: um url relative

See merge request artica/pandorafms!2444
 2019-05-23 11:33:46 +02:00
fbsanchez 0ee42fbafe fixed: um url relative 2019-05-23 11:23:42 +02:00
Daniel Maya 4c874e152c Merge 2019-05-23 10:43:32 +02:00
fbsanchez dd8af874fa Merge branch 'ent-1668-update-manager' into 'develop' 
license forms sync MC-N

See merge request artica/pandorafms!2441
 2019-05-23 10:36:43 +02:00
Daniel Maya 2de2d1f482 Added expiration and deleted old cache data in pandora_db 2019-05-23 10:35:03 +02:00
fbsanchez 7b5ae40868 multiple fixes 2019-05-23 10:27:50 +02:00
artica 4c3dea3ba4 Auto-updated build strings. 2019-05-23 00:01:07 +02:00
fbsanchez 119a5ea2fd Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-05-22 16:52:56 +02:00
Daniel Rodriguez 8b511c2ca3 Merge branch 'ent-3984-7962-ldap-bug-en-token-force-automatically-create-profile-user' into 'develop' 
Changed condition for ldap Force automatically create profile user

See merge request artica/pandorafms!2422
 2019-05-22 16:15:06 +02:00
fbsanchez 4fe7680694 Merge remote-tracking branch 'origin/develop' into ent-3295-revision-comportamiento-metaconsola-con-nodo-multi-servidor 2019-05-22 15:33:13 +02:00
fbsanchez bd88cbd42d 1st approach simplifying MC management 2019-05-22 15:31:59 +02:00
artica 892dcc750f Updated version and build strings. 2019-05-22 15:29:49 +02:00
Daniel Rodriguez 979f11ca8f Merge branch 'ent-1668-update-manager' into 'develop' 
Ent 1668 update manager

See merge request artica/pandorafms!2420
 2019-05-22 15:25:49 +02:00
marcos.alconada 07b42f7241 Changed for metaconsole 2019-05-22 13:57:31 +02:00
Alejandro Fraguas 5b286b4f67 Merge branch 'ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual' into 'develop' 
Mejorar la actualizacion de los datos y elementos de la consola visual

See merge request artica/pandorafms!2429
 2019-05-22 13:06:18 +02:00
alejandro-campos e82916001b allow fetching of event id in metaconsole event table when getting target of an event response in metaconsole having server_id=0 2019-05-22 10:18:44 +02:00
artica ba9edc0378 Auto-updated build strings. 2019-05-22 00:01:07 +02:00
Daniel Rodriguez f6171de522 Merge branch 'ent-3468-Ayudas_online' into 'develop' 
helpers

See merge request artica/pandorafms!2381
 2019-05-21 17:28:27 +02:00
Alejandro Fraguas ce359bfaf6 Merge branch 'ent-3937-eliminar-echos-y-prints-de-las-subclases-de-wizard' into 'develop' 
Ent 3937 eliminar echos y prints de las subclases de wizard

See merge request artica/pandorafms!2430
 2019-05-21 12:11:53 +02:00
manuel ada49966e0 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/reporting/reporting_builder.php
 2019-05-21 10:05:06 +02:00
fbsanchez b853582fb9 Changed preview by \"click here\" message 2019-05-21 08:29:59 +02:00
artica 20e38ead81 Auto-updated build strings. 2019-05-21 00:01:08 +02:00
fbsanchez 77fc1abe89 minor style updates and fixes in safe-output 2019-05-20 18:16:21 +02:00
Daniel Maya 5c0a197b6b Added cache 2019-05-20 15:15:54 +02:00
fbsanchez 5e9b2479eb Merge remote-tracking branch 'origin/develop' into ent-1668-update-manager 2019-05-20 13:11:39 +02:00
alejandro-campos a898fad2c3 lint fixes 2019-05-20 10:35:46 +02:00
artica d82d178a0d Auto-updated build strings. 2019-05-20 00:01:08 +02:00
artica 2dc5fce6a6 Auto-updated build strings. 2019-05-19 00:01:06 +02:00
artica 509c476c33 Auto-updated build strings. 2019-05-18 00:01:08 +02:00
Luis Calvo fdd61e4f27 Fixed agent searh box 2019-05-17 16:36:21 +02:00
alejandro-campos 54d3eefa43 lint changes 2019-05-17 14:27:59 +02:00
alejandro-campos e746a49158 lint changes 2019-05-17 14:26:44 +02:00
Alejandro Gallardo Escobar bdcea7ec7d Minor fix 2019-05-17 14:25:17 +02:00
alejandro-campos a0b7164d9f lint changes 2019-05-17 14:20:01 +02:00
Alejandro Gallardo Escobar 2c8dd3b5e5 Merge remote-tracking branch 'origin/develop' into ent-3975-mejorar-la-actualizacion-de-los-datos-y-elementos-de-la-consola-visual 2019-05-17 14:16:23 +02:00
Alejandro Gallardo Escobar 34218fa7eb Improved the management of the async requests of the visual console client 2019-05-17 14:09:30 +02:00
marcos.alconada 0c9f8892e0 Changed evaluates permissions 2019-05-17 13:58:34 +02:00
Alejandro Fraguas ea39766d59 Merge branch 'ent-3684-Dashboard-publico-no-muestra-mapa-de-red' into 'develop' 
ent-3684-Dashboard-publico-no-muestra-mapa-de-red into develop

See merge request artica/pandorafms!2427
 2019-05-17 12:11:19 +02:00
marcos.alconada 86dabc6476 Variability event_storm_protection check is added with empty data 2019-05-17 11:31:02 +02:00
Daniel Rodriguez 833c2d91a7 Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual-return' into 'develop' 
Fixed error window in visual console

See merge request artica/pandorafms!2426
 2019-05-17 11:27:57 +02:00
artica bf202496da Auto-updated build strings. 
Former-commit-id: ff3141fab3d61823cc7bf64e4e013ccda69ecffd
 2019-05-17 00:01:10 +02:00
Luis Calvo 0cd60d0431 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 
Former-commit-id: fb3ba4cbda0daa688550708e4bc99e6512eea413
 2019-05-16 18:11:33 +02:00
Luis Calvo b3d2eaaf9e Fixed img url on js 
Former-commit-id: 72a6122343da8c27248c639a6afa180fbfded9c0
 2019-05-16 17:25:18 +02:00
Luis Calvo 1bfd91725e Changed <img> to hmtl_print_image 
Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472
 2019-05-16 17:13:14 +02:00
Daniel Maya f1705af9f6 Fixed error window in visual console 
Former-commit-id: 757fb0daa0a56b517a88063dedbe5cbf51cdf73e
 2019-05-16 16:04:38 +02:00
fbsanchez c8c0194183 Minor fix in url 
Former-commit-id: 087a93624d65109c9c66de329c4365b98d99c8ed
 2019-05-16 12:33:05 +02:00
fbsanchez 034480bf88 minor fixes 
Former-commit-id: ced1aad7a9835dab5b44817f191e33d2ca11cff3
 2019-05-16 12:28:46 +02:00
fbsanchez e7dbb55392 Minor fixes 
Former-commit-id: 51e446b36a4ad2b93a1a2e3ff76e89ea2a21db9b
 2019-05-16 12:00:49 +02:00
alejandro-campos 13b32003b3 save changes ticket 3937 
Former-commit-id: 264c0fed3ddcf7c34796af0a3c2bd4d48a6763bb
 2019-05-16 11:37:48 +02:00
Daniel Rodriguez 50ad335794 Merge branch 'ent-3720-7750-anadir-filtros-en-custom-graphs-2' into 'develop' 
New branch without thras files

See merge request artica/pandorafms!2423

Former-commit-id: 909ad4d321231e4d610b409c3f5b1224a780150b
 2019-05-16 11:37:25 +02:00
Alejandro Gallardo Escobar a25a08f48d Added an async task manager to the visual console client 
Former-commit-id: 4f5c92a976ae976e77cc11505c7a57bf31121930
 2019-05-16 11:04:03 +02:00
Luis Calvo 702926cf85 solved merge conflict mr 28.sql 
Former-commit-id: 687cf5c37f15648421843b5d2908351fc2f3c032
 2019-05-16 10:15:46 +02:00
artica f5f66fc144 Auto-updated build strings. 
Former-commit-id: dff1ba74fcb60ee0ba0278c8baf25614ce391c58
 2019-05-16 00:01:06 +02:00
artica 9c08aa7b57 Auto-updated build strings. 
Former-commit-id: 37439887da302715dff5aa9ba55f3dd11a27f2ca
 2019-05-15 00:01:11 +02:00
fbsanchez d871b599ef General fixes and UM comm updates 
Former-commit-id: b4c58f467f195627f96afe7f06b59004adeb83be
 2019-05-14 23:49:01 +02:00
marcos.alconada 0e99b750b4 New branch without trash files 
Former-commit-id: fd64df2d8fb7d69ad871d870cbe11e4e69ae677d
 2019-05-14 18:15:23 +02:00
fbsanchez 8004e096fd MR 28 and minor fixes 
Former-commit-id: 99292ecb6401cf20066dd09188a32e24b9194b25
 2019-05-14 18:09:34 +02:00
Alejandro Fraguas 3548070ec1 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' into 'develop' 
Add new message to News board

See merge request artica/pandorafms!2415

Former-commit-id: b0adfc73ac247cda59dea01e83429e06ba5747ee
 2019-05-14 17:56:43 +02:00
Daniel Rodriguez be20163073 Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop' 
Ent 3799 bug en configuracion ehorus

See merge request artica/pandorafms!2421

Former-commit-id: cf20d4985c6de38e1eab8bdd23ddb32708cc57ba
 2019-05-14 17:38:55 +02:00
fbsanchez 53e9113b7e UM notifications MR update 
Former-commit-id: d2aad195cb9bab4e1efa504cb4b4a583f262f0e3
 2019-05-14 17:15:28 +02:00
marcos.alconada 35c7ea1f48 Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4020-cambiar-mensaje-de-bienvenida-tnews 
Former-commit-id: 3c10d8ecea2a6fdb44a6003d45ccf146972a92e1
 2019-05-14 17:14:02 +02:00
marcos.alconada bc849c16fb Only one image for welcome new board 
Former-commit-id: a8effda6019c394a9a2d15fbf4998490867b3b02
 2019-05-14 17:13:44 +02:00
marcos.alconada 43547267a0 Changed condition for ldap Force automatically create profile user 
Former-commit-id: caa1218b7ae4dc09649a6a4bb54b158255ea268f
 2019-05-14 15:59:35 +02:00
fbsanchez 6e35f6aec7 UM updates and fixes 
Former-commit-id: 1c06fca2174091a1a18de3d88724dc4243306b39
 2019-05-14 13:41:21 +02:00
manuel 827ebcfbc5 Fix helps 
Former-commit-id: c4c666d8552f153a8d29320d655d27da50fa4267
 2019-05-14 13:09:49 +02:00
Daniel Barbero Martin ae11ea18c9 Merge remote-tracking branch 'origin/develop' into ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas 
Conflicts:
	pandora_console/include/functions_graph.php


Former-commit-id: 8436d51b142d4f3d528b3f1c4d459f5194f6a234
 2019-05-14 12:27:02 +02:00
manuel b89751e647 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/alerts/configure_alert_command.php


Former-commit-id: 9051a95f31fd7163a0b326d7e513c5689c5b304f
 2019-05-14 11:50:07 +02:00
manuel 421e6b559d Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop 
Former-commit-id: 1addcf3afd8ef2b4376f7b888ea10e1e5735deb7
 2019-05-14 11:46:39 +02:00
Alejandro Fraguas 8ff62a58ce Merge branch 'ent-3695-ipam-oids' into 'develop' 
IPAM vlan wizard ExtremeXOS

See merge request artica/pandorafms!2409

Former-commit-id: e3881101a9d529cf64241b24ed251eaafc45d6f5
 2019-05-14 11:30:55 +02:00
Daniel Rodriguez 15446453fb Merge branch 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' into 'develop' 
Ent 3771 nueva tipo de macro password en comandos acciones de alerta

See merge request artica/pandorafms!2397

Former-commit-id: bd4887079f93ed26eef66f5b5047dcc07caf56a6
 2019-05-14 10:53:44 +02:00
manuel 4497554b37 Merge branch 'develop' of brutus.artica.lan:artica/pandorafms into develop 
Former-commit-id: b271e6e740b1f0cdec273786fae3e707288e72cd
 2019-05-14 10:40:49 +02:00
Daniel Rodriguez 865796ed5e Merge branch 'visual-console-phase-2' into 'develop' 
Visual console phase 2

See merge request artica/pandorafms!2404

Former-commit-id: af616c2346655fcf1f5732c00c0ef2f053126d86
 2019-05-14 10:21:14 +02:00
artica b7ebb44c48 Auto-updated build strings. 
Former-commit-id: 8ec4c48ebf34ee5d60ddb8b0b1579c47874e936f
 2019-05-14 00:01:09 +02:00
fbsanchez 5f87b13e13 WIP: updatemanager interaction 
Former-commit-id: 5983c8a2f885dc696fb5bdf779e3e56783687667
 2019-05-13 19:34:10 +02:00
Alejandro Fraguas 81f7cf699b Merge branch 'ent-3768-no-funciona-selector-de-nodo-event-group-report-meta' into 'develop' 
Ternary condition is added

See merge request artica/pandorafms!2311

Former-commit-id: c7e9365d322c9f2bf7b52a58c4e6f077f3e68288
 2019-05-13 18:36:34 +02:00
fbsanchez 6ca07c0914 Merge remote-tracking branch 'origin/develop' into 1668-update-manager 
Former-commit-id: 33d676ea02d3dfbb3f8c3c23aa8466192516eafb
 2019-05-13 17:58:35 +02:00
fbsanchez ced1b32915 Configuration, Registration and newsletter wizards 
Former-commit-id: bbd367a10fd01c229c848b15572c4b1d6ccb75cf
 2019-05-13 17:55:41 +02:00
Luis Calvo 8c1c337522 Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings 
Former-commit-id: 1eac76c75f311a20f402859cf7b9a47b70765f75
 2019-05-13 17:36:32 +02:00
Daniel Maya 539f416cc4 Merge 
Former-commit-id: ab93502ce1140ff37c513f2c574b4ca22f552ee9
 2019-05-13 17:30:35 +02:00
Luis Calvo ce34adb9d8 Fixed errors and corrected style 
Former-commit-id: 645c76e98d2ba8b417048722001193bc3197bb0a
 2019-05-13 17:28:23 +02:00
Alejandro Campos 9347fc17aa Merge branch 'develop' into 'ent-3771-Nueva-tipo-de-macro-password-en-comandos-acciones-de-alerta' 
# Conflicts:
#   pandora_console/extras/mr/28.sql

Former-commit-id: f9ff15a815fa9a15f1d326174ac40acbdd4110dd
 2019-05-13 17:10:06 +02:00
Daniel Rodriguez a38ef3e729 Merge branch 'ent-3858-Alert-template-Condition-Type-Not-normal' into 'develop' 
Added condition type not normal in alert templates

See merge request artica/pandorafms!2376

Former-commit-id: bfd561123a0eb57cfb4c99a0c12f3c665a661765
 2019-05-13 16:51:34 +02:00
manuel 20dace7de8 Merge branch 'develop' into ent-3468-Ayudas_online 
Conflicts:
pandora_console/godmode/agentes/agent_manager.php


Former-commit-id: c53d6c5819284e92caae040c52c6da477c27a2f3
 2019-05-13 16:20:12 +02:00
root 2f2385c9cb Merge remote-tracking branch 'remotes/origin/ent-3611-Vista-Creación-Edición-de-Agente' into develop 
Former-commit-id: bcd067e3b702c3eaa60fff2aeae7e39625f565ef
 2019-05-13 15:57:19 +02:00
Luis Calvo 895588ebe0 Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings 
Former-commit-id: c5f4313d97cad17c9f653dc0e4bbc0d9e7e9f308
 2019-05-13 15:00:35 +02:00
Daniel Rodriguez ecacf2d3f5 Merge branch 'ent-3799-bug-en-configuracion-ehorus' into 'develop' 
Ent 3799 bug en configuracion ehorus

See merge request artica/pandorafms!2403

Former-commit-id: 183212d8ad2e9cab574800000ac71576d7ae75ae
 2019-05-13 14:54:25 +02:00
Daniel Rodriguez f281dda622 Merge branch 'ent-4013-7999-Bug-custom-graph-en-consola-visual' into 'develop' 
Fixed error window in visual console

See merge request artica/pandorafms!2412

Former-commit-id: 312950779bb4cd02938f1e825d86ab3c1fef01ff
 2019-05-13 14:52:17 +02:00
Tatiana Llorente 5f2bd0bc8d Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente 
Conflicts:
	pandora_console/include/styles/pandora.css


Former-commit-id: f04b28c642afe7fe1251ae966b3964c321b34c29
 2019-05-13 13:17:17 +02:00
Alejandro Fraguas 20f77f5393 Merge branch 'ent-4004-Estilos-Discovery' into 'develop' 
Unify the styles of Discovery with Pandora - #4004

See merge request artica/pandorafms!2411

Former-commit-id: 463116b12ece33846a8d86514145e2d97e7eaec1
 2019-05-13 13:05:34 +02:00
Luis Calvo 3d66fca5d6 Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings 
Former-commit-id: df2707c912cccfa684dc82e5ad8a777819b2b9e8
 2019-05-13 10:08:37 +02:00
alejandro-campos 874f4764ea Merge remote-tracking branch 'origin/ent-4004-Estilos-Discovery' into ent-3937-Eliminar-echos-y-prints-de-las-subclases-de-wizard 
Former-commit-id: 2344b96903d759aa88b01404f259c6f70077027f
 2019-05-13 09:38:24 +02:00
artica 40af2205b1 Auto-updated build strings. 
Former-commit-id: bde62e989e369e296a685f7d2050a92f4b8417e2
 2019-05-13 00:01:06 +02:00
artica 3fc5f183fd Auto-updated build strings. 
Former-commit-id: bcb6a01291e16430de319d27a04f21723e39a5c5
 2019-05-12 00:01:06 +02:00
artica 0008f57e35 Auto-updated build strings. 
Former-commit-id: 62f8df997289fe4c8e8e63eedbb8dcdb1a08da1f
 2019-05-11 00:01:09 +02:00
Luis Calvo c527435a0e eHorus user-login settings 
Former-commit-id: e62be3b137ef5583fbd29186a834a86b075e78fb
 2019-05-10 15:32:25 +02:00
marcos.alconada b51cdb93df arreglo con la vista del formulario 
Former-commit-id: 0d5b5c099ce2e096d8e3d8e1c0a6220baa27e0a9
 2019-05-10 15:00:21 +02:00
marcos.alconada 793304b52d Se habilita el boton de ehorus 
Former-commit-id: aceee670b00ad4291b7f4e9e0a90f17dca3feed9
 2019-05-10 12:26:09 +02:00
Daniel Barbero Martin ab2bf737d5 Merge remote-tracking branch 'origin/develop' into ent-3894-Bug-Feature-labels-weigh-en-graficas 
Conflicts:
	pandora_console/include/functions.php


Former-commit-id: 6c1ef8bcb15b9969b25082851fa39c8241398b29
 2019-05-10 12:18:10 +02:00
Tatiana Llorente a9834dc415 Merge branch 'develop' into 'ent-4004-Estilos-Discovery' 
Conflicts:
  pandora_console/godmode/wizards/HostDevices.class.php
Former-commit-id: de7b4b069e1c5f673b567fcb3271ec867d0fbae1
 2019-05-10 09:55:54 +02:00
Luis Calvo 44b14debdc Merge remote-tracking branch 'origin/develop' into 3924-eHorus-settings 
Former-commit-id: 781b73ee3896c138223d46d40abdb3a7100bcf2c
 2019-05-10 09:38:31 +02:00
manuel 12c9952e4a Merge branch 'develop' into ent-3858-Alert-template-Condition-Type-Not-normal 
Conflicts:
pandora_console/extras/mr/28.sql


Former-commit-id: 841526b8d92b3f5ea7e642a36829b1bc33c62c8a
 2019-05-10 09:11:17 +02:00
artica 3119278b26 Auto-updated build strings. 
Former-commit-id: 1dc55561e83817f91b38b437d57e479fb13f3ac3
 2019-05-10 00:01:14 +02:00
Luis Calvo ecce1160e1 Added button to select ehorus conf type and box into user conf 2019-05-09 19:23:18 +02:00
manuel 43ce4f9883 Added helps 2019-05-09 17:20:27 +02:00
Daniel Rodriguez 3e91207186 Merge branch 'ent-3617-Gráfica-de-módulos' into 'develop' 
Ent 3617 gráfica de módulos

See merge request artica/pandorafms!2407

Former-commit-id: ac545e4211f9e68e81482657c6e294dcac082a8e
 2019-05-09 17:03:03 +02:00
Daniel Barbero Martin e981edfa89 fixed label reports and more fixed 
Former-commit-id: a71c341fc7f6f182f7d847911a7dc4e0cd6f36f7
 2019-05-09 16:26:38 +02:00
Daniel Maya dab12ecdc5 Fixed error window in visual console 
Former-commit-id: 97def5509195b687a1607810043076e58dd72fe0
 2019-05-09 15:06:03 +02:00
marcos.alconada e0729b6ca6 Se vuelve a crear la rama 
Former-commit-id: 8ac69d4e1d15be23411faff82dc2bddcfcf7f7b6
 2019-05-09 14:59:47 +02:00
manuel 143def5d87 Added helps 2019-05-09 13:43:53 +02:00
Daniel Rodriguez 7c3e883c01 Merge branch 'ent-3770-texto-del-pandora-diag' into 'develop' 
Ent 3770 texto del pandora diag

Closes pandora_enterprise#3529, pandora_enterprise#1744, pandora_enterprise#3305, pandora_enterprise#3121, and pandora_enterprise#3252

See merge request artica/pandorafms!2393

Former-commit-id: d78409acd362ebc5308495c359344f5b706685cd
 2019-05-09 13:01:28 +02:00
Daniel Maya c2b8ad22d3 Added cache_expiration in builder items 2019-05-09 12:44:58 +02:00
Daniel Rodriguez c7c7a8457f Merge branch 'ent-3952-6601-aadcm-fallo-visual-en-pdf-report-sla-semanal' into 'develop' 
fixed errors pdf SLA Weekly

See merge request artica/pandorafms!2410
 2019-05-09 11:05:54 +02:00
Tatiana Llorente ef45fc3ca6 Merge remote-tracking branch 'origin/develop' into ent-3617-Gráfica-de-módulos 2019-05-09 10:44:31 +02:00
Tatiana Llorente f5114918b5 Unify the styles of Discovery with Pandora - #4004 2019-05-09 08:45:55 +02:00
artica 7da73afd08 Auto-updated build strings. 2019-05-09 00:01:10 +02:00
Daniel Rodriguez 8f6c8a9932 Merge branch 'ent-3613-Ventana-modal-de-vista-de-Eventos' into 'develop' 
Ent 3613 ventana modal de vista de eventos

See merge request artica/pandorafms!2387
 2019-05-08 19:07:39 +02:00
Daniel Barbero Martin 1644b492d2 fixed errors pdf SLA Weekly 2019-05-08 18:29:33 +02:00
Daniel Rodriguez 0a7539cc3a Merge branch 'ent-3990-7999-colecciones-no-funcionan-no-se-puede-subir-ni-crear-archivos' into 'develop' 
fixed filemanager

See merge request artica/pandorafms!2408
 2019-05-08 18:26:23 +02:00
Daniel Rodriguez ac101af72f Merge branch '3631_Unidades_no_se_muestran_en_informes_de_graficas_combinadas' into 'develop' 
Added module units in module graphs

See merge request artica/pandorafms!2237
 2019-05-08 16:36:43 +02:00
Alejandro Fraguas 4b7f9e4882 Merge branch 'ent-3884-Error-Superredes' into 'develop' 
fixed errors IPAM subneting

See merge request artica/pandorafms!2395
 2019-05-08 15:57:53 +02:00
Daniel Maya 3833eb6463 elex's recommendations :D 2019-05-08 15:27:22 +02:00
marcos.alconada 1ffc6bd028 Merge remote-tracking branch 'origin/develop' into ent-3770-texto-del-pandora-diag 
Former-commit-id: 35f8be06ed6fff20ff930a19429a0cbcf5aff33d
 2019-05-08 14:36:04 +02:00
fbsanchez 9bc5a2d346 IPAM vlan wizard ExtremeXOS 2019-05-08 14:17:40 +02:00
Daniel Rodriguez 0ebf89a9eb Merge branch 'ent-3533-Mostrar-Contact-en-informacion-de-los-eventos' into 'develop' 
Show contact in events information

See merge request artica/pandorafms!2373
 2019-05-08 14:13:08 +02:00
Daniel Rodriguez f13162abf1 Merge branch 'ent-3802-visual-constole-warning-state-bug' into 'develop' 
Fixed select bug not selectig value

See merge request artica/pandorafms!2346
 2019-05-08 13:17:02 +02:00
Daniel Rodriguez 247605f308 Merge branch 'ent-3664-Al_aplicar_un_cambio_en_un_agente_se_muestra_que_se_ha_realizado_con_exito_pero_no_actualiza_campos_a_primera_vista' into 'develop' 
Eliminated the cache when update agents

See merge request artica/pandorafms!2242
 2019-05-08 12:50:40 +02:00
Luis Calvo ef1149d3bb Fixed get agent status on linked map 2019-05-08 12:39:53 +02:00
Luis Calvo 5b75b671aa Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug 2019-05-08 12:37:10 +02:00
Alejandro Fraguas 297f53b9de Merge branch 'ent-3608-Update-Manager-Online' into 'develop' 
Ent 3608 update manager online

See merge request artica/pandorafms!2379
 2019-05-08 11:20:12 +02:00
Daniel Barbero Martin 99f5cab83d fixed filemanager 2019-05-08 10:55:20 +02:00
Tatiana Llorente cb49de4d81 New menu module graph - #3617 2019-05-08 10:28:00 +02:00
manuel f5759abcad Merge branch 'develop' into ent-3468-Ayudas_online 2019-05-08 09:35:32 +02:00
Tatiana Llorente 5e0b53e3c2 New menu module graph - #3617 2019-05-08 09:35:28 +02:00
artica f2873714a6 Auto-updated build strings. 2019-05-08 00:01:08 +02:00
Luis Calvo 954aac3aeb Merge remote-tracking branch 'origin/develop' into ent-3802-visual-constole-warning-state-bug 2019-05-07 17:13:54 +02:00
Daniel Maya e565ddee42 Round decimal value in percentil item and fixed value font size 2019-05-07 16:43:27 +02:00
Tatiana Llorente 283be8f632 New menu module graph - #3617 2019-05-07 16:07:07 +02:00
manuel b2b4372c9d Added helps 
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
 2019-05-07 11:34:09 +02:00
Alejandro Fraguas 0a96cfd696 Merge branch 'ent-3819-Bug-en-vista-monitor-details-con-tags' into 'develop' 
Fixed bug in monitor detail view

See merge request artica/pandorafms!2360

Former-commit-id: fcbe351e4a71b0827fa7e4919a3b4ae8ffa956bb
 2019-05-07 10:17:37 +02:00
artica 9116a72a2b Auto-updated build strings. 
Former-commit-id: dfb64d2cea90593ac4b70d6e4d9f6958f3b472d8
 2019-05-07 00:01:09 +02:00
Daniel Maya b57adb38a5 added graph_precision for the float in static_graph and percentile item 
Former-commit-id: 7fda14add9bcb0d9c0a425caad752364e29b309c
 2019-05-06 17:12:00 +02:00
Alejandro Fraguas 11a16e4c2a Merge branch 'ent-3408-snmp-component-creation-api' into 'develop' 
Fixed wrong array index for id_group

See merge request artica/pandorafms!2286

Former-commit-id: eaea4fc6551e34c2941e094c78099e07a5315df5
 2019-05-06 17:00:29 +02:00
manuel 00b5fc0a2c Added helps 
Former-commit-id: 54292202ea50b6a15c909875853b52fe2f1a045a
 2019-05-06 16:59:31 +02:00
Daniel Barbero Martin 3fcd854ae6 fixed error labels graphs and weight in chart 
Former-commit-id: 52acfda4438417b711295ce8d335ea2748b1fa53
 2019-05-06 16:43:59 +02:00
Daniel Maya 759c175d4f Added date in analogic clock 
Former-commit-id: 2436cac56b3910e23ce06defc5ce362f463b002f
 2019-05-06 11:36:20 +02:00
Alejandro Fraguas 545afcb684 Merge branch 'ent-3866-7901-bug-en-busqueda-general-usuario-con-grupo-asignado' into 'develop' 
Added secondary groups in global search

See merge request artica/pandorafms!2351

Former-commit-id: c9202c576699e7cd4df19e5d7a28bda5fc36826c
 2019-05-06 10:33:30 +02:00
artica 6d7b748591 Auto-updated build strings. 
Former-commit-id: 0110fd44ff110c73a9bdb427e7a017258a48bfa8
 2019-05-06 00:01:06 +02:00
artica 83b6fe5a55 Auto-updated build strings. 
Former-commit-id: 24f76ce9d15cf44952fe148ff48f6017b5798942
 2019-05-05 00:01:07 +02:00
artica 168ee6cdc6 Auto-updated build strings. 
Former-commit-id: 0a99a82af6cebf9b798329e52e44819825c0bb05
 2019-05-04 00:01:07 +02:00
alejandro-campos 5b3dfcbf74 add feature to enable obfuscation on command fields when creating or updating commands 
Former-commit-id: ac5a1fb86e7e690bccc9c4f672678781acd1414d
 2019-05-03 13:46:52 +02:00
Tatiana Llorente 9f3c586b55 Merge remote-tracking branch 'origin/develop' into ent-3611-Vista-Creación-Edición-de-Agente 
Former-commit-id: b60c4d8c438d79f20cc9dcdfac856bbaf0a4ada5
 2019-05-03 13:11:26 +02:00
Tatiana Llorente 7721c0e605 New View Create/Update Agent - #3611 
Former-commit-id: 5bcb4f0d94a05819e82cd636ef1683fbb4047495
 2019-05-03 13:07:58 +02:00
artica b88456f696 Auto-updated build strings. 
Former-commit-id: 21d8c77dbdf5653b73aed9a83b833ec8dc5cb243
 2019-05-03 00:01:06 +02:00
artica 828d7830a5 Auto-updated build strings. 
Former-commit-id: 646717be2ca7b947dc8acf0c9db4b8e4ab7762b0
 2019-05-02 00:01:06 +02:00
artica a9e0acd3e1 Auto-updated build strings. 
Former-commit-id: e2dcdd18fd18f75cff8c27ebd69b40940186166b
 2019-05-01 00:01:10 +02:00
Daniel Rodriguez 3b73ea95ae Merge branch 'ent-3940-No-salen-IPs-en-mapas-netflow' into 'develop' 
Fixed node name in netflow map

See merge request artica/pandorafms!2386

Former-commit-id: 14cf4f85a78b092fb7efe10a05e63702d4dbcbb2
 2019-04-30 17:53:48 +02:00
Daniel Rodriguez 5be813e210 Merge branch 'ent-3877-custom-field-view-faltan-los-enlaces-en-los-contadores' into 'develop' 
add links counters cfv

See merge request artica/pandorafms!2388

Former-commit-id: 8666427450be1b27f1c6b7ae08a3e9388e32aa97
 2019-04-30 17:50:33 +02:00
Daniel Maya c31948b7c2 Fixed netflow node name 
Former-commit-id: 0e134e7e70546aca26178336e4ff5ba2489d55ea
 2019-04-30 17:30:57 +02:00
Daniel Maya 37d3737f82 Fixed number_format in group stadistic 
Former-commit-id: 7580be83cce0432ab68e3698813fd7eef079665a
 2019-04-30 16:23:14 +02:00
manuel b1dd6edc64 Added changes in helps 
Former-commit-id: e63717665df7be9e2f00b5492ef77c8e93a4e9a4
 2019-04-30 12:28:11 +02:00
manuel 7045e59e87 Added changes in helps 
Former-commit-id: 863eec78c48a3a29b62326dc7ef2609b2990819c
 2019-04-30 10:44:53 +02:00
Luis Calvo e9e24505fe Added option in massive delete alerts to show alerts on disabled modules 
Former-commit-id: 2ee8db665f9e3ae657887e61e4b99dccd2e6e3a9
 2019-04-30 10:29:42 +02:00
artica 310d217fb2 Auto-updated build strings. 
Former-commit-id: 0a9db145834a075fc587da6ed5e09fd3f24a2684
 2019-04-30 00:01:09 +02:00
Daniel Maya 61a0528717 Fixed EventHistory link 
Former-commit-id: 431251e74f419123b4848e10edc5fe472accdf43
 2019-04-29 17:37:36 +02:00
Daniel Barbero Martin 2aaeddd803 fixed errors IPAM subneting 
Former-commit-id: 58fb50dd594be993a1f17413ab9466d8588fa19a
 2019-04-29 16:42:26 +02:00
Daniel Barbero Martin 94932d23ac fixed error cfv status 
Former-commit-id: cccd14ea5d2e202124233372e3db47564b2d8475
 2019-04-29 15:43:51 +02:00
Daniel Rodriguez 9788a9f6d5 Merge branch 'visual-console-refactor' into 'develop' 
Visual console refactor: hotfixes

See merge request artica/pandorafms!2384

Former-commit-id: 59e435071a8cf94f4628ce04a77c00b42c65e4eb
 2019-04-29 12:43:42 +02:00
Alejandro Gallardo Escobar 5f986e2390 Visual Console Refactor: bugfix 
Former-commit-id: 2afef18813cc2a2d51a40bdf0a5c619bd0900b59
 2019-04-29 11:53:21 +02:00
Alejandro Gallardo Escobar 7f6ec7a501 Visual Console Refactor: bugfix 
Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9
 2019-04-29 11:03:56 +02:00
Alejandro Gallardo Escobar e5c17f660b Visual Console Refactor: fixed the label position 
Former-commit-id: d39b91f86c43e6e90f9287409635d331667d9551
 2019-04-29 10:56:06 +02:00
Alejandro Gallardo Escobar c09fbf4ddb Visual Console Refactor: fixed the links 
Former-commit-id: c37373329350c8b1ed421ae91f2a3c1e7d7f577a
 2019-04-29 10:45:12 +02:00
marcos.alconada 24e8d81b43 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 
Former-commit-id: c15ebac07056c99c3c79ae57fa1396ea66d00c04
 2019-04-29 09:26:48 +02:00
artica 5d6bd31786 Auto-updated build strings. 
Former-commit-id: 90534253be4245eaeca6b5994e861ac7f96d3b09
 2019-04-29 00:01:06 +02:00
artica 141a042ee2 Auto-updated build strings. 
Former-commit-id: 64644bc78a4b14adc5d7d76e1dc669788f06944f
 2019-04-28 00:01:06 +02:00
artica 29b7ddeb6d Auto-updated build strings. 
Former-commit-id: 48f05c5d685e8d6897e3eb490f5d4543feefcbb7
 2019-04-27 00:01:09 +02:00
Daniel Maya 504457f9a6 Fixed decimal in percentil 
Former-commit-id: ad964b4e4e2fa59eae959d5107b63d3c6f96766c
 2019-04-26 14:37:35 +02:00
Daniel Barbero e54112641d add links counters cfv 
Former-commit-id: 5a1bdfc376db32f94d06330c2e498c473361e710
 2019-04-26 14:25:51 +02:00
Tatiana Llorente 77941953a2 New style for modal window Show More. Tabs: Responses, Related, Custom data. - #3613 
Former-commit-id: 48ed0a69416232a9016b6aaff76378954ddacdc1
 2019-04-26 11:57:41 +02:00
Daniel Maya 4b73518804 Fixed node name in netflow map 
Former-commit-id: 4805505ff44d05ea9fd4aaa8b1cb1b699c2e90f8
 2019-04-26 09:54:38 +02:00
marcos.alconada cffb469334 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 
Former-commit-id: 2883dbe057d3c6063a1d1784c64c85dc49c0713b
 2019-04-26 09:44:54 +02:00
artica 6de9b4f23e Auto-updated build strings. 
Former-commit-id: 2662fa51b6a4dc2cdb87c769480ed35df148cc62
 2019-04-26 00:01:06 +02:00
Alejandro Gallardo Escobar 6feaba0b9d Visual Console: changed the default orientation of the items 
Former-commit-id: 121e71236369303385a4579b49b2129c1a0f62d0
 2019-04-25 18:23:28 +02:00
Alejandro Gallardo Escobar f3f5bcecd8 Visual Console Refactor: fixed the module graph element 
Former-commit-id: baee256acdbc28c3b2d0364b97f301f776121e36
 2019-04-25 16:59:24 +02:00
Alejandro Gallardo Escobar af69804708 Improved the background size and the elements order of the Visual Console 
Former-commit-id: 6c6c7f332062dd0b405387730e06f29cf1d328d8
 2019-04-25 16:36:17 +02:00
marcos.alconada da8507c4b4 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 
Former-commit-id: 56da7f09fa90543ae4b07af79da5dd308a4aa395
 2019-04-25 16:05:27 +02:00
Alejandro Gallardo Escobar 08f9a34f23 Visual Console Refactor: bugfix 
Former-commit-id: e6bff1d0458ca878cf31661bfcb77d833f5b8093
 2019-04-25 14:24:19 +02:00
Alejandro Gallardo Escobar 2d9b4908de Visual Console Refactor: the legacy visual console is enabled by default 
Former-commit-id: 0ee821fac4e3665ac0d869e6b772b12014f76a8a
 2019-04-25 14:08:55 +02:00
Alejandro Gallardo Escobar 0bd276bc88 Visual Console Refactor: bugfix 
Former-commit-id: f7e4f04507695550c96f91a296e316be3c18636d
 2019-04-25 14:02:30 +02:00
Daniel Rodriguez 3b03b6fa10 Merge branch 'visual-console-refactor' into 'develop' 
Visual console refactor

See merge request artica/pandorafms!2348

Former-commit-id: 6a257514f7a5487b84a1cb35514899e1ef6f11e8
 2019-04-25 11:27:49 +02:00
Alejandro Gallardo Escobar 7d95151a5b Visual Console Refactor: minor fixes 
Former-commit-id: ddd06e0f0aa3bf473d370414378cbcc1034d3f93
 2019-04-25 10:57:25 +02:00
Daniel Maya 260a149668 fixed include_once in items 
Former-commit-id: e0a7f89a5ead53c8b5cbc49f66e473fa2f77bffa
 2019-04-25 10:37:11 +02:00
Alejandro Gallardo Escobar 35d54a7e79 Visual Console Refactor: added missing libs 
Former-commit-id: e0564527b93b844c69035f125d9e74e5baa693b7
 2019-04-25 10:30:24 +02:00
Alejandro Gallardo Escobar fbd8937cd3 Merge remote-tracking branch 'origin/develop' into visual-console-phase-2 
Former-commit-id: d79ca27527b9f3662617f8cfd641a55a8272b3b8
 2019-04-25 10:09:45 +02:00
Alejandro Gallardo Escobar 6a378f664e Merge branch 'visual-console-refactor' of https://brutus.artica.lan:8081/artica/pandorafms into visual-console-refactor 
Former-commit-id: 0c2ffa8d51737644ae99eebdaae842af26ba52b8
 2019-04-25 10:02:38 +02:00
Alejandro Gallardo Escobar 8ae521b2c4 Visual Console Refactor: added missing libraries 
Former-commit-id: 02a027fb7f6276c9a59d58cd47fb2736c3878c38
 2019-04-25 10:02:35 +02:00
marcos.alconada 87ff7b3d4e Merge remote-tracking branch 'refs/remotes/origin/develop' into develop 
Former-commit-id: 2c3deaf32137b14caa9b714148808922a169f937
 2019-04-25 09:37:14 +02:00
Daniel Maya 3d2bcb3495 Fixed include_once in DonutGraph 
Former-commit-id: 20c76457cabdc1cf78fc77c2218d025543d4607e
 2019-04-25 09:25:19 +02:00
Alejandro Gallardo Escobar b6d6b05ddb Visual Console Refactor: upgraded the bundles 
Former-commit-id: af79177070cbae3c3ff61282332564f8426a544d
 2019-04-25 09:13:34 +02:00
artica 7f7a727c21 Auto-updated build strings. 
Former-commit-id: ed16fd78100502c29d6310c2c259282c0b776d0e
 2019-04-25 00:01:10 +02:00
Daniel Barbero Martin 596e760454 fixed error secondary groups 
Former-commit-id: 758cebf4ad68e24e86739d8be21dd90e2cc44847
 2019-04-24 17:28:55 +02:00
Alejandro Gallardo Escobar 48917c565f Visual Console Refactor: renamed the bundles 
Former-commit-id: 0f63859b3e2eeeb890ad35779d2119137855fb8a
 2019-04-24 17:25:57 +02:00
Alejandro Gallardo Escobar c1272035cc Merge remote-tracking branch 'origin/develop' into visual-console-refactor 
Former-commit-id: 6cffccf44d4bf8c5b87c5c5f112d814c796645c6
 2019-04-24 17:05:20 +02:00
Alejandro Gallardo Escobar dab4024f24 Visual Console Refactor: fixed the module graph's height 
Former-commit-id: 9e9bed04904c136450d0831e542bf7bcd6abab14
 2019-04-24 16:57:52 +02:00
Tatiana Llorente ab6658a450 Fixed pagination in modal windows - #3707 
Former-commit-id: 090149ce7add4d30c8747e570a819c1b8025a0a6
 2019-04-24 16:26:50 +02:00
marcos.alconada e543b64833 Merge branch 'develop' of https://brutus.artica.lan:8081/artica/pandorafms into develop 
Former-commit-id: dcf81c584d7d2dc8ee8def3e8786d7e67f92da46
 2019-04-24 16:20:42 +02:00
Alejandro Gallardo Escobar 1cb15c9404 Visual Console Refactor: fixed the donut graph 
Former-commit-id: a59da7d787571779c3dbc1be790855fda83d4b00
 2019-04-24 16:07:46 +02:00
Alejandro Gallardo Escobar 3c2e65a8a5 Visual Console Refactor: added the missing macros to the label 
Former-commit-id: 2e52a35c0f571d6162cbd3fb1188c3f47b77a8a5
 2019-04-24 15:58:33 +02:00
Daniel Maya d541eab986 Fixed size in module graph 
Former-commit-id: 5afdc41a1a7ec50f16bd39f70af6821505f98946
 2019-04-24 15:40:07 +02:00
Tatiana Llorente 313ff93c8c Fixed pagination in modal window to create dashboard - #3707 
Former-commit-id: 6fbfff55e76cb88db890864ec36d6bc766f6e2c6
 2019-04-24 15:38:46 +02:00