Commit Graph

20001 Commits

Author SHA1 Message Date
Julio Cesar Laura Avendaño
cd91821310 Solving conflicts merging with develop branch 2020-01-06 09:03:37 -04:00
Paula Quispe
fa1d704dad Merged in feature/PMC-1241 (pull request #7171)
PMC-1241

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-01-03 13:06:05 +00:00
Paula Quispe
ac20a0acbf Merged in bugfix/PMC-1540 (pull request #7200)
PMC-1540

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-01-03 12:16:56 +00:00
Paula Quispe
b9304dc001 PMC-1540 2020-01-02 15:52:31 -04:00
Roly
2d37bb8919 Merged in bugfix/PMC-1489 (pull request #7180)
PMC-1489 ErrorException: Function create_function() is deprecated in PHP7.3 with smarty 2.6.30

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-01-02 13:37:37 +00:00
Roly
306ad67ebc Merged in bugfix/PMC-1459 (pull request #7196)
PMC-1459 It is not possible to export processes

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-23 19:01:18 +00:00
Roly Rudy Gutierrez Pinto
2871f02a04 PMC-1459 It is not possible to export processes 2019-12-23 12:36:40 -04:00
Paula Quispe
509baac152 Merged in bugfix/PMC-1442 (pull request #7176)
PMC-1442

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-20 20:16:31 +00:00
Paula Quispe
91242d9c17 Merged in feature/PMC-1518 (pull request #7195)
PMC-1518

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-20 14:03:12 +00:00
Paula Quispe
1008ee1ee3 Merged in release/3.4.4 (pull request #7197)
3.4.4: Update the feature with the last official build

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2019-12-20 14:02:38 +00:00
Roly Rudy Gutierrez Pinto
cf9dfe30f4 PMC-1518 Restructure the offline definition over the PM Tables 2019-12-20 09:10:10 -04:00
Paula Quispe
76746deeb7 Merged in release/3.4.4 (pull request #7194)
PMC-1503

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2019-12-19 19:15:41 +00:00
Andrea Adamczyk
056d416705 Merged in bugfix/PMC-1396 (pull request #7193)
PMC-1396

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-19 15:12:38 +00:00
Andrea Adamczyk
df9aaefd70 PMC-1396 2019-12-19 09:41:52 -04:00
Andrea Adamczyk
3d9bc16480 Merged in bugfix/PMC-1503 (pull request #7192)
PMC-1503

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-18 20:01:42 +00:00
Andrea Adamczyk
4deabf1cb0 PMC-1503 2019-12-18 14:01:39 -04:00
Julio Cesar Laura Avendaño
375c6569f8 Merged in bugfix/PMC-1325 (pull request #7190)
PMC-1325

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2019-12-18 12:44:23 +00:00
Andrea Adamczyk
21b2eddc89 Merged in bugfix/PMC-1399 (pull request #7189)
PMC-1399

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-17 19:33:55 +00:00
Julio Cesar Laura Avendaño
a9d5f32cd6 PMC-1325 2019-12-17 13:47:45 -04:00
Andrea Adamczyk
8872026257 PMC-1399 2019-12-17 10:18:09 -04:00
Julio Cesar Laura Avendaño
740c8cd76c PMC-1495 2019-12-16 15:53:54 -04:00
Julio Cesar Laura Avendaño
dae5a53316 PMC-1494 2019-12-16 15:53:48 -04:00
Paula Quispe
6dcf2e44ed Merged in release/3.4.4 (pull request #7187)
Release/3.4.4

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-16 19:50:27 +00:00
Paula Quispe
076762fd9d Merged in bugfix/PMC-1498 (pull request #7185)
PMC-1498

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-16 19:12:41 +00:00
Paula Quispe
1a79c40d8e PMC-1498 2019-12-16 13:04:14 -04:00
Julio Cesar Laura Avendaño
1c943d010c Merged in bugfix/PMC-1409 (pull request #7179)
PMC-1409

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2019-12-16 12:53:59 +00:00
Andrea Adamczyk
07c02a256c Merged in bugfix/PMC-1412 (pull request #7183)
PMC-1412

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-13 20:14:04 +00:00
Andrea Adamczyk
74b14688b0 PMC-1412 2019-12-13 12:09:21 -04:00
Roly
03d7003a17 Merged in bugfix/PMC-131 (pull request #7178)
PMC-131 In section Admin->Users->Groups the second page of the list always shows double the corresponding amount of groups

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-13 15:46:37 +00:00
Paula Quispe
8a54785b52 Merged in bugfix/PMC-1493 (pull request #7182)
PMC-1493

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-13 15:40:30 +00:00
Julio Cesar Laura Avendaño
0fe00e718a PMC-1409 2019-12-13 11:34:31 -04:00
Paula Quispe
cf01e82cae PMC-1493 2019-12-13 10:13:19 -04:00
Roly Rudy Gutierrez Pinto
43ce5470ca PMC-131 In section Admin->Users->Groups the second page of the list always shows double the corresponding amount of groups 2019-12-12 16:10:44 -04:00
Roly Rudy Gutierrez Pinto
8ac44c0479 PMC-1489 ErrorException: Function create_function() is deprecated in PHP7.3 with smarty 2.6.30 2019-12-12 16:05:35 -04:00
Paula Quispe
62459e52e1 PMC-1442 2019-12-10 11:33:47 -04:00
Paula Quispe
9e8728499f Merged in bugfix/PMC-1453-A (pull request #7173)
PMC-1453

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-10 13:20:49 +00:00
Julio Cesar Laura Avendaño
5349860fc7 Merged in feature/PMC-1478 (pull request #7175)
PMC-1478 Update to ensure setting of cache entry for ee contents if cache does not have it stored

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-10 12:42:05 +00:00
Taylor Dondich
c8823fe954 Update to ensure setting of cache entry for ee contents if cache does not have it stored. 2019-12-09 20:23:57 -08:00
Taylor Dondich
1cb3a15f0d Merge branch 'feature/PMC-1478' of bitbucket.org:colosa/processmaker into feature/PMC-1478 2019-12-09 19:24:10 -08:00
Julio Cesar Laura Avendaño
fd07993a21 Merged in feature/PMC-1478-A (pull request #7174)
PMC-1478: Missing 'use' statements

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-09 21:16:50 +00:00
Julio Cesar Laura Avendaño
2d2a113d89 PMC-1478: Missing 'use' statementswq 2019-12-09 21:15:45 +00:00
Taylor Dondich
d03777a25d Merged in feature/PMC-1478 (pull request #7172)
PMC-1478: Update to have registerEE utilize cache behavior for loading and storing from ee file.

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-09 21:11:17 +00:00
Taylor Dondich
2b11bc0c80 PMC-1478 2019-12-09 21:07:44 +00:00
Taylor Dondich
100fd62aaa Add return null just for safety. 2019-12-09 12:20:21 -08:00
Taylor Dondich
8655fcdb72 Update one last place where EE is read. 2019-12-09 11:59:02 -08:00
Taylor Dondich
92b850b0a6 Update any references to reading ee file. Update code style. Update prefix of key for workspace specific. 2019-12-09 11:46:30 -08:00
Paula Quispe
26865ceebe PMC-1453 2019-12-09 15:45:31 -04:00
Taylor Dondich
ee0ea57680 Update to have registerEE utilize cache behavior for loading and storing from ee file. 2019-12-09 11:06:29 -08:00
Paula Quispe
5968bd5b7b PMC-1380 2019-12-09 09:34:31 -04:00
Paula Quispe
b7f6df7eb5 Merged in bugfix/PMC-1472 (pull request #7170)
PMC-1472

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2019-12-06 15:58:57 +00:00