Commit Graph

13391 Commits

Author SHA1 Message Date
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
ad220584a0 Fix conflicts in cherry pick 2019-07-03 12:50:47 -04:00
Fabio Guachalla
a07867510d PMC-774:[Mantis - 27541] PM_USERS permission removes System and System Information options
correction

Correction CR
2019-07-02 08:22:16 -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
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
Fabio Guachalla
046a5ef0ff PMC-73: Suggest field improvements
CR correction
2019-06-28 16:41:29 -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
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
Roly
0e6e38a48d Merged in bugfix/PMC-476 (pull request #6784)
PMC-476

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-30 16:47:45 +00:00
Paula Quispe
595a46143e Merged in bugfix/PMC-840 (pull request #6916)
PMC-840

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-30 15:47:58 +00:00
Paula Quispe
bb8e914964 Merged in bugfix/PMC-786 (pull request #6894)
PMC-786

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-29 18:55:41 +00:00
Andrea Adamczyk
c73ee5c2e0 Merged in bugfix/PMC-815 (pull request #6915)
PMC-815

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-29 18:43:02 +00:00
Andrea Adamczyk
c83988d5ac PMC-815 2019-05-29 14:27:00 -04:00
Paula Quispe
5dd5a25a74 Merge with develop: solving conflicts 2019-05-29 13:12:45 -04:00
Roly Rudy Gutierrez Pinto
b24a3eca66 PMC-476 2019-05-29 11:07:49 -04:00
Paula Quispe
05d713c847 PMC-840 2019-05-29 09:53:13 -04:00
Roly
d93c713297 Merged in bugfix/PMC-744 (pull request #6905)
PMC-744

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-28 20:30:40 +00:00
Paula Quispe
ff33075228 PMC-786 2019-05-28 08:33:17 -04:00
Paula Quispe
4064c1bebf Merged in bugfix/PMC-798 (pull request #6904)
PMC-798

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-27 12:42:44 +00:00
Julio Cesar Laura Avendaño
3e9eacfc99 Merged in bugfix/PMC-604 (pull request #6900)
PMC-604

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-24 21:35:59 +00:00
Paula Quispe
ef18b79e90 PMC-798 2019-05-24 10:57:49 -04:00
Rodrigo Quelca
ffee1de408 Merged in feature/PMC-814 (pull request #6908)
PMC-814

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-24 14:29:24 +00:00
Roly Rudy Gutierrez Pinto
250976c159 PMC-744 2019-05-23 16:30:49 -04:00
Ronald Quenta
22a95fb920 Merged in bugfix/PMC-801 (pull request #6903)
PMC-801

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-05-23 16:48:40 +00:00
Rodrigo Quelca
04a2796188 PMC-814: Improve advanced search sending the param CATEGORY_UID to filter process by categories 2019-05-23 10:37:01 -04:00
Julio Cesar Laura Avendaño
dcc1634fd3 PMC-604 2019-05-21 16:00:18 -04:00
Ronald Q
fb0153fa7d PMC-800 2019-05-21 13:33:46 -04:00
Ronald Q
42f8c662f1 PMC-801 2019-05-21 12:06:30 -04:00
Andrea Adamczyk
9282eeadb5 PMC-791 2019-05-20 14:08:50 -04:00