Commit Graph

18430 Commits

Author SHA1 Message Date
Paula Quispe
de7a0190d2 Code Style 2017-10-27 13:04:00 -04:00
Paula Quispe
44c81b32b1 HOR-3916 2017-10-27 13:03:43 -04:00
Paula Quispe
8b550cfca3 Merged in bugfix/HOR-3900 (pull request #6140)
HOR-3900

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-10-27 16:38:28 +00:00
Paula Quispe
35cee79b46 Merged in bugfix/HOR-3228 (pull request #6139)
HOR-3228

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-10-27 15:42:54 +00:00
Paula Quispe
05c3c2ad96 Merged in release/3.2.2 (pull request #6151)
release/3.2.2

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-10-27 14:12:04 +00:00
Paula Quispe
877d9cd7f9 Merged in bugfix/HOR-4013 (pull request #6150)
HOR-4013

Approved-by: David Callizaya <david.callizaya@processmaker.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-10-26 21:17:11 +00:00
Paula Quispe
ecbb5df1d2 HOR-4013 2017-10-26 16:30:46 -04:00
Paula Quispe
c800a2999b Merged in release/3.2.2 (pull request #6147)
release/3.2.2

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-10-26 16:43:14 +00:00
Roly
7b03b91590 Merged in bugfix/HOR-4006-B (pull request #6145)
HOR-4006-B

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Marco Antonio Nina Mena <marco.antonio.nina@processmaker.com>
2017-10-26 15:13:06 +00:00
Paula Quispe
6d9e5cf7ec Merged in release/3.2.2 (pull request #6146)
release/3.2.2

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-10-26 12:07:07 +00:00
Roly Rudy Gutierrez Pinto
d234b6f944 HOR-4006-B 2017-10-25 18:38:24 -04:00
Julio Cesar Laura Avendaño
f78b6bb173 fix CR observations in .po file 2017-10-25 17:56:16 -04:00
Paula Quispe
eb478cadb9 Merged in bugfix/HOR-4009 (pull request #6144)
HOR-4009

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-10-25 21:40:47 +00:00
Paula Quispe
2936ce97f5 Code style 2017-10-25 16:12:42 -04:00
Roly Rudy Gutierrez Pinto
76e6c30944 HOR-4006-B 2017-10-25 16:11:07 -04:00
Paula Quispe
a64284be2c HOR-4009 2017-10-25 15:36:45 -04:00
Paula Quispe
db8c23a20e Merged in bugfix/HOR-3521-A (pull request #6117)
HOR-3521

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-10-25 19:00:09 +00:00
Paula Quispe
81fc730cdb HOR-3521 2017-10-25 14:08:35 -04:00
Paula Quispe
5b31d90465 HOR-3228 2017-10-25 09:56:32 -04:00
Dante Loayza
1ba7a3fd1d Merged in bugfix/HOR-3960 (pull request #6136)
HOR-3960

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-10-24 20:12:01 +00:00
jonathan Quispe
0ada15154c Merged in bugfix/HOR-1717 (pull request #5680)
HOR-1717

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-10-24 20:10:41 +00:00
Paula Quispe
dc5d17241a HOR-3900 2017-10-24 14:06:54 -04:00
Roly
bb3108a084 Merged in bugfix/HOR-4000 (pull request #6137)
Bugfix/HOR-4000

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-10-24 15:29:34 +00:00
dante
6e6c9e0218 adding comment to function parameter 2017-10-24 10:48:01 -04:00
dante
672a3ee57e adding the executed query in the exception 2017-10-24 10:01:38 -04:00
dante
aae6c8a61b adding some SQLException fields with relevant info of the executed query 2017-10-23 16:38:42 -04:00
Roly Rudy Gutierrez Pinto
6f2e92854f HOR-4000 2017-10-23 16:30:49 -04:00
Roly Rudy Gutierrez Pinto
9396ec76a3 HOR-4000 2017-10-23 15:57:54 -04:00
Roly Rudy Gutierrez Pinto
78cd531b62 HOR-4000 2017-10-23 15:55:58 -04:00
dante
232c566b67 HOR-3960 2017-10-23 15:25:20 -04:00
Paula Quispe
546882d365 Merged in bugfix/HOR-3784 (pull request #6090)
HOR-3784

Approved-by: Roly <gproly@gmail.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-10-23 18:58:45 +00:00
Paula Quispe
b41c95c6e8 Merged in 322ToDev (pull request #6135)
release/3.2.2

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-10-23 18:29:59 +00:00
Roly Rudy Gutierrez Pinto
99278dfa78 HOR-1717 2017-10-23 12:42:09 -04:00
Roly Rudy Gutierrez Pinto
e0aa6a11dc HOR-1717 2017-10-23 12:35:23 -04:00
Roly Rudy Gutierrez Pinto
01dcc8606e HOR-1717 2017-10-23 11:52:43 -04:00
Paula Quispe
81c90278bd release/3.2.2 to develop conflicts 2017-10-23 11:37:41 -04:00
Paula Quispe
07a04d472a Upper 2017-10-23 09:02:58 -04:00
Paula Quispe
e7ca3e6887 Merged in feature/HOR-3965 (pull request #6133)
Feature/HOR-3965

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-10-20 23:17:35 +00:00
David Callizaya
f6eb465ea1 Merged in bugfix/HOR-3967 (pull request #6109)
HOR-3967

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-10-20 23:11:53 +00:00
Paula Quispe
9952cdb8ff Conflicts 2017-10-20 18:51:24 -04:00
Dante Loayza
294707cb42 Merged in bugfix/HOR-3845-B (pull request #6131)
HOR-3845

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-10-20 21:55:29 +00:00
Paula Quispe
4173cfac47 HOR-3784 2017-10-20 17:01:58 -04:00
Paula Quispe
c7480418f2 Merged in feature/HOR-3906 (pull request #6100)
feature/HOR-3906

Approved-by: David Callizaya <david.callizaya@processmaker.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-10-20 20:15:17 +00:00
Roly
eb2fbc8323 Merged in bugfix/HOR-3968 (pull request #6111)
HOR-3968

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-10-20 19:00:09 +00:00
dante
e9697990e6 moving file name sanitization to ouput document files only 2017-10-20 14:50:17 -04:00
dante
21e1912fd5 moving sanitization to file names of output documents only 2017-10-20 14:38:10 -04:00
Paula Quispe
22702842b9 Merge branch 'develop' of bitbucket.org:colosa/processmaker into bugfix/HOR-3784 2017-10-20 12:20:13 -04:00
davidcallizaya
ec6995972e HOR-3996
Since the web entry is assigned to guest, it was not able to load the user information through
the PMfunctions because it is validated to not return guest information. Now it will load directly
from Users table.
2017-10-20 12:02:13 -04:00
davidcallizaya
bcf6b10e0c HOR-3996
Fix logic of update web entry user.
2017-10-20 12:00:12 -04:00
Paula Quispe
1647edb43e HOR-3959 2017-10-20 12:00:11 -04:00