3693 Commits

Author SHA1 Message Date
Andrea Adamczyk
dccb63c84b PMC-633 2019-07-26 12:50:15 -04:00
Andrea Adamczyk
f1d059251d Merged in bugfix/PMC-870 (pull request #6991)
PMC-870

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-26 16:31:41 +00:00
Andrea Adamczyk
39e922126e PMC-870 2019-07-26 11:32:20 -04:00
Paula Quispe
1706e6f70a PMC-634 2019-07-26 10:54:41 -04:00
Paula Quispe
e4c73e9bc7 PMC-995 2019-07-25 09:53:17 -04:00
Paula Quispe
5b6c2927e4 Merged in bugfix/PMC-985 (pull request #6988)
PMC-985

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-22 19:20:02 +00:00
Paula Quispe
f7cd7ebf41 PMC-985 2019-07-22 15:04:57 -04:00
Julio Cesar Laura Avendaño
0af150a8af Fixing conflict with PMC-852 2019-07-22 12:05:21 -04:00
Roly Rudy Gutierrez Pinto
7f55e951fa PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980
# Conflicts:
#	workflow/engine/classes/WsBase.php
2019-07-22 11:24:00 -04:00
Paula Quispe
8fc35bccb9 PMC-914 2019-07-19 16:34:40 -04:00
Roly Rudy Gutierrez Pinto
73fda41918 PMC-963 We need a new artisan command to run the pending jobs, because we need to load the workspace configuration 2019-07-18 13:53:43 -04:00
Roly Rudy Gutierrez Pinto
33b63bed20 PMC-930 Use the "JobsManager" class in "Derivation" class 2019-07-12 18:11:09 -04:00
Roly
44cb9966eb Merged in feature/PMC-61 (pull request #6706)
PMC-61

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2019-07-12 19:32:32 +00:00
Roly
c233541f5e Merged in bugfix/PMC-926 (pull request #6969)
PMC-926 Create a class JobsManager in order to build, setup and dispatch the jobs in PM

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-12 13:32:49 +00:00
Roly Rudy Gutierrez Pinto
74f9a58d15 PMC-926 Create a class JobsManager in order to build, setup and dispatch the jobs in PM 2019-07-12 09:19:01 -04:00
Paula Quispe
380d7ede10 Merged in feature/PMC-43 (pull request #6701)
PMC-43

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-12 12:28:16 +00:00
Andrea Adamczyk
a1e4895268 Merged in bugfix/PMC-114 (pull request #6965)
PMC-114

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-11 19:42:23 +00:00
Andrea Adamczyk
43c3790b43 PMC-114 2019-07-11 11:51:58 -04:00
Paula Quispe
ef7da50e83 Merged in bugfix/PMC-402 (pull request #6966)
PMC-402

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-11 15:05:43 +00:00
Ronald Q
b634eb35d8 solved conflict composer.lock, config/app.php, workflow/engine/classes/SpoolRun.php 2019-07-11 11:03:09 -04:00
Paula Quispe
1f83aab20e PMC-402 2019-07-11 10:28:21 -04:00
Roly Rudy Gutierrez Pinto
244a873ce7 PMC-928 Create a factory class for the Jobs in PM 2019-07-11 10:23:05 -04:00
Andrea Adamczyk
448e0722fa PMC-119 2019-07-09 14:32:40 -04:00
Julio Cesar Laura Avendaño
f21657b43e Merged in feature/PMC-563 (pull request #6868)
PMC-563

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-08 20:28:42 +00:00
Julio Cesar Laura Avendaño
7c68bd0c3f Fix conflict 2019-07-05 12:15:52 -04:00
Paula Quispe
fdd204581c Merged in feature/PMC-90 (pull request #6883)
PMC-90

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-05 15:59:45 +00:00
Julio Cesar Laura Avendaño
0da9afd8d3 PMC-570 2019-07-04 14:24:26 -04:00
Julio Cesar Laura Avendaño
d7f50269fe PMC-565 2019-07-04 14:24:25 -04:00
Ronald Q
51dfa1c565 PMC-895 2019-07-04 13:25:42 -04:00
Andrea Adamczyk
fec3f382ac Merged in bugfix/PMC-898 (pull request #6948)
PMC-898

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-01 19:33:52 +00:00
Andrea Adamczyk
43cc784ede PMC-898 2019-07-01 15:29:20 -04:00
Julio Cesar Laura Avendaño
e486b40906 PMC-916 2019-07-01 11:49:26 -04:00
Fabio Guachalla
046a5ef0ff PMC-73: Suggest field improvements
CR correction
2019-06-28 16:41:29 -04:00
Paula Quispe
3805b1c2c0 HOR-4216 2019-06-28 16:41:04 -04:00
Roly Rudy Gutierrez Pinto
f1b77aafcf PMC-885 2019-06-19 15:20:05 -04:00
Paula Quispe
80632ace1b Merged in release/3.3.12 (pull request #6934)
PMC-884

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-06-17 12:47:31 +00:00
Paula Quispe
ecb3475342 Merged in release/3.3.12 (pull request #6933)
PMC-884

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-06-17 12:47:25 +00:00
Julio Cesar Laura Avendaño
cc51c76b12 Revert PMC-602 2019-06-11 10:14:02 -04:00
Roly Rudy Gutierrez Pinto
239eef80e6 PMC-809-A 2019-06-07 10:21:13 -04:00
Roly Rudy Gutierrez Pinto
f3c81598cb PMC-809 2019-06-06 16:43:42 -04:00
Paula Quispe
595a46143e Merged in bugfix/PMC-840 (pull request #6916)
PMC-840

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-30 15:47:58 +00:00
Paula Quispe
bb8e914964 Merged in bugfix/PMC-786 (pull request #6894)
PMC-786

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-29 18:55:41 +00:00
Paula Quispe
5dd5a25a74 Merge with develop: solving conflicts 2019-05-29 13:12:45 -04:00
Paula Quispe
05d713c847 PMC-840 2019-05-29 09:53:13 -04:00
Roly
d93c713297 Merged in bugfix/PMC-744 (pull request #6905)
PMC-744

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-28 20:30:40 +00:00
Paula Quispe
ff33075228 PMC-786 2019-05-28 08:33:17 -04:00
Paula Quispe
4064c1bebf Merged in bugfix/PMC-798 (pull request #6904)
PMC-798

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-27 12:42:44 +00:00
Julio Cesar Laura Avendaño
3e9eacfc99 Merged in bugfix/PMC-604 (pull request #6900)
PMC-604

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-24 21:35:59 +00:00
Paula Quispe
ef18b79e90 PMC-798 2019-05-24 10:57:49 -04:00
Roly Rudy Gutierrez Pinto
250976c159 PMC-744 2019-05-23 16:30:49 -04:00