fernando/luos
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity
17,623 Commits 1 Branch 0 Tags
409ad519a9b4aced63e6ededdbfe6d4c8ca988fa
Commit Graph

17623 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
davidcallizaya
409ad519a9 HOR-3620 
Move UI libraries to develop.
 2017-08-04 15:49:25 -04:00
davidcallizaya
4960c8abc0 HOR-3620 
Fix conflict with Path class in html2ps library.
 2017-08-04 15:40:33 -04:00
davidcallizaya
c3a2ba1950 HOR-3620 
+ Included changes of commit 3b4f20565ca264b9ecd148603be7b678e9b46281
- Remove unused class thirdparty/pear/Net/IDNA/php4.php
 2017-08-04 15:20:23 -04:00
davidcallizaya
b2762baffe HOR-3620 
Remove deprecated class to fix ambiguos class.
 2017-08-04 15:19:19 -04:00
Roly
d693b69201 Merged in bugfix/HOR-3621 (pull request #5850) 
HOR-3621

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2017-08-04 18:55:41 +00:00
Roly Rudy Gutierrez Pinto
b48830a494 HOR-3621 2017-08-04 14:11:09 -04:00
Paula Quispe
980998681b Merged in bugfix/HOR-3618 (pull request #5849) 
HOR-3618

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2017-08-04 17:53:36 +00:00
Paula Quispe
6e13a722df Added phpMailer 2017-08-04 13:52:27 -04:00
jonathan Quispe
76f0a7ad42 Merged in bugfix/HOR-3619 (pull request #5847) 
Path of third party, report tables, triggers

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2017-08-04 17:46:28 +00:00
hjonathan
17a2560723 fix the extend class 2017-08-04 13:45:19 -04:00
hjonathan
253481c3cd Merge branch 'feature/HOR-3559' of https://bitbucket.org/colosa/processmaker into bugfix/HOR-3619 2017-08-04 13:42:36 -04:00
David Callizaya
824b6b29c0 Merged in bugfix/HOR-3620 (pull request #5848) 
HOR-3620

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2017-08-04 17:42:13 +00:00
davidcallizaya
9e46fb4601 HOR-3620 
Change phing's class Task to PhingTask
 2017-08-04 13:26:41 -04:00
hjonathan
1baf391bb3 update composer .json 2017-08-04 11:58:34 -04:00
David Callizaya
687e5c9d9d Merged in bugfix/HOR-3620 (pull request #5846) 
HOR-3620

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2017-08-04 15:55:16 +00:00
hjonathan
3a8194a412 Path of third party, report tables, triggers 2017-08-04 11:54:39 -04:00
davidcallizaya
44d60e96d9 HOR-3620 
Fix PMSystem -> PmSystem since Processmaker is one word.
 2017-08-04 11:49:43 -04:00
davidcallizaya
bce594fe24 HOR-3620 
+ Add missing Phing package
- Remove pending LoadInclude
 2017-08-04 11:23:34 -04:00
Paula Quispe
53f1350a89 Merged in bugfix/HOR-3618 (pull request #5845) 
HOR-3618

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
 2017-08-04 14:57:04 +00:00
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