Commit Graph

1513 Commits

Author SHA1 Message Date
Paula Quispe
55cc90126a PMC-1116 2019-11-04 14:05:42 -04:00
Roly Rudy Gutierrez Pinto
3e3ef93816 PMC-138 Assigned user lost in case of Custom Import (Promotion Manager) 2019-11-01 12:28:55 -04:00
Andrea Adamczyk
de1afc51f0 PMC-778 2019-10-18 08:36:18 -04:00
Paula Quispe
682b07e6a5 PMC-1226 2019-10-11 11:53:25 -04:00
Fabio Guachalla
90a8150bd7 PMC-778 2019-10-04 12:08:54 -04:00
Paula Quispe
b7d108cfc7 Merged in release/3.4.0 (pull request #7083)
Release/3.4.0

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-09-25 14:12:20 +00:00
Paula Quispe
b57766c935 PMC-1227 2019-09-24 14:13:41 -04:00
Paula Quispe
5272d7ea89 Merged in feature/PMC-1180 (pull request #7075)
PMC-1181

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-09-16 20:02:47 +00:00
Paula Quispe
98964715af PMC-1195: resolve conflict 2019-09-16 11:57:49 -04:00
Paula Quispe
e9fa3c3872 PMC-1181 2019-09-13 09:28:46 -04:00
Paula Quispe
a60b9b304a PMC-1181 2019-09-13 07:46:12 -04:00
Julio Cesar Laura Avendaño
6a6ccc1b8c Merged in feature/PMC-1173 (pull request #7066)
PMC-1173

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-09-10 11:13:03 -04:00
Julio Cesar Laura Avendaño
0ab5ce14da PMC-1173 2019-09-09 12:33:01 -04:00
Julio Cesar Laura Avendaño
bd16aeabfd PMC-1173 2019-09-09 12:15:48 -04:00
Paula Quispe
1e4f663a53 Merged in bugfix/PMC-24 (pull request #7062)
PMC-24

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-09-06 12:51:53 +00:00
Paula Quispe
9523ab01e1 PMC-24 2019-09-05 14:09:26 -04:00
Ronald Q
60b3dce21d PMC-1160 2019-09-04 12:31:40 -04:00
Ronald Q
e2bac4b84e PMC-1160 2019-09-04 08:24:27 -04:00
Julio Cesar Laura Avendaño
160b891219 PMC-1152 2019-09-02 13:20:12 -04:00
Julio Cesar Laura Avendaño
e35037b3d2 PMC-1152 2019-08-30 15:33:21 -04:00
Julio Cesar Laura Avendaño
6fac85df76 PMC-1152 2019-08-30 14:50:11 -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