Commit Graph

18711 Commits

Author SHA1 Message Date
Marco Antonio Nina Mena
ae28e48861 Merged in bugfix/HOR-4201 (pull request #6245)
HOR-4201

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-05-08 13:58:49 -04:00
Taylor Dondich
fbd4438ddd Merged in bugfix/HOR-4151 (pull request #6218)
Add commit to populate Laravel database configuration for workflow.

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-05-08 13:54:43 -04:00
Julio Cesar Laura Avendaño
605bc01e5b Merged in bugfix/HOR-4527 (pull request #6458)
HOR-4527

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-05-08 17:47:10 +00:00
Marco Antonio Nina Mena
0d533e19d9 HOR-4527 2018-05-08 10:16:52 -04:00
Paula Quispe
abe71a6ffe Merged in bugfix/HOR-4505 (pull request #6456)
HOR-4505: update with 3.2.3

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-05-04 17:43:41 +00:00
Paula Quispe
00bb3bf43d HOR-4505: update with 3.2.3 2018-05-04 12:11:01 -04:00
Paula Quispe
6e704582ee Merged in bugfix/HOR-4396 (pull request #6436)
HOR-4396

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>
2018-05-04 15:30:48 +00:00
Paula Quispe
f3f1d8a0a3 HOR-4396 2018-05-03 16:37:51 -04:00
Julio Cesar Laura Avendaño
d2d5b9454e Merged in bugfix/HOR-4521-B (pull request #6455)
HOR-4521

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2018-05-03 12:12:29 +00:00
Rodrigo Quelca
ee535ad587 Merged in bugfix/FBI-2362 (pull request #6451)
FBI-2362

Approved-by: Fabio Guachalla <fabio.guachalla@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2018-05-02 14:03:11 +00:00
Julio Cesar Laura Avendaño
c9cdcc3f51 HOR-4521 2018-04-27 16:42:09 -04:00
Rodrigo Quelca
aa6e34bd8b FBI-2362: Create/complete missing labels on version 3.2.2 2018-04-25 19:39:19 +00:00
Roly
2445778721 Merged in bugfix/HOR-4355 (pull request #6439)
HOR-4355

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-04-25 15:13:10 +00:00
Roly
36e0a362b0 Merged in bugfix/HOR-4512 (pull request #6450)
HOR-4512

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-04-25 13:47:08 +00:00
Roly Rudy Gutierrez Pinto
68ad5ca55a HOR-4512 2018-04-24 17:03:44 -04:00
Roly Rudy Gutierrez Pinto
c8d82b7c31 HOR-4355 2018-04-23 16:05:26 -04:00
Paula Quispe
ca4ff3b26c Merged in feature/HOR-4501 (pull request #6446)
HOR-4501

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-04-18 19:52:39 +00:00
Paula Quispe
2ee9ba2749 Merged in bugfix/HOR-4499 (pull request #6447)
HOR-4499

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-04-18 13:07:54 +00:00
Fabio Guachalla
429af6c4e1 Merged in bugfix/FBI-2377 (pull request #6441)
FBI-2377

Approved-by: Rodrigo Quelca <rockoinfo@yahoo.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-04-17 19:48:37 +00:00
Marco Antonio Nina Mena
255a9526d2 HOR-4391 Error when creating a role by End Point
- Create rol

Code Style

Fix CR

Fix CR

Add validation Render format date
2018-04-17 15:47:29 -04:00
Paula Quispe
9a42249df8 HOR-4440 2018-04-17 15:44:35 -04:00
Fabio Guachalla
d33d03c1f4 FBI-2377:HTML editor >> Buttons overlap preview panel
Style

Styles themes
2018-04-17 15:09:05 -04:00
Paula Quispe
6c215b9d22 HOR-4501 2018-04-17 14:52:21 -04:00
Paula Quispe
12faf8c35d Merged in bugfix/HOR-4496 (pull request #6444)
HOR-4496

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-04-17 14:01:40 +00:00
Fabio Guachalla
bdf4bb7a43 Merged in bugfix/FBI-2358 (pull request #6433)
FBI-2358

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Rodrigo Quelca <rockoinfo@yahoo.com>
2018-04-17 13:38:06 +00:00
Paula Quispe
876336b250 Merged in bugfix/HOR-4500 (pull request #6445)
HOR-4500

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-04-17 13:13:19 +00:00
Paula Quispe
335344f029 HOR-4496 2018-04-17 09:04:52 -04:00
Rodrigo Quelca
2d1d3495f6 Merged in bugfix/FBI-2356_B (pull request #6429)
FBI-2356

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-04-17 12:10:39 +00:00
Roly Rudy Gutierrez Pinto
51840119ab HOR-4450 2018-04-16 16:39:10 -04:00
Roly Rudy Gutierrez Pinto
a73fb850a3 HOR-4410 2018-04-16 16:38:50 -04:00
dante
5d5bf2ca11 HOR-4185
Conflicts:
	workflow/engine/src/ProcessMaker/BusinessModel/Light.php
2018-04-16 16:38:40 -04:00
Rodrigo Quelca
37d7d0c417 FBI-2356: when we enter a Template, ouputDocument, IEE, the buttons come out one on top of the other
complete tinyMCE patches

fix code style

change height sizes in dialog styles

Correction

remove commented code
2018-04-16 16:16:39 +00:00
Paula Quispe
f5b5e08554 Merged in bugfix/HOR-4498 (pull request #6443)
HOR-4498

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-04-16 16:02:57 +00:00
Paula Quispe
446293b561 HOR-4498 2018-04-16 11:45:25 -04:00
Paula Quispe
4a3bf05f73 Merged in bugfix/HOR-4495 (pull request #6440)
HOR-4495

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-04-13 20:26:19 +00:00
Julio Cesar Laura Avendaño
334170bd6e HOR-4495 2018-04-13 15:41:37 -04:00
Paula Quispe
1c2c7d69cd Merged in feature/HOR-4411 (pull request #6437)
HOR-4411

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-04-12 18:10:03 +00:00
Marco Antonio Nina Mena
f3800fdef5 HOR-4411 2018-04-09 10:44:53 -04:00
Roly
56663da08a Merged in bugfix/HOR-4468 (pull request #6434)
HOR-4468

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-04-09 12:12:39 +00:00
Roly Rudy Gutierrez Pinto
03be0254ed HOR-4468 2018-04-05 11:16:36 -04:00
Fabio Guachalla
6ea1f36592 FBI-2358:Message History >> A blank panel overlays the page 2018-04-04 09:51:53 -04:00
Paula Quispe
affc5e869d Merged in bugfix/HOR-4442 (pull request #6417)
HOR-4442

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-03-29 21:53:12 +00:00
Paula Quispe
9b2a985654 Merged in bugfix/HOR-4441 (pull request #6416)
HOR-4441

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-03-28 21:03:47 +00:00
Roly
4e6fda2e6c Merged in bugfix/HOR-4450 (pull request #6428)
HOR-4450

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-03-28 21:03:18 +00:00
Roly Rudy Gutierrez Pinto
8bca6702d5 HOR-4450 2018-03-28 08:31:06 -04:00
Roly Rudy Gutierrez Pinto
bf4a9aca03 HOR-4446 2018-03-27 16:37:15 -04:00
Roly
349165227d Merged in bugfix/HOR-4446 (pull request #6421)
HOR-4446

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-03-23 14:15:25 +00:00
Roly Rudy Gutierrez Pinto
66864011c4 HOR-4446 2018-03-23 09:41:40 -04:00
Alex Santos
7c90b84c2a Merged in bugfix/FBI-2355 (pull request #6415)
FBI-2355

Approved-by: Rodrigo Quelca <rockoinfo@yahoo.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-03-22 19:47:20 +00:00
Paula Quispe
8929236e1a HOR-4442 2018-03-22 12:04:14 -04:00