e5890b038d
Merge branch 'ent-4069-Graphs-containers-in-Custom-graphs-error' into 'develop'
...
Ent 4069 graphs containers in custom graphs error
See merge request artica/pandorafms!2787
2019-10-17 14:20:06 +02:00
be29f1dd55
Merge branch 'ent-4746-boton-de-aspecto-raro-en-forgot-your-password' into 'develop'
...
fixed minor error
See merge request artica/pandorafms!2782
2019-10-17 13:20:14 +02:00
cb269789a7
Merge branch 'ent-4818-cambio-en-plugin-tools' into 'develop'
...
Updated file names to avoid collision
See merge request artica/pandorafms!2816
2019-10-17 12:14:51 +02:00
2dfc2b7a8a
Merge branch 'ent-3989-graficas-sql-metaconsola' into 'develop'
...
Available in metaconsole sql charts in reports for metaconsole server
See merge request artica/pandorafms!2697
2019-10-17 11:07:37 +02:00
3cb80e5d32
Merge branch '4820-planned_downtimes_created-no-se-almacena-correctamente' into 'develop'
...
Solved issue with date_from and dato_to missing time data
See merge request artica/pandorafms!2817
2019-10-17 10:16:07 +02:00
e80ef83d66
Merge branch 'ent-4692-vodat-al-editar-un-item-de-un-custom-report-devuelve-la-pantalla-de-item-editor' into 'develop'
...
When an item is updated, it is redirected to the item lists
See merge request artica/pandorafms!2755
2019-10-17 10:13:40 +02:00
269f1f2da4
Merge branch 'ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos' into 'develop'
...
Ent 4720 redireccion erronea de meta a nodo desde eventos
See merge request artica/pandorafms!2771
2019-10-17 09:54:31 +02:00
5264de2008
Merge branch 'develop' into 'ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos'
...
Conflicts:
pandora_console/operation/events/events.php
2019-10-17 09:27:00 +02:00
361f2022f4
Auto-updated build strings.
2019-10-17 00:01:10 +02:00
b6db2aa041
Merge branch 'ent-4684-migracion-de-mapas-open-y-enterprise-de-v6-a-v7' into 'develop'
...
Fixed open and enterprise network map migration
See merge request artica/pandorafms!2745
2019-10-16 19:03:24 +02:00
4a29057a1b
Solved issue with date_from and dato_to missing time data
2019-10-16 16:41:22 +02:00
039d854441
Merge branch 'ent-4784-Selector-de-intervalo-en-bulks-pule-el-conf-de-los-agentes-con-remote-dependiendo-de-la-opción-que-seleccionemos' into 'develop'
...
Ent 4784 selector de intervalo en bulks pule el conf de los agentes con remote dependiendo de la opción que seleccionemos
See merge request artica/pandorafms!2800
2019-10-16 14:16:13 +02:00
5f2adbfb7a
Updated file names to avoid collision
2019-10-16 13:40:46 +02:00
2d801a0109
Merge branch '3366-mensajes-ejecutar-pandora_db' into 'develop'
...
Solved an issue with uninizialized variable
See merge request artica/pandorafms!2815
2019-10-16 12:05:48 +02:00
5f0dffb816
Merge branch 'ent-4559-desajuste-en-custom-fields' into 'develop'
...
Ent 4559 desajuste en custom fields
See merge request artica/pandorafms!2684
2019-10-16 11:38:38 +02:00
7e54a26b49
Merge branch 'ent-4618-8580-4526-Bug-en-los-CSV-report' into 'develop'
...
Fixed csv reports download
See merge request artica/pandorafms!2742
2019-10-16 09:58:00 +02:00
a3a456da92
Auto-updated build strings.
2019-10-16 00:01:08 +02:00
68c064feee
Merge branch '4673-mal-funcionamiento-use-xml-timestamp' into 'develop'
...
Changed parameter of use_xml_timestamp
See merge request artica/pandorafms!2797
2019-10-15 17:28:59 +02:00
7d4b75c4b3
Solved an issue with uninizialized variable
2019-10-15 17:04:08 +02:00
402bd6b58f
Merge branch 'ent-4778-macro-policy-no-funciona' into 'develop'
...
Fixed macro _policy_ in alerts
See merge request artica/pandorafms!2792
2019-10-15 16:17:49 +02:00
8999f408ef
redirect to list items when update item
2019-10-15 14:13:07 +02:00
ca5a31db6a
Merge branch 'ent-3830-autorrefresh-en-mapas-gis' into 'develop'
...
add gis maps to autorefresh list
See merge request artica/pandorafms!2731
2019-10-15 13:21:19 +02:00
78610b127c
Merge branch 'ent-4682-Comentarios-en-eventos-no-se-ven-en-metaconsola' into 'develop'
...
Ent 4682 comentarios en eventos no se ven en metaconsola
See merge request artica/pandorafms!2775
2019-10-15 11:42:00 +02:00
89843fcc3b
Update functions_ui
2019-10-15 11:13:40 +02:00
6c21d57677
Auto-updated build strings.
2019-10-15 00:01:09 +02:00
febe54e3c8
Merge branch '4779-call-set-planned_downtimes-no-se-muestra' into 'develop'
...
Added date control
See merge request artica/pandorafms!2794
2019-10-14 16:21:39 +02:00
8407d7fe9a
Merge branch 'ent-3913-gis-data-refresh-bug' into 'develop'
...
Added current gis location to agent gis view list
See merge request artica/pandorafms!2772
2019-10-14 15:57:27 +02:00
a1c4b3eaeb
Fixed minor bug
2019-10-14 13:38:10 +02:00
1cbeed7b06
Merge branch '3366-mensajes-ejecutar-pandora_db' into 'develop'
...
Added a string with information of the caller of pandora_server. Modified too...
See merge request artica/pandorafms!2786
2019-10-14 11:45:08 +02:00
8fb672f27c
Merge branch '4611-despliegue-plugins-meta-nodos' into 'develop'
...
Modified character for string fusion (| ---> ~)
See merge request artica/pandorafms!2806
2019-10-14 11:25:18 +02:00
83b16d9d84
Auto-updated build strings.
2019-10-14 00:01:07 +02:00
838fcfa3a1
Auto-updated build strings.
2019-10-13 00:01:06 +02:00
df2acbce96
Auto-updated build strings.
2019-10-12 00:01:10 +02:00
5ffa93bb25
Modified character for string fusion
2019-10-11 13:49:19 +02:00
e4775a3e6d
Merge branch 'ent-4607-8644-informe-histograma-no-funciona-bien' into 'develop'
...
Fixed bug in histogram graph report
See merge request artica/pandorafms!2803
2019-10-11 13:06:27 +02:00
adaead5f8f
Merge branch 'ent-4763-paginacion-datatables' into 'develop'
...
datatables hide when only 1 page
See merge request artica/pandorafms!2784
2019-10-11 12:46:22 +02:00
c1853523f5
Merge branch 'ent-4545-Bug-creacion-infrome-con-graficas-MAX-Value-fallo-tabla' into 'develop'
...
Ent 4545 bug creacion infrome con graficas max value fallo tabla
See merge request artica/pandorafms!2719
2019-10-11 12:30:36 +02:00
f139fb0d2c
Merge branch 'develop' into ent-4618-8580-4526-Bug-en-los-CSV-report
2019-10-11 11:39:41 +02:00
7fc31d127d
Merge branch 'ent-4662-bug-creacion-agente-API-visualizacion-Metaconsola' into 'develop'
...
Ent 4662 bug creacion agente api visualizacion metaconsola
See merge request artica/pandorafms!2764
2019-10-11 11:25:16 +02:00
a69cfb63f1
Fixed bug in histogram graph report
2019-10-11 09:04:13 +02:00
9a165dc9d8
Auto-updated build strings.
2019-10-11 00:01:08 +02:00
41b84ccd81
Merge branch 'pulido/discovery-duplicados-alhambra' into 'develop'
...
Locate instead search before create new Discovered agent
See merge request artica/pandorafms!2790
2019-10-10 18:51:23 +02:00
fb4f4b4046
minor error cleanup
2019-10-10 17:31:57 +02:00
97f246ae60
discovery os detection
2019-10-10 17:28:02 +02:00
f1ec7d2339
minor fix in str comparison
2019-10-10 17:23:19 +02:00
f8dc0596ba
Merge branch 'ent-4653-item-agent-modules-blank-on-template' into 'develop'
...
Removed item agent/modules from templates
See merge request artica/pandorafms!2760
2019-10-10 17:00:28 +02:00
ea9fd23b89
Merge branch 'ent-4760-error-pandora_smpp-pl' into 'develop'
...
Allowed several destination numbers in a single script call
See merge request artica/pandorafms!2801
2019-10-10 16:43:20 +02:00
0433718612
Allowed several destination numbers in a single script call
2019-10-10 14:07:22 +02:00
fc0e4827ea
No change interval if is empty in massive edit - #4784
2019-10-10 13:37:01 +02:00
edb3c806ce
Auto-updated build strings.
2019-10-10 00:01:08 +02:00
Daniel Rodriguez
Alejandro Fraguas
Tatiana Llorente
artica
Jose Gonzalez
fbsanchez
marcos
Luis Calvo
manuel
Kike