Commit Graph

1870 Commits

Author SHA1 Message Date
Paula Quispe
62f7aabf9d Merged feature/HOR-3559 into bugfix/HOR-3639-T 2017-08-10 14:25:35 -04:00
hjonathan
01ad652f3a add uses 2017-08-10 14:23:15 -04:00
hjonathan
f2aa6229db It was added use in the header 2017-08-10 13:55:21 -04:00
hjonathan
90691b6d52 fix the comments in CR 2017-08-10 12:29:25 -04:00
hjonathan
32a494eee0 Merge remote-tracking branch 'origin/feature/HOR-3559' into bugfix/HOR-3633-C 2017-08-10 12:00:36 -04:00
jonathan Quispe
1c0fed9062 Merged in bugfix/HOR-3282-B (pull request #5880)
HOR-3282

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-08-10 15:57:17 +00:00
hjonathan
ddee408644 Merge remote-tracking branch 'origin/feature/HOR-3559' into bugfix/HOR-3633-C 2017-08-10 11:51:13 -04:00
David Callizaya
950a440d78 Merged in bugfix/HOR-3433 (pull request #5893)
HOR-3433

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-08-10 14:36:18 +00:00
Paula Quispe
528132230a PR observations 2017-08-10 10:02:38 -04:00
Paula Quispe
de4d75828b HOR-3639 2017-08-09 17:22:20 -04:00
Paula Quispe
6bccb5c639 Merged in bugfix/HOR-2949 (pull request #5892)
HOR-2949

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-08-09 19:47:03 +00:00
davidcallizaya
2f3daccd6b HOR-3433
Fix ProcessMaker User Password Hash Disclosure.
2017-08-09 14:40:02 -04:00
jonathan Quispe
254a9bf7b1 Merged in bugfix/HOR-2933-B (pull request #5876)
Bugfix/HOR-2933 B

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-08-09 16:42:06 +00:00
Paula Quispe
deb4999537 HOR-2949 2017-08-09 12:03:25 -04:00
hjonathan
6b42d59c2b Merge remote-tracking branch 'origin/feature/HOR-3559' into bugfix/HOR-3633-C 2017-08-09 10:32:34 -04:00
hjonathan
ee3561fb16 order the headers in file
update
2017-08-09 09:58:50 -04:00
hjonathan
a11462ff0a Merge remote-tracking branch 'origin/feature/HOR-3559' into bugfix/HOR-3282-B 2017-08-09 09:25:16 -04:00
Ronald Quenta
814704e6e1 Merged in bugfix/HOR-3464 (pull request #5885)
HOR-3464

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-08-08 23:56:15 +00:00
Ronald Quenta
1b0514c941 Merged in bugfix/HOR-3465 (pull request #5869)
Bugfix/HOR-3465

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-08-08 21:54:28 +00:00
hjonathan
5da1478fdb add use library
remove use library
2017-08-08 17:50:11 -04:00
hjonathan
e5337fb071 Merge remote-tracking branch 'origin/feature/HOR-3559' into bugfix/HOR-3282-B 2017-08-08 17:30:37 -04:00
hjonathan
9dd07338c1 add use library 2017-08-08 17:28:35 -04:00
hjonathan
4ceb59804e Merge remote-tracking branch 'origin/feature/HOR-3559' into bugfix/HOR-2933-B 2017-08-08 17:18:36 -04:00
hjonathan
6991839309 HOR-3633 2017-08-08 16:45:49 -04:00
Ronald Quenta
6fddb1841c Merge remote-tracking branch 'origin/feature/HOR-3559' into bugfix/HOR-3464 2017-08-08 14:07:25 -04:00
Ronald Quenta
143348acd0 ad label in exception 2017-08-08 14:05:34 -04:00
Ronald Quenta
5811ea3231 HOR-3464 2017-08-08 11:25:46 -04:00
Roly Rudy Gutierrez Pinto
51c7dfc380 HOR-3400 documentation 2017-08-08 10:02:24 -04:00
hjonathan
d861a22244 HOR-3282
update
2017-08-08 08:40:48 -04:00
u1
47fa74b8ec HOR-3400 Change of destination branch 2017-08-08 00:21:36 -04:00
Ronald Quenta
496d590f42 Merge remote-tracking branch 'origin/feature/HOR-3560' into bugfix/HOR-3465 2017-08-07 16:13:26 -04:00
hjonathan
33091008ff HOR-3282 2017-08-07 13:50:14 -04:00
hjonathan
c5a63873b4 HOR-2933
HOR-2933-B

update
2017-08-07 11:40:32 -04:00
Ronald Quenta
70bbade5e0 add new exception 2017-08-07 02:20:05 -04:00
Paula Quispe
445b19014c HOR-3482 2017-08-06 10:22:04 -04:00
davidcallizaya
eb43543daf HOR-3620
Fixed class name processMap to ProcessMap
2017-08-04 16:21:06 -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
davidcallizaya
9d42e978a3 HOR-3610
Remove pending G::LoadClass and G::LoadClassRBAC
2017-08-04 08:54:13 -04:00
davidcallizaya
81149399da HOR-3610
Fix System class conflict.
2017-08-03 18:44:57 -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
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
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
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
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
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
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
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