2165 Commits

Author SHA1 Message Date
Rafael Ameijeiras
bfee610b4f Merge branch 'ent-12621-meter-tips-de-ayuda-en-la-interfaz' into 'develop'
Ent 12621 meter tips de ayuda en la interfaz

See merge request artica/pandorafms!6904
2024-02-26 11:51:37 +00:00
Jonathan
9082fbf798 #12621 tips and size window 2024-02-22 10:49:57 +01:00
Matias Didier
2f6a95dea5 Merge branch 'ent-12909-guardia17097-campos-pluginserver-no-se-guardan-en-politicas-772-3' into 'develop'
Ent 12909 [GUARDIA][#17097] Campos pluginserver no se guardan en políticas 772.3.

See merge request artica/pandorafms!6954
2024-02-21 12:36:42 +00:00
Jonathan
c725624dcb #12621 style tips dialogs 2024-02-20 16:16:48 +01:00
Daniel Cebrian
9f000fcc35 #12909 fixed macros plugin in policies 2024-02-19 12:47:15 +01:00
Jonathan
52bad466ed Merge branch 'develop' into ent-12621-meter-tips-de-ayuda-en-la-interfaz 2024-02-16 11:24:56 +01:00
Jonathan
499ea9b805 #12633 fix visuals errors 2024-02-07 09:21:42 +01:00
Rafael Ameijeiras
f072936f21 Merge branch 'ent-12845-errores-visuales-en-nuevas-modales' into 'develop'
Ent 12845 errores visuales en nuevas modales

See merge request artica/pandorafms!6913
2024-02-06 16:55:38 +00:00
Jonathan
644308db4f #12845 fix style hover 2024-02-06 14:34:34 +01:00
Jonathan
59fd298215 #12845 fix styles events 2024-02-05 17:24:52 +01:00
Jonathan
80c0f48774 #12488 when px lower 0 default 100 2024-02-05 16:05:16 +01:00
Jonathan
21fe027a62 #12488 tips window move for clicks 2024-02-05 14:34:43 +01:00
Jonathan
4c617acefc #12621 dialog tips on click 2024-02-02 13:43:04 +01:00
Daniel Cebrian
5feb11c547 9992 added email test dialog in metaconsole 2024-01-31 16:34:25 +01:00
Rafael Ameijeiras
2daa6f1e87 Merge branch 'ent-12797-error-select2-javascript-discovery' into 'develop'
Ent 12797 error select2 javascript discovery

See merge request artica/pandorafms!6892
2024-01-31 14:06:36 +00:00
Jonathan
f430d3ce9f #12797 fix select2 2024-01-30 14:53:48 +01:00
Daniel Cebrian
f01902903c #12789 fixed regex in event table 2024-01-29 13:38:29 +01:00
Rafael Ameijeiras
ccaa25da23 Merge branch 'ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor' into 'develop'
Ent 12657 mostrar show entries de eventos de menor a mayor

See merge request artica/pandorafms!6785
2024-01-29 09:30:55 +00:00
Matias Didier
1cce0a3cea Merge branch 'ent-12777-export-qr-mete-html-encoding' into 'develop'
Ent 12777 export qr mete html encoding

See merge request artica/pandorafms!6865
2024-01-23 11:23:33 +00:00
Matias Didier
eba0ce9e80 Merge branch 'ent-12624-cambio-estilo-de-ventanas-modales' into 'develop'
Ent 12624 cambio estilo de ventanas modales

See merge request artica/pandorafms!6826
2024-01-23 09:44:21 +00:00
Diego Muñoz-Reja
f560ae8d56 Merge branch 'ent-12520-errores-en-formularios-de-los-dashboards' into 'develop'
Ent 12520 errores en formularios de los dashboards

See merge request artica/pandorafms!6718
2024-01-22 11:16:19 +00:00
Jonathan
f43279acc3 #12777 qr name remove entities 2024-01-22 09:27:02 +01:00
Daniel Rodriguez
cc33e5413a Merge branch 'ent-12202-eastern-egg-asteroids' into 'develop'
Ent 12202 eastern egg asteroids

See merge request artica/pandorafms!6693
2024-01-19 11:10:55 +00:00
Rafael Ameijeiras
2baef1ccf2 Merge branch 'ent-12553-correccion-de-erratas' into 'develop'
Ent 12553 Corrección de erratas

See merge request artica/pandorafms!6817
2024-01-19 08:23:35 +00:00
Diego Muñoz-Reja
5ade3a9e82 Merge branch 'ent-12541-fallos-en-graph-analytics' into 'develop'
Ent 12541 Fallos en graph analytics

See merge request artica/pandorafms!6714
2024-01-18 16:00:08 +00:00
Rafael Ameijeiras
9bd4593c60 Merge branch 'ent-12542-16692-grupo-de-modulo-de-componente-local-no-se-muestra-correctamente' into 'develop'
Ent 12542 16692 grupo de modulo de componente local no se muestra correctamente

See merge request artica/pandorafms!6730
2024-01-18 15:46:31 +00:00
Jonathan
01049303d9 #12202 remove loadModal not defined function 2024-01-18 16:22:44 +01:00
Rafael Ameijeiras
c2c3c5e5ed Merge branch 'ent-12484-pestanas-de-informacion-en-el-about-en-774-han-desaparecido' into 'develop'
Ent 12484 pestanas de informacion en el about en 774 han desaparecido

See merge request artica/pandorafms!6831
2024-01-18 11:33:28 +00:00
Rafael Ameijeiras
8a41a04345 Merge branch 'ent-12143-arreglar-mejorar-visualizacion-de-calendarios-y-selectores-de-fecha' into 'develop'
Ent 12143 arreglar mejorar visualizacion de calendarios y selectores de fecha

See merge request artica/pandorafms!6765
2024-01-18 11:27:20 +00:00
Rafael Ameijeiras
14b512ddde Merge branch 'ent-12685-se-pueden-anadir-widget-sin-estar-en-modo-edicion' into 'develop'
Ent 12685 se pueden anadir widget sin estar en modo edicion

See merge request artica/pandorafms!6841
2024-01-18 11:20:34 +00:00
Rafael Ameijeiras
1f64fb6115 Merge branch 'ent-12320-wizard-de-bienvenida-mas-molon-visualmente' into 'develop'
Ent 12320 wizard de bienvenida mas molon visualmente

See merge request artica/pandorafms!6842
2024-01-18 11:16:08 +00:00
Daniel Rodriguez
32c9524447 Merge branch 'ent-12384-restricciones-de-permisos-de-mapas-de-red' into 'develop'
Ent 12384 restricciones de permisos de mapas de red

See merge request artica/pandorafms!6727
2024-01-18 08:16:37 +00:00
Jonathan
c973d8b257 #12542 trigger module change 2024-01-17 14:04:27 +01:00
Jonathan
49784cab5a Merge branch 'develop' into ent-12202-eastern-egg-asteroids 2024-01-17 09:29:21 +01:00
Pablo Aragon
12f6f2e02b 12320-Welcome wizard new styles 2024-01-11 09:33:51 +01:00
Jonathan
bcf945daa2 #12685 fix invisible add widget 2024-01-10 15:16:15 +01:00
Jonathan
2ace34425c #12143 fix datepicker 2024-01-09 16:04:28 +01:00
Jonathan
83b25fef31 Merge branch 'develop' into ent-12143-arreglar-mejorar-visualizacion-de-calendarios-y-selectores-de-fecha 2024-01-09 11:37:54 +01:00
Jonathan
c862946813 Merge branch 'develop' into ent-12657-mostrar-show-entries-de-eventos-de-menor-a-mayor 2024-01-09 09:25:22 +01:00
Jonathan
71b491a49d #12484 same about 2024-01-08 13:07:48 +01:00
Daniel Maya
b80bfa2799 #12624 change of style in dialog 2 2024-01-04 15:39:27 +01:00
Daniel Cebrian
5b4531e74f #12553 fixed titles 2023-12-27 17:10:11 +01:00
Rafael Ameijeiras
8658dbc938 Merge branch 'ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center' into 'develop'
fix error js load modal filter sound events pandora_enterprise#12607

See merge request artica/pandorafms!6739
2023-12-20 10:21:51 +00:00
Rafael Ameijeiras
6a904f4e59 Merge branch 'ent-12269-el-editor-de-widgets-no-me-dice-que-tipo-de-widget-estoy-editando' into 'develop'
Ent 12269 el editor de widgets no me dice que tipo de widget estoy editando

See merge request artica/pandorafms!6590
2023-12-19 14:59:13 +00:00
daniel
d57f0971b6 Merge remote-tracking branch 'origin/develop' into ent-12607-faltan-botones-de-desacoplar-y-minimizar-en-consola-sonora-command-center
Conflicts:
	pandora_console/include/javascript/pandora.js
2023-12-19 14:41:12 +01:00
daniel
855fc32a7d Merge remote-tracking branch 'origin/develop' into ent-9640-agrupacion-de-graficas-en-periodos-de-tiempo
Conflicts:
	pandora_console/include/javascript/pandora.js
	pandora_console/include/styles/pandora.css
2023-12-19 09:39:24 +01:00
Jonathan
5c047fc1b5 #12657 entries order function datatables 2023-12-18 14:46:44 +01:00
Daniel Maya
0ac20717f1 #12200 resolved conflict 2023-12-18 13:15:42 +01:00
daniel
9b0bee3b36 fix rerors duplicate in CVS pandora_enterprise#9640 2023-12-18 11:35:39 +01:00
daniel
d56e3a5496 fix rerors duplicate in CVS pandora_enterprise#9640 2023-12-18 11:14:55 +01:00