Commit Graph

21355 Commits

Author SHA1 Message Date
Julio Cesar Laura Avendaño
5af15646b2 Merged in bugfix/PMCORE-2358 (pull request #7947)
PMCORE-2358

Approved-by: Paula Quispe
2021-06-29 14:40:20 +00:00
Julio Cesar Laura Avendaño
ba87bea6d2 PMCORE-2358 2021-06-29 13:51:25 +00:00
Julio Cesar Laura Avendaño
5474e539fb Merge branch 'develop' of bitbucket.org:colosa/processmaker into develop 2021-06-28 20:58:29 +00:00
Henry Jonathan Quispe Quispe
536a06d452 Merged in bugfix/PMCORE-3017-E (pull request #7938)
PMCORE-3017

Approved-by: Rodrigo Quelca
Approved-by: Julio Cesar Laura Avendaño
2021-06-24 16:11:19 +00:00
Henry Jordan
c68c168396 solve conflicts 2021-06-24 15:59:57 +00:00
Julio Cesar Laura Avendaño
4efbef85ff Merge branch 'develop' of bitbucket.org:colosa/processmaker into develop 2021-06-18 13:35:30 +00:00
Henry Jonathan Quispe Quispe
6beaf36874 Merged in bugfix/PMCORE-956-B (pull request #7931)
PMCORE-956

Approved-by: Julio Cesar Laura Avendaño
2021-06-16 14:04:44 +00:00
Julio Cesar Laura Avendaño
179a1f2571 Fix parse error 2021-06-15 14:33:41 +00:00
Julio Cesar Laura Avendaño
b35dffd680 Merge branch 'develop' of bitbucket.org:colosa/processmaker into develop 2021-06-15 14:22:28 +00:00
Paula Quispe
802970c82e Merged in release/3.6.5 (pull request #7944)
PMCORE-3046: update with release 3.6.5

Approved-by: Julio Cesar Laura Avendaño
2021-06-15 14:18:43 +00:00
Julio Cesar Laura Avendaño
f735cd0a66 Merge branch 'develop' of bitbucket.org:colosa/processmaker into develop 2021-06-08 15:32:08 +00:00
Rodrigo Quelca
3312022746 Merged in bugfix/PMCORE-3041_C (pull request #7939)
PMCORE-3041

Approved-by: Julio Cesar Laura Avendaño
2021-06-02 20:26:26 +00:00
Rodrigo Quelca
f5b732b41a PMCORE-3041: List of different PO labels from Version PMCORE_3.6.3 against version PMCORE_3.3.0 2021-06-02 14:47:56 +00:00
Paula Quispe
5746135164 Merged in bugfix/PMCORE-3018 (pull request #7932)
PMCORE-3018

Approved-by: Julio Cesar Laura Avendaño
2021-06-01 22:06:02 +00:00
Henry Jordan
b80b0f25b1 PMCORE-3017-E 2021-06-01 19:58:39 +00:00
Henry Jordan
88bd085c5b PMCORE-3017 2021-06-01 18:59:33 +00:00
Henry Jordan
ed34f3199c Merge branch 'bugfix/PMCORE-3018' of https://bitbucket.org/colosa/processmaker into bugfix/PMCORE-3018 2021-06-01 18:56:22 +00:00
Rodrigo Quelca
e1a17d1617 Merged in bugfix/PMCORE-3041_B (pull request #7937)
PMCORE-3041:

Approved-by: Julio Cesar Laura Avendaño
2021-05-31 18:32:05 +00:00
Rodrigo Quelca
bdecc40034 PMCORE-3041: PMCORE-3041: List of different PO labels from Version PMCORE_3.6.3 against version PMCORE_3.3.0 2021-05-31 18:23:34 +00:00
Roly Rudy Gutierrez Pinto
e1b969a9e5 Merged in bugfix/PMCORE-2994 (pull request #7935)
PMCORE-2994 Complete the phpunit test for "SqlBlacklist" class.

Approved-by: Paula Quispe
2021-05-26 15:08:29 +00:00
Roly Rudy Gutierrez Pinto
7a8c9135f4 PMCORE-2994 Complete the phpunit test for "SqlBlacklist" class. 2021-05-19 00:13:10 -04:00
Paula Quispe
87138811a2 PMCORE-3018 2021-05-17 15:51:51 -04:00
Paula Quispe
9e57f97b34 Merged in bugfix/PMCORE-3027 (pull request #7934)
PMCORE-3027
2021-05-17 12:47:45 +00:00
Paula Quispe
2dd631f023 PMCORE-3027 2021-05-14 16:51:49 -04:00
Paula Quispe
e20c1461a5 Merged in bugfix/PMCORE-2730 (pull request #7933)
PMCORE-2730
2021-05-14 19:35:57 +00:00
Henry Jordan
c0550e976a PMCORE-956 2021-05-13 15:05:02 +00:00
Henry Jordan
b690d065ad PMCORE-3018 2021-05-13 14:45:40 +00:00
Paula Quispe
63732a02a1 Merged in bugfix/PMCORE-3023 (pull request #7929)
PMCORE-3023

Approved-by: Julio Cesar Laura Avendaño
2021-05-12 20:19:26 +00:00
Paula Quispe
96c7675977 PMCORE-3023 2021-05-12 11:13:10 -04:00
Roly Rudy Gutierrez Pinto
0dde1a5619 Merged in bugfix/PMCORE-3010 (pull request #7926)
PMCORE-3010

Approved-by: Julio Cesar Laura Avendaño
2021-05-11 22:48:59 +00:00
Roly Rudy Gutierrez Pinto
be635f7d09 PMCORE-3010 Avoid the AppCacheView used in ProcessMaker\TaskScheduler\Task:: fillReportByUser 2021-05-11 18:46:12 -04:00
Paula Quispe
4db0a40c6b Merged in bugfix/PMCORE-1220 (pull request #7900)
PMCORE-1220

Approved-by: Julio Cesar Laura Avendaño
2021-05-11 22:21:13 +00:00
Paula Quispe
dc894d6857 PMCORE-1220 2021-05-11 17:38:26 -04:00
Paula Quispe
6a9aabb5fe Merged in release/3.6.5 (pull request #7923)
release/3.6.5

Approved-by: Julio Cesar Laura Avendaño
2021-05-11 18:34:09 +00:00
Paula Quispe
f1536156ef Merged in release/3.6.4 (pull request #7928)
release/3.6.4
2021-05-11 18:21:27 +00:00
Roly Rudy Gutierrez Pinto
501fb65392 Merged in bugfix/PMCORE-3014 (pull request #7925)
PMCORE-3014 Update the branches with release/3.6.4

Approved-by: Julio Cesar Laura Avendaño
2021-05-11 13:07:56 +00:00
Roly Rudy Gutierrez Pinto
af4d2ecf6c PMCORE-3014 Update the branches with release/3.6.4 2021-05-10 22:46:35 -04:00
Paula Quispe
5e083a3ed1 Merged in release/3.6.4 (pull request #7920)
release/3.6.4

Approved-by: Julio Cesar Laura Avendaño
2021-05-10 13:04:24 +00:00
Paula Quispe
e9c1bef6c5 Merged in feature/PMCORE-2860 (pull request #7882)
PMCORE-2860

Approved-by: Julio Cesar Laura Avendaño
2021-05-07 21:19:28 +00:00
Roly Rudy Gutierrez Pinto
17f62d2696 Merged in bugfix/PMCORE-1225-D (pull request #7922)
PMCORE-1225 The sentences DESCRIBE, EXPLAIN, SHOW, and BEGIN, now are supported.

Approved-by: Julio Cesar Laura Avendaño
2021-05-07 19:41:36 +00:00
Roly Rudy Gutierrez Pinto
41230e7d54 PMCORE-1225 The sentences DESCRIBE, EXPLAIN, SHOW, and BEGIN, now are supported. The EXEC and EXECUTE cannot be used within the black list and are removed from the documentation. 2021-05-07 13:17:28 -04:00
Paula Quispe
fb9e07a5ad Merged in bugfix/PMCORE-3009 (pull request #7921)
PMCORE-3009

Approved-by: Julio Cesar Laura Avendaño
2021-05-06 21:30:27 +00:00
Paula Quispe
2f8858c205 PMCORE-3009 2021-05-06 16:50:26 -04:00
Andrea Adamczyk
80623dde3c Merged in bugfix/PMCORE-1469 (pull request #7918)
PMCORE-1469

Approved-by: Julio Cesar Laura Avendaño
2021-05-06 20:49:08 +00:00
Paula Quispe
f651b949ea Merged in bugfix/PMCORE-3000 (pull request #7919)
PMCORE-3000

Approved-by: Julio Cesar Laura Avendaño
2021-05-06 15:57:23 +00:00
Paula Quispe
c73454dc9e PMCORE-3000 2021-05-06 11:42:01 -04:00
Andrea Adamczyk
5a8408ae54 PMCORE-1469 2021-05-06 09:27:49 -04:00
Roly Rudy Gutierrez Pinto
ff13d14727 Merged in bugfix/PMCORE-1225-C (pull request #7917)
PMCORE-1225 execute-query-blacklist.ini not working according to the documentation

Approved-by: Julio Cesar Laura Avendaño
2021-05-05 22:35:08 +00:00
Roly Rudy Gutierrez Pinto
1a0effda3b PMCORE-1225 execute-query-blacklist.ini not working according to the documentation 2021-05-05 17:55:20 -04:00
Paula Quispe
39dd49b402 Merged in release/3.6.4 (pull request #7916)
release/3.6.4

Approved-by: Julio Cesar Laura Avendaño
2021-05-05 15:54:15 +00:00