17573 Commits

Author SHA1 Message Date
edu.corral
fb4b42e6c5 ent 9722 expired license notifications 2022-11-03 13:55:06 +01:00
alejandro.campos@artica.es
2c7d7e4044 fixed vulnerability in load of help iframes 2022-11-03 13:53:10 +01:00
Daniel Barbero
33b1c0ab8f add new filter pandora_enterprise#9135 2022-11-03 12:00:58 +01:00
edu.corral
5eee3ade4a ent 9722 expired license 2022-11-03 11:36:28 +01:00
Daniel Rodriguez
e52da7d379 Merge branch 'ent-9105-poder-anadir-colecciones-al-satellite-server' into 'develop'
Ent 9105 poder anadir colecciones al satellite server

See merge request artica/pandorafms!5202
2022-11-03 10:28:32 +00:00
jose.gonzalez@pandorafms.com
32466c6906 Changes 2022-11-03 10:18:17 +01:00
artica
08f0d416cd Auto-updated build strings. 2022-11-03 01:00:24 +01:00
alejandro.campos@artica.es
92455e7ef9 fixed backup cron task 2022-11-02 17:36:17 +01:00
Daniel Barbero
0ff07d7224 add new macro event response group_contact pandora_enterprise#9246 2022-11-02 16:59:04 +01:00
Daniel Barbero
94fb25d104 Merge remote-tracking branch 'origin/develop' into ent-9705-14417-pestanas-dentro-de-widget-events-incorrecta-visualizacion 2022-11-02 13:42:13 +01:00
Daniel Barbero
7655c23637 fix api get events pandora_enterprise#9723 2022-11-02 13:40:23 +01:00
edu.corral
8d34ef88c5 ent 9722 expired licence notification 2022-11-02 09:19:15 +01:00
Daniel Barbero
19109a682e fix images maintenance mode 2022-11-02 08:14:11 +01:00
Junichi Satoh
98cc59a136 Updated Japanese console translations. 2022-11-02 15:55:00 +09:00
artica
42db6497aa Auto-updated build strings. 2022-11-02 01:00:18 +01:00
artica
91795a3078 Auto-updated build strings. 2022-11-01 01:00:24 +01:00
Daniel Rodriguez
d99ccaba9e Merge branch 'ent-9729-xss-en-busqueda-de-libreria-de-modulos' into 'develop'
Fix module library XSS

See merge request artica/pandorafms!5233
2022-10-31 14:12:46 +00:00
Daniel Barbero
331219ba16 Merge remote-tracking branch 'origin/develop' into ent-8733-giss-anadir-alertas-externas-desde-varias-politicas-sin-pisar-las-anteriores
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-31 14:13:45 +01:00
Daniel Rodriguez
a1210c7814 Merge branch 'ent-9233-Historico-de-traps' into 'develop'
implemented trap history

See merge request artica/pandorafms!5116
2022-10-31 11:17:29 +00:00
Daniel Rodriguez
0be07d1bb4 Merge branch 'ent-9536-autoincremento-de-indices-en-la-sync-de-meta-nodo' into 'develop'
force insert with primary key pandora_enterprise#9536

See merge request artica/pandorafms!5171
2022-10-31 10:06:15 +00:00
Daniel Rodriguez
41946bfda7 Merge branch 'ent-4822-estado-de-consola-visual-mantenimiento' into 'develop'
add mode maintenance VC pandora_enterprise#4822

See merge request artica/pandorafms!5191
2022-10-31 10:02:44 +00:00
Calvo
7bdf103725 Fix module library XSS 2022-10-31 10:19:13 +01:00
artica
1288a3c00b Auto-updated build strings. 2022-10-31 01:00:17 +01:00
artica
c1290bd7d0 Auto-updated build strings. 2022-10-30 01:00:19 +02:00
artica
0eb3c12cd9 Auto-updated build strings. 2022-10-29 01:00:22 +02:00
Jimmy Olano
15955d2329 Merge branch 'ent-5584-9778-nuevo-editor-masivo-de-usuarios-meta-y-nodo-post' into 'develop'
Ent 5584 9778 nuevo editor masivo de usuarios meta y nodo post

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/5584

See merge request artica/pandorafms!5153
2022-10-28 15:18:15 +00:00
Jimmy Olano
af73da2291 Merge branch 'ent-4043-proyectos-banco-de-credenciales-contrasenas-para-modulos' into 'develop'
Ent 4043 proyectos banco de credenciales contrasenas para modulos

https://brutus.artica.es:8081/artica/pandora_enterprise/-/issues/4043

See merge request artica/pandorafms!5172
2022-10-28 14:00:46 +00:00
jose.gonzalez@pandorafms.com
195611a3c1 Adapt views and refactor 2022-10-28 15:01:00 +02:00
jose.gonzalez@pandorafms.com
97b249d5a5 Improved color picker 2022-10-28 10:54:30 +02:00
Daniel Barbero
12c4217b3f fix timestamp modal event grouped by extra id pandora_enterprise#9716 2022-10-28 10:10:53 +02:00
Daniel Barbero
10750e2464 translates pandora_enterprise#9714 2022-10-28 08:35:21 +02:00
artica
0da1247d68 Auto-updated build strings. 2022-10-28 01:00:26 +02:00
jose.gonzalez@pandorafms.com
809fbb4dc0 Fix somethings about styles 2022-10-27 17:31:48 +02:00
jose.gonzalez@pandorafms.com
e6af39a3d7 Changes 2022-10-27 16:22:18 +02:00
jose.gonzalez@pandorafms.com
356d6eccf7 Fix CSS styles 2022-10-27 16:21:27 +02:00
Daniel Barbero
6d19391c72 fix interfaces charts pandora_enterprise#9683 2022-10-27 16:12:17 +02:00
Calvo
8a43421b49 Fix module type validadion on api set create network module 2022-10-27 15:18:15 +02:00
Calvo
eed8361621 Check group and profile exist on api add permission user to group 2022-10-27 15:03:50 +02:00
Calvo
a96eb2ce29 Hide meta treeview user hash 2022-10-27 12:35:31 +02:00
Daniel Maya
382e74ae36 resolved conflict 2022-10-27 09:42:40 +02:00
Daniel Barbero
59f0bba7f3 fix styles events list dashboards pandora_enterprise#9705 2022-10-27 09:07:04 +02:00
artica
bf6f5479e8 Auto-updated build strings. 2022-10-27 01:00:24 +02:00
alejandro.campos@artica.es
8d611a8e7f implemented float formatting and option in reports to change visualization format 2022-10-26 18:25:16 +02:00
jose.gonzalez@pandorafms.com
edbf7ff249 Adapted views 2022-10-26 17:04:50 +02:00
jose.gonzalez@pandorafms.com
30fb724359 Made some changes for better visualization 2022-10-26 16:58:28 +02:00
Jimmy Olano
d9c5b59eff Merge branch 'ent-9630-Bug-en-codigo-de-functions-api-php' into 'develop'
fix typo in code

Ref pandora_enterprise#9630

See merge request artica/pandorafms!5189
2022-10-26 11:02:42 +00:00
Daniel Barbero
17889c51c1 new image pandora_enterprise#4822 2022-10-26 09:54:55 +02:00
Diego Muñoz-Reja
00a1e74473 Merge branch 'ent-9332-13917-fallos-al-autenticarse-con-ldap-cuando-tenemos-la-contrasena-encriptada' into 'develop'
Fix entities ldap admin pass

See merge request artica/pandorafms!5217
2022-10-26 07:53:31 +00:00
Daniel Barbero
3273fc23ed Merge remote-tracking branch 'origin/develop' into ent-4822-estado-de-consola-visual-mantenimiento
Conflicts:
	pandora_console/extras/mr/58.sql
2022-10-26 09:42:02 +02:00
artica
b1c35e7385 Auto-updated build strings. 2022-10-26 01:00:24 +02:00