Commit Graph

18676 Commits

Author SHA1 Message Date
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
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
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 Rudy Gutierrez Pinto
bf4a9aca03 HOR-4446 2018-03-27 16:37:15 -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
Paula Quispe
48129d1fcd HOR-4441 2018-03-22 11:49:23 -04:00
Alex Santos
39140b666e FBI-2355: In the process designer the icons are out of phase 2018-03-22 10:04:48 -04:00
Paula Quispe
131551818f Merged in bugfix/HOR-4434 (pull request #6408)
HOR-4434

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-03-17 14:23:02 +00:00
Marco Antonio Nina Mena
937e40d6d1 HOR-4434 2018-03-17 10:10:26 -04:00
Roly
eacf859390 Merged in bugfix/HOR-4430 (pull request #6405)
HOR-4430

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-03-17 09:58:41 -04:00
Paula Quispe
d47e63e509 Merged in bugfix/HOR-4408-C (pull request #6395)
HOR-4408: Update the branch with 3.2.2 tickets

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-03-07 20:37:48 +00:00
Paula Quispe
bfed67d0c2 HOR-4408 2018-03-07 16:01:39 -04:00
Rodrigo Quelca
8901d064d3 Merged in bugfix/FBI-2341 (pull request #6392)
FBI-2341

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-03-07 18:11:01 +00:00
Rodrigo Quelca
ce0d2abb95 FBI-2315: [Mantis - 24294] Moving a sub-department to another department fails
fix code comments

rempve spaces
2018-03-07 15:38:43 +00:00
Fabio Guachalla
71f4dcd0c1 FBI-2293:Workspace> You can create a new ws with different password
Documentation
2018-03-07 15:38:27 +00:00
Paula Quispe
659bffc95a Merged in bugfix/HOR-4404 (pull request #6387)
HOR-4404

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-03-06 19:17:57 +00:00
Paula Quispe
b3cb0a104c Merged in bugfix/HOR-4400-PHP7 (pull request #6385)
HOR-4400: Move tickets merged after php 7

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-03-06 19:14:10 +00:00
Paula Quispe
36c8a38fea HOR-4404 2018-03-06 13:46:32 -04:00
Paula Quispe
5e82f70d63 HOR-3612 2018-03-06 13:03:56 -04:00
Roly Rudy Gutierrez Pinto
79e0b778c5 HOR-4263 2018-03-06 13:00:11 -04:00
Roly Rudy Gutierrez Pinto
e2793d9e2e HOR-4263 2018-03-06 13:00:00 -04:00
Roly Rudy Gutierrez Pinto
27168ac56f HOR-4133 2018-03-06 12:58:18 -04:00
Roly Rudy Gutierrez Pinto
1e1e190cf0 HOR-4133 2018-03-06 12:58:11 -04:00
Roly Rudy Gutierrez Pinto
f71f6f970e HOR-4133 2018-03-06 12:58:04 -04:00
Roly Rudy Gutierrez Pinto
726c7af619 HOR-4133 2018-03-06 12:57:57 -04:00
Roly Rudy Gutierrez Pinto
d1f6a3126c HOR-4133 2018-03-06 12:57:48 -04:00
Paula Quispe
50ab4cb5f0 HOR-4204 2018-03-06 12:55:49 -04:00
Roly Rudy Gutierrez Pinto
156d979f34 HOR-4357 2018-03-06 12:55:26 -04:00
Paula Quispe
b014c9d936 HOR-4212 2018-03-06 12:52:49 -04:00
Paula Quispe
ed2280b6c2 HOR-4294 2018-03-06 12:50:53 -04:00
Julio Cesar Laura Avendaño
c480a8b65e Merged in bugfix/HOR-4378 (pull request #6366)
HOR-4378

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Aldo Mauricio  Veliz Valenzuela <mauricio@colosa.com>
2018-02-22 17:29:43 +00:00
Julio Cesar Laura Avendaño
74819cc5c4 HOR-4378 2018-02-22 13:17:58 -04:00
Paula Quispe
1720c72e5f Merged in bugfix/HOR-4372 (pull request #6360)
HOR-4372

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-02-20 21:33:15 +00:00
Paula Quispe
8b840c93ac HOR-4372 2018-02-20 14:07:16 -04:00
Marco Antonio Nina Mena
f5302ba138 Merged in bugfix/HOR-4369 (pull request #6358)
HOR-4369

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2018-02-20 12:49:13 +00:00
Marco Antonio Nina Mena
27ea25eae4 HOR-4369 When importing a custom plugin, it is imported with the status enabled.
- change by default install plugin status disabled
2018-02-19 15:28:58 -04:00