You are viewing a plain text version of this content. The canonical link for it is here.
Posted to dev@openmeetings.apache.org by Ankush Mishra <an...@gmail.com> on 2018/10/27 11:09:29 UTC

CalendarDialog changes between v4.0.6 branch and master

Hello Maxim,

I was just testing the updated code for the Calendar behaviour, and notice
that, there are some discrepancies between the branches *master* and *4.0.x*
.

From git blame, I notice this arises from this commit here
<https://github.com/apache/openmeetings/commit/575638b29ea0ba415be5598741993c32e09b3262#diff-5a3e333589e00fd9afa94b85942e3924>
, as an example refer to CalendarDialog changes. Should I thus, base my
work off of master or the 4.0.x branch? Currently it's based off of master.

Regards
Ankush

Re: CalendarDialog changes between v4.0.6 branch and master

Posted by Ankush Mishra <an...@gmail.com>.
Yes, that would be great.

Also, by any chance is master stable enough to test? I keep getting an
error from wicket stating "Cookie cannot be null" or something similar.
This caused me to change branches.

Thanks in advance
Ankush

On Sat, Oct 27, 2018 at 5:34 PM Maxim Solodovnik <so...@gmail.com>
wrote:

> Hello Ankush,
>
> I can sync both branches for you
> Is `org.apache.openmeetings.web.user.calendar` package will be sufficient?
>
> On Sat, 27 Oct 2018 at 18:10, Ankush Mishra <an...@gmail.com>
> wrote:
>
>> Hello Maxim,
>>
>> I was just testing the updated code for the Calendar behaviour, and
>> notice that, there are some discrepancies between the branches *master*
>> and *4.0.x*.
>>
>> From git blame, I notice this arises from this commit here
>> <https://github.com/apache/openmeetings/commit/575638b29ea0ba415be5598741993c32e09b3262#diff-5a3e333589e00fd9afa94b85942e3924>
>> , as an example refer to CalendarDialog changes. Should I thus, base my
>> work off of master or the 4.0.x branch? Currently it's based off of master.
>>
>> Regards
>> Ankush
>>
>
>
> --
> WBR
> Maxim aka solomax
>

Re: CalendarDialog changes between v4.0.6 branch and master

Posted by Ankush Mishra <an...@gmail.com>.
Ok, I'll take a look. Maybe, some build issue cropped up.

On Sat, Oct 27, 2018, 18:12 Maxim Solodovnik <so...@gmail.com> wrote:

> Hmm
> Maybe cookies are disabled in your browser?
> I'm currently testing this version (with mysql db) on 2 oses
> Works for me :)
>
> WBR, Maxim
> (from mobile, sorry for the typos)
>
> On Sat, Oct 27, 2018, 19:28 Ankush Mishra <an...@gmail.com> wrote:
>
>> Sorry, the last email, got cut off.
>>
>> For the steps:
>>
>>  - Built the git master version, with my changes
>>  - Ran the tomcat from ./startup.sh
>>  - Configured the instance with Derby, and no other external dependencies.
>>  - Tried logging into my account, and kept gettting the "Cookie cannot be
>> null" error.
>>
>> On Sat, Oct 27, 2018 at 5:56 PM Ankush Mishra <an...@gmail.com>
>> wrote:
>>
>>> Hello Maxim,
>>>
>>> PR on any branch is fine with me.
>>>
>>> I don't think it's reproducible on the demo server, I recently did a
>>> pull from Master from the github repo. So, I should be about the same as
>>> the Master. To reproduce, here's what I did:
>>>
>>>  - Built the git master version, with my changes
>>>  - Ran the tomcat from ./startup.sh
>>>
>>> On Sat, Oct 27, 2018 at 5:40 PM Maxim Solodovnik <so...@gmail.com>
>>> wrote:
>>>
>>>> Hmm, just have checked this package
>>>> No big differences
>>>>
>>>> Can you create PR for any branch and I'll perform the merge, would it
>>>> be OK?
>>>>
>>>> Master is actually should work same way as 4.0.x
>>>> What are your steps to get this error?
>>>>
>>>> is it reproducible on demo server?
>>>>
>>>> On Sat, 27 Oct 2018 at 19:04, Maxim Solodovnik <so...@gmail.com>
>>>> wrote:
>>>>
>>>>> Hello Ankush,
>>>>>
>>>>> I can sync both branches for you
>>>>> Is `org.apache.openmeetings.web.user.calendar` package will be
>>>>> sufficient?
>>>>>
>>>>> On Sat, 27 Oct 2018 at 18:10, Ankush Mishra <an...@gmail.com>
>>>>> wrote:
>>>>>
>>>>>> Hello Maxim,
>>>>>>
>>>>>> I was just testing the updated code for the Calendar behaviour, and
>>>>>> notice that, there are some discrepancies between the branches
>>>>>> *master* and *4.0.x*.
>>>>>>
>>>>>> From git blame, I notice this arises from this commit here
>>>>>> <https://github.com/apache/openmeetings/commit/575638b29ea0ba415be5598741993c32e09b3262#diff-5a3e333589e00fd9afa94b85942e3924>
>>>>>> , as an example refer to CalendarDialog changes. Should I thus, base my
>>>>>> work off of master or the 4.0.x branch? Currently it's based off of master.
>>>>>>
>>>>>> Regards
>>>>>> Ankush
>>>>>>
>>>>>
>>>>>
>>>>> --
>>>>> WBR
>>>>> Maxim aka solomax
>>>>>
>>>>
>>>>
>>>> --
>>>> WBR
>>>> Maxim aka solomax
>>>>
>>>

Re: CalendarDialog changes between v4.0.6 branch and master

Posted by Maxim Solodovnik <so...@gmail.com>.
Hmm
Maybe cookies are disabled in your browser?
I'm currently testing this version (with mysql db) on 2 oses
Works for me :)

WBR, Maxim
(from mobile, sorry for the typos)

On Sat, Oct 27, 2018, 19:28 Ankush Mishra <an...@gmail.com> wrote:

> Sorry, the last email, got cut off.
>
> For the steps:
>
>  - Built the git master version, with my changes
>  - Ran the tomcat from ./startup.sh
>  - Configured the instance with Derby, and no other external dependencies.
>  - Tried logging into my account, and kept gettting the "Cookie cannot be
> null" error.
>
> On Sat, Oct 27, 2018 at 5:56 PM Ankush Mishra <an...@gmail.com>
> wrote:
>
>> Hello Maxim,
>>
>> PR on any branch is fine with me.
>>
>> I don't think it's reproducible on the demo server, I recently did a pull
>> from Master from the github repo. So, I should be about the same as the
>> Master. To reproduce, here's what I did:
>>
>>  - Built the git master version, with my changes
>>  - Ran the tomcat from ./startup.sh
>>
>> On Sat, Oct 27, 2018 at 5:40 PM Maxim Solodovnik <so...@gmail.com>
>> wrote:
>>
>>> Hmm, just have checked this package
>>> No big differences
>>>
>>> Can you create PR for any branch and I'll perform the merge, would it be
>>> OK?
>>>
>>> Master is actually should work same way as 4.0.x
>>> What are your steps to get this error?
>>>
>>> is it reproducible on demo server?
>>>
>>> On Sat, 27 Oct 2018 at 19:04, Maxim Solodovnik <so...@gmail.com>
>>> wrote:
>>>
>>>> Hello Ankush,
>>>>
>>>> I can sync both branches for you
>>>> Is `org.apache.openmeetings.web.user.calendar` package will be
>>>> sufficient?
>>>>
>>>> On Sat, 27 Oct 2018 at 18:10, Ankush Mishra <an...@gmail.com>
>>>> wrote:
>>>>
>>>>> Hello Maxim,
>>>>>
>>>>> I was just testing the updated code for the Calendar behaviour, and
>>>>> notice that, there are some discrepancies between the branches
>>>>> *master* and *4.0.x*.
>>>>>
>>>>> From git blame, I notice this arises from this commit here
>>>>> <https://github.com/apache/openmeetings/commit/575638b29ea0ba415be5598741993c32e09b3262#diff-5a3e333589e00fd9afa94b85942e3924>
>>>>> , as an example refer to CalendarDialog changes. Should I thus, base my
>>>>> work off of master or the 4.0.x branch? Currently it's based off of master.
>>>>>
>>>>> Regards
>>>>> Ankush
>>>>>
>>>>
>>>>
>>>> --
>>>> WBR
>>>> Maxim aka solomax
>>>>
>>>
>>>
>>> --
>>> WBR
>>> Maxim aka solomax
>>>
>>

Re: CalendarDialog changes between v4.0.6 branch and master

Posted by Maxim Solodovnik <so...@gmail.com>.
Hmm, just have checked this package
No big differences

Can you create PR for any branch and I'll perform the merge, would it be OK?

Master is actually should work same way as 4.0.x
What are your steps to get this error?

is it reproducible on demo server?

On Sat, 27 Oct 2018 at 19:04, Maxim Solodovnik <so...@gmail.com> wrote:

> Hello Ankush,
>
> I can sync both branches for you
> Is `org.apache.openmeetings.web.user.calendar` package will be sufficient?
>
> On Sat, 27 Oct 2018 at 18:10, Ankush Mishra <an...@gmail.com>
> wrote:
>
>> Hello Maxim,
>>
>> I was just testing the updated code for the Calendar behaviour, and
>> notice that, there are some discrepancies between the branches *master*
>> and *4.0.x*.
>>
>> From git blame, I notice this arises from this commit here
>> <https://github.com/apache/openmeetings/commit/575638b29ea0ba415be5598741993c32e09b3262#diff-5a3e333589e00fd9afa94b85942e3924>
>> , as an example refer to CalendarDialog changes. Should I thus, base my
>> work off of master or the 4.0.x branch? Currently it's based off of master.
>>
>> Regards
>> Ankush
>>
>
>
> --
> WBR
> Maxim aka solomax
>


-- 
WBR
Maxim aka solomax

Re: CalendarDialog changes between v4.0.6 branch and master

Posted by Maxim Solodovnik <so...@gmail.com>.
Hello Ankush,

I can sync both branches for you
Is `org.apache.openmeetings.web.user.calendar` package will be sufficient?

On Sat, 27 Oct 2018 at 18:10, Ankush Mishra <an...@gmail.com> wrote:

> Hello Maxim,
>
> I was just testing the updated code for the Calendar behaviour, and notice
> that, there are some discrepancies between the branches *master* and
> *4.0.x*.
>
> From git blame, I notice this arises from this commit here
> <https://github.com/apache/openmeetings/commit/575638b29ea0ba415be5598741993c32e09b3262#diff-5a3e333589e00fd9afa94b85942e3924>
> , as an example refer to CalendarDialog changes. Should I thus, base my
> work off of master or the 4.0.x branch? Currently it's based off of master.
>
> Regards
> Ankush
>


-- 
WBR
Maxim aka solomax