Commit Graph

12725 Commits

Author SHA1 Message Date
Brayan Pereyra
29eaea60f6 PM-2660 Adicion del permiso Summary Form 2015-05-08 15:41:43 -04:00
Julio Cesar Laura Avendaño
672c6b9bf8 Merged in dashboards2 (pull request #2114)
Input validation in admin
2015-05-07 13:29:52 -04:00
Julio Cesar Laura Avendaño
755875f21b Merged in richardnoel/processmaker (pull request #2112)
PM-2626 UPDATE autoResizeScreen Iframes
2015-05-07 12:45:37 -04:00
Julio Cesar Laura Avendaño
70342486a3 Merged in mcuiza/processmaker/PM-2634 (pull request #2115)
PM-2634
2015-05-07 12:28:31 -04:00
Julio Cesar Laura Avendaño
6a4819d39b Merged in cochalo/processmaker/PM-2597 (pull request #2116)
PM-2597 Correccion de label en la version de PM
2015-05-07 12:20:26 -04:00
Dante Loayza
aaf4502cdb Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2118)
Change label PKI
2015-05-07 12:06:06 -04:00
Marco Antonio Nina Mena
1f3438d7f8 Change label PKI 2015-05-07 12:02:30 -04:00
Dante Loayza
c2d979ba4b Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2117)
Add validation access users
2015-05-07 11:17:21 -04:00
Marco Antonio Nina Mena
710e060c16 Add validation access users 2015-05-07 11:15:16 -04:00
Brayan Pereyra
1b658d1145 Correccion de label en la version de PM 2015-05-07 11:06:54 -04:00
marcelo.cuiza
ec8846fd1b PM-2634
error de sintaxis, faltaba un ";"
2015-05-07 09:55:28 -04:00
Dante
18db51b0aa bootsrap defatul width changed 2015-05-07 09:22:02 -04:00
Marco Antonio Nina Mena
dee3ad81fd Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-05-07 08:38:43 -04:00
Dante
732244f7dd costs calculation fix 2015-05-07 08:33:02 -04:00
Richard Yujra
1367585cd8 Merge branch 'master' of bitbucket.org:richardnoel/processmaker 2015-05-06 18:36:58 -04:00
Richard Yujra
9a20750c6d UPDATE autoResizeScreen Iframes 2015-05-06 18:36:33 -04:00
Richard Yujra
527b6edecc Merged colosa/processmaker into master 2015-05-06 18:36:00 -04:00
Dante Loayza
1fff0c9986 Merged master into dashboards2 2015-05-06 18:04:16 -04:00
Dante Loayza
5ddc538b11 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2111)
Improvement form dashboard validation title
2015-05-06 18:03:08 -04:00
Marco Antonio Nina Mena
38d13de3d7 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-05-06 18:01:25 -04:00
Marco Antonio Nina Mena
3744a68307 Merged colosa/processmaker into master 2015-05-06 17:59:47 -04:00
Marco Antonio Nina Mena
239c6d5e50 improvement form dashboard validation title 2015-05-06 17:59:20 -04:00
Dante
7664e72b3f changes in labels 2015-05-06 17:07:32 -04:00
Julio Cesar Laura Avendaño
464eb9a7ff Merged in cochalo/processmaker/PM-2619 (pull request #2106)
PM-2619 No se visualiza si se subió correctamente el logo requerido
2015-05-06 16:12:32 -04:00
Julio Cesar Laura Avendaño
7e16bfa9ea Merged in paulis/processmaker/PM-INSTALLER (pull request #2109)
I solved some issues in installer
2015-05-06 16:07:24 -04:00
Paula V. Quispe
4635782949 Ï solved some issues in installer 2015-05-06 16:03:49 -04:00
Brayan Pereyra
16e2720072 PM--2619 Adicion de funcion G::json_encode 2015-05-06 15:48:33 -04:00
Brayan Pereyra
6709f28546 PM--2619 No se visualiza si se subió correctamente el logo requerido 2015-05-06 15:31:54 -04:00
Dante
f9ba2534f4 Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 2015-05-06 14:54:02 -04:00
Dante
92f880f6fb added long lables to Charting Library 2015-05-06 14:52:14 -04:00
Julio Cesar Laura Avendaño
ad7bffd087 Merged in cochalo/processmaker/PM-2597 (pull request #2104)
PM-2597 Correccion de estilos de la pagina getStart
2015-05-06 14:39:30 -04:00
Julio Cesar Laura Avendaño
a6369f7cc9 Merged in victorsl/processmaker (pull request #2102)
PM-00000 "Fix to import project" SOLVED
2015-05-06 14:18:59 -04:00
Brayan Pereyra
44976b56df Correccion de estilos de la pagina getStart 2015-05-06 14:18:07 -04:00
Julio Cesar Laura Avendaño
07436bd259 Merged in paulis/processmaker/PM-INSTALLER (pull request #2101)
I reverted some changes in installer.php
2015-05-06 14:14:07 -04:00
Victor Saisa Lopez
7c5d5f575d PM-00000 "Fix to import project" SOLVED
Issue:
    Fix to import project
Cause:
    Invalid value in field ACT_LOOP_TYPE
Solution:
    Setting valid value in field ACT_LOOP_TYPE
2015-05-06 14:08:55 -04:00
Paula V. Quispe
24d493bd2c I reverted some changes in installer.php 2015-05-06 13:50:32 -04:00
Julio Cesar Laura Avendaño
bb3e1d3885 Merged in cochalo/processmaker/PM-2614 (pull request #2098)
PM-2614 Error de contadores al momento de derviar un caso con paralelo
2015-05-06 13:25:45 -04:00
Marco Antonio Nina Mena
bca372e31a Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-05-06 13:02:15 -04:00
Dante Loayza
72e8336444 Merged master into dashboards2 2015-05-06 12:20:42 -04:00
Brayan Pereyra
f9032c7b63 PM-2614 Error de contadores al momento de derviar un caso con paralelo 2015-05-06 12:20:18 -04:00
Julio Cesar Laura Avendaño
1bcd5c6742 Merged in dashboards2 (pull request #2094)
fixes in the view
2015-05-06 12:14:40 -04:00
Dante
53553cd80d adding semicolons in presenter 2015-05-06 12:09:15 -04:00
Julio Cesar Laura Avendaño
e4809f4be7 Merged in paulis/processmaker (pull request #2095)
I reverted some changes in Class G
2015-05-06 11:37:16 -04:00
Paula V. Quispe
e9ecc0925e I reverted some changes in Class G 2015-05-06 11:19:52 -04:00
Dante
c266b339bb including hour cost by user in calculations 2015-05-06 10:22:24 -04:00
Dante
199e1caef7 Round variation with 2 digits 2015-05-06 09:15:02 -04:00
Marco Antonio Nina Mena
55e1edcd83 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-05-06 08:43:38 -04:00
Dante
4c3753cdc1 current date correction 2015-05-06 08:42:02 -04:00
Dante Loayza
0eb35d20be Merged master into dashboards2 2015-05-05 17:38:55 -04:00
Dante Loayza
cef34ac6fd Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2092)
Improvement fonts dashboards
2015-05-05 17:37:39 -04:00