fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
22,696 Commits 1 Branch 0 Tags
c9152c20aef076e8c16e60e360a0aebdfefa77a5
Commit Graph

904 Commits

Author SHA1 Message Date
Paula Quispe
283794ca23 Merged in bugfix/PMCORE-1373 (pull request #7336) 
PMCORE-1373

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
 2020-05-21 15:29:40 +00:00
Julio Cesar Laura Avendaño
fb24d3f17d Merged in bugfix/PMCORE-577 (pull request #7325) 
PMCORE-577

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2020-05-20 14:52:18 +00:00
Paula Quispe
5cc476ee8a PMCORE-1345 2020-05-04 09:56:38 -04:00
Julio Cesar Laura Avendaño
0c38e1e3c4 Solving conflict in workflow/engine/content/languages/translation.en 2020-04-24 22:45:18 +00:00
Andrea Adamczyk
890e0c9e8e PMCORE-959 2020-04-22 10:14:58 -04:00
Julio Cesar Laura Avendaño
643edc8f2a PMCORE-577 2020-04-21 19:42:26 +00:00
Julio Cesar Laura Avendaño
4255031a49 Solving conflicts with the last changes in develop branch 2020-02-27 13:23:51 -04:00
Roly Rudy Gutierrez Pinto
14d34b5a57 PMCORE-525 Two different labels for the same action (Promotion Manager export) 2020-02-18 15:56:40 -04:00
Julio Cesar Laura Avendaño
13b8e409dc PMCORE-1121 2020-02-06 08:25:12 -04:00
Paula Quispe
76f2eaf619 Merged in feature/PMC-1332 (pull request #7136) 
PMC-1332 PMCORE-1018

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2020-02-03 13:58:16 +00:00
Paula Quispe
75b74fe4d6 PMCORE-542 2020-01-29 15:21:27 -04:00
Andrea Adamczyk
3901e53bd3 PMCORE-1057 2020-01-21 12:17:58 -04:00
Julio Cesar Laura Avendaño
2efbb6183a Fix conflicts with develop branch 2020-01-17 11:27:11 -04:00
Paula Quispe
26bde68123 PMCORE-490 2020-01-13 10:40:31 -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
b9304dc001 PMC-1540 2020-01-02 15:52:31 -04: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
Julio Cesar Laura Avendaño
f0961df40c PMC-1436 2019-12-02 15:46:08 -04:00
Andrea Adamczyk
51bd3e793d PMC-1452 2019-12-02 13:52:08 -04:00
Roly Rudy Gutierrez Pinto
70b71985a3 PMC-1346 Changes in the email server creation 2019-11-21 15:07:44 -04:00
Paula Quispe
b3bfd850ba Merged in develop (pull request #7127) 
Update with develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2019-11-18 16:17:32 +00:00
Roly Rudy Gutierrez Pinto
53e1100576 PMC-1308 New attributes in the PMTables editions 2019-10-30 16:28:21 -04:00
Andrea Adamczyk
4e078d1406 PMC-1334 2019-10-30 16:01:46 -04:00
Paula Quispe
4705c94b59 PMC-943 2019-10-18 14:05:36 -04:00
Paula Quispe
e4852c96b5 PMC-1193 2019-09-13 13:26:00 -04:00
Andrea Adamczyk
23e6d4c22c PMC-1151 2019-09-02 08:52:54 -04:00
Andrea Adamczyk
ba32d7ca69 PMC-1054 2019-08-13 14:28:13 -04:00
Roly Rudy Gutierrez Pinto
45b7b82538 PMC-802 Review the file "processmaker.en.po", probably the file is disordered again 2019-08-08 14:21:19 -04:00
Fabio Guachalla
5ec536759f PMC-1022:PROD-641 >> The validation message is misspelled 
correction

Add correct ID

Correction Spelling
 2019-07-31 13:46:23 -04:00
Roly Rudy Gutierrez Pinto
d4519b0436 PMC-950-A 2019-07-30 14:43:17 -04:00
Paula Quispe
61ca7cab45 PMC-870 2019-07-29 12:21:00 -04:00
Julio Cesar Laura Avendaño
5ce2d9778a Merged in bugfix/PMC-1003 (pull request #7001) 
PMC-1003

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Mauricio Veliz <mauricio@processmaker.com>
 2019-07-26 20:39:52 +00:00
Julio Cesar Laura Avendaño
3c9c63429e PMC-1003 2019-07-26 15:57:04 -04:00
Andrea Adamczyk
f1d059251d Merged in bugfix/PMC-870 (pull request #6991) 
PMC-870

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
 2019-07-26 16:31:41 +00:00
Andrea Adamczyk
39e922126e PMC-870 2019-07-26 11:32:20 -04:00
Paula Quispe
e4c73e9bc7 PMC-995 2019-07-25 09:53:17 -04:00
Paula Quispe
8968734667 Merged in feature/PMC-512 (pull request #6993) 
PMC-512

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
 2019-07-24 17:58:07 +00:00
Rodrigo Quelca
77050d255e PMC-974: Back Button: Use the filters saved and add the button return 
complete icon, and validations for filters

remove d character

clean code

remove extra line

solve
 2019-07-23 14:11:43 -04:00
Paula Quispe
214c3f4491 Merged in bugfix/PMC-973 (pull request #6978) 
PMC-973

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
 2019-07-23 17:48:06 +00:00
Paula Quispe
c22891dc7e PMC-973 2019-07-22 15:41:50 -04:00
Paula Quispe
5b6c2927e4 Merged in bugfix/PMC-985 (pull request #6988) 
PMC-985

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
 2019-07-22 19:20:02 +00:00
Paula Quispe
f7cd7ebf41 PMC-985 2019-07-22 15:04:57 -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 Rudy Gutierrez Pinto
33b63bed20 PMC-930 Use the "JobsManager" class in "Derivation" class 2019-07-12 18:11:09 -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