Commit Graph

13157 Commits

Author SHA1 Message Date
Ronald Quenta
13ee3c6f2d Merge branch 'master' of bitbucket.org:qronald/processmaker 2015-06-15 15:34:52 -04:00
Ronald Quenta
7596424f35 Merge remote branch 'pm/master' 2015-06-15 15:34:30 -04:00
Quenta Ronald
d9573e3eef Merged colosa/processmaker into master 2015-06-15 15:33:32 -04:00
Ronald Quenta
c6338995e0 add method jsonr in get json definitions 2015-06-15 15:32:29 -04:00
Julio Cesar Laura Avendaño
4786272544 Merged in dheeyi/processmaker/PM-2934 (pull request #2342)
PM-2934
2015-06-15 12:43:45 -04:00
dheeyi
d37e76b6e5 PM-2934 Validacion en el listado de variables a la creacion de un ReportTable 2015-06-15 11:42:53 -04:00
Julio Cesar Laura Avendaño
7a86be0ca4 Merged in paulis/processmaker/PM-2939 (pull request #2339)
PM-2939: Actions by email plugin and feature working together
2015-06-15 11:24:05 -04:00
Julio Cesar Laura Avendaño
570acadcdd Merged in paulis/processmaker/PM-2938 (pull request #2336)
PM-2938: Batch routing - Consolidated cases plugin and feature working together
2015-06-15 11:22:42 -04:00
Paula V. Quispe
2a82e14fed PM-2939: I catch and show the error 2015-06-15 10:17:14 -04:00
Paula V. Quispe
89ddab8a30 I deleted some lines 2015-06-15 09:11:38 -04:00
Paula V. Quispe
1f08900b71 PM-2939: Actions by email plugin and feature working together 2015-06-12 17:30:18 -04:00
Paula V. Quispe
f350f27386 PM-2938: I solved the issue when deschecked the option [Enable consolidate for this task] 2015-06-12 16:49:52 -04:00
Quenta Ronald
b23ecc2ba9 Merged colosa/processmaker into master 2015-06-12 15:34:22 -04:00
Paula V. Quispe
52bf21289d PM-2938: I deleted the validacion in Ok windows 2015-06-12 15:32:55 -04:00
Paula V. Quispe
1aec306dbe PM-2938: I correct some issues 2015-06-12 15:27:01 -04:00
dheeyi
a6af3fe2e3 Merge remote branch 'upstream/master' 2015-06-12 14:48:22 -04:00
Julio Cesar Laura Avendaño
6b4af36ece Merged in paulis/processmaker/PM-2815-PM (pull request #2313)
PM-2815: I added minutes in Assigment rules > timing control
2015-06-12 14:42:59 -04:00
Ronald Quenta
1734c92375 Merge remote branch 'pm/master' 2015-06-12 14:11:57 -04:00
Quenta Ronald
aa139350c9 Merged colosa/processmaker into master 2015-06-12 14:10:33 -04:00
Julio Cesar Laura Avendaño
54c4a24916 Merged in gproly/processmaker/IMPROVEMENT (pull request #2332)
IMPROVEMENT
2015-06-12 11:35:51 -04:00
Roly Rudy Gutierrez Pinto
28aa6afa42 IMPROVEMENT 2015-06-12 11:32:29 -04:00
Julio Cesar Laura Avendaño
134ffa6e77 Merged in luisfernandosl/processmaker/PM-2880 (pull request #2324)
PM-2880 "Separar Templates y Process Files..." SOLVED
2015-06-12 08:43:16 -04:00
Paula V. Quispe
68d92c465b PM-2938: Show only 1 cases menu [Batch Routing] 2015-06-11 18:42:58 -04:00
Paula V. Quispe
bc6f4fae31 PM-2938: Batch routing plugin and feature working together 2015-06-11 17:01:06 -04:00
william barra
538e37f396 Merged colosa/processmaker into master 2015-06-11 14:10:33 -04:00
Quenta Ronald
127f895309 Merged colosa/processmaker into master 2015-06-11 11:04:06 -04:00
Ronald Quenta
149b2e59eb Merge remote branch 'pm/master' 2015-06-11 11:02:11 -04:00
Julio Cesar Laura Avendaño
707ee8fe28 Merged in mcuiza/processmaker/PM-2615 (pull request #2322)
PM-2615 - Personal Information: No se despliega la información del usuario en toda la pantalla
2015-06-11 08:46:06 -04:00
Paula V. Quispe
138388d9c1 PM-2815: I added the dropdwon[Execute Trigger] 2015-06-10 17:55:47 -04:00
Ronald Quenta
68405cc7dd Merge branch 'master' of bitbucket.org:qronald/processmaker 2015-06-10 17:11:06 -04:00
Luis Fernando Saisa Lopez
86060d09c4 PM-2880 "Separar Templates y Process Files..." SOLVED
> Code Isuue:
  Separar Templates y Process Files del Process Object Menu
> Solution:
  se separa la opcion del menu File Manager que contiene dos opciones: Templates y Public llevandolo al menu principal
  estas dos opciones por separado.
2015-06-10 17:09:57 -04:00
Ronald Quenta
a8489f34cc Merge remote branch 'pm/master' 2015-06-10 17:09:46 -04:00
Quenta Ronald
2312d6f313 Merged colosa/processmaker into master 2015-06-10 17:08:52 -04:00
Julio Cesar Laura Avendaño
f3bbf90231 Merged in mcuiza/processmaker/PM-2348,PM-2469,PM-2470 (pull request #2316)
PM-2348,PM-2469,PM-2470 - Designer > BPMN Designer: Estandarizar la funcionalidad del botón 'Cancel'
2015-06-10 16:48:47 -04:00
marcelo.cuiza
c246476b9e PM-2615
Personal Information: No se despliega la informacióel usuario en toda la pantalla

Se corrigio la asignacion del atributo height de la ventana para su correcta visualizacion.
2015-06-10 15:53:18 -04:00
marcelo.cuiza
ab89629ec4 PM-2348,PM-2469,PM-2470
Designer > BPMN Designer: Estandarizar la funcionalidad del botóCancel'

Se agrego funcionalidad para IE
2015-06-09 14:36:43 -04:00
marcelo.cuiza
4ee1c1ec70 Merge remote branch 'upstream/master' 2015-06-09 10:42:10 -04:00
Quenta Ronald
0b67947407 Merged colosa/processmaker into master 2015-06-09 08:59:37 -04:00
Julio Cesar Laura Avendaño
7b8f7b3792 Merged in paulis/processmaker/PM-2780-PM (pull request #2308)
PM-2780:Add an option to select minutes to task timing control
2015-06-08 13:37:45 -04:00
Paula V. Quispe
0db77754aa I added minutes in end point 2015-06-08 13:10:48 -04:00
Paula V. Quispe
058120f862 PM-2815: I checked the funcion in cron 2015-06-08 12:59:45 -04:00
Julio Cesar Laura Avendaño
0dc542bef2 Merged in paulis/processmaker/PM-2884 (pull request #2311)
PM-2884: I solved a issue with ENGINE=InnoDB
2015-06-08 12:57:57 -04:00
Paula V. Quispe
35c9338a14 PM-2884: I deleted a line 2015-06-08 12:43:48 -04:00
Paula V. Quispe
11af05a351 PM-2884: I solved a issue with ENGINE=InnoDB 2015-06-08 12:06:25 -04:00
Paula V. Quispe
193c996bfa PM-2815: I added minutes in Assigment rules > timing control 2015-06-08 11:34:13 -04:00
Ronald Quenta
2c7f2e5cf3 Merge branch 'master' of bitbucket.org:qronald/processmaker 2015-06-08 10:23:14 -04:00
Ronald Quenta
d93b4b6464 Merge remote branch 'pm/master' 2015-06-08 10:23:00 -04:00
Quenta Ronald
e5362006fa Merged colosa/processmaker into master 2015-06-08 10:10:19 -04:00
Julio Cesar Laura Avendaño
f1b7efe331 Merged in victorsl/processmaker/PM-2835 (pull request #2303)
PM-2835 "Adicionar los siguientes features..." SOLVED
2015-06-08 09:57:33 -04:00
Quenta Ronald
c5c3b404c3 Merged colosa/processmaker into master 2015-06-08 09:51:20 -04:00