Commit Graph

19476 Commits

Author SHA1 Message Date
Julio Cesar Laura Avendaño
ba0895dbf0 Merged in bugfix/PMC-934-A (pull request #6963)
PMC-934

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-05 19:34:28 +00:00
Julio Cesar Laura Avendaño
18d00f40d1 PMC-934 2019-07-05 15:19:06 -04: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
Julio Cesar Laura Avendaño
d4c81fe47f Merged in feature/PMC-877 (pull request #6950)
PMC-877: Upgrade Laravel Framework to version 5.7

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Mauricio Veliz <mauricio@processmaker.com>
2019-07-04 13:57:53 +00:00
Roly
2bf853fb01 Merged in bugfix/PMC-913-A (pull request #6957)
PMC-913 All existing Unit Tests are running correctly

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-04 13:40:49 +00:00
Roly Rudy Gutierrez Pinto
f2e45cb2da PMC-913 All existing Unit Tests are running correctly 2019-07-04 09:18:28 -04:00
Roly
238390b894 Merged in bugfix/PMC-913-A (pull request #6956)
PMC-913 All existing Unit Tests are running correctly

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-04 12:45:13 +00:00
Roly Rudy Gutierrez Pinto
f80324f519 PMC-913 All existing Unit Tests are running correctly 2019-07-03 18:03:59 -04:00
Julio Cesar Laura Avendaño
d0aa7d6e9f Merged in feature/PMC-894 (pull request #6953)
PMC-894: MySQL 5.7 Support

Approved-by: Mauricio Veliz <mauricio@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-03 18:59:44 +00:00
Andrea Adamczyk
c2b740fdff Merged in bugfix/PMC-910 (pull request #6955)
PMC-910

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-03 18:57:09 +00:00
Andrea Adamczyk
c99216e41e PMC-910 2019-07-03 14:54:58 -04:00
Andrea Adamczyk
fec3f382ac Merged in bugfix/PMC-898 (pull request #6948)
PMC-898

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-01 19:33:52 +00:00
Andrea Adamczyk
43cc784ede PMC-898 2019-07-01 15:29:20 -04:00
Julio Cesar Laura Avendaño
9e565816fd Merge branch 'feature/PMC-894' of bitbucket.org:colosa/processmaker into feature/PMC-894 2019-07-01 15:21:51 -04:00
Andrea Adamczyk
725a949769 PMC-897 2019-07-01 15:16:47 -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
8bcbb64d3e Merge branch 'feature/PMC-877' of bitbucket.org:colosa/processmaker into feature/PMC-877 2019-07-01 15:16:00 -04:00
Roly Rudy Gutierrez Pinto
2d87cec8dd PMC-882 Make the necessary changes in the core according to the "Laravel" upgrade guide (From v5.6.30 to v5.7) 2019-07-01 15:15:33 -04:00
Roly Rudy Gutierrez Pinto
9953c196c9 PMC-880 Make the necessary changes in the core according to the "Laravel" upgrade guide (From v5.5.42 to v5.6.0) 2019-07-01 15:15:32 -04:00
Roly Rudy Gutierrez Pinto
efc38c9400 PMC-878 Make the necessary changes in the core according to the "Laravel" upgrade guide (From v5.4 to v5.5.0) 2019-07-01 15:15:32 -04:00
Julio Cesar Laura Avendaño
3940693e6a Merged in bugfix/PMC-916 (pull request #6951)
PMC-916

Approved-by: Mauricio Veliz <mauricio@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-01 18:29:14 +00:00
Julio Cesar Laura Avendaño
e486b40906 PMC-916 2019-07-01 11:49:26 -04:00
Roly
62c660eca5 Merged in bugfix/PMC-911 (pull request #6949)
PMC-911

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-01 13:32:53 +00:00
Roly Rudy Gutierrez Pinto
2e8f252b55 PMC-911 Add unit tests for the feature. 2019-07-01 09:07:33 -04:00