Daniel Rodriguez
|
e403c781ea
|
Merge branch 'ent-5822-prueba-concepto-modal-selector-de-grupos' into 'develop'
Group selection improvement
See merge request artica/pandorafms!3450
|
2020-10-05 13:11:23 +02:00 |
|
Daniel Rodriguez
|
099a0e4d67
|
Merge branch 'ent-6145-Mostrar-AVG-MAX-MIN-en-graficas-con-selector-individual' into 'develop'
add new options char
See merge request artica/pandorafms!3471
|
2020-10-05 12:04:46 +02:00 |
daniel
|
48831b5032
|
add new options char
|
2020-10-05 12:04:46 +02:00 |
fbsanchez
|
27c2fa0860
|
minor fix
|
2020-10-05 11:52:41 +02:00 |
|
fbsanchez
|
e21fa82b48
|
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
|
2020-10-05 10:58:21 +02:00 |
artica
|
b1d218d875
|
Auto-updated build strings.
|
2020-10-05 01:00:14 +02:00 |
|
artica
|
2965099f2f
|
Auto-updated build strings.
|
2020-10-04 01:00:17 +02:00 |
|
artica
|
344cf25874
|
Auto-updated build strings.
|
2020-10-03 01:00:18 +02:00 |
|
fbsanchez
|
2187f9d0c9
|
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
Conflicts:
pandora_console/godmode/reporting/reporting_builder.item_editor.php
|
2020-10-02 14:56:07 +02:00 |
|
fbsanchez
|
ea3f147bad
|
minor fixes group selector
|
2020-10-02 14:31:41 +02:00 |
|
Daniel Rodriguez
|
350018982c
|
Merge branch 'ent-6366-Definir-tipo-de-grafica-en-informes-de-grafica' into 'develop'
add render graph to reports
See merge request artica/pandorafms!3483
|
2020-10-02 14:16:55 +02:00 |
|
daniel
|
a5d5a45cac
|
add render graph to reports
|
2020-10-02 14:16:55 +02:00 |
|
fbsanchez
|
07ed5ac9d8
|
minor fix AJAX group selector in MC
|
2020-10-02 14:00:04 +02:00 |
|
Daniel Rodriguez
|
1cdb91a02d
|
Merge branch 'ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos' into 'develop'
Custom id improvements
See merge request artica/pandorafms!3464
|
2020-10-02 13:07:59 +02:00 |
|
Daniel Rodriguez
|
e9ec50c81f
|
Merge branch 'ent-6315-pandora_db-genere-un-db-lock-cuando-se-este-ejecutando-ha' into 'develop'
pandora_db only runs on the master server.
See merge request artica/pandorafms!3477
|
2020-10-02 12:26:38 +02:00 |
|
artica
|
354ae84171
|
Auto-updated build strings.
|
2020-10-02 01:00:20 +02:00 |
|
fbsanchez
|
308598ba8d
|
minor fix
|
2020-10-01 16:23:00 +02:00 |
|
Daniel Rodriguez
|
7daf37ab35
|
Merge branch 'ent-6385-Vista-de-grafica-muy-grande' into 'develop'
fix visual windows charts
See merge request artica/pandorafms!3485
|
2020-10-01 15:29:54 +02:00 |
|
daniel
|
0db539c444
|
fix visual windows charts
|
2020-10-01 15:29:54 +02:00 |
|
fbsanchez
|
f44b614f54
|
Fix cache hit users_get_groups
|
2020-10-01 15:17:06 +02:00 |
|
fbsanchez
|
679d72e5c0
|
minor fix
|
2020-10-01 14:05:25 +02:00 |
|
fbsanchez
|
4f80eec179
|
recovered changes after merge request
|
2020-10-01 13:42:41 +02:00 |
|
fbsanchez
|
d052c09f44
|
Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
|
2020-10-01 13:36:13 +02:00 |
|
artica
|
43b02efa4e
|
Auto-updated build strings.
|
2020-10-01 01:00:20 +02:00 |
|
fbsanchez
|
b07d24ed25
|
Merge remote-tracking branch 'origin/develop' into ent-6302-proyectos-anadir-un-campo-de-numero-de-ticket-para-modulos
Conflicts:
pandora_console/include/functions_api.php
pandora_console/operation/events/events.php
|
2020-09-30 18:38:27 +02:00 |
|
fbsanchez
|
95f58776c8
|
fixes group selection
|
2020-09-30 17:47:44 +02:00 |
|
Daniel Rodriguez
|
570a1bf18e
|
Merge branch 'ent-6325-empty-network-map-genera-error-500' into 'develop'
fixed error on create empty network map
See merge request artica/pandorafms!3494
|
2020-09-30 16:03:04 +02:00 |
marcos
|
add9387876
|
fixed error on create empty network map
|
2020-09-30 14:42:51 +02:00 |
|
Daniel Rodriguez
|
311186a70a
|
Merge branch 'ent-6328-Consola-movil-imagenes-rotas' into 'develop'
fixed mobile console donut charts
See merge request artica/pandorafms!3470
|
2020-09-30 13:19:06 +02:00 |
|
Daniel Rodriguez
|
def89b77d9
|
Merge branch 'ent-6251-add-error-control-pandoraagent-rpm-installer' into 'develop'
Adding error control if the link already exist, then wont be created again
See merge request artica/pandorafms!3438
|
2020-09-30 13:18:43 +02:00 |
|
Daniel Rodriguez
|
ccbbd7909b
|
Merge branch 'ent-6342-10704-wmi-errores-modulos-nuevos-cpu-disk-services-etc' into 'develop'
Ent 6342 10704 wmi errores modulos nuevos cpu disk services etc
See merge request artica/pandorafms!3475
|
2020-09-30 10:25:32 +02:00 |
|
artica
|
1a2f14a35b
|
Auto-updated build strings.
|
2020-09-30 01:00:21 +02:00 |
|
fbsanchez
|
b7c2913071
|
Avoid create agent if no group is selected
|
2020-09-29 15:49:10 +02:00 |
|
fbsanchez
|
d73c215b91
|
Avoid create agent if no group is selected
|
2020-09-29 15:48:20 +02:00 |
|
fbsanchez
|
5d63bc547e
|
Group selection review
|
2020-09-29 14:22:58 +02:00 |
|
fbsanchez
|
5f4893ef1a
|
Merge remote-tracking branch 'origin/develop' into ent-5822-prueba-concepto-modal-selector-de-grupos
|
2020-09-29 12:47:11 +02:00 |
|
Daniel Rodriguez
|
4939d71420
|
Merge branch 'ent-6382-10451-Bug-en-chequeos-de-notificaciones-por-HA-+-ticket-guardia' into 'develop'
fixed bug when node is disabled
See merge request artica/pandorafms!3484
|
2020-09-29 12:43:59 +02:00 |
|
Daniel Rodriguez
|
89a7eb65b6
|
Merge branch 'ent-5317-9399-agente-proxy-no-puede-setear-puerto-de-escucha' into 'develop'
Add proxy_address and proxy_port parameters to the agents.
See merge request artica/pandorafms!3482
|
2020-09-29 11:06:29 +02:00 |
|
artica
|
f9dfa8bbc3
|
Auto-updated build strings.
|
2020-09-29 01:00:20 +02:00 |
|
fbsanchez
|
f69166bd53
|
Updates style width group selector
|
2020-09-28 18:04:46 +02:00 |
|
fbsanchez
|
d152ba2980
|
estado_agente prevent filter options overlapping
|
2020-09-28 16:11:26 +02:00 |
|
fbsanchez
|
12314d33c3
|
fixed direct html responses with sl2
|
2020-09-28 16:02:54 +02:00 |
|
fbsanchez
|
29ac13815a
|
preload env required files (css,js)
|
2020-09-28 15:56:17 +02:00 |
|
fbsanchez
|
d4e837b7e6
|
Group all management, "all" selected instead "none" if included
|
2020-09-28 15:47:38 +02:00 |
|
Daniel Rodriguez
|
8df5fab69f
|
Merge branch 'ent-6022-uptime-incorrecto-en-politica-mejorada-windows' into 'develop'
Ent 6022 uptime incorrecto en politica mejorada windows
See merge request artica/pandorafms!3315
|
2020-09-28 10:39:59 +02:00 |
|
Daniel Rodriguez
|
6d319cbe5d
|
Merge branch 'ent-5847-optimizacion-recomendada-Gautier' into 'develop'
Added indexes
Closes pandora_enterprise#5847
See merge request artica/pandorafms!3462
|
2020-09-28 08:39:31 +02:00 |
|
artica
|
fe4916c0c3
|
Auto-updated build strings.
|
2020-09-28 01:00:14 +02:00 |
|
artica
|
0cbec13ec6
|
Auto-updated build strings.
|
2020-09-27 01:00:17 +02:00 |
|
artica
|
bc7b0ae798
|
Auto-updated build strings.
|
2020-09-26 01:00:19 +02:00 |
Kevin
|
b1c4a9890e
|
Merge branch 'master' of brutus.artica.es:artica/pandorafms into ent-6022-uptime-incorrecto-en-politica-mejorada-windows
|
2020-09-25 11:46:08 +02:00 |