Commit Graph

1652 Commits

Author SHA1 Message Date
Julio Cesar Laura Avendaño
a9d5f32cd6 PMC-1325 2019-12-17 13:47:45 -04:00
Julio Cesar Laura Avendaño
2d2a113d89 PMC-1478: Missing 'use' statementswq 2019-12-09 21:15:45 +00:00
Taylor Dondich
2b11bc0c80 PMC-1478 2019-12-09 21:07:44 +00:00
Roly Rudy Gutierrez Pinto
53d4998030 PMC-1441 get_class() expects parameter 1 to be object 2019-11-28 10:22:23 -04:00
Paula Quispe
5272d7ea89 Merged in feature/PMC-1180 (pull request #7075)
PMC-1181

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-09-16 20:02:47 +00:00
Paula Quispe
a60b9b304a PMC-1181 2019-09-13 07:46:12 -04:00
Paula Quispe
83c441f525 Conflicts 2019-09-12 15:10:46 -04:00
Paula Quispe
0e698e5c98 PMC-1106 2019-08-23 09:06:10 -04:00
Julio Cesar Laura Avendaño
c18072eae5 PMC-1092 2019-08-21 08:53:28 -04:00
Andrea Adamczyk
ba32d7ca69 PMC-1054 2019-08-13 14:28:13 -04:00
Andrea Adamczyk
f46826d7f0 PMC-1012 2019-07-30 09:24:50 -04:00
Paula Quispe
27261d437a Merged in bugfix/PMC-1006 (pull request #7000)
PMC-1006

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-07-26 20:30:48 +00:00
Andrea Adamczyk
39e922126e PMC-870 2019-07-26 11:32:20 -04:00
Paula Quispe
27555a58d3 PMC-1006 2019-07-26 08:36:37 -04:00
Julio Cesar Laura Avendaño
0af150a8af Fixing conflict with PMC-852 2019-07-22 12:05:21 -04:00
Roly Rudy Gutierrez Pinto
7f55e951fa PMC-980 Merge remote-tracking branch 'upstream/feature/PMC-43' into bugfix/PMC-980
# Conflicts:
#	workflow/engine/classes/WsBase.php
2019-07-22 11:24:00 -04: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
b634eb35d8 solved conflict composer.lock, config/app.php, workflow/engine/classes/SpoolRun.php 2019-07-11 11:03:09 -04: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
Roly Rudy Gutierrez Pinto
8c8b5f7eea PMC-924-A Propel models is required for upgrade database 2019-07-05 13:54:35 -04:00
Julio Cesar Laura Avendaño
416093f698 PMC-771 2019-07-04 14:52:31 -04:00
Julio Cesar Laura Avendaño
d7f50269fe PMC-565 2019-07-04 14:24:25 -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
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
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
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
Rodrigo Quelca
81aaae594a solve conflicts 2019-05-17 11:16:18 -04:00
Julio Cesar Laura Avendaño
f432e66233 PMC-602 2019-05-15 16:34:14 -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
Roly Rudy Gutierrez Pinto
06fb08671f PMC-693-A 2019-04-18 14:48:18 -04:00
Paula Quispe
c66af1eb4d PMC-711 2019-04-17 15:53:12 -04:00
Julio Cesar Laura Avendaño
2877d0ba7b PMC-593 2019-04-11 17:51:27 -04:00
Paula Quispe
be7605c83a Merged in bugfix/PMC-601 (pull request #6835)
PMC-601
2019-04-10 19:02:00 +00:00
Paula Quispe
888622118e PMC-601 2019-04-10 10:46:25 -04:00
Paula Quispe
4bdb500b00 PMC-680 2019-04-10 10:05:11 -04:00
Israel Bernabe
ef84cd1523 PMC-32 2019-04-02 10:53:55 -04:00
Julio Cesar Laura Avendaño
ec0d3d6eb5 Merged in release/3.3.7 (pull request #6825)
Updating branch develop with last changes from release/3.3.7

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-03-28 16:40:42 +00:00
Roly Rudy Gutierrez Pinto
f84e73580c PMC-541-B 2019-03-25 08:09:11 -04:00
Roly Rudy Gutierrez Pinto
5a8cf0c736 PMC-425 2019-03-20 17:03:09 -04:00
Andrea Adamczyk
f8fe785b17 PMC-8 2019-03-14 10:46:08 -04:00
Paula Quispe
e90882847f PMC-522 2019-03-07 12:19:37 -04:00
Paula Quispe
d2757b8a7c PMC-507 2019-03-01 11:38:39 -04:00
Paula Quispe
460bb1aef4 Merged in release/3.3.4 (pull request #6782)
Release/3.3.4

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2019-02-14 12:45:43 +00:00