Commit Graph

20660 Commits

Author SHA1 Message Date
Rodrigo Quelca
c2f6b671a2 Merged in advanced-search (pull request #7585)
advanced search was added

Approved-by: Henry Jonathan Quispe Quispe
2020-12-07 12:36:04 +00:00
Rodrigo Quelca
ffda3997d5 fix conflicts
fix

Revert "fix"

This reverts commit 6d21e322081ecd8b89db4d6c07c6c8a82b2549a6.

add advanced-search main

fix header

gif Home

fix missed code

CR notes

CR notes 2

CR notes 5

CR notes 8
2020-12-04 21:36:59 +00:00
Henry Jonathan Quispe Quispe
9e6414a4b2 Merged in feature/PMCORE-2511-A (pull request #7584)
PMCORE-2511

Approved-by: Rodrigo Quelca
2020-12-04 19:18:20 +00:00
Henry Jordan
d3ce86f3ec PMCORE-2511 2020-12-04 19:09:08 +00:00
Henry Jonathan Quispe Quispe
ecc82474c1 Merged in feature/PMCORE-2512 (pull request #7583)
PMCORE-2512

Approved-by: Rodrigo Quelca
2020-12-04 15:00:36 +00:00
Henry Jordan
c2f0d239aa PMCORE-2512 2020-12-04 13:33:23 +00:00
Julio Cesar Laura Avendaño
e54bf886f1 Merged in feature/PMCORE-2389-A (pull request #7581)
PMCORE-2389

Approved-by: Rodrigo Quelca <rockoinfo@yahoo.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-12-03 20:37:23 +00:00
Rodrigo Quelca
20a8c546f6 Merged in feature/PMCORE-2507 (pull request #7579)
PMCORE-2506

Approved-by: Henry Jonathan Quispe Quispe
2020-12-03 20:31:59 +00:00
Julio Cesar Laura Avendaño
91f1ff60e2 PMCORE-2389 2020-12-03 20:27:03 +00:00
Julio Cesar Laura Avendaño
bb935e1637 Solving conflicts updating with last changes in develop branch 2020-12-03 20:19:49 +00:00
Henry Jonathan Quispe Quispe
ebc8e61d8c Merged in feature/PMCORE-2510 (pull request #7578)
PMCORE-2510

Approved-by: Rodrigo Quelca
2020-12-03 20:10:28 +00:00
Rodrigo Quelca
d4ad331685 PMCORE-2506: sideabr collapsed feature is not working
PMCORE-2507: Grouped cell  feature, create a component to support this  functionality

fix conflicts
2020-12-03 20:04:08 +00:00
Henry Jordan
dc3678a4e2 PMCORE-2510 2020-12-03 15:23:23 +00:00
Henry Jonathan Quispe Quispe
cb88c726ba Merged in feature/PMCORE-2509 (pull request #7576)
PMCORE-2509
2020-12-03 13:21:33 +00:00
Henry Jordan
1ef8804ab2 PMCORE-2509 2020-12-03 12:39:57 +00:00
Henry Jonathan Quispe Quispe
7304da3651 Merged in feature/PMCORE-2505 (pull request #7575)
PMCORE-2505
2020-12-02 22:39:26 +00:00
Henry Jordan
cfe8120455 solve conflicts 2020-12-02 22:37:19 +00:00
Rodrigo Quelca
80f1fee65e Merged in feature/PMCORE-2506 (pull request #7574)
PMCORE-2506

Approved-by: Henry Jonathan Quispe Quispe
2020-12-02 22:11:14 +00:00
Henry Jordan
81d12abb7d PMCORE-2505 2020-12-02 21:28:16 +00:00
Rodrigo Quelca
71d88443d4 PMCORE-2506: sideabr collapsed feature is not working
remove bad code
2020-12-02 20:56:29 +00:00
Henry Jordan
bb56be2730 WEBAPP NEW UI FIRST COMMIT 2020-12-02 19:46:17 +00:00
Julio Cesar Laura Avendaño
098acc57a2 Merged in bugfix/PMCORE-2424 (pull request #7570)
PMCORE-2424

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2020-11-30 21:22:48 +00:00
Julio Cesar Laura Avendaño
3fc6e37bb1 PMCORE-2424 2020-11-30 20:01:43 +00:00
Paula Quispe
20b29ff148 Merged in feature/PMCORE-640 (pull request #7271)
PMCORE-640

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2020-11-25 13:23:49 +00:00
Julio Cesar Laura Avendaño
11c6a64ee0 Solving conflicts merginf with last merge in develop branch 2020-11-25 13:18:20 +00:00
Julio Cesar Laura Avendaño
3625d63691 Merged in feature/PMCORE-2177 (pull request #7514)
PMCORE-2177

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-24 16:18:37 +00:00
Julio Cesar Laura Avendaño
8d6c5d1da6 Fix QA observations, first round 2020-11-23 19:06:30 +00:00
Julio Cesar Laura Avendaño
3d45f51113 Merged in develop (pull request #7562)
Updating feature branch with last changes in develop

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-18 16:11:02 +00:00
Roly Rudy Gutierrez Pinto
7f9b900cc2 Merged in feature/PMCORE-2453 (pull request #7561)
PMCORE-2453 The file ListUnassignedTest.php has a method conflict.

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-18 16:05:38 +00:00
Roly Rudy Gutierrez Pinto
e55ef505bd PMCORE-2453 The file ListUnassignedTest.php has a method conflict. 2020-11-18 11:57:37 -04:00
Paula Quispe
f883f92c05 Merged in feature/PMCORE-1213 (pull request #7554)
PMCORE-1213

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-18 14:04:21 +00:00
Paula Quispe
4120a8ca9f PMCORE-1213 2020-11-17 18:36:43 -04:00
Roly Rudy Gutierrez Pinto
796e50513d Merged in feature/PMCORE-2371 (pull request #7559)
PMCORE-2371 ABE response was not added on the taskscheduler log

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-17 21:28:36 +00:00
Roly Rudy Gutierrez Pinto
b4fafe3168 PMCORE-2371 ABE response was not added on the taskscheduler log 2020-11-17 16:25:44 -04:00
Roly Rudy Gutierrez Pinto
2aef8ca8cc Merged in feature/PMCORE-2370 (pull request #7558)
PMCORE-2370 When a cron is executed by the task scheduler, the log file does not display what is the start or the end that execution

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-16 18:56:00 +00:00
Roly Rudy Gutierrez Pinto
0870afd1bb PMCORE-2370 When a cron is executed by the task scheduler, the log file does not display what is the start or the end that execution 2020-11-16 14:41:38 -04:00
Julio Cesar Laura Avendaño
0fce4e2bdf Fixed issue with translation.en file 2020-11-16 14:40:50 +00:00
Julio Cesar Laura Avendaño
7073b10bb1 Merged in develop (pull request #7557)
Updating feature branch with last changes in develop

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-12 19:06:45 +00:00
Henry Jonathan Quispe Quispe
035676880e Merged in feature/PMCORE-2287 (pull request #7553)
PMCORE-640

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-10 21:08:44 +00:00
Henry Jordan
cecdff08d5 PMCORE-640
PMCORE-2287

update tranlsataions

update

update

update
2020-11-10 21:02:56 +00:00
Paula Quispe
50b5eaec39 Merged in feature/PMCORE-1214 (pull request #7548)
PMCORE-1214

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-10 19:39:15 +00:00
Paula Quispe
939d479a06 PMCORE-1214 2020-11-10 15:29:36 -04:00
Julio Cesar Laura Avendaño
0535726ae3 Merged in bugfix/PMCORE-2412 (pull request #7551)
PMCORE-2412

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-10 15:18:24 +00:00
Julio Cesar Laura Avendaño
b47f838e62 PMCORE-2412 2020-11-10 15:14:49 +00:00
Julio Cesar Laura Avendaño
50359a1d43 Merged in bugfix/PMCORE-2390 (pull request #7550)
PMCORE-2390

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-10 12:45:48 +00:00
Julio Cesar Laura Avendaño
591674a8d9 PMCORE-2390 2020-11-09 15:29:09 +00:00
Andrea Adamczyk
5d62fee6a9 Merged in feature/PMCORE-1217 (pull request #7546)
PMCORE-1217

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-09 13:46:33 +00:00
Andrea Adamczyk
c0f15b3db3 PMCORE-1217 2020-11-06 16:13:54 -04:00
Julio Cesar Laura Avendaño
a37491d4ca Merged in bugfix/PMCORE-2286 (pull request #7549)
PMCORE-2286

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2020-11-06 16:15:09 +00:00
Julio Cesar Laura Avendaño
7865834282 PMCORE-2286 2020-11-06 16:07:57 +00:00