fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,604 Commits 1 Branch 0 Tags
0732e65e3aba654bffe0f3006cec3dccecc58b3f
Commit Graph

17604 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Paula Quispe
0732e65e3a Add pmFunction in composer 2017-08-04 10:55:47 -04:00
Paula Quispe
77de809069 Merged in bugfix/HOR-3618 (pull request #5844) 
HOR-3618

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2017-08-04 14:39:55 +00:00
Paula Quispe
0054edbc89 Restore the loads function with empty content, for backward compatibilities 2017-08-04 10:38:28 -04:00
David Callizaya
a629993ad8 Merged in bugfix/HOR-3620 (pull request #5843) 
HOR-3620
 2017-08-04 14:32:37 +00:00
davidcallizaya
dd63a4384b HOR-3620 
Fix class dynaform to Dynaform
 2017-08-04 10:31:18 -04:00
David Callizaya
f7f66824ca Merged in bugfix/HOR-3620 (pull request #5842) 
HOR-3620

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2017-08-04 14:16:59 +00:00
davidcallizaya
7e8ad3431d HOR-3620 
Rename class calendar to Calendar
 2017-08-04 10:13:09 -04:00
Paula Quispe
ddfb4eea63 Merged in feature/HOR-3610 (pull request #5836) 
Feature/HOR-3610

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
Approved-by: David Callizaya <david.callizaya@processmaker.com>
 2017-08-04 13:34:53 +00:00
Roly Rudy Gutierrez Pinto
845d363749 I applied code style 2017-08-04 09:23:12 -04:00
davidcallizaya
9d42e978a3 HOR-3610 
Remove pending G::LoadClass and G::LoadClassRBAC
 2017-08-04 08:54:13 -04:00
Paula Quispe
3be5e942d3 Delete groupUser 2017-08-04 08:31:28 -04:00
Paula Quispe
466488d31f Remove inputFilter 2017-08-04 08:25:39 -04:00
Paula Quispe
6b68fda97a Resolve conflict in G 2017-08-04 08:11:58 -04:00
Paula Quispe
f9d33e6451 Resolve conflict with Rbac and remove loads 2017-08-04 07:19:26 -04:00
Paula Quispe
cba358b98b Remove loads in WebApplication and sysGeneric 2017-08-04 07:03:27 -04:00
Paula Quispe
0a7c78f8fe Delete require Smarty and initVendors 2017-08-03 19:00:35 -04:00
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
efbf4d8b39 HOR-2689 Removed instances of LoadSystem, LoadThirdParty 2017-08-03 17:52:56 -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
Paula Quispe
26983f3738 Merged in bugfix/HOR-3568-A (pull request #5840) 
HOR-3568

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
 2017-08-03 21:06:47 +00: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
8359e30998 Merged in develop (pull request #5841) 
Develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2017-08-03 20:57:37 +00: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
27f6e7344a Merged in develop (pull request #5835) 
Develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2017-08-02 11:23:23 +00:00
Roly
e17f66cfb8 Merged in bugfix/HOR-3419 (pull request #5757) 
HOR-3419

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
 2017-08-01 20:36:21 +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