Commit Graph

2869 Commits

Author SHA1 Message Date
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
davidcallizaya
55b4481901 HOR-3369
Fix update from Multiple Step to Single Step.
2017-08-10 08:51:16 -04:00
Paula Quispe
eb3a80f883 HOR-3058 2017-08-10 08:27:16 -04:00
Ronald Quenta
0fb5b39664 Merge remote-tracking branch 'origin/feature/HOR-3559' into feature/HOR-3629 2017-08-10 08:18:12 -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
Roly Rudy Gutierrez Pinto
67acb41e88 HOR-3363 2017-08-09 15:34:07 -04:00
Roly Rudy Gutierrez Pinto
810eeb0c2d HOR-3509 2017-08-09 14:49:21 -04: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
c6142eafe5 Merge remote-tracking branch 'origin/feature/HOR-3559' into feature/HOR-3629 2017-08-09 08:13:09 -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
David Callizaya
1f1ce47d05 Merged in bugfix/HOR-3373 (pull request #5782)
HOR-3373

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-08-08 23:55:09 +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
14e81863d2 change default value in type boolean 2017-08-08 15:50:00 -04:00
Ronald Quenta
75b1f1a520 fix multitenant 2017-08-08 15:49:46 -04:00
Ronald Quenta
4b152e76b1 add comment in methods 2017-08-08 15:49:16 -04:00
Ronald Quenta
67f9631066 fix for plugins multitenant 2017-08-08 15:48:57 -04:00
Ronald Quenta
651d22a71d up observations 2017-08-08 15:47:02 -04:00
Ronald Quenta
6ca19b77c9 PluginDetail keeps your properties private 2017-08-08 15:44:13 -04:00
Ronald Quenta
cc5fcb08bc change 2017-08-08 15:40:50 -04:00
Ronald Quenta
63dfcf408a up observations 2017-08-08 15:13:48 -04:00
Ronald Quenta
2825cb6868 up observations 2017-08-08 15:13:15 -04:00
dev-ronald
c979a43d36 fix in login and pluginregistry 2017-08-08 15:08:45 -04:00
dev-ronald
519e9e477f HOR-3502 HOR-2043 2017-08-08 15:08:34 -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
u1
2240773cba HOR-3365 conflict resolution 2017-08-07 23:52:32 -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