Commit Graph

172 Commits

Author SHA1 Message Date
Paula Quispe
e901f82e6e PMCORE-2614 2020-12-22 12:07:32 -04:00
Paula Quispe
80b7864781 PMCORE-2314: Observations 2020-12-18 19:46:44 -04:00
Rodrigo Quelca
5011ba6b76 fix merge conflicts 2020-12-18 19:28:38 +00:00
Paula Quispe
80b27a7b01 PMCORE-2591 2020-12-18 12:27:28 -04:00
Paula Quispe
a460fa65e2 Merged in feature/PMCORE-2559 (pull request #7627)
PMCORE-2559

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2020-12-18 15:39:21 +00:00
Paula Quispe
95f561779f PMCORE-2559 2020-12-18 10:55:53 -04:00
Andrea Adamczyk
c740d135e0 PMCORE-2537 2020-12-17 16:52:23 -04:00
Roly Rudy Gutierrez Pinto
d57a3ac932 PMCORE-2352 User extended attributes PMCORE-2247 2020-12-16 19:47:59 -04:00
Julio Cesar Laura Avendaño
300ff70130 PMCORE-2540 2020-12-14 20:49:52 +00:00
Andrea Adamczyk
ae1d7d5075 PMCORE-2525 2020-12-14 11:02:19 -04:00
Julio Cesar Laura Avendaño
fe3528113c Merged in feature/PMCORE-2539 (pull request #7609)
PMCORE-2539

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-12-14 13:00:10 +00:00
Paula Quispe
9565312ca9 PMCORE-2397 2020-12-11 17:39:10 -04:00
Julio Cesar Laura Avendaño
3fdae0b272 PMCORE-2539 2020-12-11 18:23:49 +00:00
Andrea Adamczyk
d29071335e PMCORE-2529 2020-12-10 11:19:30 -04:00
Paula Quispe
899c67ebcb PMCORE-2477 2020-12-09 15:56:40 -04:00
Paula Quispe
267c3627bf PMCORE-2524: Conflicts with develop 2020-12-09 12:26:20 -04:00
Julio Cesar Laura Avendaño
bf7e28b131 PMCORE-2389 2020-12-08 19:24:41 +00:00
Andrea Adamczyk
3cc4baff8e PMCORE-2396 2020-12-08 09:01:17 -04:00
Paula Quispe
6bdadfd59c PMCORE-2381 2020-12-07 12:39:25 -04:00
Paula Quispe
a00593696d Merge develop 2020-12-01 17:47:50 -04:00
Paula Quispe
b55e95fa33 . 2020-12-01 17:42:09 -04:00
Paula Quispe
b35c2b9bad PMCORE-2395 2020-11-26 10:13:59 -04:00
Julio Cesar Laura Avendaño
11c6a64ee0 Solving conflicts merginf with last merge in develop branch 2020-11-25 13:18:20 +00:00
Andrea Adamczyk
d7bae0577a PMCORE-2433 2020-11-18 15:46:32 -04:00
Paula Quispe
4120a8ca9f PMCORE-1213 2020-11-17 18:36:43 -04:00
Paula Quispe
50b5eaec39 Merged in feature/PMCORE-1214 (pull request #7548)
PMCORE-1214

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-10 19:39:15 +00:00
Paula Quispe
939d479a06 PMCORE-1214 2020-11-10 15:29:36 -04:00
Andrea Adamczyk
c0f15b3db3 PMCORE-1217 2020-11-06 16:13:54 -04:00
Andrea Adamczyk
9a65d236fb Merged in feature/PMCORE-1215 (pull request #7535)
PMCORE-1215

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-05 23:00:32 +00:00
Andrea Adamczyk
fafbcad004 PMCORE-1215
PMCORE-1215
2020-11-05 15:48:13 -04:00
Julio Cesar Laura Avendaño
05e983bf77 PMCORE-2290 2020-10-30 18:21:14 +00:00
Paula Quispe
0d32551ca5 PMCORE-1176 2020-10-30 18:21:13 +00:00
Paula Quispe
ebfc73ca11 PMCORE-552 2020-10-26 20:45:42 +00:00
Paula Quispe
53d779a7c7 PMCORE-1218 2020-10-23 07:55:04 -04:00
Paula Quispe
2e76cfdeae PMCORE-1216 2020-10-21 14:16:24 -04:00
Andrea Adamczyk
05c99db5c1 Merged in bugfix/PMCORE-561-A (pull request #7529)
PMCORE-561-A

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-10-20 01:21:20 +00:00
Andrea Adamczyk
b3f22bc334 PMCORE-561-A 2020-10-19 14:29:00 -04:00
Paula Quispe
415b3f19df Merged develop into feature/PMCORE-639 2020-10-16 12:14:28 -04:00
Paula Quispe
2deade19e1 PMCORE-1070 2020-10-15 17:24:52 -04:00
Julio Cesar Laura Avendaño
8f8704f63f Merged in bugfix/PMCORE-2320 (pull request #7517)
PMCORE-2320

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-10-14 16:48:03 +00:00
Julio Cesar Laura Avendaño
0713bce9d5 PMCORE-2320 2020-10-13 23:20:30 +00:00
Paula Quispe
9ce6686e27 PMCORE-1884 2020-10-12 17:57:08 -04:00
Paula Quispe
0b2086591a PMCORE-871 2020-10-08 11:11:50 -04:00
Andrea Adamczyk
9e16fc0bd8 PMC-829 2020-10-08 11:10:02 -04:00
Paula Quispe
e1e6ae3fcd PMCORE-850 2020-10-08 11:06:15 -04:00
Paula Quispe
9ebeadd086 PMCORE-1884 2020-10-05 11:55:04 -04:00
Andrea Adamczyk
fe49792fc0 PMCORE-561 2020-09-18 16:04:05 -04:00
Paula Quispe
c7f1d2ae88 PMCORE-1948 2020-07-28 18:15:09 -04:00
Paula Quispe
7dae245e8c Merged in release/3.5.0 (pull request #7389)
Release/3.5.0

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-07-03 18:55:56 +00:00
Roly Rudy Gutierrez Pinto
dbc0465174 PMCORE-1349 [19511] Multiple file fields dont work with Action By Email 2020-06-30 11:23:41 -04:00