Commit Graph

2880 Commits

Author SHA1 Message Date
Chloe Deguzman
60efcf7ac7 HOR-2689 Removed references to G::LoadClass, Bootstrap::LoadClass and various references to class loading methods and require_once 2017-08-03 17:19:55 -04:00
Paula Quispe
3e659921fd Merged in feature/HOR-3085 (pull request #5733)
HOR-3085

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-08-01 15:31:33 +00:00
Julio Cesar Laura Avendaño
cccd79d983 Merged in bugfix/HOR-3468 (pull request #5779)
HOR-3468

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-08-01 13:47:03 +00:00
jonathan Quispe
d421d7941a Merged in bugfix/HOR-3449 (pull request #5770)
HOR-3449

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-28 21:37:11 +00:00
Paula Quispe
0a8a918251 Merged in bugfix/HOR-3348 (pull request #5746)
HOR-3348

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-28 13:26:22 +00:00
hjonathan
9376388c23 HOR-3582 2017-07-27 12:22:22 -04:00
Roly
033e4b30f1 Merged in bugfix/HOR-3489 (pull request #5794)
HOR-3489

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-26 15:19:25 +00:00
hjonathan
0b6530904e resolve conflicts 2017-07-25 16:20:30 -04:00
Paula Quispe
9ca514fdc7 Merged in bugfix/HOR-3451 (pull request #5785)
HOR-3450

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-25 16:35:43 +00:00
Paula Quispe
9dffdce612 Merged in bugfix/HOR-3324 (pull request #5739)
HOR-3324

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-25 16:34:58 +00:00
Paula Quispe
d160585122 HOR-2704 2017-07-19 13:46:52 -04:00
Roly Rudy Gutierrez Pinto
b7d7abc365 HOR-3489 Improvement 2017-07-14 08:02:14 -04:00
Paula Quispe
cda8fab073 HOR-3516 2017-07-13 16:49:57 -04:00
Roly Rudy Gutierrez Pinto
495fa542c9 HOR-3489 2017-07-13 12:18:58 -04:00
Paula Quispe
5884bc478e HOR-3450 2017-07-05 14:54:32 -04:00
Julio Cesar Laura Avendaño
7154387c0b HOR-3468 2017-07-04 10:28:19 -04:00
hjonathan
b2e1e7282f HOR-3449
update
2017-06-28 16:50:43 -04:00
hjonathan
1a06a73b7f The unused code has been removed 2017-06-22 15:25:30 -04:00
hjonathan
539c4fe2cf HOR-3374 2017-06-19 16:21:40 -04:00
Paula Quispe
6a664c22e7 Merge branch 'develop' of bitbucket.org:colosa/processmaker into bugfix/HOR-3348 2017-06-16 08:02:45 -04:00
Paula Quispe
f877081e28 HOR-3348 2017-06-14 15:46:34 -04:00
Julio Cesar Laura Avendaño
720e3eb458 Put security fixes to develop branch 2017-06-14 11:14:23 -04:00
Paula Quispe
0ead6c513c HOR-3324 2017-06-13 14:31:05 -04:00
Paula Quispe
f83ba242a4 HOR-3085 2017-06-09 16:40:18 -04:00
Paula Quispe
c11526ea9b HOR-3350 2017-06-09 10:17:01 -04:00
Paula Quispe
f510177896 HOR-3350 2017-06-08 15:47:37 -04:00
Paula Quispe
842b3e10ad HOR-3351 2017-06-07 15:30:09 -04:00
Julio Cesar Laura Avendaño
d64d56c42f HOR-3202 2017-06-07 14:39:04 -04:00
Paula Quispe
97c25a320e HOR-3351 2017-06-06 15:36:13 -04: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
Ronald Henry Quenta Apaza
c8018671cd Merged in bugfix/HOR-3281 (pull request #5692)
HOR-3281

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-01 13:50:01 +00:00
Julio Cesar Laura Avendaño
54ccc28b2d Merged in bugfix/HOR-3202 (pull request #5701)
HOR-3202

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-05-31 17:11:32 +00:00
Julio Cesar Laura Avendaño
e0850cbba3 HOR-3202 2017-05-30 12:37:53 -04:00
Paula Quispe
2f4c25778e HOR-3286 2017-05-30 12:23:13 -04:00
Roly Rudy Gutierrez Pinto
f1e9e1e492 HOR-3290 improvement 2017-05-30 10:57:29 -04:00
Paula Quispe
1c34eb29f4 Merge branch 'release/security-3.2' of bitbucket.org:colosa/processmaker into bugfix/HOR-3286 2017-05-30 09:35:19 -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
Paula Quispe
2131b4648e Merged in bugfix/HOR-2067 (pull request #5549)
HOR-2067

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-05-25 17:05:09 +00:00
Ronald Henry Quenta Apaza
40483e0431 Merged in feature/HOR-3059 (pull request #5674)
HOR-3059

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-05-24 20:41:23 +00:00
Paula Quispe
a445056fbf HOR-3286 2017-05-24 15:19:33 -04:00
Roly Rudy Gutierrez Pinto
8a68563f83 Merge remote-tracking branch 'upstream/develop' into bugfix/HOR-3275 2017-05-24 11:26:27 -04:00
qronald
f3cc8e610e Adding new considerations in other ajax 2017-05-24 11:01:30 -04:00
qronald
59ac566335 fix in disable plufin MTM 2017-05-24 10:31:29 -04:00
qronald
1063802933 up observations 2017-05-24 08:39:04 -04:00
Paula Quispe
2b2d27ff0a HOR-3276 2017-05-23 15:22:17 -04:00
qronald
c0e80d1d32 HOR-3281 2017-05-23 10:08:44 -04:00
hjonathan
e7de1ef5cf Merge remote-tracking branch 'origin/develop' into bugfix/HOR-3203 2017-05-19 16:21:37 -04:00
hjonathan
21ba5c641d bugfix/HOR-3203
update
2017-05-19 16:21:05 -04:00
Roly Rudy Gutierrez Pinto
23a928c7e0 HOR-3275 2017-05-19 16:20:44 -04:00
Roly
f47e3ee789 Merged in bugfix/HOR-2761 (pull request #5556)
HOR-2761

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-05-19 15:52:00 +00:00