Tatiana Llorente
|
c83b85c225
|
Ent 4801 error informes pdf csv
|
2019-11-04 18:41:03 +01:00 |
|
Alejandro Fraguas
|
777bbdd180
|
Merge branch '4581-sample-agent-nueva-funcionalidad' into 'develop'
Added feature sample_agent
See merge request artica/pandorafms!2826
|
2019-11-04 17:54:33 +01:00 |
|
Alejandro Fraguas
|
648778fffe
|
Merge branch 'ent-4810-No-funcionan-los-templates-de-consolas-visuales' into 'develop'
Ent 4810 no funcionan los templates de consolas visuales
See merge request artica/pandorafms!2814
|
2019-11-04 12:40:04 +01:00 |
|
Tatiana Llorente
|
28e2702a48
|
Changed condition for general reports with last value checked
|
2019-11-04 12:00:12 +01:00 |
|
fbsanchez
|
123cf6e4a0
|
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
|
2019-11-04 11:25:22 +01:00 |
|
Alejandro Fraguas
|
cf3bcefddf
|
Merge branch 'ent-4826-error-accesso-con-sin-acl' into 'develop'
Fixed planned downtime acl
See merge request artica/pandorafms!2829
|
2019-11-04 11:25:17 +01:00 |
|
fbsanchez
|
a7e3614fa6
|
renamed ws service
|
2019-11-04 11:23:31 +01:00 |
|
manuel
|
d0c2c0d1eb
|
Fixed visual bug in general report item
|
2019-11-04 10:39:16 +01:00 |
|
Tatiana Llorente
|
867ab6d0bf
|
Fixed bug in report date
|
2019-10-31 09:51:38 +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 |
|
Daniel Maya
|
8573add0b3
|
Fixed agent name and error lenght
|
2019-10-30 13:01:59 +01:00 |
|
fbsanchez
|
c07baa614f
|
Merge remote-tracking branch 'origin/ent-4766-feedback-de-ayudas' into ent-EDF
|
2019-10-29 17:00:57 +01:00 |
|
Marcos Alconada
|
613e5741fb
|
Merge branch 'develop' into 'ent-4766-feedback-de-ayudas'
# Conflicts:
# pandora_console/include/functions_ui.php
|
2019-10-29 17:00:39 +01:00 |
|
fbsanchez
|
383967f68a
|
Merge branch 'ent-4769-modulos-ssh-php-perl' into ent-EDF
|
2019-10-29 16:56:01 +01:00 |
|
fbsanchez
|
0a53c0b915
|
Merge remote-tracking branch 'origin/ent-4752-Herramientas-de-diagnostico' into ent-EDF
|
2019-10-29 16:50:46 +01:00 |
|
fbsanchez
|
7224131126
|
Merge branch 'ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace' into ent-EDF
|
2019-10-29 16:50:02 +01:00 |
|
alejandro-campos
|
14230d218a
|
fix bug in snmp console filter
|
2019-10-29 16:14:33 +01:00 |
|
fbsanchez
|
f3fdcb4de0
|
MR update
|
2019-10-29 16:06:34 +01:00 |
|
fbsanchez
|
6478c7a51f
|
minor tips quickshell
|
2019-10-29 15:55:39 +01:00 |
|
fbsanchez
|
06c7544041
|
minor fixes
|
2019-10-29 15:44:46 +01:00 |
|
marcos
|
8174b4f2eb
|
add help option in welcome window
|
2019-10-29 10:38:22 +01:00 |
|
Luis Calvo
|
64e80e6fee
|
Fixed error message
|
2019-10-29 10:32:59 +01:00 |
|
Luis Calvo
|
7f01f3d014
|
Merge remote-tracking branch 'origin/develop' into ent-3687-get-agents-id-name-by-alias-api-cli
|
2019-10-29 10:23:46 +01:00 |
|
Daniel Barbero Martin
|
6ff85d2abb
|
fixed image
|
2019-10-29 09:21:08 +01:00 |
|
Daniel Barbero Martin
|
6f52095419
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
|
2019-10-29 09:14:06 +01:00 |
|
Daniel Barbero Martin
|
f6fd5cc21f
|
Add image feedback
|
2019-10-29 09:13:48 +01:00 |
|
artica
|
6f3e42e732
|
Auto-updated build strings.
|
2019-10-29 00:01:13 +01:00 |
|
fbsanchez
|
2e629af15c
|
Simplified log message avoid extra symbols "*"
|
2019-10-28 20:43:36 +01:00 |
|
marcos
|
57bfc364ae
|
add modal confirmation window
|
2019-10-28 18:57:10 +01:00 |
|
fbsanchez
|
6d21f71617
|
removed trace
|
2019-10-28 18:38:56 +01:00 |
|
fbsanchez
|
7d5b845e1f
|
minor fixes
|
2019-10-28 18:37:01 +01:00 |
|
Tatiana Llorente
|
32da1d287b
|
Fixed API function set_module_data
|
2019-10-28 15:19:39 +01:00 |
|
alejandro-campos
|
049c3c2476
|
fix migrate missing content
|
2019-10-28 13:46:37 +01:00 |
|
fbsanchez
|
e12bcb2ac4
|
Merge remote-tracking branch 'origin/develop' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
|
2019-10-28 12:59:02 +01:00 |
|
fbsanchez
|
7accbc97c4
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
|
2019-10-28 12:36:19 +01:00 |
|
artica
|
3094d5af05
|
Updated version and build strings.
|
2019-10-28 12:35:59 +01:00 |
|
artica
|
428c678a05
|
Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop
|
2019-10-28 12:35:53 +01:00 |
|
fbsanchez
|
74007ebf70
|
33 => 34, cleanup
|
2019-10-28 12:18:56 +01:00 |
|
fbsanchez
|
ccf971c2eb
|
Merge remote-tracking branch 'origin/develop' into ent-4769-modulos-ssh-php-perl
|
2019-10-28 12:18:19 +01:00 |
|
fbsanchez
|
d6681cedd1
|
33 => 34
|
2019-10-28 12:18:13 +01:00 |
|
Alejandro Fraguas
|
ffb9b9052c
|
Merge branch 'ent-4848-phantomjs-se-queda-congelado' into 'develop'
Ent 4848 phantomjs se queda congelado
See merge request artica/pandorafms!2837
|
2019-10-28 11:53:47 +01:00 |
|
Daniel Rodriguez
|
08247c1952
|
Merge branch 'ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name' into 'develop'
changed pandora api functions to include possibility of using agent alias when...
See merge request artica/pandorafms!2819
|
2019-10-28 11:25:38 +01:00 |
|
Alejandro Fraguas
|
405b91a2ac
|
Merge branch 'ent-3584-no-pasa-html_encode-al-alias-de-los-broker_agents' into 'develop'
Encode the agent alias with HTML entities.
See merge request artica/pandorafms!2836
|
2019-10-28 10:01:48 +01:00 |
|
artica
|
89cf58f814
|
Merge remote-tracking branch 'remotes/origin/ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name' into develop
|
2019-10-28 09:56:59 +01:00 |
|
alejandro-campos
|
b16ef248d6
|
minor fixes in cli and api functions
|
2019-10-28 09:48:52 +01:00 |
|
Daniel Barbero Martin
|
89b030c484
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
|
2019-10-28 08:50:02 +01:00 |
|
artica
|
88a56a1f22
|
Auto-updated build strings.
|
2019-10-28 00:01:08 +01:00 |
|
artica
|
874ac0c630
|
Auto-updated build strings.
|
2019-10-27 00:01:07 +02:00 |
|
artica
|
8a03486dfc
|
Auto-updated build strings.
|
2019-10-26 00:01:09 +02:00 |
|