14801 Commits

Author SHA1 Message Date
Julio Cesar Laura Avendaño
600220c396 HOR-3507 2017-07-11 10:11:46 -04:00
Paula Quispe
1cb5482b4f Merged in develop (pull request #5790)
Develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-07-11 13:07:43 +00:00
hjonathan
beed6f061a Ordering the code 2017-07-10 15:58:44 -04:00
hjonathan
221a75c9cd Merge remote-tracking branch 'origin/develop' into bugfix/HOR-3189 2017-07-10 15:53:21 -04:00
hjonathan
8ba7c8edd0 Merge remote-tracking branch 'origin/develop' into bugfix/HOR-3108 2017-07-10 15:25:59 -04:00
hjonathan
59b0b2d951 HOR-3108
update

update

update
2017-07-10 15:24:44 -04:00
Paula Quispe
53989da252 HOR-3487 2017-07-10 09:26:17 -04:00
Paula Quispe
6e6857d9ab HOR-3390 2017-07-10 09:26:17 -04:00
jonathan Quispe
5b9d5cd8a4 Merged in bugfix/HOR-3374 (pull request #5750)
HOR-3374

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-06 17:50:38 +00:00
Paula Quispe
61fe1abcb1 HOR-3460 2017-07-06 12:09:39 -04:00
davidcallizaya
09d8d048e6 HOR-3344
Remove validation of skins, language and domain for DEFAULT url generation.
2017-07-05 15:15:25 -04:00
Paula Quispe
5884bc478e HOR-3450 2017-07-05 14:54:32 -04:00
Paula Quispe
07d304780d HOR-3298 2017-07-05 10:16:53 -04:00
davidcallizaya
cb80a42125 HOR-3373
+ Fix web entry login bloqued when session_block configuration is enabled.
+ Include behat test.
2017-07-04 16:51:24 -04:00
Roly Rudy Gutierrez Pinto
e85ac1e0ab HOR-3366 pull request observations 2017-07-04 14:51:18 -04:00
Paula Quispe
966c2890fe Merged in develop (pull request #5780)
Develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-07-04 14:41:49 +00:00
Julio Cesar Laura Avendaño
7154387c0b HOR-3468 2017-07-04 10:28:19 -04:00
Roly Rudy Gutierrez Pinto
6c97a19ad2 HOR-3366 pull request observations 2017-07-04 08:27:35 -04:00
Paula Quispe
7fa1dc105e Merged in bugfix/HOR-3390 (pull request #5744)
HOR-3390

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-07-03 19:36:00 +00:00
Paula Quispe
dd1cab9d32 Merged in bugfix/HOR-3306 (pull request #5738)
HOR-3306

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-06-30 21:06:04 +00:00
Roly Rudy Gutierrez Pinto
ab866e5779 HOR-3366 2017-06-30 15:15:58 -04:00
Roly Rudy Gutierrez Pinto
debbeb7785 HOR-3436 2017-06-29 14:11:40 -04:00
hjonathan
b2e1e7282f HOR-3449
update
2017-06-28 16:50:43 -04:00
Roly Rudy Gutierrez Pinto
8e35674d97 HOR-3309 improvement 2017-06-28 08:05:56 -04:00
hjonathan
fef8cef447 HOR-3189 2017-06-27 14:18:35 -04:00
Roly Rudy Gutierrez Pinto
713dcb6d77 Merge remote-tracking branch 'upstream/develop' into bugfix/HOR-3309 2017-06-27 14:16:35 -04:00
Roly Rudy Gutierrez Pinto
adad1839fa HOR-3309 2017-06-27 12:17:19 -04:00
Paula Quispe
6f1443bca1 Merged in develop (pull request #5762)
Develop

Approved-by: Paula Quispe <paula.quispe@processmaker.com>
2017-06-27 16:09:17 +00:00
Rodrigo Quelca
04502f58fa FBI-1914: Some of the options in designer like show debug mode,etc are not showing in the UI
rollback to FBI-1901 and fix the contextmenu problems

code style
2017-06-27 06:59:38 -04:00
Julio Cesar Laura Avendaño
eac6bebca5 HOR-3220 2017-06-23 14:27:16 -04:00
Rodrigo Quelca
ca9c782d20 Merged in bugfix/FBI-1901 (pull request #5755)
FBI-1901

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-22 21:19:48 +00:00
hjonathan
08aee57a1b remove login/init.js 2017-06-22 16:01:44 -04:00
Roly
0913710f15 Merged in bugfix/HOR-3379 (pull request #5737)
HOR-3379

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-22 19:47:01 +00:00
hjonathan
1a06a73b7f The unused code has been removed 2017-06-22 15:25:30 -04:00
Rodrigo Quelca
1abbe6337e FBI-1901: Javascript error when exporting a process 2017-06-22 13:59:44 -04:00
Paula Quispe
1ec4a9ba4b Suggest user 2017-06-22 13:43:11 -04:00
Paula Quispe
f191a59528 HOR-3417 2017-06-22 11:16:15 -04:00
Paula Quispe
54193f0492 HOR-3390 2017-06-20 16:10:44 -04:00
Paula Quispe
f2bb4a98d4 Merge branch 'develop' of bitbucket.org:colosa/processmaker into bugfix/HOR-3306 2017-06-20 16:06:32 -04:00
Roly Rudy Gutierrez Pinto
4f6483a542 HOR-3379 improvement in class.AppSolr.php 2017-06-20 11:53:18 -04:00
Roly Rudy Gutierrez Pinto
b141ccbad7 HOR-3379 improvement in class.AppSolr.php 2017-06-20 11:51:35 -04:00
Paula Quispe
be81e67a90 HOR-3295 2017-06-20 10:03:26 -04:00
Paula Quispe
8e7fc0ee7a HOR-3295 2017-06-19 16:50:52 -04:00
hjonathan
539c4fe2cf HOR-3374 2017-06-19 16:21:40 -04:00
Paula Quispe
1a41cf0537 Merged in bugfix/HOR-2814-A (pull request #5629)
HOR-2814

Approved-by: Julio Cesar Laura Avendaño <contact@julio-laura.com>
2017-06-19 16:20:42 +00:00
Paula Quispe
6a664c22e7 Merge branch 'develop' of bitbucket.org:colosa/processmaker into bugfix/HOR-3348 2017-06-16 08:02:45 -04:00
Paula Quispe
f877081e28 HOR-3348 2017-06-14 15:46:34 -04:00
Roly Rudy Gutierrez Pinto
abdb2184a8 HOR-3393 2017-06-14 11:28:01 -04:00
Paula Quispe
42ac321495 HOR-3327 2017-06-14 11:21:09 -04:00
Julio Cesar Laura Avendaño
720e3eb458 Put security fixes to develop branch 2017-06-14 11:14:23 -04:00