Commit Graph

12747 Commits

Author SHA1 Message Date
Julio Cesar Laura Avendaño
26b60adcd4 Merged in gproly/processmaker (pull request #2125)
IMPROVEMENT
2015-05-08 11:49:48 -04:00
Julio Cesar Laura Avendaño
1c09f7bdee Merged in dashboards2 (pull request #2130)
using calendar days for configured task time
2015-05-08 11:10:26 -04:00
Dante Loayza
6e8e4d0470 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2133)
Improvement script usr reportin pro reporting
2015-05-08 10:58:27 -04:00
Marco Antonio Nina Mena
6e59ac932d Improvement script usr reportin pro reporting 2015-05-08 10:47:42 -04:00
Marco Antonio Nina Mena
6c2c29f5c4 Changed label error cost by hour 2015-05-08 09:54:27 -04:00
Dante
a48a45e1dc default dashboard added 2015-05-08 09:53:25 -04:00
Marco Antonio Nina Mena
4d328acb0c Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-05-08 08:35:46 -04:00
Marco Antonio Nina Mena
b8313a7cf6 Merged colosa/processmaker into master 2015-05-08 08:34:43 -04:00
Marco Antonio Nina Mena
d7072d0e65 Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-05-08 08:34:33 -04:00
Dante Loayza
c5519a9db5 Merged master into dashboards2 2015-05-07 18:56:31 -04:00
Dante Loayza
0b44bcb9cb Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2129)
Improvement configured task time of calendar
2015-05-07 18:55:50 -04:00
Dante
b5cb01835f add round 2015-05-07 18:50:08 -04:00
Marco Antonio Nina Mena
c656f8e650 Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-05-07 18:49:08 -04:00
Marco Antonio Nina Mena
878e9bc6da Improvement configured task time of calendar 2015-05-07 18:46:59 -04:00
Dante
d5dace0e53 detail view corrected for long names of processes, tasks and users 2015-05-07 17:43:48 -04:00
Dante
d5e9c073f5 detail view changed 2015-05-07 17:31:50 -04:00
Dante
51d45c5a72 20150507_1701PM 2015-05-07 17:01:05 -04:00
Roly Rudy Gutierrez Pinto
4723c6ab54 IMPROVEMENT 2015-05-07 16:44:30 -04:00
Julio Cesar Laura Avendaño
9e024e9e96 Merged in mcuiza/processmaker/veracode-06-05-15 (pull request #2122)
veracode-06-05-15
2015-05-07 15:37:03 -04:00
Dante
005f00a153 adding 1 decimal to costs 2015-05-07 15:26:07 -04:00
marcelo.cuiza
3c6baafc5b correcciones 2015-05-07 14:29:48 -04:00
Dante Loayza
fa6a3e57b4 Merged master into dashboards2 2015-05-07 13:49:37 -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
marcelo.cuiza
f02c45f6a1 very high y high 2015-05-07 13:17:58 -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