Commit Graph

14726 Commits

Author SHA1 Message Date
Dante
8955b60d36 resolution of integration conflicts with PM Final mods 2015-06-18 08:46:57 -04:00
william barra
6713d26f71 Merged colosa/processmaker into master 2015-06-18 08:44:38 -04:00
Victor Saisa Lopez
199592f8f3 Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2576 2015-06-18 08:40:51 -04:00
Quenta Ronald
6e003180ec Merged colosa/processmaker into master 2015-06-18 08:33:32 -04:00
Dante Loayza
f931be9a99 Merged master into dashboards2 2015-06-18 08:30:13 -04:00
Julio Cesar Laura Avendaño
f1d5636ef0 Merged in dashboards2 (pull request #2317)
Modifications to PM tables for new KPIs calculation
2015-06-17 17:54:16 -04:00
Dante Loayza
31f1d8a80f Merged master into dashboards2 2015-06-17 17:22:00 -04:00
Dante
f89a40ef61 schema confflicts resolution 5 2015-06-17 17:03:33 -04:00
Dante
645bb86b22 schema confflicts resolution 4 2015-06-17 16:58:43 -04:00
Dante
fce7dcbc0a schema confflicts resolution 3 2015-06-17 16:46:35 -04:00
Paula V. Quispe
5b87652492 PM-1060: I used the valid key 2015-06-17 15:54:48 -04:00
Paula V. Quispe
50a02c3dbe PM-1060: I corrected the paths 2015-06-17 15:47:41 -04:00
dheeyi
b658b0d2d0 PM-2647
Designer > BPMN Designer > Porcess Supervisors > Steps: Estandarizar la ventana al nuevo diseñue se solicito para el diseñr BPMN
2015-06-17 15:32:41 -04:00
Paula V. Quispe
1c6c576629 PM-1060: I changed the path of cron execution 2015-06-17 15:25:21 -04:00
Marco Antonio Nina Mena
139d23e8b0 Merged colosa/processmaker into master 2015-06-17 14:36:21 -04:00
Paula V. Quispe
859eb80db2 PM-1124: I changed the class name 2015-06-17 14:16:55 -04:00
Paula V. Quispe
987f140c2a PM-1124: I changed the class name 2015-06-17 13:56:25 -04:00
Paula V. Quispe
99981a00be PM-1124: I changed the class name 2015-06-17 13:54:52 -04:00
Marco Antonio Nina Mena
e9f1f9ad41 Delete graphic task status 2015-06-17 13:47:52 -04:00
Victor Saisa Lopez
e4f0a4af6e Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2576 2015-06-17 13:37:51 -04:00
Paula V. Quispe
2ea7a2cf09 PM-1124: I used the corrected key 2015-06-17 12:52:08 -04:00
Paula V. Quispe
8bff906b3f PM-1060: I added the ldap cron files in core 2015-06-17 12:49:48 -04:00
Julio Cesar Laura Avendaño
1efc67a0f7 Merged in victorsl/processmaker/PM-2917 (pull request #2356)
PM-2917 "Case Scheduler issues" SOLVED
2015-06-17 12:30:33 -04:00
Julio Cesar Laura Avendaño
3a6f10c002 Merged in paulis/processmaker/PM-2976 (pull request #2358)
PM-2976: ActionsByEmail is active in task
2015-06-17 11:36:17 -04:00
Dante
bc4cb7abea schema confflicts resolution 2 2015-06-17 11:30:24 -04:00
Paula V. Quispe
6d6746a53c PM-2976: ActionsByEmail is active in task 2015-06-17 11:25:04 -04:00
Dante
11376de960 schema confflicts resolution 2015-06-17 11:21:21 -04:00
Paula V. Quispe
4a1725492b PM-2938: I solved a notice 2015-06-17 10:52:47 -04:00
Victor Saisa Lopez
b70073850b Merge branch 'master' of bitbucket.org:colosa/processmaker into PM-2576 2015-06-17 10:32:17 -04:00
Victor Saisa Lopez
5c8121cf09 PM-2917 "Case Scheduler issues" SOLVED
Fixes 2015-JUN-16
2015-06-17 10:25:36 -04:00
Julio Cesar Laura Avendaño
240800d32a Merged in paulis/processmaker/PM-2939 (pull request #2354)
PM-2939: ActionsByEmail executed if the task is active with actionsByEmail and exists the feature
2015-06-17 10:22:56 -04:00
Paula V. Quispe
37600cf77a PM-2939: I deleted the error log 2015-06-17 10:21:33 -04:00
Paula V. Quispe
6b2e912a49 PM-2939: ActionsByEmail executed if the task is active with actionsByEmail and exists the feature 2015-06-17 10:17:07 -04:00
Quenta Ronald
542f88d421 Merged colosa/processmaker into master 2015-06-17 10:08:57 -04:00
Marco Antonio Nina Mena
954157ecb7 Merged colosa/processmaker into master 2015-06-17 08:58:23 -04:00
Julio Cesar Laura Avendaño
aef8aba74b Merged in gproly/processmaker/IMPROVEMENT (pull request #2351)
IMPROVEMENT
2015-06-17 08:40:39 -04:00
Paula V. Quispe
a7f7f8701d PM-1086: I added validation when the feature is active 2015-06-16 17:44:03 -04:00
Paula V. Quispe
b0e26bf8c3 PM-1124: I added validation when the feature is active 2015-06-16 17:14:03 -04:00
Paula V. Quispe
59fe78114a PM-1124: I corrected the class.sso.php 2015-06-16 16:53:07 -04:00
Paula V. Quispe
554e280b0b PM-1124: Firts migration WSSO new version 2015-06-16 16:50:37 -04:00
Quenta Ronald
7ef35b04b8 Merged colosa/processmaker into master 2015-06-16 16:05:54 -04:00
Roly Rudy Gutierrez Pinto
1796166a7b IMPROVEMENT 2015-06-16 15:56:20 -04:00
Paula V. Quispe
310aaa3a3d PM-2973: classic, despues de derivar no actualiza la data de la grilla 2015-06-16 15:46:41 -04:00
dheeyi
97601425b3 Merge remote branch 'upstream/master' into PM-2647 2015-06-16 14:25:47 -04:00
Julio Cesar Laura Avendaño
a8295bf601 Merged in victorsl/processmaker/PM-2917 (pull request #2320)
PM-2917 "Case Scheduler issues" SOLVED
2015-06-16 13:50:29 -04:00
dheeyi
10020bbc15 PM-2647
Designer > BPMN Designer > Porcess Supervisors > Steps: Estandarizar la ventana al nuevo diseñue se solicito para el diseñr BPMN
2015-06-16 11:21:24 -04:00
dheeyi
1d74d69316 PM-2647
Designer > BPMN Designer > Porcess Supervisors > Steps: Estandarizar la ventana al nuevo diseñue se solicito para el diseñr BPMN
2015-06-16 11:06:22 -04:00
Julio Cesar Laura Avendaño
3a647c4da7 Merged in paulis/processmaker/PM-2973 (pull request #2350)
PM-2973: Update the report table related to Batch routing
2015-06-16 10:59:14 -04:00
Paula V. Quispe
581c029a64 PM-2973: Update the report table related to Batch routing 2015-06-16 10:53:07 -04:00
Julio Cesar Laura Avendaño
097eb7cac5 Merged in qronald/processmaker (pull request #2348)
add method jsonr in get json definitions
2015-06-16 10:48:30 -04:00