Commit Graph

5182 Commits

Author SHA1 Message Date
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
Paula Quispe
80632ace1b Merged in release/3.3.12 (pull request #6934)
PMC-884

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-06-17 12:47:31 +00:00
Paula Quispe
ecb3475342 Merged in release/3.3.12 (pull request #6933)
PMC-884

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-06-17 12:47:25 +00:00
Julio Cesar Laura Avendaño
cc51c76b12 Revert PMC-602 2019-06-11 10:14:02 -04:00
Roly Rudy Gutierrez Pinto
4c116946ad PMC-558 2019-06-06 12:16:50 -04:00
Paula Quispe
5dd5a25a74 Merge with develop: solving conflicts 2019-05-29 13:12:45 -04:00
Paula Quispe
05d713c847 PMC-840 2019-05-29 09:53:13 -04:00
Roly Rudy Gutierrez Pinto
250976c159 PMC-744 2019-05-23 16:30:49 -04:00
Andrea Adamczyk
9282eeadb5 PMC-791 2019-05-20 14:08:50 -04:00
Rodrigo Quelca
81aaae594a solve conflicts 2019-05-17 11:16:18 -04:00
Roly Rudy Gutierrez Pinto
bc1862db3d PMC-585-A 2019-05-15 20:20:24 -04: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