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

1132 Commits

Author SHA1 Message Date
Daniel Maya e182997308 Merge branch 'ent-3994-Añadir-actualización-de-ciertos-valores-a-la-api-web-de-la-consola-visual' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual 2019-06-20 11:40:33 +02:00
Tatiana Llorente 988eb2e257 Add module filter by text -#2094 2019-06-19 17:36:55 +02:00
fbsanchez 8b8d17f089 event ajax validation little improvement 2019-06-18 18:35:34 +02:00
fbsanchez 24025ebb74 Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-18 17:48:03 +02:00
fbsanchez a1f004fdec minor fixes 2019-06-18 15:03:49 +02:00
fbsanchez 22272225b8 massive operations over events 2019-06-18 14:26:55 +02:00
fbsanchez dc81d168e0 event filters group selectors 2019-06-18 11:00:48 +02:00
fbsanchez f7cf6e1e8b wip events 2019-06-18 10:32:04 +02:00
Daniel Maya 589000fb6c Added save in onItemMoved 2019-06-18 10:13:56 +02:00
fbsanchez a8a206fa10 events 2019-06-17 19:12:45 +02:00
fbsanchez 457c1c9edf wip event view 2019-06-17 18:33:39 +02:00
fbsanchez ab7d72a1c9 wip event vwr ui-box close tick 2019-06-17 17:02:33 +02:00
Luis Calvo 08c035a612 Refactorf SNMPBrowserWndow in one unique function 2019-06-17 16:33:57 +02:00
Daniel Rodriguez a583da3de3 Merge branch 'ent-3992-anadir-el-modo-de-edicion-a-la-vista-de-la-consola-visual' into 'develop' 
Añadir el modo de edición a la vista de la consola visual

Closes pandora_enterprise#3981

See merge request artica/pandorafms!2482
 2019-06-17 15:07:12 +02:00
Alejandro Gallardo Escobar dbf15a759f Added a functionality to allows the live vc item resizement 2019-06-17 12:22:55 +02:00
fbsanchez 36a1387632 WIP event show info 2019-06-14 19:23:04 +02:00
fbsanchez 132076198d minor fixes and event ACL - groups 2019-06-14 13:20:34 +02:00
fbsanchez 23d09a3c46 wip massive event operations 2019-06-13 20:09:55 +02:00
fbsanchez b08e8b595d multiple fixes 2019-06-13 19:41:21 +02:00
fbsanchez 0df48675f3 event deletion 2019-06-13 16:28:26 +02:00
fbsanchez 029d3b073f Avoid double validation, avoid redraw 2019-06-13 13:52:38 +02:00
fbsanchez 0afb53dc17 fix in time comparison while validating events 2019-06-13 13:35:02 +02:00
fbsanchez 9740275388 dyn redraw 2019-06-13 13:07:11 +02:00
fbsanchez d12773cfd0 Avoid double validation, avoid redraw 2019-06-13 12:36:31 +02:00
fbsanchez ecc2fef8f6 event validation/in process 2019-06-13 12:30:09 +02:00
fbsanchez f3a0f37a1c Events agent grouped 2019-06-12 18:19:39 +02:00
fbsanchez 4bb300889d Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles 2019-06-12 13:17:36 +02:00
fbsanchez b615b50920 wip event grouped 2019-06-12 13:17:18 +02:00
Alejandro Gallardo Escobar ee7fb4db5f Merge branch 'develop' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual 2019-06-12 12:13:48 +02:00
Alejandro Gallardo Escobar 7307d34c75 Minor fix 2019-06-11 17:39:46 +02:00
Alejandro Gallardo Escobar 5735326430 Added an async task to persist the visual console item movement to the database 2019-06-11 17:27:22 +02:00
Alejandro Fraguas cb6d71b930 Merge branch 'ent-3474-Exportar-a-csv-custom-field-view' into 'develop' 
Ent 3474 exportar a csv custom field view

See merge request artica/pandorafms!2483
 2019-06-11 17:06:14 +02:00
Alejandro Gallardo Escobar 9d15ece41a Added an event handler for move events of the visual console items 2019-06-11 16:44:19 +02:00
fbsanchez 48e6fef0b7 Event filters 2019-06-11 12:58:18 +02:00
marcos.alconada 73466b9096 Node deleted disapear in tree view 2019-06-06 18:47:10 +02:00
fbsanchez 23e6711f09 WIP Events 2019-06-06 17:50:47 +02:00
Tatiana Llorente 1a8b09229c Export csv from custom field view meta - #3474 2019-06-04 17:28:55 +02:00
Alejandro Gallardo Escobar 795542b311 Added a mode to enable the edit mode of the visual console client items 2019-06-04 17:21:54 +02:00
fbsanchez 2f5265fcbb color updates 2019-06-04 14:08:07 +02:00
Daniel Rodriguez 6b4f1466f7 Merge branch 'ent-3825-local-components-salen-con-intervalos-inversos' into 'develop' 
Changed check value on JS

See merge request artica/pandorafms!2340
 2019-05-30 15:32:16 +02:00
fbsanchez e338d5ba95 Merge remote-tracking branch 'origin/develop' into fix/styles 2019-05-27 22:40:11 +02:00
fbsanchez 9eecc414dd cps changes - switch core touched - test this commit carefully 2019-05-27 14:12:53 +02:00
fbsanchez c5bd3204ab Minor style, avoided duplicated iface names with spaces 2019-05-24 11:42:46 +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
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
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
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
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
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
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
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
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
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
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
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
manuel b2b4372c9d Added helps 
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
 2019-05-07 11:34:09 +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
Alejandro Gallardo Escobar 7f6ec7a501 Visual Console Refactor: bugfix 
Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9
 2019-04-29 11:03:56 +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 Barbero Martin ac41e9255f helpers 
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
 2019-04-24 13:53:18 +02:00
Tatiana Llorente 8aa1737d23 New style for update manager online Open Version - #3608 
Former-commit-id: 782a5467c6249e73cbcf5ef1f3185a3edfc6a9d5
 2019-04-24 12:45:07 +02:00
Alejandro Gallardo Escobar 683dcf3469 Visual Console Refactor: bugfixes 
Former-commit-id: 0c06a88cc6136961cbb7622e373e5c1dfe265c27
 2019-04-17 12:29:38 +02:00
Alejandro Gallardo Escobar 2bd88e858d Merge remote-tracking branch 'origin/develop' into visual-console-refactor 
Former-commit-id: 87f11087d0ce33be0be009d8e4e88ca525204350
 2019-04-12 14:28:20 +02:00
Alejandro Gallardo Escobar f45818ac86 Visual Console Refactor: improved the background updates interval 
Former-commit-id: 85acb18e01da36f2d9b15dec46dbc7b83b74156f
 2019-04-12 10:32:31 +02:00
Tatiana Llorente 59c2734b5a Deleted old files. Centered the map. Fixed broken image in meta. - #3806 
Former-commit-id: 30ebc8e1afeb3401011ee359ecd8626436d85fb7
 2019-04-12 09:20:55 +02:00
Alejandro Gallardo Escobar 3928a5a523 Visual Console Refactor: added the initial version of the background updates 
Former-commit-id: 6c859ebebf4882b3e48e9ec5f99570687ec31117
 2019-04-11 10:05:28 +02:00
Daniel Barbero Martin 0769c61b19 add map user edit 
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
 2019-04-09 18:18:10 +02:00
Daniel Barbero Martin 6585a4736b fixed minor error local companent with keep counters 
Former-commit-id: f9864be72f448885b2da118585f1bbb92319bd18
 2019-04-09 10:19:51 +02:00
Daniel Barbero 447655409d fixed minor error keep counters local and network components 
Former-commit-id: 8d57bede6ea7c6f44d51a696a3257600410734fe
 2019-04-05 09:27:46 +02:00
marcos.alconada 57cfdcfbc4 Changed check value on JS 
Former-commit-id: 508cf9a75eedd4836720215451903c3951339ddf
 2019-04-04 18:06:48 +02:00
Luis Calvo 1b6a01cfd5 Changed modal size to fit err. msg 
Former-commit-id: 2676ac1d217cc5245ce09277b8b76d1d562cdf5f
 2019-04-04 14:11:44 +02:00
Daniel Barbero Martin a0a250bef7 fixed error add ff_type 
Former-commit-id: b270ec363b84bbfafcea5418b6007aba8217680b
 2019-04-02 16:45:01 +02:00
Daniel Barbero Martin c679751f94 fixed error add ff_type 
Former-commit-id: 177e40f655f309eed3e7d877ffb00172b0105095
 2019-04-02 16:01:24 +02:00
Luis Calvo 4c95a160de Changed Jquery .text for .html for html conversion 
Former-commit-id: 9dd9c63e637e504ff51e38165687bacfae59ed38
 2019-04-01 17:57:22 +02:00
fbsanchez 3c853ff508 widget networkmap simple working 
Former-commit-id: 7a922350fbedefae374f89517e69863d60a8fbee
 2019-03-27 11:47:09 +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 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
Daniel Barbero Martin db39c3921b fixed minor error tasklist 
Former-commit-id: 1ee10794b09e17c3b8403dfe5540195047595577
 2019-03-26 17:22:14 +01:00
fbsanchez a76ad27825 minor fixes 
Former-commit-id: f885316b4f063daac744ca458fa3d41a16d5d81b
 2019-03-26 16:51:09 +01:00
fbsanchez 2d1463ee0c minor fixes networkmaps 
Former-commit-id: 85dda0470280e1f0cf142f7393f1492c61f42c6b
 2019-03-26 16:46:32 +01:00
Daniel Barbero Martin e3b0b7ad11 fixed update progress bars task for 3 second 
Former-commit-id: 7558c33e8540007608f7afd97ebf03e193a08def
 2019-03-26 15:38:47 +01:00
Ramon Novoa fa7cdc020b Add a countdown to license error messages. 
Former-commit-id: bba7ccf777c05801731a790351dc9920b1546262
 2019-03-26 15:32:57 +01:00
fbsanchez 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
Daniel Rodriguez 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
fbsanchez 1238f15190 discovery task advanced summary support 
Former-commit-id: f9be116dbc2d9b07119794374319ea79a3343a81
 2019-03-25 17:32:18 +01:00
fbsanchez 0cdf8a16cf removed debug trace 
Former-commit-id: c9be9dfa635e45d50fdc908134e6f5cc65383c7e
 2019-03-25 15:53:52 +01:00
fbsanchez dad791b887 relationship management JS 
Former-commit-id: 82216265dece0e5d9f77a82b1b22d6ff00265ee1
 2019-03-25 15:52:15 +01:00
fbsanchez 0708947804 add interface link fix 
Former-commit-id: 368a30d67bdbd3a08e503167b81a75fb733f327b
 2019-03-22 20:30:14 +01:00
fbsanchez face622e9e reset-map fixed 
Former-commit-id: b89cf24a88f5e190cae0d2e55a55a8d988d94458
 2019-03-22 18:27:12 +01:00
fbsanchez 4947d2117a minor fixes networkmapclass 
Former-commit-id: d8eaa2ab328d803647d365a023c3ec08efb086d3
 2019-03-22 03:56:31 +01:00
fbsanchez 26d231e78c Improved user experience networkmaps 
Former-commit-id: bd665ad24124b227c4aba763648e4735f61770c3
 2019-03-21 20:52:01 +01:00
fbsanchez 95d2259236 Improvements. networkmap class 
Former-commit-id: b2e940cbb28112fe2ac9088ce2e76fd5b48239f9
 2019-03-21 16:16:53 +01:00
Tatiana Llorente b8f1b5f6a1 Fixed a bug: show popup double authentication 
Former-commit-id: a5a7d6f2cf2f3b90a277ccf9f4f042c1ab3be48d
 2019-03-21 15:58:10 +01:00
fbsanchez 6fb6963501 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2 
Former-commit-id: 9df9a4c3a4a50e191af5167129df1352e712171e
 2019-03-20 17:40:08 +01:00
Daniel Barbero Martin daf72a4bac fixed errors delete files update manager open and metaconsole 
Former-commit-id: 1ebff30c092290b3e65e639d94c6920afed960c0
 2019-03-20 13:35:24 +01:00
Tatiana Llorente d27c509817 Merge remote-tracking branch 'origin/develop' into ent-3610-Vista-Edicion-de-Usuario 
Former-commit-id: fb1fffdf576bd46ba733717abf2425ee0e0d607c
 2019-03-20 13:28:07 +01:00
Tatiana Llorente a99c8b1a7b New view user edit 
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
 2019-03-20 13:26:15 +01:00