ed6dd2983f
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
...
Conflicts:
pandora_console/include/javascript/pandora.js
2019-11-05 15:21:21 +01:00
58cbc3c738
Merge remote-tracking branch 'origin/develop' into ent-EDF
...
Conflicts:
pandora_console/extras/mr/33.sql
pandora_console/pandoradb_data.sql
2019-11-05 15:17:09 +01:00
ebb7cbfe6c
Fix styles css
2019-11-05 15:12:24 +01:00
a1b879d065
Merge branch 'ent-4728-Desactivar-Restart-Map-para-usuarios-sin-permisos' into 'develop'
...
Ent 4728 desactivar restart map para usuarios sin permisos
See merge request artica/pandorafms!2805
2019-11-04 18:45:57 +01:00
3eb0a6bb95
minor fixes after internal meeting
2019-10-30 18:33:33 +01:00
72b1fb2b16
Merge remote-tracking branch 'origin/ent-4774-welcome-to-pandorafms' into ent-EDF
...
Conflicts:
pandora_console/include/javascript/pandora.js
modified: pandora_console/general/register.php
modified: pandora_console/godmode/agentes/configurar_agente.php
modified: pandora_console/godmode/agentes/module_manager_editor.php
new file: pandora_console/include/ajax/welcome_window.php
new file: pandora_console/include/class/WelcomeWindow.class.php
modified: pandora_console/include/constants.php
modified: pandora_console/include/functions_config.php
modified: pandora_console/include/javascript/pandora.js
new file: pandora_console/include/styles/new_installation_welcome_window.css
2019-10-30 16:56:44 +01:00
383967f68a
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
2019-10-29 16:56:01 +01:00
57bfc364ae
add modal confirmation window
2019-10-28 18:57:10 +01:00
7d5b845e1f
minor fixes
2019-10-28 18:37:01 +01:00
c4aea1ac59
add styles validation form of modal
2019-10-25 13:28:01 +02:00
3dee6888d6
fix
2019-10-24 17:42:37 +02:00
de22fb70e3
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
2019-10-23 19:51:49 +02:00
f06a55c6bb
continue feedback mail
2019-10-23 19:50:57 +02:00
c01a856826
Changed color
2019-10-23 11:17:16 +02:00
353246f9f6
first changed to welcome window
2019-10-18 10:30:19 +02:00
4e56f6751a
Continue work diagnostics
2019-10-17 15:17:28 +02:00
dd2ace99e1
Check permissions to reset a network map - #4728
2019-10-11 13:51:52 +02:00
722ba58085
more comprehensible vc form display flow
2019-10-03 11:04:13 +02:00
79dca2fe6b
Php OO form load
2019-10-02 18:37:50 +02:00
c5022fc243
continue VC
2019-10-02 12:28:17 +02:00
a44e1feeb4
fixed error comments events
2019-10-01 16:24:02 +02:00
d35a5d4f71
continue VC form create items
2019-09-27 15:44:39 +02:00
8258e1f446
add css form VC
2019-09-26 15:26:00 +02:00
cd5fd4782c
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
...
Conflicts:
pandora_console/include/visual-console-client/vc.main.css
2019-09-24 13:20:25 +02:00
c9f15e877d
continue VC
2019-09-24 13:18:34 +02:00
7d52614064
Ent 4615 implementar cifrado en los contenedores de credenciales usando el sistema de cifrado interno de pandora
2019-09-24 11:25:53 +02:00
50c37e56c9
continue VC
2019-09-23 19:16:36 +02:00
fc024898ef
continue VC
2019-09-22 20:35:51 +02:00
034bbff2cf
continue VC
2019-09-20 15:14:26 +02:00
716c79fc3e
continue VC
2019-09-19 17:47:41 +02:00
46fdfc4445
fixed autocomplete agent
2019-08-22 10:11:06 +02:00
ee1eed93b4
Merge remote-tracking branch 'origin/develop' into new-vc-line-element
2019-08-21 07:58:08 +02:00
e537cd09f4
Fixed errors
2019-08-19 12:32:38 +02:00
c6b6566048
fixed errors
2019-08-14 14:31:41 +02:00
dbf141d866
Improved the movement of the visual console line element
2019-08-14 14:24:06 +02:00
adbb48ab87
pandora HA review
2019-08-10 02:13:01 +02:00
0bc8fc72cb
add new input group image
2019-08-05 14:58:27 +02:00
ed2d57aa4e
Add new input group visual console linked
2019-08-02 12:24:47 +02:00
2030c0beee
added copy an item
2019-07-31 13:23:25 +02:00
ade9345a74
Add select group form VC
2019-07-31 11:03:13 +02:00
a581a4b1ac
add new input group parent linked
2019-07-30 14:58:01 +02:00
8845fc9330
item deletion improvements
2019-07-30 11:20:03 +02:00
9918cc7249
Added async data request to the input groups of the visual console items
2019-07-29 15:31:13 +02:00
a8ce05d5c3
Merge branch 'new-vc-line-element' of https://brutus.artica.lan:8081/artica/pandorafms into new-vc-line-element
2019-07-29 11:33:20 +02:00
f7ab47e637
Fixed delete item
2019-07-26 14:17:14 +02:00
5067462620
Added remove item
2019-07-25 17:58:37 +02:00
30491a307c
Bugfixes
2019-07-24 16:38:00 +02:00
8d9c4682c7
WIP Agent repository
2019-07-17 20:37:13 +02:00
67b376466b
Great improvements into the edition of the visual console items
2019-07-16 16:27:23 +02:00
39d02db364
Merge branch 'new-vc-line-element' of https://brutus.artica.lan:8081/artica/pandorafms into new-vc-line-element
2019-07-12 14:04:55 +02:00
3120058c36
Added item selection and a WIP version of the edition form
2019-07-12 14:00:24 +02:00
d060468361
Added spinner
2019-07-12 11:00:11 +02:00
1f8e143963
Fixed bug to change the event status in modal window - #4309
2019-07-10 13:04:06 +02:00
bfb7897149
Added success and error messages when change the event status - #4309
2019-07-10 12:15:41 +02:00
8c7745768c
Added success and error messages when change the event owner - #4309
2019-07-10 11:05:06 +02:00
936a7e839f
Added success and error messages when change the event owner - #4309
2019-07-09 17:18:37 +02:00
8047bf2c87
Added isUpdating
2019-07-09 16:43:23 +02:00
084d1a229e
Added success and error messages when change the event owner - #4309
2019-07-09 16:41:00 +02:00
127f67f2ac
fixed error in network component
2019-07-08 19:33:54 +02:00
aafba795ee
Update visual console
2019-07-08 17:51:01 +02:00
b70c904ec3
fixed minor error network components
2019-07-08 13:40:52 +02:00
6e7dfb38fd
fixed error network component plugin
2019-07-05 13:46:48 +02:00
3a76f331c8
Merge branch 'ent-2094-Añadir-buscador-en-operaciones-masivas' into 'develop'
...
Add module filter by text -#2094
See merge request artica/pandorafms!2520
2019-07-02 11:37:01 +02:00
47838a1134
Merge branch 'ent-4213-SNMP-Walk-dede-modulo-creado-no-muestra-parametros-v3' into 'develop'
...
Ent 4213 snmp walk dede modulo creado no muestra parametros v3
See merge request artica/pandorafms!2511
2019-07-01 09:48:33 +02:00
4136f19190
Merge branch 'ent-4258-visual-console-movement-redimension-mode' into 'develop'
...
Visual Console's movement and redimension mode
See merge request artica/pandorafms!2527
2019-06-26 13:06:02 +02:00
61e07abf3a
Merge branch 'ent-4238-eventos-csv-e-historico' into 'develop'
...
Ent 4238 eventos csv e historico
See merge request artica/pandorafms!2515
2019-06-25 18:33:49 +02:00
8f914b69a6
Minor fixes
2019-06-25 17:24:16 +02:00
96ca26dc97
minor fix in event mass response process
2019-06-25 16:05:56 +02:00
01514ba5b6
Merge branch 'ent-3699-descuadre-visual-recuperar-password' into 'develop'
...
Ent 3699 descuadre visual recuperar password
See merge request artica/pandorafms!2336
2019-06-25 14:26:57 +02:00
1966c81f2d
Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico
2019-06-25 14:10:32 +02:00
c5be8e55ae
Merge branch 'ent-3807-html-special-chars-conversion' into 'develop'
...
Ent 3807 html special chars conversion
See merge request artica/pandorafms!2320
2019-06-25 12:19:01 +02:00
d9fee539a8
Merge branch 'develop' into 'ent-4258-visual-console-movement-redimension-mode'
...
# Conflicts:
# pandora_console/include/visual-console-client/vc.main.css
2019-06-24 10:31:53 +02:00
526ebdebd9
ajax comments
2019-06-20 21:11:56 +02:00
71ea94eea3
Fixed item save
2019-06-20 16:36:24 +02:00
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
988eb2e257
Add module filter by text -#2094
2019-06-19 17:36:55 +02:00
8b8d17f089
event ajax validation little improvement
2019-06-18 18:35:34 +02:00
24025ebb74
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-18 17:48:03 +02:00
a1f004fdec
minor fixes
2019-06-18 15:03:49 +02:00
22272225b8
massive operations over events
2019-06-18 14:26:55 +02:00
dc81d168e0
event filters group selectors
2019-06-18 11:00:48 +02:00
f7cf6e1e8b
wip events
2019-06-18 10:32:04 +02:00
589000fb6c
Added save in onItemMoved
2019-06-18 10:13:56 +02:00
a8a206fa10
events
2019-06-17 19:12:45 +02:00
457c1c9edf
wip event view
2019-06-17 18:33:39 +02:00
ab7d72a1c9
wip event vwr ui-box close tick
2019-06-17 17:02:33 +02:00
08c035a612
Refactorf SNMPBrowserWndow in one unique function
2019-06-17 16:33:57 +02:00
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
dbf15a759f
Added a functionality to allows the live vc item resizement
2019-06-17 12:22:55 +02:00
36a1387632
WIP event show info
2019-06-14 19:23:04 +02:00
132076198d
minor fixes and event ACL - groups
2019-06-14 13:20:34 +02:00
23d09a3c46
wip massive event operations
2019-06-13 20:09:55 +02:00
b08e8b595d
multiple fixes
2019-06-13 19:41:21 +02:00
0df48675f3
event deletion
2019-06-13 16:28:26 +02:00
029d3b073f
Avoid double validation, avoid redraw
2019-06-13 13:52:38 +02:00
0afb53dc17
fix in time comparison while validating events
2019-06-13 13:35:02 +02:00
9740275388
dyn redraw
2019-06-13 13:07:11 +02:00
d12773cfd0
Avoid double validation, avoid redraw
2019-06-13 12:36:31 +02:00
ecc2fef8f6
event validation/in process
2019-06-13 12:30:09 +02:00
f3a0f37a1c
Events agent grouped
2019-06-12 18:19:39 +02:00
4bb300889d
Merge remote-tracking branch 'origin/develop' into ent-4136-button-styles
2019-06-12 13:17:36 +02:00
b615b50920
wip event grouped
2019-06-12 13:17:18 +02:00
ee7fb4db5f
Merge branch 'develop' into ent-3997-anadir-posicionamiento-a-los-elementos-de-la-consola-visual
2019-06-12 12:13:48 +02:00
7307d34c75
Minor fix
2019-06-11 17:39:46 +02:00
5735326430
Added an async task to persist the visual console item movement to the database
2019-06-11 17:27:22 +02:00
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
9d15ece41a
Added an event handler for move events of the visual console items
2019-06-11 16:44:19 +02:00
48e6fef0b7
Event filters
2019-06-11 12:58:18 +02:00
73466b9096
Node deleted disapear in tree view
2019-06-06 18:47:10 +02:00
23e6711f09
WIP Events
2019-06-06 17:50:47 +02:00
1a8b09229c
Export csv from custom field view meta - #3474
2019-06-04 17:28:55 +02:00
795542b311
Added a mode to enable the edit mode of the visual console client items
2019-06-04 17:21:54 +02:00
2f5265fcbb
color updates
2019-06-04 14:08:07 +02:00
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
e338d5ba95
Merge remote-tracking branch 'origin/develop' into fix/styles
2019-05-27 22:40:11 +02:00
9eecc414dd
cps changes - switch core touched - test this commit carefully
2019-05-27 14:12:53 +02:00
c5bd3204ab
Minor style, avoided duplicated iface names with spaces
2019-05-24 11:42:46 +02:00
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
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
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
34218fa7eb
Improved the management of the async requests of the visual console client
2019-05-17 14:09:30 +02:00
b3d2eaaf9e
Fixed img url on js
...
Former-commit-id: 72a6122343da8c27248c639a6afa180fbfded9c0
2019-05-16 17:25:18 +02:00
1bfd91725e
Changed <img> to hmtl_print_image
...
Former-commit-id: 6f72ebce38470308bccb08c5d0b1906b5e711472
2019-05-16 17:13:14 +02:00
a25a08f48d
Added an async task manager to the visual console client
...
Former-commit-id: 4f5c92a976ae976e77cc11505c7a57bf31121930
2019-05-16 11:04:03 +02:00
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
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
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
ef45fc3ca6
Merge remote-tracking branch 'origin/develop' into ent-3617-Gráfica-de-módulos
2019-05-09 10:44:31 +02:00
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
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
cb49de4d81
New menu module graph - #3617
2019-05-08 10:28:00 +02:00
f5759abcad
Merge branch 'develop' into ent-3468-Ayudas_online
2019-05-08 09:35:32 +02:00
b2b4372c9d
Added helps
...
Former-commit-id: 0f3894ec81918c25e33bfb67463f4709e156c374
2019-05-07 11:34:09 +02:00
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
7f6ec7a501
Visual Console Refactor: bugfix
...
Former-commit-id: 10f2a2199275475b7674364bb5f3d595b65f12c9
2019-04-29 11:03:56 +02:00
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
ac41e9255f
helpers
...
Former-commit-id: 56c67397cb17ca0ebc28e2903c378fcda10a6536
2019-04-24 13:53:18 +02:00
8aa1737d23
New style for update manager online Open Version - #3608
...
Former-commit-id: 782a5467c6249e73cbcf5ef1f3185a3edfc6a9d5
2019-04-24 12:45:07 +02:00
683dcf3469
Visual Console Refactor: bugfixes
...
Former-commit-id: 0c06a88cc6136961cbb7622e373e5c1dfe265c27
2019-04-17 12:29:38 +02:00
2bd88e858d
Merge remote-tracking branch 'origin/develop' into visual-console-refactor
...
Former-commit-id: 87f11087d0ce33be0be009d8e4e88ca525204350
2019-04-12 14:28:20 +02:00
f45818ac86
Visual Console Refactor: improved the background updates interval
...
Former-commit-id: 85acb18e01da36f2d9b15dec46dbc7b83b74156f
2019-04-12 10:32:31 +02:00
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
3928a5a523
Visual Console Refactor: added the initial version of the background updates
...
Former-commit-id: 6c859ebebf4882b3e48e9ec5f99570687ec31117
2019-04-11 10:05:28 +02:00
0769c61b19
add map user edit
...
Former-commit-id: 0adbeea2f272233a9bd105bbb3d7d02ea3759ad7
2019-04-09 18:18:10 +02:00
6585a4736b
fixed minor error local companent with keep counters
...
Former-commit-id: f9864be72f448885b2da118585f1bbb92319bd18
2019-04-09 10:19:51 +02:00
447655409d
fixed minor error keep counters local and network components
...
Former-commit-id: 8d57bede6ea7c6f44d51a696a3257600410734fe
2019-04-05 09:27:46 +02:00
57cfdcfbc4
Changed check value on JS
...
Former-commit-id: 508cf9a75eedd4836720215451903c3951339ddf
2019-04-04 18:06:48 +02:00
1b6a01cfd5
Changed modal size to fit err. msg
...
Former-commit-id: 2676ac1d217cc5245ce09277b8b76d1d562cdf5f
2019-04-04 14:11:44 +02:00
a0a250bef7
fixed error add ff_type
...
Former-commit-id: b270ec363b84bbfafcea5418b6007aba8217680b
2019-04-02 16:45:01 +02:00
c679751f94
fixed error add ff_type
...
Former-commit-id: 177e40f655f309eed3e7d877ffb00172b0105095
2019-04-02 16:01:24 +02:00
4c95a160de
Changed Jquery .text for .html for html conversion
...
Former-commit-id: 9dd9c63e637e504ff51e38165687bacfae59ed38
2019-04-01 17:57:22 +02:00
3c853ff508
widget networkmap simple working
...
Former-commit-id: 7a922350fbedefae374f89517e69863d60a8fbee
2019-03-27 11:47:09 +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
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
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
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
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
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
0cdf8a16cf
removed debug trace
...
Former-commit-id: c9be9dfa635e45d50fdc908134e6f5cc65383c7e
2019-03-25 15:53:52 +01:00
dad791b887
relationship management JS
...
Former-commit-id: 82216265dece0e5d9f77a82b1b22d6ff00265ee1
2019-03-25 15:52:15 +01:00
0708947804
add interface link fix
...
Former-commit-id: 368a30d67bdbd3a08e503167b81a75fb733f327b
2019-03-22 20:30:14 +01:00
face622e9e
reset-map fixed
...
Former-commit-id: b89cf24a88f5e190cae0d2e55a55a8d988d94458
2019-03-22 18:27:12 +01:00
4947d2117a
minor fixes networkmapclass
...
Former-commit-id: d8eaa2ab328d803647d365a023c3ec08efb086d3
2019-03-22 03:56:31 +01:00
26d231e78c
Improved user experience networkmaps
...
Former-commit-id: bd665ad24124b227c4aba763648e4735f61770c3
2019-03-21 20:52:01 +01:00
95d2259236
Improvements. networkmap class
...
Former-commit-id: b2e940cbb28112fe2ac9088ce2e76fd5b48239f9
2019-03-21 16:16:53 +01:00
b8f1b5f6a1
Fixed a bug: show popup double authentication
...
Former-commit-id: a5a7d6f2cf2f3b90a277ccf9f4f042c1ab3be48d
2019-03-21 15:58:10 +01:00
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
daf72a4bac
fixed errors delete files update manager open and metaconsole
...
Former-commit-id: 1ebff30c092290b3e65e639d94c6920afed960c0
2019-03-20 13:35:24 +01:00
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
a99c8b1a7b
New view user edit
...
Former-commit-id: 46b0d396f2121901b19417ebdfe91963c3ea0e54
2019-03-20 13:26:15 +01:00
d5108efb0d
fixed error update manager delete files
...
Former-commit-id: 88b915f9278eba5949c867ae514a104ce796aec1
2019-03-15 12:19:02 +01:00
a1aa480421
add delete files in update manager
...
Former-commit-id: 880dfc8079e7e85fa1fcba4746927caf1a2d2c06
2019-03-14 18:04:28 +01:00
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
d7983bec4e
WIP NetworkMap class
...
Former-commit-id: ae987e5f6f3ec0997746093d20f7dbd5758c9ff1
2019-03-12 12:05:54 +01:00
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
00283a5c6a
progress task list
...
Former-commit-id: 5b8a10cdc792e74538784ae27367bc1ca2c7bed0
2019-03-07 14:45:26 +01:00
f79400ecfb
Merge remote-tracking branch 'origin/develop' into ent-3498-Anadir_parametros_manualmente_en_respuestas_de_eventos_masiva
...
Former-commit-id: 76e5afc943bd05e89a82efbe091db42d1e0a4e8d
2019-03-07 08:32:40 +01:00
d722c39393
add custom net scan
...
Former-commit-id: 61df342754f17b2ecfe3ad06055e9c5b73617d03
2019-03-06 17:14:32 +01:00
e26c81aa6c
Fixed images and reset map in networkmap
...
Former-commit-id: d56dc68d542aa1e4d30a3014acc53b44dc07191e
2019-03-05 15:33:27 +01:00
9d7c6854a8
fixed error in snmp browser change server
...
Former-commit-id: 0545012dd8526bdf4cc836af2d263af7b5ca5328
2019-03-04 15:33:36 +01:00
8780571a74
add new functionality in event response
...
Former-commit-id: 2cf28b95c068c40e79b8f05b212aad0f720de79b
2019-02-27 10:59:44 +01:00
8f24c0cb18
Fixed conflict in CLI apply_policy
...
Former-commit-id: ab512d9c2b88cd7042d6ae065251cd116b2ea5af
2019-02-27 10:28:36 +01:00
441fb979e1
Merge branch 'ent-3210-Nueva-vista-de-servicios' into 'develop'
...
Ent 3210 nueva vista de servicios
See merge request artica/pandorafms!2195
Former-commit-id: f29cb46b83ff0fde722f3c5e3eaf26aedf5cf327
2019-02-26 16:32:34 +01:00
7791639b35
fix bad image routes
...
Former-commit-id: 236701131f5c2f5b11c01b878d8a04b71f76ddd3
2019-02-26 13:31:35 +01:00
db5d2ceee1
fix bad routes in services treeview
...
Former-commit-id: 27bfcca5a7e0f7c3929e2a1f449c0f1d318891c9
2019-02-25 17:04:07 +01:00
faae9c58b3
implement services tree view
...
Former-commit-id: a081515f62ab210f96687577bfde60d5f6d23f23
2019-02-22 14:09:27 +01:00
eb56fd566c
implemented services treeview
...
Former-commit-id: d5d71442d0c6122ba91b160647559cdf03f55625
2019-02-22 13:07:47 +01:00
00cba4cbc9
Fixed bug in filtered modules by tag
...
Former-commit-id: 098d3c88a9a30fb1c38074e741f093ff40fd5d02
2019-02-19 13:05:31 +01:00
6a9e69adb1
Added changes
...
Former-commit-id: 0d0de6dba065aaaa5bbfc4b9f9790e4ef1b92b7d
2019-02-13 12:21:31 +01:00
9baa3dcfa2
Merge remote-tracking branch 'origin/develop' into 3358-Mejora-en-la-aplicación-de-estilos
...
Conflicts:
pandora_console/extensions/agents_modules.php
pandora_console/extensions/module_groups.php
pandora_console/general/login_page.php
pandora_console/godmode/alerts/alert_list.builder.php
pandora_console/godmode/alerts/alert_list.list.php
pandora_console/godmode/gis_maps/configure_gis_map.php
pandora_console/godmode/groups/group_list.php
pandora_console/godmode/reporting/visual_console_builder.data.php
pandora_console/godmode/reporting/visual_console_builder.editor.php
pandora_console/godmode/reporting/visual_console_builder.elements.php
pandora_console/godmode/setup/setup_visuals.php
pandora_console/include/chart_generator.php
pandora_console/include/functions_networkmap.php
pandora_console/include/functions_pandora_networkmap.php
pandora_console/include/functions_ui.php
pandora_console/include/functions_visual_map_editor.php
pandora_console/include/styles/common.css
pandora_console/include/styles/countdown.css
pandora_console/include/styles/datepicker.css
pandora_console/include/styles/dialog.css
pandora_console/include/styles/help.css
pandora_console/include/styles/menu.css
pandora_console/include/styles/pandora.css
pandora_console/include/styles/pandora_forms.css
pandora_console/operation/agentes/estado_monitores.php
pandora_console/operation/agentes/interface_traffic_graph_win.php
pandora_console/operation/agentes/realtime_win.php
pandora_console/operation/agentes/stat_win.php
pandora_console/operation/events/events.php
pandora_console/operation/snmpconsole/snmp_view.php
pandora_console/operation/tree.php
pandora_console/operation/visual_console/render_view.php
Former-commit-id: 87793fc5a319121753f591da7949ad0ff3bd72b1
2019-02-05 09:23:53 +01:00
7a9684f23c
Changed the format of the .css files
...
Former-commit-id: a0dce3fe780031105396a8439c83d520197670af
2019-01-30 12:42:16 +01:00
dc238cf74a
Changed the format of the .js and .html files
...
Former-commit-id: 7a06315787b85355f4840cbfb0431d55dea4293d
2019-01-30 12:27:18 +01:00
f5c96b7e5d
New organization of CSS files - #3358
...
Former-commit-id: 8512adc7742eecb64db2b0ee539acfddd33406c2
2019-01-24 11:10:49 +01:00
1ed90180c9
disable actions in event list when centralized mode is enabled and improve behavior of checkboxes when a massive action is applied
...
Former-commit-id: 11f4606d2e7dd9b91c918323dc8a3dada0c8f765
2019-01-15 11:27:05 +01:00
5a8e46d608
modify the way event responses are executed in event list
...
Former-commit-id: 14ef545eef10427d95f96484e8d6b8d9656bd53c
2019-01-14 12:10:43 +01:00
4f7733d8e8
Merge branch '2923-unit-y-post-process-no-se-guardan' into 'develop'
...
fixed bug: failing load of post process and unit fields in plugin component in module creation
See merge request artica/pandorafms!1912
Former-commit-id: 659495290305079e9932ab60b5fef924ef6089ed
2019-01-09 10:31:44 +01:00
c6b9122cfc
minor fix in control messages format and processing
...
Former-commit-id: bda61b3e6d6ef74090c215f9aa9d2f3db42456bd
2018-12-27 19:16:56 +01:00
3c317c182d
Default value given to a textPath's startOffet attribute to fix an error
2018-12-04 16:42:19 +01:00
a4f2a65e3a
Fixed the initial zoom and center of the networkmaps
2018-12-03 16:12:43 +01:00
48c83430ec
Merge branch '3071_Fallo_en_mapa_GIS' into 'develop'
...
Fixed error in agent table in GIS map
See merge request artica/pandorafms!1970
2018-11-30 13:05:10 +01:00
726cabb578
fixed minor error jquery
2018-11-23 10:47:57 +01:00
2eb47c1251
fixed errors in custom fields view
2018-11-16 15:00:09 +01:00
0a097d185d
fixed errors in custom fields view
2018-11-16 11:58:49 +01:00
dc6a293b52
Fixed error in agent table in GIS map
2018-11-14 11:53:12 +01:00
1c1df4b5f7
fixed errors css jqueryui
2018-11-07 17:09:42 +01:00
267f83cc4c
add datatabes
2018-11-07 13:25:02 +01:00
7d54858b45
delete files dont use
2018-11-07 13:24:07 +01:00
74016c928f
fixed bug: failing load of post process and unit fields in plugin component in module creation
2018-10-30 10:20:31 +01:00
1973a5fe54
Merge branch '2326-unificar-vistas-ux-y-wux-en-un-mismo-portal' into 'develop'
...
WUX-UX integration
See merge request artica/pandorafms!1890
2018-10-26 14:42:23 +02:00
c06bd4207e
estilos popup
2018-10-25 16:40:45 +02:00
8619adbf4c
estilos popup
2018-10-25 15:42:20 +02:00
85051924b7
estilos popup
2018-10-25 14:01:12 +02:00
82f6e3cb95
Merge branch '2786-Errores-en-mapas-de-red-dev' into 'develop'
...
Fixed group and set_center
See merge request artica/pandorafms!1880
2018-10-25 11:43:38 +02:00
4f406d8702
Merge branch '2876-No-se-guardan-datos-Network-components' into 'develop'
...
Fixed bug in the data collection of network component when creating its corresponding module
See merge request artica/pandorafms!1865
2018-10-25 10:58:03 +02:00
f10a661cd6
Fixed group and set_center
2018-10-23 12:36:20 +02:00
aa0c4b41e7
Fixed bug in the data collection of network component when creating its corresponding module
2018-10-17 13:31:14 +02:00
14afe2ff88
Added message 'Please, select an agent first'
2018-10-17 12:35:11 +02:00
de10de03f7
[Tags performance] Fixed edit and delete massive delete and edit modules in bulk selecting modules first
2018-10-10 17:42:33 +02:00
28f9e152e7
[Tags performance] Fixed tags filter and removed unwanted code
2018-10-09 10:56:02 +02:00
1e4c570541
[Tags performance] check agents_get_modules in networkmap and removed unused code
2018-10-05 10:44:24 +02:00
e8621e54e5
Updated tags optimization
2018-10-05 09:40:08 +02:00
0c853a83d1
add new tree view edition group
2018-09-18 09:28:22 +02:00
f317f3e736
fixed errors in graph min and max warning and critical for edition module
2018-07-17 11:26:25 +02:00
082e9c6185
Merge branch '1781-Animación-visual-para-ventanas-modales-de-ayuda-2' into 'develop'
...
Add visual animation to popup modal windows - #1781
See merge request artica/pandorafms!1284
2018-06-25 18:59:34 +02:00
e07da64c5d
fixed minor errors size stat-win
2018-06-12 16:54:45 +02:00
f85a8b513a
fixed errors
2018-06-08 14:30:15 +02:00
89a481c452
fixed errors in graphs
2018-06-06 11:18:39 +02:00
dd57ddbd3c
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/functions.php
pandora_console/include/styles/pandora.css
2018-05-28 17:54:53 +02:00
063865e179
[Rebranding] Refactorized logos preview in nodo
2018-05-24 12:50:24 +02:00
16dca6860f
Merge remote-tracking branch 'origin/develop' into 1827-Graficas_TIP_eje_x_no_mantiene_ratio
...
Conflicts:
pandora_console/include/graphs/flot/pandora.flot.js
2018-05-23 12:46:12 +02:00
e71fd399fb
Merge branch 'develop' into 2106-intracom-rebranding
...
Conflicts:
pandora_console/godmode/admin_access_logs.php
pandora_console/include/javascript/functions_pandora_networkmap.js
2018-05-22 19:29:46 +02:00
25666e1bff
fixed errors
2018-05-22 10:50:38 +02:00
58370449dd
Merge branch 'ent-2200-Unreachable-host-en-respuestas-de-eventos' into 'develop'
...
Removed unreachable host from events responses
See merge request artica/pandorafms!1450
2018-05-22 10:00:37 +02:00
0e3db1eb80
[Rebranding] Added custom logo to network maps central node
2018-05-21 18:26:28 +02:00
80aeded931
[Rebranding] Central node in network maps
2018-05-14 12:58:22 +02:00
7d6e50814f
Merge branch 'develop' into ent-2215-cut-node-names-networkmap
2018-05-10 12:41:28 +02:00
9af7b75e3e
The node names of the networkmap are reduced if they are too long
2018-05-10 11:46:49 +02:00
220ea8d319
Merge branch 'ent-2103-wms-map-server' into 'develop'
...
Added a new GIS map source type called WMS
See merge request artica/pandorafms!1469
2018-05-09 10:28:30 +02:00
d746af9c28
Merge branch 'ent-1888-anadir-nueva-feature-para-poder-cambiar-los-eventos-a-estado-en-proceso' into 'develop'
...
Ent 1888 anadir nueva feature para poder cambiar los eventos a estado en proceso
See merge request artica/pandorafms!1442
2018-05-09 10:24:19 +02:00
27b2d55371
Fixed Flip Flop threshold change value on component loading via AJAX
2018-04-30 17:48:49 +02:00
cc06dfe876
Added a new GIS map source type called WMS
2018-04-27 12:17:42 +02:00
03b5cbdb62
Fixed issue in networkmap
2018-04-26 12:29:11 +02:00
708cd1020b
Fixed repeated relationships in networkmap
2018-04-26 10:40:16 +02:00
5429ebb8de
Removed unreachable host from events responses
2018-04-25 19:04:52 +02:00
675e8deb47
Added function display_confirm_dialog with custom dialog
2018-04-25 12:32:58 +02:00
118f32e12e
Fixed duplicate relationships in networkmap
2018-04-24 10:28:34 +02:00
fbsanchez
Daniel Barbero Martin
Daniel Rodriguez
marcos
Daniel Maya
Tatiana Llorente
Alejandro Gallardo Escobar
Alejandro Fraguas
Luis Calvo
manuel
Alejandro Campos
Ramon Novoa
samucarc
artica
vgilc
fermin831
slerena