Re: Git history problem

2020-03-09 Thread Michael Brohl
+1 It is easy to prevent this by using rebase merging but committers have to care about it. If Github can be configured to prevent merge commits we should do so. Thanks, Michael > Am 09.03.2020 um 17:58 schrieb Mathieu Lirzin : > > Hello, > > The history of OFBiz trunk with the adoption of

Re: [TEST] Test "POC for CSRF Token"

2020-03-09 Thread Jacques Le Roux
Hi Girish, I just had a look with Zap.  As a note: Zap reports missing CSRF tokens in forms when there are actually present in the URL. This is explained by the point 3 of OFBIZ-11306 description (Freemarker handling). Jacques Le 09/03/2020 à 10:57, Girish Vasmatkar a écrit : Hi Jacques I

Git history problem

2020-03-09 Thread Mathieu Lirzin
Hello, The history of OFBiz trunk with the adoption of the Pull Request based contribution process is getting less and less readable. Here is a snippet of `git log --oneline --graph` demonstrating that: --8<---cut here---start->8--- a3bcdc4cc3 * | Improved:

Re: OFBIZ-11415: Backport request - Using FlexibleStringExpander in form widget field's parameter names

2020-03-09 Thread Jacques Le Roux
Thanks Daniel, I continue... Jacques Le 09/03/2020 à 16:04, Daniel Watford a écrit : Hi Jacques, All looks good to me, thanks. The branch used for PR37 was taken from PR31's branch, which means there was some shared commits. >From the git log it looks like you merged PR37, which would

Re: OFBIZ-11415: Backport request - Using FlexibleStringExpander in form widget field's parameter names

2020-03-09 Thread Daniel Watford
Hi Jacques, All looks good to me, thanks. The branch used for PR37 was taken from PR31's branch, which means there was some shared commits. >From the git log it looks like you merged PR37, which would explain why all the commits from PR31 were merged as well. Thanks, Dan. On Mon, 9 Mar 2020

Re: OFBIZ-11415: Backport request - Using FlexibleStringExpander in form widget field's parameter names

2020-03-09 Thread Jacques Le Roux
Hi Daniel, Done, please check I did not miss anything. I was a bit confused because when I merged PR31 it seem PR37 was automatically merged too. If all is OK I'll continue on OFBIZ-4035 Thanks Jacques Le 06/03/2020 à 18:03, Jacques Le Roux a écrit : Hi Daniel, All, At

Re: [GitHub] [ofbiz-site] PierreSmits commented on issue #1: Improved: widget-theme.xsd typos (OFBIZ-11421)

2020-03-09 Thread Swapnil M Mane
Hello team, Here is the Jira ticket to track the progress for this activity https://issues.apache.org/jira/browse/INFRA-19945 Best regards, Swapnil M Mane, ofbiz.apache.org On Sat, Feb 29, 2020 at 10:24 AM Swapnil M Mane wrote: > Thank you team for inputs, will sync up with the Infra team to

Re: OFBiz-Github-MultiBranch » trunk - Build # 6 - Still Failing

2020-03-09 Thread Michael Brohl
Hi Pierre, can you explain why a push to your private repository triggers a build on the official ASF infrastructure builds.apache.org? Thanks, Michael Brohl ecomify GmbH - www.ecomify.de Am 09.03.20 um 09:15 schrieb Pierre Smits: Good morning Michael, all, My apologies for the

Re: [TEST] Test "POC for CSRF Token"

2020-03-09 Thread Girish Vasmatkar
Hi Jacques I tried to simulate the CSRF manually (and I plan to use Zap as well) and I got this error - Invalid or missing CSRF token to path '/EntitySQLProcessor' I logged in to OFBiz and then used an HTML form to perform the attack and the patch successfully prevented. So it looks good to

Re: Demo instance for OFBiz 17.12 release and remove 13.07 demo

2020-03-09 Thread Nicolas Malin
+1 Nicolas On 06/03/2020 10:34, Swapnil M Mane wrote: > Hello team, > Current we have three demo instances [1] for OFBiz. > > -- Current Stable Release 16.11 - Demo > https://demo-stable.ofbiz.apache.org/ordermgr/control/main > > -- Developer Trunk - Demo >

Re: OFBiz-Github-MultiBranch » trunk - Build # 6 - Still Failing

2020-03-09 Thread Pierre Smits
Good morning Michael, all, My apologies for the inconvenience caused. A minor glitch in a push to my GitHub fork of the official repository caused this to happen. Met vriendelijke groet, Pierre Smits *Proud* *contributor** of* Apache OFBiz since 2008 (without

Re: Demo instance for OFBiz 17.12 release and remove 13.07 demo

2020-03-09 Thread Aditya Sharma
+1 Thanks Swapnil Thanks and Regards, Aditya Sharma On Sun, Mar 8, 2020 at 4:17 PM Michael Brohl wrote: > +1 > > Thanks Swapnil, > > Michael > > > Am 06.03.20 um 10:34 schrieb Swapnil M Mane: > > Hello team, > > Current we have three demo instances [1] for OFBiz. > > > > -- Current Stable

Fwd: OFBiz-Github-MultiBranch » trunk - Build # 6 - Still Failing

2020-03-09 Thread Michael Brohl
Good morning, I've got this mailed to my apache mail account. Does anyone know what this is? Seems to be a misconfigured Jenkins but I am not aware that we have this running. I also see that it is partly working against a repository from Pierre so it might be initiated by him? Regards,