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 |
|
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
|
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 |
|
Julio Cesar Laura Avendaño
|
e486b40906
|
PMC-916
|
2019-07-01 11:49:26 -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 |
|
Fabio Guachalla
|
af55e46539
|
PMC-774:[Mantis - 27541] PM_USERS permission removes System and System Information options
correction
Correction CR
|
2019-06-17 15:33:03 -04:00 |
|
Paula Quispe
|
782aece22c
|
PMC-849
|
2019-06-17 14:42:50 -04: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
|
6cf7147d25
|
Merged in bugfix/PMC-809 (pull request #6918)
PMC-809
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2019-06-07 14:30:12 +00:00 |
|
Roly Rudy Gutierrez Pinto
|
239eef80e6
|
PMC-809-A
|
2019-06-07 10:21:13 -04:00 |
|
Roly Rudy Gutierrez Pinto
|
f3c81598cb
|
PMC-809
|
2019-06-06 16:43:42 -04:00 |
|
Roly Rudy Gutierrez Pinto
|
4c116946ad
|
PMC-558
|
2019-06-06 12:16:50 -04:00 |
|
Roly
|
1d535dd914
|
Merged in bugfix/PMC-834 (pull request #6922)
PMC-834
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2019-06-05 15:08:49 +00:00 |
|
Roly Rudy Gutierrez Pinto
|
cf4dbf50df
|
PMC-834
|
2019-06-05 07:56:10 -04:00 |
|
Paula Quispe
|
e4e65ccb14
|
PMC-167
|
2019-06-03 10:04:38 -04:00 |
|