marcos
0cfb7c994f
fixed merge conflict
2021-06-14 11:02:57 +02:00
marcos
ee4a3dc450
fixed merge conflict
2021-06-14 10:52:50 +02:00
marcos
5162864b28
fixed merge conflict
2021-06-14 09:03:17 +02:00
marcos
0ab343e672
merge conflict
2021-06-14 08:26:33 +02:00
artica
595fabb232
Auto-updated build strings.
2021-06-14 01:00:18 +02:00
artica
e7a204d6d8
Auto-updated build strings.
2021-06-13 01:00:16 +02:00
artica
8272eb4f5b
Auto-updated build strings.
2021-06-12 01:00:21 +02:00
Daniel Rodriguez
81c2ebc43b
Merge branch 'ent-7678-treeview-modules-no-funciona' into 'develop'
...
Fix treeview modules sql inner condition
See merge request artica/pandorafms!4195
2021-06-11 08:44:44 +00:00
Daniel Rodriguez
0adcf5aac2
Merge branch 'ent-7671-cambiar-enlaces-a-documentacion' into 'develop'
...
add new link documentation
See merge request artica/pandorafms!4188
2021-06-11 08:32:06 +00:00
Daniel Rodriguez
d0c122c193
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!4194
2021-06-11 08:24:27 +00:00
artica
876e776d29
Auto-updated build strings.
2021-06-11 01:00:09 +02:00
Calvo
e0b3536d1b
Fix treeview modules sql inner condition
2021-06-10 18:00:53 +02:00
marcos
1165ea11b9
cambio de fuentes css
2021-06-10 17:42:39 +02:00
artica
ace916bc8e
Updated version and build strings.
2021-06-10 17:12:11 +02:00
marcos
45667da362
cambio de fuentes css
2021-06-10 16:21:06 +02:00
marcos
e75abd1d2f
cambio de fuentes css
2021-06-10 16:13:45 +02:00
Marcos Alconada
665efa4fb7
Ent 7519 cambio de fuentes en la consola a nivel global
2021-06-10 08:19:11 +00:00
artica
5ad364cc4a
Auto-updated build strings.
2021-06-10 01:00:20 +02: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
marcos
50282dccf4
add new link documentation
2021-06-09 16:55:25 +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
Daniel Rodriguez
95832cd071
Merge branch 'ent-7652-iconos-para-black-theme' into 'develop'
...
changed icons for black theme
See merge request artica/pandorafms!4186
2021-06-09 13:12:47 +00:00
Marcos Alconada
8814b1f971
changed icons for black theme
2021-06-09 13:12:47 +00:00
Daniel Rodriguez
73f54c3375
Merge branch 'ent-7661-Error-500-al-editar-las-opciones-avanzadas-de-un-informe' into 'develop'
...
fixed bug
See merge request artica/pandorafms!4185
2021-06-09 12:37:59 +00:00
Daniel Rodriguez
79499204ce
Merge branch 'ent-fix-planned-downtime' into 'develop'
...
Fixed problems in planned downtime
See merge request artica/pandorafms!4181
2021-06-09 10:49:48 +00:00
alejandro.campos@artica.es
13850e52d5
fixed bug
2021-06-09 10:41:45 +02:00
artica
2953870e4f
Auto-updated build strings.
2021-06-09 01:00:20 +02: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
artica
a63a4efb71
Auto-updated build strings.
2021-06-08 01:00:20 +02:00
artica
bc6b4acd8b
Auto-updated build strings.
2021-06-07 01:00:19 +02:00
artica
656105cdf0
Auto-updated build strings.
2021-06-06 01:00:14 +02:00
artica
2513693ada
Auto-updated build strings.
2021-06-05 01:00:19 +02:00
Marcos Alconada
3bc2844b4d
fixed visual error black theme
2021-06-04 11:03:35 +00:00
Daniel Rodriguez
77b05de784
Merge branch 'ent-fix-bulk-alert-operations' into 'develop'
...
Fixed that restricted users can add/delete all alert templates using bulk alert operations.
See merge request artica/pandorafms!4171
2021-06-04 10:24:51 +00:00
Daniel Rodriguez
90a5a1c1a3
Merge branch 'ent-5785-Nuevo-informe-inventario-de-agentes' into 'develop'
...
Added new item type in reports
See merge request artica/pandorafms!4133
2021-06-04 09:03:32 +00:00
alejandro.campos@artica.es
c9edf8081c
excluded report item from templates list
2021-06-04 10:50:06 +02:00
alejandro.campos@artica.es
70946af507
Merge remote-tracking branch 'origin/develop' into ent-5785-Nuevo-informe-inventario-de-agentes
2021-06-04 10:32:45 +02:00
Daniel Rodriguez
d11ddfe059
Merge branch 'ent-7342-Bug-en-busqueda-de-usuarios' into 'develop'
...
fixed bug in users search
See merge request artica/pandorafms!4085
2021-06-04 07:49:56 +00:00
Daniel Rodriguez
8aae3f79be
Merge branch 'ent-7650-no-aparecen-graph-buttons' into 'develop'
...
Fixed missed buttons, improve code and added go back button when create-update
Closes pandora_enterprise#7650
See merge request artica/pandorafms!4169
2021-06-04 07:46:59 +00:00
Junichi Satoh
3563a99703
Fixed that restricted users can see all alert templates.
2021-06-04 16:01:16 +09:00
artica
8976ec4b6e
Auto-updated build strings.
2021-06-04 01:00:19 +02:00
Daniel Rodriguez
a12c692972
Merge branch 'ent-fix-custom-report' into 'develop'
...
Fixed custom report
See merge request artica/pandorafms!4167
2021-06-03 15:08:26 +00:00
Jose Gonzalez
08c945d91d
Fixed missed buttons, improve code and added go back button when create-update
2021-06-03 15:37:11 +02:00
alejandro.campos@artica.es
fb5ecaeef4
minor fixes in report item
2021-06-03 13:49:10 +02:00
Daniel Rodriguez
5040b4b265
Merge branch 'ent-7602-XSS-nombre-consolas-visuales' into 'develop'
...
Improved code and fix xss vulnerability
Closes pandora_enterprise#7602
See merge request artica/pandorafms!4157
2021-06-03 11:37:15 +00:00
Daniel Rodriguez
b5802d41c7
Merge branch 'ent-7604-Vulnerabilidad-file-manager-images' into 'develop'
...
Fix vulnerability with directories created in upper levels
Closes pandora_enterprise#7604
See merge request artica/pandorafms!4158
2021-06-03 11:36:22 +00:00
alejandro.campos@artica.es
b8c6922902
minor fixes in report item
2021-06-03 12:04:25 +02:00
artica
e1ae9d7908
Auto-updated build strings.
2021-06-03 01:00:17 +02:00
alejandro.campos@artica.es
36eb084824
minor fixes
2021-06-02 19:02:25 +02:00