22835 Commits

Author SHA1 Message Date
marcos
b35c9dd96d ajust changes 2019-10-22 16:42:13 +02:00
Jose Gonzalez
a6d1f3a544 Another minor fix applied 2019-10-22 16:23:46 +02:00
Luis Calvo
33d26144f1 Fixed planned downtime acl 2019-10-22 16:00:01 +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
Jose Gonzalez
305dfa441d Minor fix applied 2019-10-22 14:03:24 +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
marcos
f14c4966e3 changes 2019-10-22 13:10:15 +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
ca49cefb0d fixed 2019-10-22 12:19:25 +02:00
Jose Gonzalez
7c39f3680e Added feature sample_agent 2019-10-22 11:54:27 +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
fbsanchez
c963681098 Quick shell telnet improvements 2019-10-21 21:10:26 +02:00
fbsanchez
47e6f4adb5 Fix and control API sessions 2019-10-21 21:09:03 +02:00
marcos
ee97ed8a5e segunda ronda 2019-10-21 18:36:02 +02:00
Daniel Barbero
e37af1598a continue feedback diagnostics 2019-10-21 18:11:04 +02:00
fbsanchez
9d8bb880fa Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:50 +02:00
fbsanchez
6c52462c8c Modular WebSocket engine, added ssh and telnet to quickshell extension 2019-10-21 17:36:26 +02:00
fbsanchez
bb2faca479 ma 2019-10-21 12:18:42 +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
alejandro-campos
f2dbcea183 fix indentation 2019-10-21 09:55:39 +02:00
alejandro-campos
6cf08dde1e Merge branch 'develop' into ent-3779-7612-Revision-de-llamadas-a-api-y-cli-agent-name-alias-name 2019-10-21 09:43:43 +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
fbsanchez
1cf77cc8f1 WSProxy ACL check 2019-10-18 18:55:29 +02:00
Daniel Barbero
b8d03e98c3 pdf diagnostic 2019-10-18 15:23:23 +02:00
Luis Calvo
4638915c70 Fixed minor bugs 2019-10-18 12:48:38 +02:00
Luis Calvo
85dff93f41 Added strict option 2019-10-18 12:22:20 +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
marcos
353246f9f6 first changed to welcome window 2019-10-18 10:30:19 +02:00
artica
22af1a3654 Auto-updated build strings. 2019-10-18 00:01:11 +02:00
fbsanchez
e24024d2f4 WS gotty extension - global 2019-10-17 15:31:17 +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
alejandro-campos
3a5bbb22bd changed pandora api functions to include possibility of using agent alias when agent id is accepted as argument 2019-10-17 11:14:42 +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