Daniel Maya
|
3083482457
|
Fixed label cache
|
2019-05-29 15:30:26 +02:00 |
|
Daniel Maya
|
76e6588b7a
|
fixed cache in label, icon, clock, box and line
|
2019-05-29 13:54:14 +02:00 |
|
Daniel Maya
|
552467286c
|
Merge branch 'develop' into 'ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual'
# Conflicts:
# pandora_console/extras/mr/28.sql
|
2019-05-29 11:10:31 +02:00 |
|
Alejandro Fraguas
|
c0763b86d2
|
Merge branch 'ent-3924-eHorus-settings' into 'develop'
Ent 3924 e horus settings
See merge request artica/pandorafms!2417
|
2019-05-29 10:51:59 +02:00 |
|
Daniel Rodriguez
|
9096444f8f
|
Merge branch 'ent-1480-4731-deshabilitado-de-modulos-agencia_aadcm' into 'develop'
Do not add disabled modules to the execution queue.
See merge request artica/pandorafms!2456
|
2019-05-29 09:53:38 +02:00 |
|
Luis Calvo
|
27963c4370
|
Fixed minor bug
|
2019-05-29 09:51:26 +02:00 |
|
Daniel Barbero Martin
|
c35cb56699
|
fixed errors
|
2019-05-29 08:50:46 +02:00 |
|
artica
|
8572a13319
|
Auto-updated build strings.
|
2019-05-29 00:01:07 +02:00 |
|
Alejandro Gallardo Escobar
|
f5d5cbf5b8
|
VC item cache improvements.
-Added a default value to the configuration.
-Changed the control to edit the cache expiration.
- Added the cache to more items.
|
2019-05-28 18:34:07 +02:00 |
|
Luis Calvo
|
8e7b769977
|
Merge branch 'ent-3924-eHorus-settings' of https://brutus.artica.lan:8081/artica/pandorafms into ent-3924-eHorus-settings
|
2019-05-28 18:04:52 +02:00 |
|
Luis Calvo
|
58a0ef1bf7
|
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
|
2019-05-28 18:03:55 +02:00 |
|
Luis Calvo
|
77dbb53db4
|
Fixed minor bug
|
2019-05-28 18:03:40 +02:00 |
|
Alejandro Fraguas
|
4a2a06ffdc
|
Merge branch 'ent-4102-Cambios-vista-detalle-de-evento' into 'develop'
Ent 4102 cambios vista detalle de evento
See merge request artica/pandorafms!2457
|
2019-05-28 18:03:14 +02:00 |
|
Luis
|
c8297165e8
|
Undo undesired changes
|
2019-05-28 17:41:39 +02:00 |
|
Luis Calvo
|
e993dcc3a5
|
Merge remote-tracking branch 'origin/develop' into ent-3924-eHorus-settings
|
2019-05-28 17:37:20 +02:00 |
|
Luis Calvo
|
6fdd88ab65
|
Fixed errors on eHorus user level conf
|
2019-05-28 17:19:13 +02:00 |
|
Daniel Barbero Martin
|
3b943ae902
|
fixed errors disabled/enabled module from list agents because not write in conf
|
2019-05-28 17:11:14 +02:00 |
|
Tatiana Llorente
|
d68bb176cf
|
Merge branch 'develop' into 'ent-4102-Cambios-vista-detalle-de-evento'
Conflicts:
pandora_console/include/styles/pandora.css
|
2019-05-28 15:56:16 +02:00 |
|
Alejandro Fraguas
|
1df2bd3c21
|
Merge branch 'ent-4101-Cambios-vista-gráfica-de-módulo' into 'develop'
Ent 4101 cambios vista gráfica de módulo
See merge request artica/pandorafms!2462
|
2019-05-28 13:30:11 +02:00 |
|
Luis Calvo
|
5966367f8f
|
eHorus user level login conf added in user editor
|
2019-05-28 13:14:42 +02:00 |
|
Alejandro Fraguas
|
a3591b799a
|
Merge branch 'ent-3983-Informes-SLA-mensuales-de-keepalive-no-se-calculan-bien' into 'develop'
fix minor bug in reporting functions
See merge request artica/pandorafms!2460
|
2019-05-28 12:03:55 +02:00 |
|
Alejandro Gallardo Escobar
|
5ea79cdfb8
|
Now only the Group item of the VC is cached by user
|
2019-05-28 10:39:34 +02:00 |
|
Tatiana Llorente
|
a6c0a082a7
|
Merge branch 'ent-4104-Cambios-vista-gráfica-de-módulo' into ent-4101-Cambios-vista-gráfica-de-módulo
|
2019-05-28 08:55:15 +02:00 |
|
artica
|
11e5a4ce18
|
Auto-updated build strings.
|
2019-05-28 00:01:07 +02:00 |
|
Luis Calvo
|
3736d84589
|
Edit ehorus user
|
2019-05-27 18:49:47 +02:00 |
|
alejandro-campos
|
58d0dc5dbc
|
fix minor bug in reporting functions
|
2019-05-27 18:31:20 +02:00 |
|
Luis Calvo
|
588d19102f
|
Resolve merge conflict
|
2019-05-27 18:30:24 +02:00 |
|
Alejandro Fraguas
|
f284112be2
|
Merge branch 'ent-4020-cambiar-mensaje-de-bienvenida-tnews-2' into 'develop'
changed PK to NULL
See merge request artica/pandorafms!2451
|
2019-05-27 18:13:09 +02:00 |
|
Daniel Rodriguez
|
61d3720787
|
Merge branch 'ent-4076-Quitar-ayudas-vacias-modulos' into 'develop'
Removed empty help icons in modules
See merge request artica/pandorafms!2454
|
2019-05-27 17:53:06 +02:00 |
|
Tatiana Llorente
|
2fd37b531e
|
Visual changes in module graph - #4104
|
2019-05-27 17:37:57 +02:00 |
|
manuel
|
513a74d120
|
Removed empty help icons in local components
|
2019-05-27 17:13:25 +02:00 |
|
Alejandro Gallardo Escobar
|
fb8bc48d64
|
Now the vc item's cache expires when the item is updated
|
2019-05-27 16:40:09 +02:00 |
|
Tatiana Llorente
|
1eb1120c6e
|
Rename class events_show_more_table to table_modal_alternate - #4102
|
2019-05-27 16:18:10 +02:00 |
|
Alejandro Fraguas
|
54461fea93
|
Merge branch 'ent-3881-discovery-fase-4' into 'develop'
Minor style, avoided duplicated iface names with spaces
See merge request artica/pandorafms!2453
|
2019-05-27 16:08:45 +02:00 |
|
Tatiana Llorente
|
016a5b3745
|
Changed image for severity in modal events window - #4102
|
2019-05-27 15:51:03 +02:00 |
|
Tatiana Llorente
|
0b4a076798
|
Changed image for severity in modal events window - #4102
|
2019-05-27 15:49:10 +02:00 |
|
Daniel Barbero Martin
|
bc64589046
|
fixed error create modules
|
2019-05-27 15:27:46 +02:00 |
|
Alejandro Gallardo Escobar
|
f8a0fc67f9
|
Minor improvements
|
2019-05-27 12:10:05 +02:00 |
|
Ramon Novoa
|
36a12d16be
|
Do not add disabled modules to the execution queue.
|
2019-05-27 11:55:42 +02:00 |
|
Alejandro Gallardo Escobar
|
ce8ba54e09
|
Merge remote-tracking branch 'origin/develop' into ent-3961-Añadir-caché-para-los-elementos-de-la-Consola-Visual
|
2019-05-27 11:31:24 +02:00 |
|
fbsanchez
|
83602e07b9
|
Merge remote-tracking branch 'origin/develop' into ent-3881-discovery-fase-4
|
2019-05-27 11:06:29 +02:00 |
|
artica
|
de3464bd02
|
Auto-updated build strings.
|
2019-05-27 00:01:05 +02:00 |
|
artica
|
ba97da46c6
|
Auto-updated build strings.
|
2019-05-26 00:01:04 +02:00 |
|
artica
|
a13701ed82
|
Auto-updated build strings.
|
2019-05-25 00:01:06 +02:00 |
|
manuel
|
bf3ac73feb
|
Removed empty help icons
|
2019-05-24 14:26:28 +02:00 |
|
marcos.alconada
|
41bc705c02
|
Image only for welcome message
|
2019-05-24 14:19:31 +02:00 |
|
marcos.alconada
|
9587b4cc44
|
Image only for welcome message
|
2019-05-24 14:18:39 +02:00 |
|
Daniel Rodriguez
|
d1d9307e85
|
Merge branch 'ent-4081-Quitar-ayudas-vacias-plantillas-informes' into 'develop'
Removed empty help icons
See merge request artica/pandorafms!2452
|
2019-05-24 12:59:53 +02:00 |
|
manuel
|
0ee2ed6f5e
|
Removed empty help icons in modules
|
2019-05-24 12:59:25 +02:00 |
|
fbsanchez
|
c5bd3204ab
|
Minor style, avoided duplicated iface names with spaces
|
2019-05-24 11:42:46 +02:00 |
|