Commit Graph

1046 Commits

Author SHA1 Message Date
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 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
marcos.alconada 73466b9096 Node deleted disapear in tree view 2019-06-06 18:47:10 +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
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
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
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