33491 Commits

Author SHA1 Message Date
Rafael Ameijeiras
46c13e0315 Merge branch 'ent-10205-falta-parametro-en-ayuda-plugin-bandwidth' into 'develop'
Ent 10205 falta parametro en ayuda plugin bandwidth

See merge request artica/pandorafms!5635
2023-03-29 13:50:14 +00:00
Pablo Aragon
168d03eecc New qrcode.js version & vcard 2023-03-29 15:35:18 +02:00
Pablo Aragon
2b121a2fd2 New qrcode.js version & vcard 2023-03-29 15:34:03 +02:00
daniel
e7d08fe6d3 fixed styles 2023-03-29 14:48:47 +02:00
Matias Didier
4297481c35 Merge branch 'ent-10819-guardia-15316-alertas-en-vista-de-alertas-tienen-icono-de-politica-sin-estar-en-ellas' into 'develop'
Ent 10819 guardia 15316 alertas en vista de alertas tienen icono de politica sin estar en ellas

See merge request artica/pandorafms!5633
2023-03-29 12:32:44 +00:00
daniel
e4383a0573 fixed styles 2023-03-29 14:07:56 +02:00
Jonathan
a64f9e98b3 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 13:44:54 +02:00
Jonathan
49500af75f Visual console duplicate copy items border fix 2023-03-29 13:44:47 +02:00
daniel
d2e642ca3e fixed styles 2023-03-29 13:37:13 +02:00
Daniel Maya
3af2637a7c #10819 Fixed img 2023-03-29 13:37:07 +02:00
Jonathan
962562f12f Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 13:35:03 +02:00
Jonathan
d5ac49e9db Log viewer fix styles 2023-03-29 13:34:54 +02:00
daniel
6c189b8834 fixed styles 2023-03-29 13:31:15 +02:00
daniel
5d952a83fe fixed styles 2023-03-29 12:39:23 +02:00
Pablo Aragon
1a82056039 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 12:13:05 +02:00
Pablo Aragon
7ada30c9b1 10718 & 10821 2023-03-29 12:12:56 +02:00
Jonathan
b9efc205df Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-29 11:03:06 +02:00
Jonathan
9a0dffbee3 Agents modules view fix filters 2023-03-29 11:02:57 +02:00
Daniel Maya
aeb5f111db #10205 Added help -f 2023-03-29 10:35:25 +02:00
daniel
32bc7335ac fixed styles 2023-03-29 09:11:26 +02:00
daniel
c610063244 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-29 08:33:02 +02:00
Jonathan
a760bbfbc2 MIB Uploader fix delete icon 2023-03-29 08:22:35 +02:00
Jimmy Olano
5044c23ef3 Merge branch 'ent-9529-14208-definir-timezone-por-defecto-para-nuevos-usuarios' into 'develop', JJOS.
Draft: Ent 9529 14208 definir timezone por defecto para nuevos usuarios

See merge request artica/pandorafms!5492
2023-03-29 02:28:47 +00:00
artica
5113117a39 Auto-updated build strings. 2023-03-29 01:00:25 +02:00
Diego Muñoz-Reja
35a1c2332d Merge branch 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob' into 'develop'
implemented consoles management

See merge request artica/pandorafms!5558
2023-03-28 15:33:37 +00:00
daniel
2c0c213a01 Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round

See merge request artica/pandorafms!5631
2023-03-28 15:30:54 +00:00
daniel
86e492f275 fixed styles 2023-03-28 17:26:14 +02:00
Daniel Maya
eac71560cb #10819 Fixed policy alert img 2023-03-28 17:22:25 +02:00
Pablo Aragon
dab2a29b6b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-28 17:07:19 +02:00
Pablo Aragon
ce014e4c6b Datatables. Treeview graph meta 2023-03-28 17:07:06 +02:00
Alejandro Campos
e909686ddc Merge branch 'develop' into 'ent-4289-8282-RWORKS-Poder-escoger-el-servidor-que-ejecute-una-CronJob'
# Conflicts:
#   pandora_console/extras/mr/62.sql
2023-03-28 14:09:33 +00:00
daniel
0df3ad3ff3 fixed styles 2023-03-28 13:44:24 +02:00
Pablo Aragon
c7cd688b4b Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-28 12:39:32 +02:00
Pablo Aragon
5969928003 10408-Fix action column & 10398-Events pure mode 2023-03-28 12:39:02 +02:00
Jonathan
7a3e894bb0 Menu fix follow reports 2023-03-28 11:06:03 +02:00
Jonathan
53194f7c3d Reports visual changes 2023-03-28 11:04:52 +02:00
Jonathan
87946161f3 Solution conflict 2023-03-28 09:30:18 +02:00
Jonathan
81be0da7fd Module manager editor relations visual change 2023-03-28 09:17:47 +02:00
daniel
3d815d56c8 fixed styles 2023-03-28 08:45:40 +02:00
daniel
4e01838238 fixed styles 2023-03-28 08:43:46 +02:00
daniel
19ddbdc30a fixed styles 2023-03-28 08:34:05 +02:00
artica
061c9f8750 Auto-updated build strings. 2023-03-28 01:00:16 +02:00
daniel
8f77ecc064 Merge branch 'ent-9662-second-round' into 'develop'
Ent 9662 second round

See merge request artica/pandorafms!5629
2023-03-27 19:25:20 +00:00
daniel
ebffb004e9 Merge remote-tracking branch 'origin/develop' into ent-9662-second-round 2023-03-27 21:22:06 +02:00
daniel
0461881420 fixed styles 2023-03-27 17:13:23 +02:00
Pablo Aragon
98f812b757 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-27 17:03:45 +02:00
Pablo Aragon
55ff0e0597 wux and wmi 2023-03-27 17:03:38 +02:00
Jonathan
52076a56c2 Merge branch 'ent-9662-second-round' of brutus.artica.es:artica/pandorafms into ent-9662-second-round 2023-03-27 16:26:28 +02:00
Jonathan
e06fc2f115 Collection visual fix 2023-03-27 16:26:12 +02:00
Jimmy Olano
a532b169a4 Merge branch 'ent-10665-version-open-edicion-del-propio-usuario-y-gestion-de-usuarios-devuelve-error-500' into 'develop', JJOS.
Draft: Ent 10665 version open edicion del propio usuario y gestion de usuarios devuelve error 500

See merge request artica/pandorafms!5597
2023-03-27 13:07:07 +00:00