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 |
|
Daniel Barbero
|
f8c9b83a9c
|
Merge remote-tracking branch 'origin/develop' into ent-4752-Herramientas-de-diagnostico
|
2019-10-25 13:46:08 +02:00 |
|
Daniel Barbero
|
c4aea1ac59
|
add styles validation form of modal
|
2019-10-25 13:28:01 +02:00 |
|
Daniel Barbero
|
22a2b7cd0b
|
Add feedback phpInfo
|
2019-10-25 10:43:03 +02:00 |
|
artica
|
86fd1275be
|
Auto-updated build strings.
|
2019-10-25 00:01:11 +02:00 |
|
Daniel Barbero Martin
|
3dee6888d6
|
fix
|
2019-10-24 17:42:37 +02:00 |
|
artica
|
38dfa5cf35
|
Auto-updated build strings.
|
2019-10-24 00:01:09 +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 |
|
Alejandro Fraguas
|
5364ef0fa1
|
Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into 'develop'
Fix and control API sessions
See merge request artica/pandorafms!2830
|
2019-10-23 16:12:19 +02:00 |
|
Daniel Rodriguez
|
48fa310aa9
|
Merge branch 'ent-4819-No-funciona-llamada-API-get-events' into 'develop'
Ent 4819 no funciona llamada api get events
See merge request artica/pandorafms!2827
|
2019-10-23 15:53:30 +02:00 |
|
Tatiana Llorente
|
31c36dc015
|
Ent 4819 no funciona llamada api get events
|
2019-10-23 15:53:30 +02:00 |
|
Alejandro Fraguas
|
8fd6f28070
|
Merge branch 'ent-4851-Cambio-de-color-en-la-union-de-agentes-del-GIS-map' into 'develop'
Changed color
See merge request artica/pandorafms!2831
|
2019-10-23 12:28:04 +02:00 |
|
Daniel Rodriguez
|
39b3a00276
|
Merge branch 'ent-4690-revision-completa-de-informes-templates-en-meta' into 'develop'
Fixed bugs in reports
See merge request artica/pandorafms!2796
|
2019-10-23 11:41:07 +02:00 |
|
Daniel Maya
|
c01a856826
|
Changed color
|
2019-10-23 11:17:16 +02:00 |
|
artica
|
1470241783
|
Auto-updated build strings.
|
2019-10-23 00:01:11 +02:00 |
|
fbsanchez
|
9edb77d288
|
proper logout (api)
|
2019-10-22 20:48:45 +02:00 |
|
fbsanchez
|
ccfd944ad7
|
Fix and control API sessions
Conflicts:
pandora_console/include/lib/User.php
modified: pandora_console/include/api.php
modified: pandora_console/include/chart_generator.php
new file: pandora_console/include/lib/User.php
modified: pandora_console/include/load_session.php
modified: pandora_console/include/web2image.js
|
2019-10-22 17:33:50 +02:00 |
|
manuel
|
bbeb750e46
|
Merge branch 'develop' into ent-4690-revision-completa-de-informes-templates-en-meta
Conflicts:
pandora_console/include/functions_graph.php
|
2019-10-22 15:51:38 +02:00 |
|
manuel
|
deb217906c
|
Fixed bug in templates
|
2019-10-22 15:41:13 +02:00 |
|
Daniel Rodriguez
|
f234e0c4a3
|
Merge branch 'ent-4836-menu-duplicado-en-reports-de-metaconsola' into 'develop'
fixed visual error metaconsole
See merge request artica/pandorafms!2828
|
2019-10-22 14:23:20 +02:00 |
|
Daniel Rodriguez
|
552d8758e8
|
Merge branch 'ent-4815-html-en-los-csv' into 'develop'
Fixed bug in CSV export
See merge request artica/pandorafms!2824
|
2019-10-22 14:22:42 +02:00 |
|
Marcos Alconada
|
6963ce894b
|
Merge branch 'develop' into 'ent-4836-menu-duplicado-en-reports-de-metaconsola'
# Conflicts:
# pandora_console/godmode/reporting/reporting_builder.php
|
2019-10-22 13:26:15 +02:00 |
|
marcos
|
70978f838c
|
fixed visual error metaconsole
|
2019-10-22 13:22:13 +02:00 |
|
Daniel Rodriguez
|
0cf3e01f74
|
Merge branch 'ent-1880-Umbrales-inversos-en-negativo' into 'develop'
Ent 1880 umbrales inversos en negativo
See merge request artica/pandorafms!2818
|
2019-10-22 12:56:21 +02:00 |
|
Alejandro Fraguas
|
ee0eee06f6
|
Merge branch 'ent-4724-estilo-vista-pandora-wux' into 'develop'
fixed visual error
See merge request artica/pandorafms!2779
|
2019-10-22 12:54:28 +02:00 |
|
marcos
|
79a1a1b2a3
|
add wux.css
|
2019-10-22 10:23:53 +02:00 |
|
artica
|
f99616723b
|
Auto-updated build strings.
|
2019-10-22 00:01:09 +02:00 |
|
Daniel Barbero
|
e37af1598a
|
continue feedback diagnostics
|
2019-10-21 18:11:04 +02:00 |
|
manuel
|
312b1c7c40
|
Fixed bug in CSV export
|
2019-10-21 11:48:13 +02:00 |
|
Alejandro Fraguas
|
2884226e56
|
Merge branch 'ent-4369-Graficas-en-meta-mobile-sin-TIP' into 'develop'
Ent 4369 graficas en meta mobile sin tip
See merge request artica/pandorafms!2780
|
2019-10-21 11:03:53 +02:00 |
|
Daniel Rodriguez
|
547607c21e
|
Merge branch 'ent-4794-Permiso-Manage-Users-no-funciona' into 'develop'
Ent 4794 permiso manage users no funciona
See merge request artica/pandorafms!2804
|
2019-10-21 10:48:36 +02:00 |
|
artica
|
f72fde0fb5
|
Auto-updated build strings.
|
2019-10-21 00:01:07 +02:00 |
|
artica
|
bb9d18b6d8
|
Auto-updated build strings.
|
2019-10-20 00:01:07 +02:00 |
|
artica
|
88248fd226
|
Auto-updated build strings.
|
2019-10-19 00:01:11 +02:00 |
|
Daniel Barbero
|
b8d03e98c3
|
pdf diagnostic
|
2019-10-18 15:23:23 +02:00 |
|
Daniel Rodriguez
|
13898da4c1
|
Merge branch 'ent-4733-no-funciona-buscador-general-de-politicas' into 'develop'
fixed minor error
See merge request artica/pandorafms!2777
|
2019-10-18 11:42:30 +02:00 |
|
artica
|
22af1a3654
|
Auto-updated build strings.
|
2019-10-18 00:01:11 +02:00 |
|
Daniel Barbero Martin
|
4e56f6751a
|
Continue work diagnostics
|
2019-10-17 15:17:28 +02:00 |
|
Daniel Rodriguez
|
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 |
|
Alejandro Fraguas
|
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 |
|
Alejandro Fraguas
|
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 |
|
Tatiana Llorente
|
adf3b08537
|
Add text (inv) in the help of the thresholds for inverse intervals - #1880
|
2019-10-17 11:50:50 +02:00 |
|
Daniel Rodriguez
|
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 |
|
Daniel Rodriguez
|
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 |
|
Daniel Rodriguez
|
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 |
|
Daniel Rodriguez
|
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 |
|