Commit Graph

1493 Commits

Author SHA1 Message Date
Julio Cesar Laura Avendaño
160b891219 PMC-1152 2019-09-02 13:20:12 -04:00
Paula Quispe
8eed97c63a PMC-1061 2019-08-14 12:35:05 -04:00
Andrea Adamczyk
dccb63c84b PMC-633 2019-07-26 12:50:15 -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
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
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
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
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
Ronald Q
51dfa1c565 PMC-895 2019-07-04 13:25:42 -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
Julio Cesar Laura Avendaño
cc51c76b12 Revert PMC-602 2019-06-11 10:14:02 -04:00
Paula Quispe
5dd5a25a74 Merge with develop: solving conflicts 2019-05-29 13:12:45 -04:00
Paula Quispe
ff33075228 PMC-786 2019-05-28 08:33:17 -04:00
Julio Cesar Laura Avendaño
dcc1634fd3 PMC-604 2019-05-21 16:00:18 -04:00
Rodrigo Quelca
81aaae594a solve conflicts 2019-05-17 11:16:18 -04:00
Julio Cesar Laura Avendaño
5d8949255b Merged in bugfix/PMC-602 (pull request #6893)
PMC-602

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2019-05-15 22:34:41 +00:00
Julio Cesar Laura Avendaño
f432e66233 PMC-602 2019-05-15 16:34:14 -04:00
Paula Quispe
d2b1e04c02 Merge remote-tracking branch 'origin/release/3.3.10' into bugfix/PMC-580 2019-05-07 14:47:08 -04:00
Paula Quispe
5486bbb027 Merge remote-tracking branch 'origin/release/3.3.9' into bugfix/PMC-580 2019-05-07 14:47:01 -04:00
Paula Quispe
ca8a914aa3 PMC-580: release/3.3.8 2019-05-07 14:46:34 -04:00
Paula Quispe
ef659e4e1a PMC-580: release/3.3.7 2019-05-07 14:39:05 -04:00
Paula Quispe
13f53bb559 PMC-567 2019-05-07 14:25:07 -04:00
Paula Quispe
d3f1516f14 PMC-751 2019-05-07 13:54:58 -04:00
Paula Quispe
701b59e8e5 PMC-112 2019-04-29 10:05:31 -04:00
Roly
34723302ca Merged in bugfix/PMC-359 (pull request #6854)
PMC-359

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-04-18 19:52:51 +00:00
Paula Quispe
c66af1eb4d PMC-711 2019-04-17 15:53:12 -04:00
Roly Rudy Gutierrez Pinto
3a137027ee PMC-359 2019-04-15 14:02:16 -04:00
Israel Bernabe
ef84cd1523 PMC-32 2019-04-02 10:53:55 -04:00
Paula Quispe
2929e8ac3e PMC-557 2019-03-28 14:29:49 -04:00
Roly Rudy Gutierrez Pinto
c3145df6ff PMC-551 2019-03-13 09:09:42 -04:00
Paula Quispe
d2757b8a7c PMC-507 2019-03-01 11:38:39 -04:00
Roly
ce63bc91e8 Merged in bugfix/PMC-313 (pull request #6790)
PMC-313

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-02-28 00:29:38 +00:00
Roly Rudy Gutierrez Pinto
e17d8f4f0e PMC-313 2019-02-27 19:48:45 -04:00
Andrea
39562841c8 PMC-126 2019-02-26 15:07:58 -04:00
Ronald Q
b56d7a48d1 PMC-450 Variables setup on 'ABE response' does not works with names different when it has two flows. 2019-02-25 11:45:34 -04:00
Paula Quispe
460bb1aef4 Merged in release/3.3.4 (pull request #6782)
Release/3.3.4

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2019-02-14 12:45:43 +00:00
Roly Rudy Gutierrez Pinto
da2ea4c865 PMC-377 2019-02-13 15:53:21 -04:00
Roly Rudy Gutierrez Pinto
6f4032b475 PMC-155-B 2019-02-06 17:35:05 -04:00
Paula Quispe
ade7020d60 PMC-399 2019-02-01 12:11:10 -04:00
Roly
e9d5c8ceec Merged in bugfix/PMC-155 (pull request #6756)
PMC-155

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-01-28 19:33:19 +00:00
Ronald Quenta
972b89f102 Merged feature/PMC-43 into feature/PMC-348 2019-01-25 11:05:23 -04:00
Ronald Q
21b91db43c PMC-348 Add marks and register the new classes for avoid this implementation in the community version 2019-01-25 11:00:29 -04:00