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
5b3fd5dd79
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-22 17:34:41 +02:00
fbsanchez
eb98f695f9
Merge branch 'ent-4745-8826-cofares-han-dejado-de-llegar-las-graficas-que-nos-llegaban-en-los-correos-de-alerta-por-mail' into ent-3178-integrar-terminal-web-en-la-consola-de-pandora-y-explorar-otras-utilidades-anyterm-replace
2019-10-22 17:34:34 +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
marcos
b35c9dd96d
ajust changes
2019-10-22 16:42:13 +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
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
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
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
Tatiana Llorente
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
artica
361f2022f4
Auto-updated build strings.
2019-10-17 00:01:10 +02:00
Daniel Rodriguez
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
Jose Gonzalez
4a29057a1b
Solved issue with date_from and dato_to missing time data
2019-10-16 16:41:22 +02:00
Alejandro Fraguas
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
Daniel Rodriguez
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
Marcos Alconada
e7a948bb71
Update HelpFeedBack.class.php
2019-10-16 11:03:21 +02:00
Alejandro Fraguas
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
artica
a3a456da92
Auto-updated build strings.
2019-10-16 00:01:08 +02:00
fbsanchez
4cceb38762
1st RC WebSocketProxy
2019-10-15 22:16:54 +02:00
Marcos Alconada
1a77e3e381
Update HelpFeedBack.class.php
2019-10-15 18:11:50 +02:00
Marcos Alconada
43d3f32d0c
Update help_feedback.css
2019-10-15 18:11:21 +02:00
Marcos Alconada
5a73b67545
Update help_feedback.css
2019-10-15 17:59:22 +02:00
fbsanchez
06f8f920b8
wip WS redirection
2019-10-15 17:20:23 +02:00
Tatiana Llorente
30caad5a6c
Added column cache_expiration in tlayout_template_data in MR, migrate, and pandoradb.sql - #4810
2019-10-15 16:50:05 +02:00
Marcos Alconada
d04544fa66
Update HelpFeedBack.class.php
2019-10-15 16:34:01 +02:00
Marcos Alconada
03ada6fb1f
Update HelpFeedBack.class.php
2019-10-15 16:28:12 +02:00
marcos
8999f408ef
redirect to list items when update item
2019-10-15 14:13:07 +02:00
Alejandro Fraguas
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
Marcos Alconada
f8636e77cc
Update HelpFeedBack.class.php
2019-10-15 12:45:40 +02:00
marcos
a31e66a9bd
add feedback
2019-10-15 12:16:50 +02:00
Alejandro Fraguas
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
Marcos Alconada
89843fcc3b
Update functions_ui
2019-10-15 11:13:40 +02:00
artica
6c21d57677
Auto-updated build strings.
2019-10-15 00:01:09 +02:00
fbsanchez
3a9e5fa477
wip: gotty redirection experiment p2
2019-10-14 19:33:00 +02:00
Daniel Barbero Martin
13a72426cd
fixed diagnostics
2019-10-14 17:21:38 +02:00
Jose Gonzalez
e0ff5bf9cc
Solved an issue with japanese wiki
2019-10-14 17:13:13 +02:00
Jose Gonzalez
01148749a6
Added secondarygroups macro and updated spanish, english and japanses wiki
2019-10-14 17:10:48 +02:00
Daniel Rodriguez
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
Alejandro Fraguas
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
Luis Calvo
a1c4b3eaeb
Fixed minor bug
2019-10-14 13:38:10 +02:00
Daniel Rodriguez
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
fbsanchez
86170b3ad8
experiments
2019-10-14 07:59:29 +02:00
artica
83b16d9d84
Auto-updated build strings.
2019-10-14 00:01:07 +02:00
artica
838fcfa3a1
Auto-updated build strings.
2019-10-13 00:01:06 +02:00
artica
df2acbce96
Auto-updated build strings.
2019-10-12 00:01:10 +02:00
Daniel Barbero
66bad65550
refactoriced diagnostics pandoraFMS
2019-10-11 14:55:20 +02:00
Tatiana Llorente
dd2ace99e1
Check permissions to reset a network map - #4728
2019-10-11 13:51:52 +02:00
Jose Gonzalez
5ffa93bb25
Modified character for string fusion
2019-10-11 13:49:19 +02:00
Daniel Rodriguez
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
fbsanchez
4c6d924495
Review remote execution modules
2019-10-11 12:50:29 +02:00
Daniel Rodriguez
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
Daniel Rodriguez
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
Tatiana Llorente
8c556d7d19
Changed permissions for management users - #4794
2019-10-11 11:47:38 +02:00
manuel
f139fb0d2c
Merge branch 'develop' into ent-4618-8580-4526-Bug-en-los-CSV-report
2019-10-11 11:39:41 +02:00
Alejandro Fraguas
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
Daniel Barbero
4fedfe92fc
fix is enterprise
2019-10-11 09:39:20 +02:00
manuel
a69cfb63f1
Fixed bug in histogram graph report
2019-10-11 09:04:13 +02:00
artica
9a165dc9d8
Auto-updated build strings.
2019-10-11 00:01:08 +02:00
Daniel Rodriguez
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
Luis Calvo
bf19fbffd3
Added API and cli function get_agents_id_by_alias
2019-10-10 14:25:17 +02:00
Tatiana Llorente
fc0e4827ea
No change interval if is empty in massive edit - #4784
2019-10-10 13:37:01 +02:00
Daniel Barbero Martin
7eb4d3c51c
add CMD command a network components
2019-10-10 11:55:32 +02:00
artica
edb3c806ce
Auto-updated build strings.
2019-10-10 00:01:08 +02:00
fbsanchez
6bf3772690
remote cmd => remote execution
2019-10-09 19:20:58 +02:00
Daniel Barbero
40076b0a55
remove debug
2019-10-09 17:33:06 +02:00
Daniel Rodriguez
f995588484
Merge branch 'ent-4639-Pantalla-en-negro-en-lugar-de-error-403' into 'develop'
...
Ent 4639 pantalla en negro en lugar de error 403
See merge request artica/pandorafms!2761
2019-10-09 17:28:01 +02:00
Daniel Barbero
8af72c1c9d
add Remote CMD
2019-10-09 17:26:06 +02:00
fbsanchez
d09c071684
discovery ACL
2019-10-09 15:45:02 +02:00
manuel
93bca4673f
Fixed bugs in reports
2019-10-09 13:15:07 +02:00
artica
be2148ff26
Auto-updated build strings.
2019-10-09 00:01:09 +02:00
Jose Gonzalez
6ad9386cf6
Added date control
2019-10-08 15:42:55 +02:00
Daniel Rodriguez
2eca6c7df3
Merge branch 'ent-4717-nombre-de-extensiones-erroneo-en-menu-php' into 'develop'
...
Deleted unnecessary "if" statement
See merge request artica/pandorafms!2759
2019-10-08 15:32:55 +02:00
Daniel Rodriguez
0b14cb64b6
Merge branch 'ent-4293-bug-keepcounter-policies' into 'develop'
...
Fixed module update bug
See merge request artica/pandorafms!2769
2019-10-08 14:30:49 +02:00
Luis Calvo
941362776e
Fixed keepcounters ckbox bug
2019-10-08 14:06:30 +02:00
Alejandro Fraguas
13b3099553
Merge branch 'ent-4775-Error-masivas-de-agente-sin-cambios' into 'develop'
...
added condition in agent massive edition
See merge request artica/pandorafms!2791
2019-10-08 13:11:55 +02:00
Daniel Rodriguez
bc2e40d0a3
Merge branch '4748-API-call-set-planned_downtimes_created' into 'develop'
...
Added control for same-day and different hours planned downtimes
See merge request artica/pandorafms!2788
2019-10-08 11:37:10 +02:00
Tatiana Llorente
d2dc6ba9c1
Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos
...
Conflicts:
pandora_console/operation/events/events.php
2019-10-08 09:14:08 +02:00
Tatiana Llorente
8a85edac93
Merge remote-tracking branch 'origin/develop' into ent-4720-Redireccion-erronea-de-Meta-a-Nodo-desde-Eventos
2019-10-08 08:59:39 +02:00
artica
2a76b06870
Auto-updated build strings.
2019-10-08 00:01:11 +02:00
Daniel Rodriguez
bd7ee945f7
Merge branch 'ent-4454-No-aparece-el-icono-con-color-de-warning-en-el-Service-Tree-View' into 'develop'
...
Fixed bad image for warning status - #4454
See merge request artica/pandorafms!2629
2019-10-07 19:21:53 +02:00
Daniel Rodriguez
e6724752ff
Merge branch 'ent-4661-leyenda-de-las-graficas-en-classic-mode' into 'develop'
...
Fixed Error
See merge request artica/pandorafms!2767
2019-10-07 19:21:28 +02:00
alejandro-campos
646f2607ab
added condition in agent massive edition
2019-10-07 19:02:19 +02:00
Daniel Rodriguez
d198cc3297
Merge branch 'ent-4567-Habilitar-borrado-masivo-de-traps-con-permisos-AW' into 'develop'
...
Changed permissions to delete traps to IM - #4567
See merge request artica/pandorafms!2690
2019-10-07 17:08:32 +02:00
Daniel Rodriguez
dc01b3e22e
Merge branch 'ent-4679-notificacion-supervisor-server-no-actualizado' into 'develop'
...
Added notify when Console and Server have version mismatch
See merge request artica/pandorafms!2770
2019-10-07 15:59:16 +02:00
Daniel Rodriguez
375fac7f3d
Merge branch 'ent-4681-8764-Fallo-en-Vodat-a-la-hora-de-editar-módulos-de-politica' into 'develop'
...
Fixed modules_get_relations
See merge request artica/pandorafms!2751
2019-10-07 14:01:24 +02:00
Daniel Rodriguez
debbbdc4e5
Merge branch 'ent-4726-truncado-eventos-texto-muy-largo' into 'develop'
...
Improved truncate system and solved issue
See merge request artica/pandorafms!2774
2019-10-07 13:49:57 +02:00
Jose Gonzalez
7ac12e45ef
Solved visual issue
2019-10-07 13:33:18 +02:00
Tatiana Llorente
3b85842fb2
Hidden Graph Container section from open version - #4069
2019-10-07 12:44:00 +02:00
Jose Gonzalez
2b2f8417a7
Added control for same-day and different hours planned downtimes
2019-10-07 12:40:59 +02:00
marcos.alconada
a7b66e6365
revert changes
2019-10-07 12:07:31 +02:00
marcos.alconada
8c0c392197
revert chanegd
2019-10-07 11:39:06 +02:00
marcos.alconada
80e6d70b31
revert style
2019-10-07 11:29:42 +02:00
marcos.alconada
a9e8b1113e
add default comments when change owner or status on events
2019-10-07 11:15:25 +02:00
Daniel Rodriguez
cb6b48aa3f
Merge branch 'ent-4671-No-se-visualiza-informe-al-cambiar-de-fuente' into 'develop'
...
Added files smallfonts and unicode into ttfonts directory
See merge request artica/pandorafms!2748
2019-10-07 11:15:11 +02:00
artica
745971dfa6
Auto-updated build strings.
2019-10-07 00:01:06 +02:00
artica
936ce0ee26
Auto-updated build strings.
2019-10-06 00:01:06 +02:00
artica
d0dead58f0
Auto-updated build strings.
2019-10-05 00:01:09 +02:00
fbsanchez
a4cff9770f
Collaborative session @manuel.montes pagination fix in datatables (hide when only 1 page)
2019-10-04 14:17:14 +02:00
Daniel Rodriguez
bfe32a5aed
Merge branch 'ent-4699-Revision-completa-de-informes-Wizard-en-Meta' into 'develop'
...
Fixed bug in meta serialize data
See merge request artica/pandorafms!2773
2019-10-04 14:04:17 +02:00
Daniel Rodriguez
658d71568a
Merge branch 'ent-1945-eliminar-informes-tipo-itil' into 'develop'
...
the itil type is removed in the report types
See merge request artica/pandorafms!2757
2019-10-04 13:55:54 +02:00
Daniel Rodriguez
915edd455d
Merge branch 'ent-4098-historical_data-report-no-definido-para-metaconsola' into 'develop'
...
Fixed historical_data report in metaconsole
See merge request artica/pandorafms!2722
2019-10-04 13:53:29 +02:00
Tatiana Llorente
305d74878c
Changed title of csv in events - #4625
2019-10-04 11:51:30 +02:00
artica
cc239e5e68
Auto-updated build strings.
2019-10-04 00:01:09 +02:00
marcos.alconada
2938435988
fixed minor error
2019-10-03 17:46:26 +02:00
Daniel Rodriguez
6802b32d93
Merge branch 'ent-4578-No-se-registran-los-nombres-de-los-items-text-en-reports' into 'develop'
...
Fixed visual bug in item names from report template
See merge request artica/pandorafms!2707
2019-10-03 17:35:03 +02:00
Daniel Rodriguez
5f463e51b8
Merge branch '4689-mostrar-instrucciones-en-la-vista-de-eventos' into 'develop'
...
Fixed issue with instructions in events view
See merge request artica/pandorafms!2752
2019-10-03 16:59:03 +02:00
Daniel Rodriguez
b2157f4b32
Merge branch 'ent-4051-tree-view-module-groups-duplica-modulos' into 'develop'
...
add condition in query
See merge request artica/pandorafms!2710
2019-10-03 16:41:15 +02:00
Kike
b25c9ca793
Merge remote-tracking branch 'origin/develop' into 4689-mostrar-instrucciones-en-la-vista-de-eventos
...
Conflicts:
pandora_console/include/functions_events.php
2019-10-03 15:59:15 +02:00
marcos.alconada
ec86380ee7
changed hint from home screen edit user
2019-10-03 14:27:10 +02:00
marcos.alconada
6f14aa3d2a
Merge remote-tracking branch 'origin/develop' into ent-4583-hint-mal-construido-en-editar-usuario-home-screen
2019-10-03 14:17:23 +02:00
Alejandro Fraguas
e42932ad19
Merge branch 'ent-4543-Bug-en-Graficas-Personalizadas-con-Average-series-Visual' into 'develop'
...
fixed summatory series custom graph
See merge request artica/pandorafms!2754
2019-10-03 13:38:18 +02:00
Alejandro Fraguas
e174f8dda9
Merge branch 'ent-4544-bug-custom-graph-csv-export' into 'develop'
...
Fixed CSV custom graphs export
See merge request artica/pandorafms!2694
2019-10-03 12:59:30 +02:00
Alejandro Fraguas
a40592b041
Merge branch 'ent-4626-Checks-de-Custom-Graphs-desplazados' into 'develop'
...
Fixed bug in list graphs view
See merge request artica/pandorafms!2711
2019-10-03 10:37:49 +02:00
artica
21d363b21e
Auto-updated build strings.
2019-10-03 00:01:09 +02:00
Tatiana Llorente
fdc5074be3
Added graph tip view in mobile version - #4369
2019-10-02 16:52:20 +02:00
marcos.alconada
2ea20c1605
fixed visual error
2019-10-02 14:42:51 +02:00
Kike
f34d30dd39
Fixed loop on network map migration process
2019-10-02 12:38:13 +02:00
marcos.alconada
d539b935bc
fixed minor error
2019-10-02 11:27:52 +02:00
artica
8e204605e5
Auto-updated build strings.
2019-10-02 00:01:07 +02:00
Marcos Alconada
f1d20d56e7
Update functions_ui.php
2019-10-01 16:26:22 +02:00
marcos.alconada
a44e1feeb4
fixed error comments events
2019-10-01 16:24:02 +02:00
manuel
454750aefe
Fixed bugs in metaconsole reports
2019-10-01 12:46:09 +02:00
Jose Gonzalez
f55b2ce80f
Improved truncate system and solved issue
2019-10-01 11:22:25 +02:00
artica
c600f74ee2
Auto-updated build strings.
2019-10-01 00:01:06 +02:00
Jose Gonzalez
5294e2f627
Now the supervisor control all servers and not only one
2019-09-30 15:40:40 +02:00
manuel
d566da6fb1
Fixed bug in meta serialize data
2019-09-30 15:33:44 +02:00
Luis Calvo
0aa73b1a60
Added current gis location to agent gis view list
2019-09-30 14:58:44 +02:00
Tatiana Llorente
9875b7c701
Added link to go to agent view (node) from metaconsole in events view - #4720
2019-09-30 13:31:15 +02:00
Jose Gonzalez
d878958502
Added notify when Console and Server have version mismatch
2019-09-30 12:48:46 +02:00
artica
b072bb5314
Auto-updated build strings.
2019-09-30 00:01:06 +02:00
artica
7ae5a8e5be
Auto-updated build strings.
2019-09-29 00:01:06 +02:00
artica
15752c10ef
Auto-updated build strings.
2019-09-28 00:01:08 +02:00
Luis Calvo
1eb0b27da3
Fixed module update bug
2019-09-27 16:09:11 +02:00
Kike
dfea704154
Show instructions on mouse over
2019-09-27 14:48:45 +02:00
marcos.alconada
4c93ca3d60
fixed minor error
2019-09-27 12:07:40 +02:00
alejandro-campos
5e0b7fc2b7
fixed integria logo redirection in integria setup
2019-09-27 09:07:09 +02:00
artica
dc3dd1cffa
Auto-updated build strings.
2019-09-27 00:01:09 +02:00
marcos.alconada
cc18d5d1ed
Fixed Error
2019-09-26 17:51:26 +02:00
Jose Gonzalez
5fdf65c440
Modified the mode of creation of agents with API
2019-09-26 17:33:51 +02:00
Daniel Barbero Martin
2ee725b204
fixed minor error
2019-09-26 16:43:31 +02:00
artica
574d9b13d6
Updated version and build strings.
2019-09-26 16:32:58 +02:00
Daniel Rodriguez
c9cfbf0bf2
Merge branch 'ent-4461-Configuracion-integracion-integria' into 'develop'
...
Ent 4461 configuracion integracion integria
See merge request artica/pandorafms!2732
2019-09-26 14:34:50 +02:00
alejandro-campos
2ec562fcc0
changed help in setup integria
2019-09-26 13:36:14 +02:00
alejandro-campos
96622933fc
added new section in integria setup to configure different options for event responses and alert created tickets
2019-09-26 13:22:10 +02:00
Tatiana Llorente
a15350b7cb
deleted calls to a function that does not exist logoff_db() - #4639
2019-09-26 12:36:08 +02:00
alejandro-campos
0fdf3874d4
Add ACL in integria ticket dashboard
2019-09-26 11:05:27 +02:00
alejandro-campos
93b176269c
remove acl check in integria ticket dashboard
2019-09-26 10:38:12 +02:00
Luis Calvo
8284dfc44f
Removed item agent/modules from templates
2019-09-26 10:32:36 +02:00
alejandro-campos
ca184faaa0
minor visual fix in integria ticket creation
2019-09-26 10:10:55 +02:00
alejandro-campos
ad01cd0303
Merge branch 'ent-4461-Configuracion-integracion-integria' of https://brutus.artica.lan:8081/artica/pandorafms into ent-4461-Configuracion-integracion-integria
2019-09-26 09:48:13 +02:00
alejandro-campos
91f90d07d6
minor fixes in integria integration
2019-09-26 09:44:58 +02:00
Kike
63f4f894eb
Deleted unnecessary "if" statement
2019-09-26 09:41:08 +02:00
artica
0dd0c4c36d
Auto-updated build strings.
2019-09-26 00:01:08 +02:00
Tatiana Llorente
5436df5575
Changed the word incident for ticket - #4461
2019-09-25 16:13:37 +02:00
marcos.alconada
93941f334a
the itil type is removed in the report types
2019-09-25 16:12:57 +02:00
Tatiana Llorente
188fce7174
Merge branch 'ent-4461-Configuracion-integracion-integria' of brutus.artica.lan:artica/pandorafms into ent-4461-Configuracion-integracion-integria
...
Conflicts:
pandora_console/extras/mr/32.sql
2019-09-25 10:52:58 +02:00
marcos.alconada
e363b17476
When an item is updated, it is redirected to the item lists
2019-09-25 10:51:02 +02:00