fbsanchez
|
53954ec853
|
Merge branch 'ent-4774-welcome-to-pandorafms' into ent-EDF
|
2019-11-11 14:26:23 +01:00 |
|
fbsanchez
|
65f5223698
|
validation alerts
|
2019-11-11 14:26:04 +01:00 |
|
fbsanchez
|
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 |
|
fbsanchez
|
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 |
Daniel Barbero Martin
|
ebb7cbfe6c
|
Fix styles css
|
2019-11-05 15:12:24 +01:00 |
Daniel Rodriguez
|
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 |
|
fbsanchez
|
3eb0a6bb95
|
minor fixes after internal meeting
|
2019-10-30 18:33:33 +01:00 |
|
fbsanchez
|
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 |
|
fbsanchez
|
383967f68a
|
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
|
2019-10-29 16:56:01 +01:00 |
marcos
|
57bfc364ae
|
add modal confirmation window
|
2019-10-28 18:57:10 +01:00 |
|
fbsanchez
|
7d5b845e1f
|
minor fixes
|
2019-10-28 18:37:01 +01:00 |
|
Daniel Barbero
|
c4aea1ac59
|
add styles validation form of modal
|
2019-10-25 13:28:01 +02:00 |
|
Daniel Barbero Martin
|
3dee6888d6
|
fix
|
2019-10-24 17:42:37 +02:00 |
|
Daniel Barbero Martin
|
de22fb70e3
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
|
2019-10-23 19:51:49 +02:00 |
|
Daniel Barbero Martin
|
f06a55c6bb
|
continue feedback mail
|
2019-10-23 19:50:57 +02:00 |
Daniel Maya
|
c01a856826
|
Changed color
|
2019-10-23 11:17:16 +02:00 |
|
marcos
|
353246f9f6
|
first changed to welcome window
|
2019-10-18 10:30:19 +02:00 |
|
Daniel Barbero Martin
|
4e56f6751a
|
Continue work diagnostics
|
2019-10-17 15:17:28 +02:00 |
Tatiana Llorente
|
dd2ace99e1
|
Check permissions to reset a network map - #4728
|
2019-10-11 13:51:52 +02:00 |
|
marcos.alconada
|
a44e1feeb4
|
fixed error comments events
|
2019-10-01 16:24:02 +02:00 |
|
fbsanchez
|
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 |
|
fbsanchez
|
adbb48ab87
|
pandora HA review
|
2019-08-10 02:13:01 +02:00 |
|
fbsanchez
|
8d9c4682c7
|
WIP Agent repository
|
2019-07-17 20:37:13 +02:00 |
|
Tatiana Llorente
|
1f8e143963
|
Fixed bug to change the event status in modal window - #4309
|
2019-07-10 13:04:06 +02:00 |
|
Tatiana Llorente
|
bfb7897149
|
Added success and error messages when change the event status - #4309
|
2019-07-10 12:15:41 +02:00 |
|
Tatiana Llorente
|
8c7745768c
|
Added success and error messages when change the event owner - #4309
|
2019-07-10 11:05:06 +02:00 |
|
Tatiana Llorente
|
936a7e839f
|
Added success and error messages when change the event owner - #4309
|
2019-07-09 17:18:37 +02:00 |
|
Tatiana Llorente
|
084d1a229e
|
Added success and error messages when change the event owner - #4309
|
2019-07-09 16:41:00 +02:00 |
|
Daniel Barbero
|
127f67f2ac
|
fixed error in network component
|
2019-07-08 19:33:54 +02:00 |
|
Daniel Barbero
|
b70c904ec3
|
fixed minor error network components
|
2019-07-08 13:40:52 +02:00 |
|
Daniel Barbero
|
6e7dfb38fd
|
fixed error network component plugin
|
2019-07-05 13:46:48 +02:00 |
Alejandro Fraguas
|
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 |
|
Alejandro Fraguas
|
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 |
|
Daniel Rodriguez
|
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 |
|
Daniel Rodriguez
|
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 |
|
fbsanchez
|
8f914b69a6
|
Minor fixes
|
2019-06-25 17:24:16 +02:00 |
|
fbsanchez
|
96ca26dc97
|
minor fix in event mass response process
|
2019-06-25 16:05:56 +02:00 |
|
Daniel Rodriguez
|
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 |
|
fbsanchez
|
1966c81f2d
|
Merge remote-tracking branch 'origin/develop' into ent-4238-eventos-csv-e-historico
|
2019-06-25 14:10:32 +02:00 |
|
Daniel Rodriguez
|
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 |
Alejandro Gallardo Escobar
|
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 |
|
fbsanchez
|
526ebdebd9
|
ajax comments
|
2019-06-20 21:11:56 +02:00 |
|
Daniel Maya
|
71ea94eea3
|
Fixed item save
|
2019-06-20 16:36:24 +02:00 |
|
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 |