Commit Graph

4239 Commits

Author SHA1 Message Date
Paula Quispe
d6f3047b6f Conflicts 2017-07-12 16:38:29 -04:00
Julio Cesar Laura Avendaño
600220c396 HOR-3507 2017-07-11 10:11:46 -04:00
hjonathan
beed6f061a Ordering the code 2017-07-10 15:58:44 -04:00
hjonathan
221a75c9cd Merge remote-tracking branch 'origin/develop' into bugfix/HOR-3189 2017-07-10 15:53:21 -04:00
Paula Quispe
53989da252 HOR-3487 2017-07-10 09:26:17 -04:00
Paula Quispe
61fe1abcb1 HOR-3460 2017-07-06 12:09:39 -04:00
Roly Rudy Gutierrez Pinto
debbeb7785 HOR-3436 2017-06-29 14:11:40 -04:00
Roly Rudy Gutierrez Pinto
8e35674d97 HOR-3309 improvement 2017-06-28 08:05:56 -04:00
hjonathan
fef8cef447 HOR-3189 2017-06-27 14:18:35 -04:00
Roly Rudy Gutierrez Pinto
adad1839fa HOR-3309 2017-06-27 12:17:19 -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
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
Paula Quispe
be81e67a90 HOR-3295 2017-06-20 10:03:26 -04:00
Paula Quispe
8e7fc0ee7a HOR-3295 2017-06-19 16:50:52 -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
Julio Cesar Laura Avendaño
720e3eb458 Put security fixes to develop branch 2017-06-14 11:14:23 -04:00
Paula Quispe
dff21ec37a HOR-3310 2017-06-13 15:59:09 -04:00
Roly Rudy Gutierrez Pinto
83dab41b53 HOR-3379 2017-06-13 10:42:09 -04:00
Julio Cesar Laura Avendaño
440c2e5f22 HOR-3388 2017-06-12 17:12:43 -04:00
Julio Cesar Laura Avendaño
e6211f3fe7 HOR-3375 2017-06-09 11:31:55 -04:00
Paula Quispe
ca178b14db HOR-3349 2017-06-06 13:43:21 -04:00
Roly
04c832fb54 Merged in bugfix/HOR-3311 (pull request #5711)
HOR-3311

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-06 14:22:03 +00:00
Paula Quispe
97c9ef6b79 CLASS PR obervations 2017-06-05 10:33:42 -04:00
Paula Quispe
cc33e1d428 CS 2017-06-02 12:29:07 -04:00
Paula Quispe
55400368dc Observations in the PR 2017-06-02 12:26:03 -04:00
Paula Quispe
c07b0fd2e9 Merge branch 'develop' of bitbucket.org:colosa/processmaker into bugfix/HOR-2814-A 2017-06-02 11:05:05 -04:00
Jonathan Quispe
70fffc77c6 Merged in bugfix/HOR-3332 (pull request #5708)
HOR-3332

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-02 14:57:16 +00:00
Paula Quispe
21b70bcf49 Observations 2017-06-01 17:09:43 -04:00
Roly Rudy Gutierrez Pinto
939910fd97 HOR-3311 2017-06-01 15:42:50 -04:00
hjonathan
45e1be495c HOR-3332
update

update
2017-06-01 15:13:28 -04:00
Paula Quispe
9f4ba65157 Merged develop into bugfix/HOR-3304 2017-06-01 14:52:14 -04:00
Jonathan Quispe
2799411866 Merged in bugfix/HOR-3160 (pull request #5704)
HOR-3160

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-01 18:47:20 +00:00
Roly
092a456bfe Merged in bugfix/HOR-3290 (pull request #5697)
HOR-3290

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-01 18:27:13 +00:00
hjonathan
a8de3d2e31 HOR-3160
update
2017-05-31 13:35:50 -04:00
Paula Quispe
61a3b373f4 HOR-2814: Observations related to search with APP_UID 2017-05-31 10:53:22 -04:00
Paula Quispe
e815883262 Merge branch 'develop' of bitbucket.org:colosa/processmaker into bugfix/HOR-2814-A 2017-05-30 14:50:40 -04:00
Paula Quispe
d218799b34 HOR-3304 2017-05-29 11:05:39 -04:00
Roly
143603f99b Merged in bugfix/HOR-3260 (pull request #5687)
HOR-3260

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-05-29 11:43:04 +00:00
Roly Rudy Gutierrez Pinto
56571bec93 HOR-3290 2017-05-25 16:07:32 -04:00
Paula Quispe
ecf54c8cb5 Merged in bugfix/HOR-3156 (pull request #5696)
HOR-3156

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-05-25 19:24:53 +00:00
Paula Quispe
1c599100c4 HOR-3156 2017-05-25 13:51:37 -04:00
Roly
b48a892b10 Merged in bugfix/HOR-3275 (pull request #5682)
HOR-3275

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-05-25 17:05:42 +00:00
Roly
de39ea54e7 Merged in bugfix/HOR-2909 (pull request #5683)
HOR-2909

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-05-24 19:51:02 +00:00
Roly Rudy Gutierrez Pinto
deb50a8ffc HOR-3260 applied './gulliver propel-build-model' command 2017-05-24 13:37:44 -04:00
Roly Rudy Gutierrez Pinto
39a18a2d96 HOR-3275 improvement 2017-05-24 11:26:13 -04:00
Paula Quispe
2b2d27ff0a HOR-3276 2017-05-23 15:22:17 -04:00
Roly Rudy Gutierrez Pinto
f3eaeff5bc Merge remote-tracking branch 'upstream/develop' into bugfix/HOR-3275 2017-05-22 08:32:27 -04:00
Roly
d49d973483 Merged in bugfix/HOR-3107 (pull request #5678)
HOR-3107

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-05-22 11:46:48 +00:00
Roly Rudy Gutierrez Pinto
cf0481a943 HOR-3275 improvement 2017-05-19 16:29:32 -04:00