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

23299 Commits

Author SHA1 Message Date
Daniel Barbero 7d60287018 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-19 08:02:47 +01:00
artica f69d243330 Auto-updated build strings. 2019-12-19 00:01:09 +01:00
Daniel Barbero 9b4f12a875 Fixed forms VC 2019-12-18 17:36:01 +01:00
Daniel Rodriguez 56f22dbd71 Merge branch 'ent-5146-No-se-pueden-editar-los-Front-side-custom-reports' into 'develop' 
Fixed mceLast class

See merge request artica/pandorafms!2973
 2019-12-18 11:14:56 +01:00
Daniel Maya 7f1245e09d Fixed mceLast class 2019-12-18 10:23:27 +01:00
Daniel Barbero 49ab5e95aa Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-18 07:50:08 +01:00
artica dcd1bbd527 Auto-updated build strings. 2019-12-18 00:01:20 +01:00
Daniel Rodriguez a016f7fb40 Merge branch 'ent-5132-Generacion-de-imagenes-en-PDFs-4' into 'develop' 
Fixed errors PDF images relative routes

See merge request artica/pandorafms!2970
 2019-12-17 18:18:00 +01:00
daniel 3e58746cd5 Fixed errors PDF images relative routes 2019-12-17 18:18:00 +01:00
Daniel Rodriguez 3b0de7d448 Merge branch 'ent-5089-color-cabeceras-informes-pdf' into 'develop' 
Changed pdf report header colours(lighter)

See merge request artica/pandorafms!2968
 2019-12-17 12:17:01 +01:00
Daniel Rodriguez ed78839d07 Merge branch 'ent-5095-Visualizacion-formato-de-fechas' into 'develop' 
Ent 5095 visualizacion formato de fechas

See merge request artica/pandorafms!2948
 2019-12-17 12:15:51 +01:00
Tatiana Llorente eca876212c Ent 5095 visualizacion formato de fechas 2019-12-17 12:15:51 +01:00
Daniel Barbero 2a92c9d38d Fixed errors VC forms 2019-12-17 10:57:19 +01:00
Daniel Barbero d77d50bb74 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-17 08:26:04 +01:00
artica 0b0c38f9c0 Auto-updated build strings. 2019-12-17 00:01:10 +01:00
Daniel Rodriguez ad9879bc1e Merge branch 'ent-5158-Informes-SQL-en-la-meta' into 'develop' 
Fixed item sql

See merge request artica/pandorafms!2966
 2019-12-16 18:23:17 +01:00
Luis Calvo b5bc431d7b Changed pdf report header colours(lighter) 2019-12-16 18:19:34 +01:00
Alejandro Fraguas f59f044c1c Merge branch 'ent-5108-ws-cookie-parser' into 'develop' 
Ent 5108 ws cookie parser

See merge request artica/pandorafms!2964
 2019-12-16 17:02:13 +01:00
fbsanchez 4631d9ea64 minor style fix 2019-12-16 16:48:29 +01:00
fbsanchez ded6dcb41a Merge remote-tracking branch 'origin/develop' into ent-5108-ws-cookie-parser 2019-12-16 16:44:02 +01:00
Daniel Maya 8bde504fc2 Fixed item sql 2019-12-16 15:50:21 +01:00
fbsanchez abd2213e71 Menu entry for websocket engine settings 2019-12-16 15:42:54 +01:00
fbsanchez 89b97e340e Revert "DEBIAN console updated with gotty binary file" 
Undo GoTTY in Pandora Console DEB packages

This reverts commit d370fa560a.
 2019-12-16 12:16:42 +01:00
fbsanchez c2d0377a8d Revert "RPMBUILD console updated with gotty binary file" 
Undo Gotty in Pandora Console RPM

This reverts commit e43d8914aa.
 2019-12-16 12:16:21 +01:00
Daniel Rodriguez 24838cad0f Merge branch 'ent-4233-Modificación-en-la-función-genérica-de-render-de-fecha-hora' into 'develop' 
Added compact mode to show timestamp - #4233

See merge request artica/pandorafms!2688
 2019-12-16 11:48:09 +01:00
artica 79cad3eaa9 Updated version and build strings. 2019-12-16 11:43:58 +01:00
artica b71752ea03 Merge remote-tracking branch 'remotes/origin/ent-5108-ws-cookie-parser' into develop 2019-12-16 11:23:06 +01:00
Daniel Rodriguez 11beedc773 Merge branch 'ent-5132-Generacion-de-imagenes-en-PDFs-3' into 'develop' 
Fixed errors

See merge request artica/pandorafms!2962
 2019-12-16 11:20:37 +01:00
Alejandro Fraguas 37020bd572 Merge branch 'ent-4903-list_ACL_IPs_for_API' into 'develop' 
Fix bug when updating ACL IP list

See merge request artica/pandorafms!2961
 2019-12-16 11:19:10 +01:00
fbsanchez d370fa560a DEBIAN console updated with gotty binary file 2019-12-16 10:51:24 +01:00
fbsanchez e43d8914aa RPMBUILD console updated with gotty binary file 2019-12-16 10:46:37 +01:00
Daniel Barbero 6aa085abb9 Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-16 07:56:13 +01:00
artica f7b0372e53 Auto-updated build strings. 2019-12-16 00:01:07 +01:00
artica 20f3583fc5 Auto-updated build strings. 2019-12-15 00:01:06 +01:00
artica ebe0ba25c8 Auto-updated build strings. 2019-12-14 00:01:09 +01:00
Daniel Barbero a203da5a26 Fixed errors 2019-12-13 16:01:24 +01:00
alejandro-campos d30c2c9b3b Fix bug when updating ACL IP list 2019-12-13 14:17:25 +01:00
Tatiana Llorente b38c396837 Change date in hover in compact mode 2019-12-13 13:40:19 +01:00
fbsanchez a558152cb2 minor fix 2019-12-13 13:20:44 +01:00
fbsanchez ad6ea431bf minor fix, hide quickshell settings while disabled 2019-12-13 13:13:09 +01:00
fbsanchez bd1954ce38 Setup Websocket engine, unified 2019-12-13 13:11:38 +01:00
Daniel Barbero 9e01cb097c Merge remote-tracking branch 'origin/develop' into new-vc-line-element 2019-12-13 13:02:04 +01:00
fbsanchez 5f32bfdb64 Datatype fix - ws engine 2019-12-13 11:58:12 +01:00
Daniel Rodriguez 13ac0a6229 Merge branch 'ent-5082-setup-visual-styles-reports' into 'develop' 
Grouped report items on styles conf. Fixed font bug

See merge request artica/pandorafms!2953
 2019-12-13 11:51:56 +01:00
fbsanchez 3b5ebd0bf7 Better quickshell integration and fixes 2019-12-13 11:46:44 +01:00
Daniel Rodriguez 350dbaf832 Merge branch 'ent-5132-Generacion-de-imagenes-en-PDFs-2' into 'develop' 
Fix gauge pdf reports

See merge request artica/pandorafms!2958
 2019-12-13 11:28:30 +01:00
Alejandro Fraguas 810ad03c65 Merge branch '4290-Opciones-Adicionales-Templates-Alertas-Idiomas' into 'develop' 
Possible solution to avoid issues with JS and apostrophe of other languages strings

See merge request artica/pandorafms!2932
 2019-12-13 10:50:37 +01:00
Daniel Barbero 603b4e71eb Fix gauge pdf reports 2019-12-13 09:06:54 +01:00
Daniel Barbero 319b3e604f Merge remote-tracking branch 'origin' into new-vc-line-element 2019-12-13 08:15:23 +01:00
artica 37c5acf4d1 Auto-updated build strings. 2019-12-13 00:01:12 +01:00