marcos.alconada
|
d5ac57064b
|
Condition is added to keep the selection color in the main menu
|
2019-05-29 11:34:23 +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 |
|
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 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 |
|
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 |
|
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 |
|
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 |
|
alejandro-campos
|
58d0dc5dbc
|
fix minor bug in reporting functions
|
2019-05-27 18:31:20 +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 |
|
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 |
|
Ramon Novoa
|
36a12d16be
|
Do not add disabled modules to the execution queue.
|
2019-05-27 11:55:42 +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 |
|
manuel
|
0319e4d4e6
|
Removed empty help icons
|
2019-05-24 11:11:30 +02:00 |
|
marcos.alconada
|
01d96728c8
|
changed PK to NULL
|
2019-05-24 11:03:09 +02:00 |
|
Alejandro Fraguas
|
f5586d7b70
|
Merge branch 'ent-3630-7648-7712-campo-label-no-se-muestra-en-informes-de-graficas' into 'develop'
fixed label reports and more fixed
See merge request artica/pandorafms!2413
|
2019-05-24 10:47:15 +02:00 |
|
artica
|
cc09c257bc
|
Auto-updated build strings.
|
2019-05-24 00:01:06 +02:00 |
|
fbsanchez
|
9d7d58f43e
|
Merge branch 'fix/newsletter_ent' into 'develop'
Newsletter reminder settings ent
See merge request artica/pandorafms!2449
|
2019-05-23 19:25:43 +02:00 |
|
fbsanchez
|
4400d9303f
|
subscription manager udp
|
2019-05-23 19:22:05 +02:00 |
|
fbsanchez
|
211b05c9d6
|
minor fix in newsletter logic
|
2019-05-23 18:59:38 +02:00 |
|
fbsanchez
|
0235b4f396
|
Merge branch 'fix/uno' into 'develop'
removed trace from user_edit
See merge request artica/pandorafms!2448
|
2019-05-23 18:54:05 +02:00 |
|
fbsanchez
|
058c9d3806
|
Newsletter reminder settings ent
|
2019-05-23 18:54:04 +02:00 |
|
fbsanchez
|
f46fdea220
|
Merge remote-tracking branch 'origin/develop' into fix/uno
|
2019-05-23 18:46:56 +02:00 |
|
fbsanchez
|
8f9c9fd156
|
removed trace from user_edit
|
2019-05-23 18:46:43 +02:00 |
|
Daniel Barbero Martin
|
1386a44e07
|
fixed errors label report
|
2019-05-23 17:52:28 +02:00 |
|
Daniel Rodriguez
|
51f846af05
|
Merge branch 'ent-3893-Errata-en-Bulk-operation-de-politicas' into 'develop'
Fixed visual bug in policies operations actions
See merge request artica/pandorafms!2369
|
2019-05-23 17:24:59 +02:00 |
|
Daniel Rodriguez
|
7c236149b0
|
Merge branch 'ent-3592-Se-eliminan-items-de-informes-aunque-se-cancele' into 'develop'
Fixed bug in items reports deleted
See merge request artica/pandorafms!2208
|
2019-05-23 17:18:00 +02:00 |
|
Alejandro Fraguas
|
7097481cca
|
Merge branch 'ent-3974-Los-campos-de-module-plugin-no-se-guardan' into 'develop'
fixed bug in macros of plugin modules
See merge request artica/pandorafms!2442
|
2019-05-23 17:08:34 +02:00 |
|
fbsanchez
|
9e1de4cbb3
|
Merge branch 'ent-1668-update-manager' into 'develop'
rb UM GCv
See merge request artica/pandorafms!2447
|
2019-05-23 16:16:26 +02:00 |
|
fbsanchez
|
4ec6aadf7d
|
rb UM GCv
|
2019-05-23 16:12:40 +02:00 |
|
fbsanchez
|
f1c077b753
|
Merge branch 'ent-1668-update-manager' into 'develop'
UM GCv
See merge request artica/pandorafms!2446
|
2019-05-23 16:09:16 +02:00 |
|