Commit Graph

17515 Commits

Author SHA1 Message Date
Paula Quispe
7e1170d411 Merged in develop (pull request #5810)
Develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-07-24 15:37:41 +00:00
Paula Quispe
03d72de184 Merged in bugfix/HOR-2704 (pull request #5802)
HOR-2704

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-24 15:31:02 +00:00
Roly
e1436477eb Merged in bugfix/HOR-3116 (pull request #5792)
HOR-3116

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-24 15:00:55 +00:00
Roly
f3b1f65f06 Merged in bugfix/HOR-3300 (pull request #5803)
HOR-3300

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-20 23:16:47 +00:00
Paula Quispe
d160585122 HOR-2704 2017-07-19 13:46:52 -04:00
Roly Rudy Gutierrez Pinto
38e1afe320 HOR-3300 2017-07-19 11:30:12 -04:00
Julio Cesar Laura Avendaño
7c4df26889 Merged in bugfix/HOR-3220 (pull request #5756)
HOR-3220

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-07-18 20:00:22 +00:00
Paula Quispe
04c681a41c Merged in develop (pull request #5799)
Update branch

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-07-18 13:07:46 +00:00
Paula Quispe
a74e750ff3 Merged in bugfix/HOR-3516 (pull request #5795)
HOR-3516

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-14 23:19:20 +00:00
Paula Quispe
425383dd77 QA observations 2017-07-14 15:10:11 -04:00
Roly Rudy Gutierrez Pinto
698c3a5c75 HOR-3116 improvement observations in pull request 2017-07-14 14:17:25 -04:00
Paula Quispe
1e8aeda475 HOR-3516 2017-07-14 12:02:29 -04:00
Paula Quispe
cda8fab073 HOR-3516 2017-07-13 16:49:57 -04:00
Roly Rudy Gutierrez Pinto
fda20185ca HOR-3489 Improvement: the observations are applied in 'Pull Request', the changes are reversed because they are not necessary in the process import... 2017-07-13 16:34:49 -04:00
Paula Quispe
8d74232727 Merged in bugfix/HOR-3460 (pull request #5787)
HOR-3460

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-12 18:44:06 +00:00
Roly Rudy Gutierrez Pinto
18d8e8904a HOR-3116 2017-07-11 13:50:56 -04:00
Paula Quispe
1cb5482b4f Merged in develop (pull request #5790)
Develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-07-11 13:07:43 +00:00
jonathan Quispe
5b9d5cd8a4 Merged in bugfix/HOR-3374 (pull request #5750)
HOR-3374

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-06 17:50:38 +00:00
Paula Quispe
61fe1abcb1 HOR-3460 2017-07-06 12:09:39 -04:00
Paula Quispe
966c2890fe Merged in develop (pull request #5780)
Develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-07-04 14:41:49 +00:00
Paula Quispe
7fa1dc105e Merged in bugfix/HOR-3390 (pull request #5744)
HOR-3390

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-03 19:36:00 +00:00
Paula Quispe
95d6554884 Merged in bugfix/HOR-3463 (pull request #5775)
HOR-3462

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-03 15:02:00 +00:00
Paula Quispe
dd1cab9d32 Merged in bugfix/HOR-3306 (pull request #5738)
HOR-3306

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-06-30 21:06:04 +00:00
Roly
55ba3052d1 Merged in bugfix/HOR-3436 (pull request #5773)
HOR-3436

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-30 16:36:25 +00:00
Paula Quispe
eb123d1729 HOR-3462 2017-06-30 10:20:51 -04:00
Roly Rudy Gutierrez Pinto
debbeb7785 HOR-3436 2017-06-29 14:11:40 -04:00
Rodrigo Quelca
9b44fe5067 Merged in bugfix/FBI-1914 (pull request #5760)
FBI-1914

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-27 16:17:39 +00:00
Paula Quispe
6f1443bca1 Merged in develop (pull request #5762)
Develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-06-27 16:09:17 +00:00
Rodrigo Quelca
04502f58fa FBI-1914: Some of the options in designer like show debug mode,etc are not showing in the UI
rollback to FBI-1901 and fix the contextmenu problems

code style
2017-06-27 06:59:38 -04:00
Julio Cesar Laura Avendaño
eac6bebca5 HOR-3220 2017-06-23 14:27:16 -04:00
Rodrigo Quelca
ca9c782d20 Merged in bugfix/FBI-1901 (pull request #5755)
FBI-1901

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-22 21:19:48 +00:00
hjonathan
08aee57a1b remove login/init.js 2017-06-22 16:01:44 -04:00
Roly
0913710f15 Merged in bugfix/HOR-3379 (pull request #5737)
HOR-3379

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-22 19:47:01 +00:00
hjonathan
1a06a73b7f The unused code has been removed 2017-06-22 15:25:30 -04:00
Rodrigo Quelca
1abbe6337e FBI-1901: Javascript error when exporting a process 2017-06-22 13:59:44 -04:00
Paula Quispe
1ec4a9ba4b Suggest user 2017-06-22 13:43:11 -04:00
Paula Quispe
54193f0492 HOR-3390 2017-06-20 16:10:44 -04:00
Paula Quispe
f2bb4a98d4 Merge branch 'develop' of bitbucket.org:colosa/processmaker into bugfix/HOR-3306 2017-06-20 16:06:32 -04:00
Roly Rudy Gutierrez Pinto
4f6483a542 HOR-3379 improvement in class.AppSolr.php 2017-06-20 11:53:18 -04:00
Roly Rudy Gutierrez Pinto
b141ccbad7 HOR-3379 improvement in class.AppSolr.php 2017-06-20 11:51:35 -04:00
hjonathan
539c4fe2cf HOR-3374 2017-06-19 16:21:40 -04:00
Paula Quispe
1a41cf0537 Merged in bugfix/HOR-2814-A (pull request #5629)
HOR-2814

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-19 16:20:42 +00:00
Ronald Henry Quenta Apaza
9097f8f5c9 Merged in bugfix/HOR-3403 (pull request #5745)
HOR-3403

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-14 22:20:46 +00:00
qronald
e3c9106375 HOR-3403 2017-06-14 14:26:07 -04:00
Paula Quispe
42ac321495 HOR-3327 2017-06-14 11:21:09 -04:00
Julio Cesar Laura Avendaño
720e3eb458 Put security fixes to develop branch 2017-06-14 11:14:23 -04:00
Roly Rudy Gutierrez Pinto
83dab41b53 HOR-3379 2017-06-13 10:42:09 -04:00
Paula Quispe
1004759c40 HOR-3306 2017-06-12 18:00:57 -04:00
Julio Cesar Laura Avendaño
440c2e5f22 HOR-3388 2017-06-12 17:12:43 -04:00
Julio Cesar Laura Avendaño
4c8abed264 Merged in bugfix/HOR-3375 (pull request #5732)
HOR-3375

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-06-09 18:55:42 +00:00