Commit Graph

4871 Commits

Author SHA1 Message Date
Andrea Adamczyk
7a656e054d PMC-370 2019-09-11 15:52:00 -04:00
Paula Quispe
0e698e5c98 PMC-1106 2019-08-23 09:06:10 -04:00
Paula Quispe
e12dae3c63 PMC-1067 2019-08-16 10:05:52 -04:00
Paula Quispe
edadedb8d4 Merged release/3.4.0 into bugfix/PMC-1054 2019-08-14 11:46:35 -04:00
Julio Cesar Laura Avendaño
310aa683e3 PMC-1060 2019-08-14 10:51:20 -04:00
Andrea Adamczyk
ba32d7ca69 PMC-1054 2019-08-13 14:28:13 -04:00
Paula Quispe
2c618e68b1 Merged in bugfix/PMC-1038 (pull request #7015)
PMC-1038

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-08-09 18:35:49 +00:00
Roly Rudy Gutierrez Pinto
11dd7659d1 PMC-1042 Memory Leak using PM Function "executeQuery" 2019-08-09 10:42:38 -04:00
Roly Rudy Gutierrez Pinto
d81339ccec PMC-931 Add unit tests for the feature PMC-852 2019-08-08 09:51:39 -04:00
Paulis
d3e632a4db PMC-1038 2019-08-02 16:00:38 -04:00
Andrea Adamczyk
f46826d7f0 PMC-1012 2019-07-30 09:24:50 -04:00
Julio Cesar Laura Avendaño
5ce2d9778a Merged in bugfix/PMC-1003 (pull request #7001)
PMC-1003

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Mauricio Veliz <mauricio@processmaker.com>
2019-07-26 20:39:52 +00:00
Paula Quispe
27261d437a Merged in bugfix/PMC-1006 (pull request #7000)
PMC-1006

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-26 20:30:48 +00:00
Julio Cesar Laura Avendaño
3c9c63429e PMC-1003 2019-07-26 15:57:04 -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
27555a58d3 PMC-1006 2019-07-26 08:36:37 -04:00
Paula Quispe
e4c73e9bc7 PMC-995 2019-07-25 09:53:17 -04:00
Paula Quispe
214c3f4491 Merged in bugfix/PMC-973 (pull request #6978)
PMC-973

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-23 17:48:06 +00:00
Paula Quispe
c22891dc7e PMC-973 2019-07-22 15:41:50 -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
1bec73b153 PMC-975 2019-07-17 09:58:12 -04:00
Paula Quispe
056e8dfc94 Merged in feature/PMC-799 (pull request #6914)
PMC-799

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-17 12:13:23 +00: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
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
1e63a81926 change 2019-07-11 11:37:48 -04:00
Ronald Q
b634eb35d8 solved conflict composer.lock, config/app.php, workflow/engine/classes/SpoolRun.php 2019-07-11 11:03:09 -04:00
Ronald Q
1df3032abf Revert "solved conflict composer.lock, config/app.php, workflow/engine/classes/SpoolRun.php"
This reverts commit fe9ac14379855e61eb560dabc1757eb7313210a9.
2019-07-11 10:55:30 -04:00
Ronald Q
65c4922619 solved conflict composer.lock, config/app.php, workflow/engine/classes/SpoolRun.php 2019-07-11 10:23:48 -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
9d0692f13c Fix errors found in FT. Command 'migrate-list-unassigned'. User Id in APP_DELAY. 2019-07-08 14:46:00 -04:00
Julio Cesar Laura Avendaño
18d00f40d1 PMC-934 2019-07-05 15:19:06 -04:00
Roly Rudy Gutierrez Pinto
8c8b5f7eea PMC-924-A Propel models is required for upgrade database 2019-07-05 13:54:35 -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
Julio Cesar Laura Avendaño
ee92390937 Fix conflicts after merge with develop, more conflictst 2019-07-04 14:56:52 -04:00
Julio Cesar Laura Avendaño
416093f698 PMC-771 2019-07-04 14:52:31 -04:00
Julio Cesar Laura Avendaño
2990788ce9 Resolving conflicts after merge in develop the features related to Laravel 5.7 and MySQL 5.7 (Part 2) 2019-07-04 14:52:30 -04:00
Julio Cesar Laura Avendaño
588e30b234 PMC-574 2019-07-04 14:43:22 -04:00
Julio Cesar Laura Avendaño
7e82d0e02c Fix conflicts after merge with develop 2019-07-04 14:36:40 -04:00
Julio Cesar Laura Avendaño
5d866a859f PMC-594 2019-07-04 14:24:26 -04:00
Julio Cesar Laura Avendaño
357fd58e0e PMC-573 2019-07-04 14:24:26 -04:00
Julio Cesar Laura Avendaño
a3a88649bd PMC-572 2019-07-04 14:24:26 -04:00
Julio Cesar Laura Avendaño
27e7f88c46 PMC-571 2019-07-04 14:24:26 -04:00
Julio Cesar Laura Avendaño
0da9afd8d3 PMC-570 2019-07-04 14:24:26 -04:00
Julio Cesar Laura Avendaño
90a7b778a1 PMC-596 2019-07-04 14:24:26 -04:00
Julio Cesar Laura Avendaño
7dd91f867c PMC-574 2019-07-04 14:24:26 -04:00
Julio Cesar Laura Avendaño
c75b943e26 PMC-569 2019-07-04 14:24:26 -04:00