davidcallizaya
|
81149399da
|
HOR-3610
Fix System class conflict.
|
2017-08-03 18:44:57 -04:00 |
|
davidcallizaya
|
f0c2511968
|
Merge branch 'feature/HOR-3610' of https://bitbucket.org/colosa/processmaker into feature/HOR-3610
|
2017-08-03 18:22:51 -04:00 |
|
Paula Quispe
|
d8c758d078
|
Merged develop into feature/HOR-3610
|
2017-08-03 18:08:17 -04:00 |
|
Chloe Deguzman
|
5d3a4c073f
|
HOR-2689 Removed instances of LoadSystem, LoadThirdParty
|
2017-08-03 17:34:55 -04:00 |
|
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 |
|
Chloe Deguzman
|
d72b7aa561
|
HOR-2689 Removed LoadClassRBAC references from testAuthenticationUser.php and rbac.appEdit.php
|
2017-08-03 17:01:14 -04:00 |
|
Paula Quispe
|
9eb7d6cac2
|
HOR-2689
|
2017-08-03 17:00:30 -04:00 |
|
Paula Quispe
|
0bbede2d35
|
HOR-3568
|
2017-08-03 16:10:59 -04:00 |
|
Paula Quispe
|
3b36f63338
|
Merged in bugfix/HOR-3487 (pull request #5789)
HOR-3487
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-08-03 18:01:06 +00:00 |
|
Paula Quispe
|
0e842e4465
|
Merged in bugfix/HOR-3180 (pull request #5808)
HOR-3180
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
|
2017-08-02 21:18:20 +00:00 |
|
Paula Quispe
|
58f038140d
|
HOR-2689
|
2017-08-02 17:15:13 -04:00 |
|
Roly
|
43c2b7bc7a
|
Merged in bugfix/HOR-3533 (pull request #5800)
HOR-3533
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
|
2017-08-02 16:09:06 +00:00 |
|
Paula Quispe
|
9936326d80
|
Merged in bugfix/HOR-3544 (pull request #5832)
HOR-3544
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-08-02 14:45:06 +00:00 |
|
Roly
|
d7364bc3c7
|
Merged in bugfix/HOR-3309 (pull request #5763)
HOR-3309
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-08-02 12:30:30 +00:00 |
|
Paula Quispe
|
083a340924
|
Merged in bugfix/HOR-3532 (pull request #5804)
HOR-3532
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-08-01 20:33:44 +00:00 |
|
Paula Quispe
|
f1fb4764bd
|
Merged in bugfix/HOR-3295 (pull request #5751)
HOR-3295
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-08-01 20:33:02 +00:00 |
|
Roly
|
b583b853ec
|
Merged in bugfix/HOR-2894 (pull request #5576)
HOR-2894
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-08-01 20:32:24 +00:00 |
|
Paula Quispe
|
a0bf3950d9
|
Merged develop into bugfix/HOR-3295
|
2017-08-01 15:02:20 -04:00 |
|
Julio Cesar Laura Avendaño
|
abac99f7c0
|
Merged in feature/HOR-3507 (pull request #5791)
HOR-3507
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-08-01 18:54:38 +00:00 |
|
Roly
|
1284697134
|
Merged in bugfix/HOR-3285 (pull request #5817)
HOR-3285
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-08-01 18:04:20 +00:00 |
|
Paula Quispe
|
2d97c1d73f
|
Merged in bugfix/HOR-3580-A (pull request #5828)
HOR-3580
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-08-01 18:03:36 +00:00 |
|
Daniel Canedo
|
6badfb2978
|
Merged in bugfix/FBI-1976 (pull request #5830)
FBI-1976: Apply workaround for ExtJS grids
Approved-by: Rodrigo Quelca <rockoinfo@yahoo.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-08-01 16:16:49 +00: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 |
|
Paula Quispe
|
1cb4695f67
|
Name of column changed
|
2017-08-01 09:23:46 -04:00 |
|
Roly
|
640eca54f7
|
Merged in bugfix/HOR-3498 (pull request #5824)
HOR-3498
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
|
2017-08-01 12:30:45 +00:00 |
|
Roly
|
7ca126bc80
|
Merged in bugfix/HOR-3393 (pull request #5742)
HOR-3393
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-08-01 12:30:23 +00:00 |
|
Paula Quispe
|
1a8ea0e3dd
|
HOR-3544
|
2017-08-01 08:26:24 -04:00 |
|
Paula Quispe
|
3335382c67
|
HOR-3580
|
2017-08-01 07:31:56 -04:00 |
|
jonathan Quispe
|
849c9686ab
|
Merged in bugfix/HOR-3174 (pull request #5731)
HOR-3174
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-07-31 15:49:20 +00:00 |
|
Paula Quispe
|
40a7666c1d
|
Merged in feature/HOR-3310 (pull request #5740)
HOR-3310
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-07-31 13:52:05 +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 |
|
duhnnie
|
9594b7230e
|
FBI-1976: Apply workaround for ExtJS grids
|
2017-07-28 15:31:47 -04:00 |
|
Paula Quispe
|
47e65ab563
|
Merged in bugfix/HOR-3229 (pull request #5734)
HOR-3229
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-07-28 16:34:23 +00:00 |
|
Paula Quispe
|
267f4fbbbd
|
Merged in bugfix/HOR-3500 (pull request #5798)
HOR-3500
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-07-28 13:48:05 +00:00 |
|
Paula Quispe
|
0c5e981406
|
Merged in bugfix/HOR-3349 (pull request #5724)
HOR-3349
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-07-28 13:47:25 +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 |
|
jonathan Quispe
|
580b062195
|
Merged in bugfix/HOR-3108 (pull request #5781)
HOR-3108
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-07-28 12:50:04 +00:00 |
|
Roly Rudy Gutierrez Pinto
|
21c9b7022b
|
HOR-3498
|
2017-07-27 16:22:36 -04:00 |
|
jonathan Quispe
|
c63c2738ce
|
Merged in bugfix/HOR-3582 (pull request #5821)
HOR-3582
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-07-27 20:03:50 +00:00 |
|
Roly
|
898ae57760
|
Merged in bugfix/HOR-3537 (pull request #5809)
HOR-3537
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-07-27 19:09:27 +00:00 |
|
hjonathan
|
9376388c23
|
HOR-3582
|
2017-07-27 12:22:22 -04:00 |
|
jonathan Quispe
|
726319e799
|
Merged in bugfix/HOR-3189 (pull request #5766)
HOR-3189
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-07-26 15:56:47 +00:00 |
|
Roly Rudy Gutierrez Pinto
|
6d06baade1
|
HOR-3285
|
2017-07-26 11:20:07 -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 |
|
Paula Quispe
|
6ef5d4b77b
|
Merged in bugfix/HOR-3417 (pull request #5754)
HOR-3417
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-07-26 15:18:46 +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
|
6b79b9844c
|
Merged in feature/HOR-3560 (pull request #5812)
HOR-3560
Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
|
2017-07-24 19:13:40 +00:00 |
|