Commit Graph

1157 Commits

Author SHA1 Message Date
Paula Quispe
c83db75676 Merged in bugfix/HOR-3670-PQ (pull request #5913)
HOR-3670

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-08-11 20:07:23 +00:00
Paula Quispe
bf3671a594 HOR-3670 2017-08-11 15:49:19 -04:00
dante
9ecfbe0c84 Changes 3 and 4 of the google sheet 2017-08-11 14:10:44 -04:00
Ronald Quenta
917c94784b Merge remote-tracking branch 'origin/feature/HOR-3559' into feature/HOR-3629 2017-08-10 18:33:14 -04:00
Ronald Quenta
d8e9ab8844 up obserpations 2017-08-10 16:50:09 -04:00
Marco A. Nina Mena
2820ba7de3 fix code review
o
2017-08-10 16:30:32 -04:00
Marco A. Nina Mena
4683f5b59d Add functionality in rbac for enable or disable compatibility with soap login 2017-08-10 14:38:48 -04:00
Marco A. Nina Mena
e3002e8de1 Delete code for compatibility with old forms of authentication. 2017-08-10 14:38:48 -04:00
hjonathan
caf48a2c76 Merge remote-tracking branch 'origin/feature/HOR-3559' into bugfix/HOR-3633-C 2017-08-10 13:47:28 -04:00
Ronald Quenta
554820fb52 change class name for namespace 2017-08-10 13:18:01 -04:00
Paula Quispe
fa2938a811 Deprecated functions 2017-08-10 12:41:23 -04:00
Ronald Quenta
94a2db1e23 HOR-3629 2017-08-10 12:10:42 -04:00
hjonathan
ddee408644 Merge remote-tracking branch 'origin/feature/HOR-3559' into bugfix/HOR-3633-C 2017-08-10 11:51:13 -04:00
Paula Quispe
2eedfdbfb5 HOR-3658 2017-08-10 11:35:13 -04:00
dev-ronald
dc7abaae6b fix in login and pluginregistry 2017-08-10 09:43:00 -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
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
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
Ronald Quenta
23844188b3 Merge remote-tracking branch 'origin/feature/HOR-3559' into bugfix/HOR-3467 2017-08-09 08:16:55 -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
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
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
cc5fcb08bc change 2017-08-08 15:40:50 -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
38e9cc93fd add permissions 2017-08-08 15:00:21 -04:00
Ronald Quenta
61f9f9f7c4 add validation for sort and up observations 2017-08-08 14:46:01 -04:00
Roly Rudy Gutierrez Pinto
efe447643e HOR-3627 pull request observations 2017-08-08 13:54:51 -04:00
Roly Rudy Gutierrez Pinto
6c9a1d1842 HOR-3627 2017-08-08 13:45:12 -04:00
hjonathan
33248ec167 Merge branch 'feature/HOR-3559' of https://bitbucket.org/colosa/processmaker into bugfix/HOR-2933-B 2017-08-08 10:04:22 -04:00
Roly Rudy Gutierrez Pinto
45c1ceffcc HOR-3627 2017-08-08 09:53:00 -04:00
Ronald Quenta
04a8b6561a HOR-3467 2017-08-07 16:33:49 -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
c5a63873b4 HOR-2933
HOR-2933-B

update
2017-08-07 11:40:32 -04:00
Paula Quispe
c366a68d37 Add permission for generateBpmn 2017-08-07 11:32:07 -04:00
Ronald Quenta
517fce5b3d review permissions 2017-08-07 02:37:39 -04:00
Ronald Quenta
70bbade5e0 add new exception 2017-08-07 02:20:05 -04:00
Ronald Quenta
3226096677 HOR-3465 2017-08-06 14:50:24 -04:00
Ronald Quenta
bf34ab8778 HOR-3465 2017-08-06 14:46:40 -04:00
Paula Quispe
0480444871 HOR-3383 2017-08-05 12:52:32 -04:00
Paula Quispe
6f26e43bd9 Issues with triggers 2017-08-05 10:08:31 -04:00
Paula Quispe
2d71097ec1 Load Model 2017-08-04 16:53:38 -04:00
Paula Quispe
c4030e08e5 Remove require_once 2017-08-04 16:42:40 -04:00
davidcallizaya
44d60e96d9 HOR-3620
Fix PMSystem -> PmSystem since Processmaker is one word.
2017-08-04 11:49:43 -04:00
Paula Quispe
0054edbc89 Restore the loads function with empty content, for backward compatibilities 2017-08-04 10:38: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