Commit Graph

1026 Commits

Author SHA1 Message Date
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 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
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
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
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
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
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
Daniel Barbero d5108efb0d fixed error update manager delete files
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
2019-03-15 12:19:02 +01:00
Daniel Barbero Martin a1aa480421 add delete files in update manager
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +01:00
fbsanchez 750c64fbd7 Merge remote-tracking branch 'origin/develop' into ent-3595-discovery-fase-2
Former-commit-id: 8dd2601c41392e8b252b2a719d16deef5b6398c7
2019-03-13 09:52:00 +01:00
fbsanchez d7983bec4e WIP NetworkMap class
Former-commit-id: ae987e5f6f3ec0997746093d20f7dbd5758c9ff1
2019-03-12 12:05:54 +01:00
Daniel Rodriguez ae006026bf Merge branch '3243-SNMP_Browser_Wizard_no_buscan_en_el_exec_server_solo_lo_hacen_en_local' into 'develop'
fixed error in snmp browser change server

See merge request artica/pandorafms!2236

Former-commit-id: a6a45ffe82e01f49139d80e09a954cceb245ce12
2019-03-11 11:54:58 +01:00
daniel 00283a5c6a progress task list
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
2019-03-07 14:45:26 +01:00