Commit Graph

14726 Commits

Author SHA1 Message Date
Dante Loayza
f0838d6dd7 Merged master into dashboards2 2015-06-22 10:13:54 -04:00
Marco A. Nina Mena
9d250c7291 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-06-22 08:47:38 -04:00
Victor Saisa Lopez
67c0cff1ef Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2576 2015-06-22 08:41:54 -04:00
Marco Antonio Nina Mena
221a2516ae Merged colosa/processmaker into master 2015-06-22 08:39:12 -04:00
Paula V. Quispe
18eff11129 PM-2973 2015-06-19 18:01:40 -04:00
Paula V. Quispe
39efbba12b PM-2973: I solve some issues 2015-06-19 17:24:16 -04:00
Julio Cesar Laura Avendaño
8242385998 Merged in cochalo/processmaker/BUG-17427 (pull request #2318)
BUG-17427 HTML Editor available for multiple Textarea controls in Dynaforms
2015-06-19 16:32:04 -04:00
Julio Cesar Laura Avendaño
88a0d2b884 Merged in cochalo/processmaker/BUG-17552 (pull request #2323)
BUG-17552 Dependatnt checkgroups into grids
2015-06-19 16:31:20 -04:00
Julio Cesar Laura Avendaño
0414de96da Merged in cochalo/processmaker/BUG-17411 (pull request #2319)
BUG-17411 Output document generados con smarty para codigo en template
2015-06-19 16:30:53 -04:00
Paula V. Quispe
7db09b642a PM-2035: I added some validations 2015-06-19 16:28:56 -04:00
Paula V. Quispe
7398b624ee PM-1124: I added the new features in array 2015-06-19 15:46:21 -04:00
Paula V. Quispe
5f4fedbaaa PM-1060: I added marcas 2015-06-19 15:42:55 -04:00
Julio Cesar Laura Avendaño
f4e89cea9d Merged in julceslau/processmaker (pull request #2371)
PM-2876 0017471 Change text from "ProcessMaker Dev Tools/User Applications" to "User Applications" SOLVED
2015-06-19 15:39:24 -04:00
Julio Cesar Laura
2a20e92d56 PM-2914 La función RouteCase no puede probarse desde ADMIN/WEB SERVICES TEST SOLVED 2015-06-19 15:31:29 -04:00
Julio Cesar Laura
673ce17e3f PM-2876 0017471 Change text from "ProcessMaker Dev Tools/User Applications" to "User Applications" SOLVED 2015-06-19 15:07:50 -04:00
Dante
9d5c49c20b PM 3001 2015-06-19 13:21:37 -04:00
Dante
85cc7b1222 PM 2999 2015-06-19 12:20:42 -04:00
Paula V. Quispe
31ac6beee1 PM-1124: I added marcas 2015-06-19 11:44:02 -04:00
Dante
4e9e58e935 taking account of queue time for indicators 2015-06-19 10:20:47 -04:00
Dante Loayza
a2092238dc Merged master into dashboards2 2015-06-19 10:08:42 -04:00
Quenta Ronald
9be23e4740 Merged colosa/processmaker into master 2015-06-19 08:33:22 -04:00
marcelo.cuiza
42f9c23e61 Merge branch 'master' into email_event 2015-06-18 18:47:13 -04:00
Paula V. Quispe
7679bff3d9 PM-2935: I solved some issue with Batch routing 2015-06-18 18:32:54 -04:00
marcelo.cuiza
1af7b5865e email_event backend 2015-06-18 18:12:35 -04:00
Paula V. Quispe
b7b4a1d14b PM-2923: Self service value based in Subprocess doesn't work 2015-06-18 16:35:47 -04:00
Paula V. Quispe
ff3f0c4be0 PM-2973: I solved a notice 2015-06-18 14:12:23 -04:00
Dante Loayza
43fbfbac3b Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2368)
Change field DEL_INIT_DATE for DEL_DELEGATE_DATE
2015-06-18 13:38:14 -04:00
Marco Antonio Nina Mena
b895fa79de Merged colosa/processmaker into master 2015-06-18 13:32:17 -04:00
Marco Antonio Nina Mena
9f21f191d1 Change field DEL_INIT_DATE for DEL_DELEGATE_DATE 2015-06-18 13:30:52 -04:00
dheeyi
d89c7b7a2b PM-803
Se puede crear un PMTable con fields con los caracteres & %
2015-06-18 13:14:34 -04:00
Victor Saisa Lopez
b51781f52f Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2576 2015-06-18 11:46:32 -04:00
Julio Cesar Laura Avendaño
fa0a00ea69 Merged in dashboards2 (pull request #2365)
PM-2987 - Error en el Inbox si no están los KPIs habilitados en la licencia
2015-06-18 11:44:46 -04:00
Paula V. Quispe
9a184c4c60 PM-2923: I used refreshTotal only when the userUid isn't empty (Self service) 2015-06-18 11:14:53 -04:00
Dante Loayza
4288190b45 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2364)
NDD-75 El inbox da error de filterStatus
2015-06-18 10:44:47 -04:00
Marco Antonio Nina Mena
98d79f4906 NDD-75 El inbox da error de filterStatus
- se valido para no depender solo de la licencia y version de PM.
2015-06-18 10:40:56 -04:00
Dante
38f8468163 Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 2015-06-18 10:26:35 -04:00
Dante
e8258b2e63 NDD70, 66, 73 2015-06-18 10:25:57 -04:00
Dante Loayza
2672e7a3eb Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2363)
NND-74 Agregar un total queue
2015-06-18 10:20:37 -04:00
Marco Antonio Nina Mena
232a89fb0d Merge branch 'dashboards2' of bitbucket.org:colosa/processmaker into dashboards2 2015-06-18 10:16:11 -04:00
Dante Loayza
a3c3d00f72 Merged in marcoAntonioNina/processmaker/dashboards2 (pull request #2360)
Delete graphic task status
2015-06-18 10:15:02 -04:00
Marco Antonio Nina Mena
2c174a0d8a Merged colosa/processmaker into master 2015-06-18 10:12:30 -04:00
Marco Antonio Nina Mena
2e0198622d NND-74 Agregar un total queue
- Se agrego la columna en usr_reporting, schema.xml, schema.sql
2015-06-18 10:09:38 -04:00
Marco Antonio Nina Mena
1b7962d656 Merge branch 'master' of bitbucket.org:marcoAntonioNina/processmaker into dashboards2 2015-06-18 08:59:07 -04:00
Marco Antonio Nina Mena
e14447cf65 Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-06-18 08:58:44 -04:00
dheeyi
0f263539b6 Merge branch 'master' of bitbucket.org:dheeyi/processmaker 2015-06-18 08:51:24 -04:00
william barra
b1aff1e806 Merged colosa/processmaker into master 2015-06-18 08:51:17 -04:00
dheeyi
c3128d78ad Merge remote branch 'upstream/master' 2015-06-18 08:50:08 -04:00
Victor Saisa Lopez
be6844f4b1 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2576 2015-06-18 08:49:57 -04:00
Marco Antonio Nina Mena
864a09a996 Merge remote-tracking branch 'upstream/dashboards2' into dashboards2 2015-06-18 08:49:12 -04:00
Julio Cesar Laura Avendaño
9e0e442d97 Merged in dashboards2 (pull request #2362)
Schema and calendar modifications for KPIs
2015-06-18 08:48:16 -04:00