tyler.durden
/
pandorafms
mirror of https://github.com/pandorafms/pandorafms.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity
21,694 Commits 34 Branches 30 Tags 901 MiB
Commit Graph

21694 Commits

Author SHA1 Message Date
Alejandro Gallardo Escobar 16ac83d961 Workaround to make the dblclick event to work when clicking into a vc item with a svg child 2019-07-17 17:27:16 +02:00
Alejandro Gallardo Escobar 67b376466b Great improvements into the edition of the visual console items 2019-07-16 16:27:23 +02:00
Alejandro Gallardo Escobar 078286a10f Improved the metadata setter of the client vc item 2019-07-16 16:24:08 +02:00
Alejandro Gallardo Escobar 39d02db364 Merge branch 'new-vc-line-element' of https://brutus.artica.lan:8081/artica/pandorafms into new-vc-line-element 2019-07-12 14:04:55 +02:00
Alejandro Gallardo Escobar 3120058c36 Added item selection and a WIP version of the edition form 2019-07-12 14:00:24 +02:00
Daniel Maya d060468361 Added spinner 2019-07-12 11:00:11 +02:00
Daniel Maya 8047bf2c87 Added isUpdating 2019-07-09 16:43:23 +02:00
Daniel Maya aafba795ee Update visual console 2019-07-08 17:51:01 +02:00
Daniel Maya dffe03aaa8 Fixed getVisualCenter to take into account the label 2019-07-02 17:32:46 +02:00
Alejandro Gallardo Escobar c6057037dd Fixed the vc client line item re-rendering 2019-07-02 12:37:58 +02:00
Alejandro Gallardo Escobar 89b12cf717 Added a defered init option and a new setter to the vc client item class 2019-07-02 12:37:10 +02:00
Alejandro Gallardo Escobar 14f83fe142 WIP: VC line 2019-06-28 13:45:19 +02:00
Alejandro Gallardo Escobar af23881fc2 Now the lines between the VC elements are moved after one of the elements of the relation is moved 2019-06-28 13:44:22 +02:00
artica 8a04e2eec2 Auto-updated build strings. 2019-06-28 00:01:06 +02:00
Daniel Rodriguez 30e6d14a7a Merge branch 'fix/dbschema-735' into 'develop' 
Revert 28.sql

See merge request artica/pandorafms!2554
 2019-06-27 16:07:58 +02:00
fbsanchez 5ccc16d7d6 Revert 28.sql 2019-06-27 15:04:58 +02:00
fbsanchez d4971c8509 Merge branch 'fix/dbschema-735' into 'develop' 
Minor fixes

See merge request artica/pandorafms!2552
 2019-06-27 10:44:42 +02:00
fbsanchez d956f08011 Minor fixes 2019-06-27 10:39:43 +02:00
artica ead768c9df Auto-updated build strings. 2019-06-27 00:01:10 +02:00
fbsanchez cbd75f3d96 Merge branch 'fix/736-mr-aws-migration' into 'develop' 
MR forgotten change

See merge request artica/pandorafms!2549
 2019-06-26 19:41:55 +02:00
fbsanchez 470e399f50 Fixed url edit task in RDS 2019-06-26 19:34:34 +02:00
fbsanchez 225de6b5ea MR forgotten change 2019-06-26 19:33:42 +02:00
Daniel Rodriguez 6f4ccff8b2 Merge branch 'ent-4256-cuenta-atras' into 'develop' 
improved countdown

See merge request artica/pandorafms!2546
 2019-06-26 17:00:12 +02:00
Alejandro Fraguas 4c6505e971 Merge branch 'ent-2966-net-tools' into 'develop' 
Fixed

See merge request artica/pandorafms!2537
 2019-06-26 16:31:28 +02:00
fbsanchez 58483e8748 improved countdown 2019-06-26 16:23:54 +02:00
daniel dac6b3cc30 Merge branch 'update_current_package_736' into 'develop' 
update current package

See merge request artica/pandorafms!2545
 2019-06-26 15:41:16 +02:00
Daniel Barbero Martin a10cf51b1b update current package 2019-06-26 15:37:04 +02:00
Daniel Rodriguez f681809f7b Merge branch 'ent-4266-eliminar-los-flashes-al-recargar-graficas-en-la-consola-visuall' into 'develop' 
Eliminar los flashes al recargar gráficas en la consola visual

See merge request artica/pandorafms!2533
 2019-06-26 14:14:35 +02:00
Alejandro Fraguas cda9cd6fe1 Merge branch 'ent-4234-Ventana-popup-que-muestra-graficas-no-tiene-en-cuenta-los-unknown-y-no-cabe' into 'develop' 
Changed size for modal window for module graph- #4234

See merge request artica/pandorafms!2536
 2019-06-26 13:43:57 +02:00
artica fb407c51f2 Updated version and build strings. 2019-06-26 13:25:57 +02:00
artica 7fa78d62fb Merge branch 'develop' of https://192.168.50.5:8081/artica/pandorafms into develop 2019-06-26 13:25:48 +02:00
Alejandro Gallardo Escobar f36e7966a1 Merge remote-tracking branch 'origin/develop' into ent-4266-eliminar-los-flashes-al-recargar-graficas-en-la-consola-visuall 2019-06-26 13:13:36 +02:00
Daniel Rodriguez 4136f19190 Merge branch 'ent-4258-visual-console-movement-redimension-mode' into 'develop' 
Visual Console's movement and redimension mode

See merge request artica/pandorafms!2527
 2019-06-26 13:06:02 +02:00
Daniel Rodriguez 321ea717af Merge branch 'ent-3644-bug-redireccion-de-static-graph' into 'develop' 
Changed js

See merge request artica/pandorafms!2544
 2019-06-26 13:02:50 +02:00
marcos.alconada c223e0bdad Changed js 2019-06-26 12:50:19 +02:00
marcos.alconada 006e0cd4ec Changed js 2019-06-26 12:31:47 +02:00
Alejandro Fraguas 88ce26dee6 Merge branch 'ent-4141-Errores-en-el-Log-del-servidor' into 'develop' 
Fixed uninitialized value  in pattern match

See merge request artica/pandorafms!2542
 2019-06-26 12:23:42 +02:00
Daniel Rodriguez d68617eda1 Merge branch 'ent-4265-array-en-valor-min' into 'develop' 
Changed variable that modify min values

See merge request artica/pandorafms!2538
 2019-06-26 12:04:41 +02:00
Daniel Rodriguez 0ea5b7ff1b Merge branch 'ent-4196-Eliminar-funcionalidad-QR-Code-in-header' into 'develop' 
Removed option to show qr code in header - #4196

See merge request artica/pandorafms!2494
 2019-06-26 12:04:00 +02:00
Daniel Rodriguez 6a27778efb Merge branch 'ent-4204-error-al-editar-una-grafica-combinada-usando-previamente-un-filtro-de-busqueda' into 'develop' 
Ent 4204 error al editar una grafica combinada usando previamente un filtro de busqueda

See merge request artica/pandorafms!2505
 2019-06-26 12:03:13 +02:00
Daniel Rodriguez 6976ba9c8e Merge branch 'ent-3800-mal-enrutamiento-discovery' into 'develop' 
Ent 3800 mal enrutamiento discovery

See merge request artica/pandorafms!2350
 2019-06-26 12:02:43 +02:00
artica ff48757077 Merge remote-tracking branch 'remotes/origin/ent-4141-Errores-en-el-Log-del-servidor' into develop 2019-06-26 11:36:22 +02:00
Alejandro Gallardo Escobar 2993278178 Removed the resize functionality of the module graph vc item 2019-06-26 11:33:45 +02:00
Alejandro Fraguas 7224974520 Merge branch 'ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion' into 'develop' 
first steps credential store

See merge request artica/pandorafms!2523
 2019-06-26 11:21:49 +02:00
fbsanchez 690b5cd7fd Merge branch 'fix/adblock-avoid' into 'develop' 
Fix class names to avoid addblock hide them

See merge request artica/pandorafms!2543
 2019-06-26 11:16:23 +02:00
fbsanchez f66e5b5ef8 Fix class names to avoid addblock hide them 2019-06-26 11:11:21 +02:00
fbsanchez fdf2a983d2 general review credential store 2019-06-26 10:39:18 +02:00
fbsanchez 4754e20784 Merge remote-tracking branch 'origin/develop' into ent-3980-7966-aws-multicuenta-y-mejora-monitorizacion 2019-06-26 09:52:22 +02:00
Alejandro Fraguas 084c4cc651 Merge branch 'ent-4095-8090-cron-lock-ha' into 'develop' 
Added get_lock/release_lock functions to functions_db

See merge request artica/pandorafms!2526
 2019-06-26 09:24:58 +02:00
artica 9a65d8188a Auto-updated build strings. 2019-06-26 00:01:09 +02:00