fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
19,579 Commits 1 Branch 0 Tags
f7cd7ebf4192b473058bed91f24df3749e621792
Commit Graph

4847 Commits

Author SHA1 Message Date
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
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
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
Julio Cesar Laura Avendaño
e7f8411241 PMC-568 2019-07-04 14:24:25 -04:00
Julio Cesar Laura Avendaño
d7f50269fe PMC-565 2019-07-04 14:24:25 -04:00
Julio Cesar Laura Avendaño
9f2a543c2d Resolving conflicts after merge in develop the features related to Laravel 5.7 and MySQL 5.7 (Part 2) 2019-07-04 10:36:22 -04:00
Julio Cesar Laura Avendaño
56693bbcb0 Resolving conflicts after merge in develop the features related to Laravel 5.7 and MySQL 5.7 2019-07-04 10:27:28 -04:00
Julio Cesar Laura Avendaño
3793f6f2fd PMC-594 2019-07-04 10:02:35 -04:00
Julio Cesar Laura Avendaño
80cd57e97a PMC-573 2019-07-04 10:02:35 -04:00
Julio Cesar Laura Avendaño
7e072bbc10 PMC-572 2019-07-04 10:02:35 -04:00
Julio Cesar Laura Avendaño
d3d4dd6961 PMC-571 2019-07-04 10:02:34 -04:00
Julio Cesar Laura Avendaño
41beb8478a PMC-570 2019-07-04 10:02:34 -04:00
Julio Cesar Laura Avendaño
ce9eed7759 PMC-596 2019-07-04 10:02:34 -04:00
Julio Cesar Laura Avendaño
c109be8690 PMC-574 2019-07-04 10:02:34 -04:00
Julio Cesar Laura Avendaño
36f9746e82 PMC-569 2019-07-04 10:02:34 -04:00
Julio Cesar Laura Avendaño
a720cd7608 PMC-568 2019-07-04 10:02:34 -04:00
Julio Cesar Laura Avendaño
b29170b87b PMC-565 2019-07-04 10:02:33 -04:00
Andrea Adamczyk
ad220584a0 Fix conflicts in cherry pick 2019-07-03 12:50:47 -04:00
Julio Cesar Laura Avendaño
8bcbb64d3e Merge branch 'feature/PMC-877' of bitbucket.org:colosa/processmaker into feature/PMC-877 2019-07-01 15:16:00 -04:00
Julio Cesar Laura Avendaño
fbe09def63 Merged in release/3.3.13 (pull request #6952) 
PMC-916

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
 2019-07-01 19:16:06 +00:00
Julio Cesar Laura Avendaño
e486b40906 PMC-916 2019-07-01 11:49:26 -04:00
Paula Quispe
3805b1c2c0 HOR-4216 2019-06-28 16:41:04 -04:00
Roly Rudy Gutierrez Pinto
6de0b830a9 PMC-913 All existing Unit Tests are running correctly? 2019-06-28 14:24:59 -04:00
Julio Cesar Laura Avendaño
c94fc85a4a Merged in release/3.3.13 (pull request #6946) 
Updating branch develop with last changes from release/3.3.13

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
 2019-06-27 17:10:46 +00:00
Julio Cesar Laura Avendaño
4207ec18c5 PMC-909 2019-06-27 12:19:07 -04:00
Roly Rudy Gutierrez Pinto
f1b77aafcf PMC-885 2019-06-19 15:20:05 -04:00
Roly
07b291a7c2 Merged in bugfix/PMC-558 (pull request #6924) 
PMC-558

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
 2019-06-19 18:30:34 +00:00