Re: [Tiki-devel] Branching matters

Hi all,

We've branched 23.x!

cheers
Roberto

On Mon, Jul 5, 2021 at 6:13 PM Bsfez Tiki via TikiWiki-devel <
[email protected]> wrote:

> Hi,
>
> Sure Jonny,
>
> https://gitlab.com/tikiwiki/tiki/-/merge_requests/824 requires now manual
> merging.
>
> "Fast-forward merge is not possible. To merge this request, first rebase
> locally."
>
>
> I don't do anything until you told me I can do. 🤐
>
> Bernard
>
>
> > On 5 Jul 2021, at 16:31 , Jonny Bradley via TikiWiki-devel <
> [email protected]> wrote:
> >
> > Thanks Bernard
> >
> > We (actually Ricardo) is just about to merge in the PRS-12 branch,
> including the tabs to spaces switch so please (assuming we have no more NEW
> or ENH things to commit) refrain from committing into master/trunk until
> that one has arrived as it will conflict with everything! :)
> >
> >    https://gitlab.com/tikiwiki/tiki/-/merge_requests/798
> >
> > TIA
> >
> > jonny
> >
> >
> >
> >> On 5 Jul 2021, at 14:03, Bernard Sfez <[email protected]> wrote:
> >>
> >> Tested already here…. so practical !
> >>
> >> I’ll try to hook up with you all around 15h++ UTC
> >> B
> >>
> >>> On 5 Jul 2021, at 12:33 , Jonny Bradley via TikiWiki-devel <
> [email protected]> wrote:
> >>>
> >>> Hi all stable branch fans! :)
> >>>
> >>> I just finally merged the new Admin UI (now called Unified Admin
> Backend) here
> >>>
> >>> https://gitlab.com/tikiwiki/tiki/-/commit/5c369942
> >>>
> >>> So i think all we're waiting for is Ricardo's PSR-12 branch to merge
> in, replace ALL tabs with spaces (really all?) and then we branch, this
> evening i hope!
> >>>
> >>> Thanks to Luci and Katy for all the work on adminui, i think it's
> looking pretty good for the first outing, it's optional and there's a new
> "Unified Admin Backend" checkbox for it in the Admin theme section on the
> Look and Feel control panel.
> >>>
> >>> Enjoy!
> >>>
> >>> jonny
> >>>
> >>>
> >>>
> >>>
> >>>> On 1 Jul 2021, at 16:57, Jonny Bradley via TikiWiki-devel <
> [email protected]> wrote:
> >>>>
> >>>> Hi all
> >>>>
> >>>> Sorry for gatecrashing the navigation overhaul meeting, i'd forgotten
> that was a Thursday thing, apologies!
> >>>>
> >>>> Thanks for all the support, we have now merged in:
> >>>>
> >>>> * socnets !808
> >>>> * Duration picker update !783
> >>>> * SortableJS for menus and structures !807
> >>>>
> >>>> So i think that leaves "just" Admin UI !788 on my plate and PSR-12
> !798 on Ricardo's...
> >>>>
> >>>> I'll be around on and off over the weekend working on these so
> everything should be in by the end of Sunday - actually hopefully before
> Sunday evening :p
> >>>>
> >>>> Thanks again!
> >>>>
> >>>> jonny
> >>>>
> >>>>
> >>>>
> >>>>
> >>>>> On 1 Jul 2021, at 15:25, Jonny Bradley via TikiWiki-devel <
> [email protected]> wrote:
> >>>>>
> >>>>> Looks like BBB is in use, let's try here
> https://meet.jit.si/Tiki23BranchingChat
> >>>>>
> >>>>> jb
> >>>>>
> >>>>>
> >>>>>> On 1 Jul 2021, at 14:47, Jonny Bradley via TikiWiki-devel <
> [email protected]> wrote:
> >>>>>>
> >>>>>> Hi all
> >>>>>>
> >>>>>> Great, thanks - i'm going to be a little late, sorry - morning
> duties overran and i need a bite to eat - will be there at about 14:30
> >>>>>>
> >>>>>> jb
> >>>>>>
> >>>>>>
> >>>>>>
> >>>>>>> On 1 Jul 2021, at 11:22, luciash via TikiWiki-devel <
> [email protected]> wrote:
> >>>>>>>
> >>>>>>> See you there!
> >>>>>>>
> >>>>>>> luci
> >>>>>>>
> >>>>>>>
> >>>>>>> On 29.06.2021 20:40, Jonny Bradley via TikiWiki-devel wrote:
> >>>>>>>> Yup, 14:00 UTC of course, 15:00 for us - see you there if/when,
> no rush!
> >>>>>>>>
> >>>>>>>> https://tiki.org/live
> >>>>>>>>
> >>>>>>>> jonny
> >>>>>>>>
> >>>>>>>>
> >>>>>>>>
> >>>>>>>>> On 29 Jun 2021, at 16:48, Roberto Kirschbaum <
> [email protected]> wrote:
> >>>>>>>>>
> >>>>>>>>> Hi Jonny, thanks for the initiative!
> >>>>>>>>>
> >>>>>>>>> If that's 14:00 UTC then yes I can, maybe will arrive a few
> minutes late as I have another meeting 1 hour earlier that might go too
> long (probably won't)
> >>>>>>>>>
> >>>>>>>>> br
> >>>>>>>>> Roberto
> >>>>>>>>>
> >>>>>>>>> On Tue, Jun 29, 2021 at 9:54 AM Jonny Bradley via TikiWiki-devel
> <[email protected]> wrote:
> >>>>>>>>>> Hi all branching fans!
> >>>>>>>>>>
> >>>>>>>>>> Just a reminder that branching 23.x really has to happen next
> Monday the 5th July - how are we all doing?
> >>>>>>>>>>
> >>>>>>>>>> How about any interested parties meet on BBB sometime soon?
> >>>>>>>>>>
> >>>>>>>>>> * I suggest Thursday afternoon, 14:00 usual TRM time?
> >>>>>>>>>>
> >>>>>>>>>> Luci, Katy and i are progressing pretty well on the adminui
> project but still a day or two more to do there i think, i see commits
> continue on Andon's menu-admin/sortable.js which must be near enough to
> merge by now (right?)
> >>>>>>>>>>
> >>>>>>>>>> And i think Aris's socnets2 looks about ready, and hopefully
> still time enough for PSR-12 to make it under the wire too? I hope!
> >>>>>>>>>>
> >>>>>>>>>> I have most of this weekend set aside for last minute 23.x
> things, so could also meet then as well if anyone else is around?
> >>>>>>>>>>
> >>>>>>>>>> Getting exciting!? 😂🤓
> >>>>>>>>>>
> >>>>>>>>>> jonny
> >>>>>>>>>>
> >>>>>>>>>>
> >>>>>>>>>>
> >>>>>>>>>>
> >>>>>>>>>>> On 24 Jun 2021, at 17:50, Roberto Kirschbaum <
> [email protected]> wrote:
> >>>>>>>>>>>
> >>>>>>>>>>> Hi Andon,
> >>>>>>>>>>>
> >>>>>>>>>>> Did you see we pushed branching to July 5th? So you have quite
> a few days available if you wish to continue with your thing.
> >>>>>>>>>>>
> >>>>>>>>>>> thanks
> >>>>>>>>>>> Roberto
> >>>>>>>>>>>
> >>>>>>>>>>> On Sun, Jun 20, 2021 at 5:38 PM Andon Andonov <
> [email protected]> wrote:
> >>>>>>>>>>>> +1 for SortableJS and menu management
> >>>>>>>>>>>> It's too complicated, I won't make it in time. I withdraw my
> request and apologize.
> >>>>>>>>>>>>
> >>>>>>>>>>>> Thanks, Andon
> >>>>>>>>>>>>
> >>>>>>>>>>>> На нд, 20.06.2021 г. в 16:07 ч. Andon Andonov <
> [email protected]> написа:
> >>>>>>>>>>>>> Can we postpone branching:
> >>>>>>>>>>>>> +1 for SortableJS and menu management
> >>>>>>>>>>>>>
> >>>>>>>>>>>>> Thanks, Andon
> >>>>>>>>>>>>>
> >>>>>>>>>>>>> На пт, 18.06.2021 г. в 18:36 ч. luciash via TikiWiki-devel <
> [email protected]> написа:
> >>>>>>>>>>>>>> +1 for Wasat! Thanks for the link Jonny!
> >>>>>>>>>>>>>>
> >>>>>>>>>>>>>> luci
> >>>>>>>>>>>>>>
> >>>>>>>>>>>>>>
> >>>>>>>>>>>>>> On 09.06.2021 12:36, Jonny Bradley via TikiWiki-devel wrote:
> >>>>>>>>>>>>>>> Wasat rather appeals... and apparently:
> >>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>> comes from the Arabic phrase Wasṭ us-Samā’, meaning “the
> middle of the sky.”
> >>>>>>>>>>>>>>> according to https://www.star-facts.com/wasat/ so good
> for a non-LTS maybe?
> >>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>> jb
> >>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>> On 9 Jun 2021, at 08:00, Roberto Kirschbaum <
> [email protected]> wrote:
> >>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>> Nice catch, Luci! I didn't know about Formalhaut
> belonging to Castor...
> >>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>> "Fomalhaut has been claimed to be one of approximately 16
> stars belonging to the Castor Moving Group. This is an association of stars
> which share a common motion through space, and have been claimed to be
> physically associated. Other members of this group include Castor and Vega.
> The moving group has an estimated age of 200±100 million years and
> originated from the same location.[35] More recent work has found that
> purported members of the Castor Moving Group appear to not only have a wide
> range of ages, but their velocities are too different to have been possibly
> associated with one another in the distant past.[17] Hence, "membership" to
> this dynamical group has no bearing on the age of the Fomalhaut system.[17]"
> >>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>> So, back to square one folks?
> >>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>> R
> >>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>> On Tue, Jun 8, 2021 at 9:49 PM luciash via TikiWiki-devel
> <[email protected]> wrote:
> >>>>>>>>>>>>>>>>> Yup, here it is:
> https://sourceforge.net/p/tikiwiki/news/2014/08/tiki-130-release/
> >>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>> On 08.06.2021 22:46, luciash via TikiWiki-devel wrote:
> >>>>>>>>>>>>>>>>>> I believe we already had Fomalhaut :-o
> >>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>> luci
> >>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>> On 05.06.2021 17:05, Roberto Kirschbaum wrote:
> >>>>>>>>>>>>>>>>>>> Dear Devs,
> >>>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>>> 1) As discussed in TikiFest Branching, please let's do
> all testing possible in our community next servers in the next few days:
> >>>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>>> https://nextdoc.tiki.org
> >>>>>>>>>>>>>>>>>>> https://nextdev.tiki.org
> >>>>>>>>>>>>>>>>>>> https://nextthemes.tiki.org
> >>>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>>> 2) Let's vote for a star name for Tiki 23.x? (spoiler:
> some people already like Castor as a companion to lonely Pollux). Here are
> a few stars that we haven't used yet:
> >>>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>>> * Algol
> >>>>>>>>>>>>>>>>>>> * Bellatrix
> >>>>>>>>>>>>>>>>>>> * Canopus
> >>>>>>>>>>>>>>>>>>> * Castor
> >>>>>>>>>>>>>>>>>>> * Cervantes (this should be reserved for an LTS imho)
> >>>>>>>>>>>>>>>>>>> * Copernicus (same)
> >>>>>>>>>>>>>>>>>>> * Diadem
> >>>>>>>>>>>>>>>>>>> * Formaulhaut
> >>>>>>>>>>>>>>>>>>> * Hadar
> >>>>>>>>>>>>>>>>>>> * Libertas
> >>>>>>>>>>>>>>>>>>> * Maia
> >>>>>>>>>>>>>>>>>>> * Meridiana
> >>>>>>>>>>>>>>>>>>> * Mimosa
> >>>>>>>>>>>>>>>>>>> * Musica
> >>>>>>>>>>>>>>>>>>> * Rotanev
> >>>>>>>>>>>>>>>>>>> * Schedar (not cheddar!)
> >>>>>>>>>>>>>>>>>>> * Wasat (rhymes with...)
> >>>>>>>>>>>>>>>>>>> * Veritate
> >>>>>>>>>>>>>>>>>>> * Zosma
> >>>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>>> thanks!
> >>>>>>>>>>>>>>>>>>> Roberto
> >>>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>>> _______________________________________________
> >>>>>>>>>>>>>>>>>>> TikiWiki-devel mailing list
> >>>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>>> [email protected]
> >>>>>>>>>>>>>>>>>>>
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>> _______________________________________________
> >>>>>>>>>>>>>>>>>> TikiWiki-devel mailing list
> >>>>>>>>>>>>>>>>>>
> >>>>>>>>>>>>>>>>>> [email protected]
> >>>>>>>>>>>>>>>>>>
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>>>>>>>>>>>>>> _______________________________________________
> >>>>>>>>>>>>>>>>> TikiWiki-devel mailing list
> >>>>>>>>>>>>>>>>> [email protected]
> >>>>>>>>>>>>>>>>>
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>>>>>>>>>>>>>> _______________________________________________
> >>>>>>>>>>>>>>>>> TikiWiki-devel mailing list
> >>>>>>>>>>>>>>>>> [email protected]
> >>>>>>>>>>>>>>>>>
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>>>>>>>>>>>> _______________________________________________
> >>>>>>>>>>>>>>> TikiWiki-devel mailing list
> >>>>>>>>>>>>>>> [email protected]
> >>>>>>>>>>>>>>>
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>>>>>>>>>>>
> >>>>>>>>>>>>>> _______________________________________________
> >>>>>>>>>>>>>> TikiWiki-devel mailing list
> >>>>>>>>>>>>>> [email protected]
> >>>>>>>>>>>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>>>>>>>>>>> _______________________________________________
> >>>>>>>>>>>>>> TikiWiki-devel mailing list
> >>>>>>>>>>>>>> [email protected]
> >>>>>>>>>>>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>>>>>>>>>>> _______________________________________________
> >>>>>>>>>>>>>> TikiWiki-devel mailing list
> >>>>>>>>>>>>>> [email protected]
> >>>>>>>>>>>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>>>>>>>
> >>>>>>>>>> _______________________________________________
> >>>>>>>>>> TikiWiki-devel mailing list
> >>>>>>>>>> [email protected]
> >>>>>>>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>>>>>
> >>>>>>>> _______________________________________________
> >>>>>>>> TikiWiki-devel mailing list
> >>>>>>>> [email protected]
> >>>>>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>>>>
> >>>>>>>
> >>>>>>> _______________________________________________
> >>>>>>> TikiWiki-devel mailing list
> >>>>>>> [email protected]
> >>>>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>>>
> >>>>>>
> >>>>>>
> >>>>>> _______________________________________________
> >>>>>> TikiWiki-devel mailing list
> >>>>>> [email protected]
> >>>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>>
> >>>>>
> >>>>>
> >>>>> _______________________________________________
> >>>>> TikiWiki-devel mailing list
> >>>>> [email protected]
> >>>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>>
> >>>>
> >>>>
> >>>> _______________________________________________
> >>>> TikiWiki-devel mailing list
> >>>> [email protected]
> >>>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>>
> >>>
> >>>
> >>> _______________________________________________
> >>> TikiWiki-devel mailing list
> >>> [email protected]
> >>> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
> >>
> >
> >
> >
> > _______________________________________________
> > TikiWiki-devel mailing list
> > [email protected]
> > https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>
>
>
> _______________________________________________
> TikiWiki-devel mailing list
> [email protected]
> https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel
>

_______________________________________________
TikiWiki-devel mailing list
[email protected]
https://lists.sourceforge.net/lists/listinfo/tikiwiki-devel