Daniel Rodriguez
00ed8233d0
Merge branch 'ent-7755-graficas-adjuntas-tienen-fuentes-muy-pequeñas' into 'develop'
...
set default font size on graph modules when is send in mails
See merge request artica/pandorafms!4264
2021-08-10 12:19:54 +00:00
Daniel Rodriguez
45abf89e6b
Merge branch 'ent-7667-12011-bug-de-mostrado-de-comentarios-en-eventos-con-filtrado' into 'develop'
...
fixed minnor error when show event comment with filters
See merge request artica/pandorafms!4241
2021-08-05 11:08:41 +00:00
fbsanchez
056bd1460a
Sound alerts only for NEW events found
2021-07-09 14:40:03 +02:00
marcos
ea57c58f40
set default font size on graph modules when is send in mails
2021-07-05 11:34:32 +02:00
marcos
a225bbdafc
fixed minnor error when show event comment with filters
2021-06-28 14:21:45 +02:00
Luis
ebceaebb58
Ent 7253 opcion formato envio informes templates
2021-06-21 13:41:14 +00:00
fbsanchez
cdad04f9cd
Update the DB schema when upgrading from RPMs.
...
Call updateMR.php to update the database schema when manually upgrading
from RPM packages.
2021-06-14 11:56:42 +00:00
Marcos Alconada
665efa4fb7
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-10 08:19:11 +00:00
Daniel Rodriguez
4b819360ff
Revert "Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'"
...
This reverts merge request !4132
2021-06-09 18:09:43 +02:00
Daniel Rodriguez
d58e9f634a
Merge branch 'ent-7519-cambio-de-fuentes-en-la-consola-a-nivel-global' into 'develop'
...
Ent 7519 cambio de fuentes en la consola a nivel global
See merge request artica/pandorafms!4132
2021-06-09 13:59:29 +00:00
Marcos Alconada
2334eccd01
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-09 13:59:28 +00:00
Junichi Satoh
5fcf3eca23
Fixed problems in planned downtime below.
...
- modules cannot be added to defined planned downtime with 'Quiet' mode.
- pending modules for delete can be selected when modify defined planned downtime.
2021-06-08 14:43:43 +09:00
Daniel Rodriguez
b8fe685028
Merge branch 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario' into 'develop'
...
implemented user level authentication for integria ims integration
See merge request artica/pandorafms!4117
2021-05-17 14:41:11 +00:00
Daniel Rodriguez
5b2c340163
Merge branch 'ent-6085-Bandwidth-view-vista-de-interfaces' into 'develop'
...
Create interface views
See merge request artica/pandorafms!4023
2021-05-14 09:37:48 +00:00
Alejandro Campos
caaa9c407e
Merge branch 'develop' into 'ent-7482-Integracion-Pandora-Integria-credenciales-de-usuario'
...
# Conflicts:
# pandora_console/extras/mr/47.sql
# pandora_console/operation/incidents/dashboard_detail_integriaims_incident.php
2021-05-13 11:39:24 +00:00
José González
9e9ea4d00a
Merge with last develop
2021-05-12 09:17:32 +02:00
alejandro.campos@artica.es
fdeaf52912
implemented user level authentication for integria ims integration
2021-05-07 14:29:29 +02:00
Daniel Maya
8ef21d9b15
Ent 7395 filtro de eventos en metaconsola server
2021-04-28 10:50:04 +00:00
alejandro.campos@artica.es
8f58b74976
fixed filter load in events view
2021-04-21 13:05:18 +02:00
alejandro.campos@artica.es
93f3551326
Create interface views
2021-04-12 18:17:09 +02:00
Daniel Rodriguez
eeff80638f
Merge branch 'ent-3059-revision-de-la-funcion-metaconsole_connect' into 'develop'
...
multiple fixes
See merge request artica/pandorafms!3812
2021-04-12 10:39:41 +00:00
Daniel Rodriguez
79b11a6b30
Merge branch 'ent-4264-cambios-vista-de-eventos' into 'develop'
...
Ent 4264 cambios vista de eventos
See merge request artica/pandorafms!3893
2021-04-12 08:47:13 +00:00
Daniel Rodriguez
32527863cb
Merge branch 'ent-7095-Bug-en-Tree-group-metaconsola-con-usuario-no-ALL' into 'develop'
...
fixed error tree groups agent edition metaconsole
See merge request artica/pandorafms!3904
2021-04-06 17:23:18 +00:00
Daniel Rodriguez
e54e06b6ac
Merge branch 'ent-7030-Alertas-sonoras-VS-eventos-API' into 'develop'
...
fixed errors sound events
See merge request artica/pandorafms!3916
2021-04-06 17:11:37 +00:00
daniel
89ffb05466
fixed errors sound events
2021-04-06 17:11:37 +00:00
Marcos Alconada
9e1bacb66e
fixed visual error
2021-03-29 07:23:03 +00:00
fbsanchez
a3e571ff50
Merge remote-tracking branch 'origin/develop' into ent-3059-revision-de-la-funcion-metaconsole_connect
...
Conflicts:
pandora_console/godmode/users/user_list.php
2021-03-26 13:52:01 +01:00
Jose Gonzalez
4ee0c580bb
WIP: Backup upload
2021-03-22 17:52:11 +01:00
Jose Gonzalez
d43c51cc66
WIP: Backup upload
2021-03-22 17:37:15 +01:00
fbsanchez
e0aa1bfc68
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
pandora_console/include/styles/pandora.css
2021-03-22 09:59:07 +01:00
Daniel Barbero Martin
b78f4093ac
fixed error tree groups agent edition metaconsole
2021-03-15 13:31:24 +01:00
Daniel Maya
2f7d0f1795
fixed permissions on response
2021-03-11 16:11:06 +01:00
Marcos Alconada
d8a628b1c4
Ent 6781 revision de estilos visuales y eliminacion de sistemas skins
2021-03-11 14:40:23 +00:00
fbsanchez
95f1a2abcc
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
...
Conflicts:
pandora_console/extras/delete_files/delete_files.txt
2021-03-11 10:00:17 +01:00
Daniel Rodriguez
2422813a29
Merge branch 'ent-7085-11447-No-se-visualizan-nombres-de-modulos-en-graficas-combinadas-en-el-agente' into 'develop'
...
visual fixes in agent view graphs
See merge request artica/pandorafms!3884
2021-03-10 15:56:15 +00:00
fbsanchez
b384e97da5
Test REGEXP is valid before apply in MySQL
2021-03-09 10:17:29 +01:00
alejandro.campos@artica.es
0a8c478c47
visual fixes in agent view graphs
2021-03-08 17:48:59 +01:00
Daniel Rodriguez
94b04a8ef4
Merge branch 'ent-6106-Exportacion-CSV-en-icono-grafica-es-diferente-a-la-exportacion-normal' into 'develop'
...
Fix styles file export_data
See merge request artica/pandorafms!3691
2021-03-04 10:29:52 +00:00
daniel
fbf26fab91
Fix styles file export_data
2021-03-04 10:29:52 +00:00
Daniel Rodriguez
51404eda8d
Merge branch 'ent-7077-no-funciona-doble-auth-meta' into 'develop'
...
Ent 7077 no funciona doble auth meta
See merge request artica/pandorafms!3866
2021-03-02 12:24:03 +00:00
Luis
93a4a90dd6
Ent 7077 no funciona doble auth meta
2021-03-02 12:24:03 +00:00
fbsanchez
d96590aea5
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
...
Conflicts:
pandora_console/include/functions_ui.php
pandora_console/include/styles/pandora.css
2021-03-02 09:40:15 +01:00
Daniel Rodriguez
4fbfc14479
Merge branch 'ent-6817-Meter-spinning-Loading-en-la-visualizacion-de-graficas-de-modulos' into 'develop'
...
Fix loading charts modules and interfaces
See merge request artica/pandorafms!3700
2021-03-01 12:16:27 +00:00
Daniel Rodriguez
39d0e66983
Merge branch 'ent-6378-descarga-custom-field-view' into 'develop'
...
Added ACL check to custom view CSV donwload
See merge request artica/pandorafms!3714
2021-03-01 10:47:50 +00:00
fbsanchez
85f37a91de
Merge remote-tracking branch 'origin/develop' into ent-4755-base-de-datos-historico-revision
...
Conflicts:
pandora_console/include/functions_ui.php
2021-02-22 12:01:29 +01:00
fbsanchez
b17d6349f7
Multiple fixes port defition
2021-02-09 13:44:21 +01:00
fbsanchez
2639533cc1
Fixes
2021-02-09 12:05:59 +01:00
fbsanchez
ecf0f3d161
Force error catching while SNMP browsing
2021-02-09 10:25:42 +01:00
fbsanchez
e711239c69
Added port, limited base OID (default) removed timeout (browser) capturing error to message
2021-02-08 17:42:41 +01:00
fbsanchez
380c77be02
Merge remote-tracking branch 'origin/develop' into ent-6384-consola-visual-nuevo-elemento-interfaz-de-red
...
Conflicts:
pandora_console/include/lib/Module.php
pandora_console/include/visual-console-client/vc.main.css.map
2021-02-02 12:15:24 +01:00