On 2/1/2017 9:27 AM, Christian Boos wrote: > > I'm going to merge today on the svn trunk, in small blocks mirroring > the commits on the git branch, so please hold off committing on trunk > in the meantime, thanks! >
It's there! (completed at r15474). Enjoy ;-) You can now resume working on trunk, but please be careful when merging template changes: - obviously the template files are now Jinja2 templates, - perhaps less obviously, if your changes affect a "generic" template, you may also need to modify its legacy Genshi version in trac/templates/genshi/ The "generic" Genshi templates like layout.html, admin.html, list_of_attachments.html, etc. have all been kept in this directory, so that we can continue to support most plugins rendering their own Genshi templates and including one of those templates. We no longer have functional tests exercising them, neither do we use them in plain Trac, so only do the absolute minimal changes there. Hopefully none will be needed, until they get decommissioned for good in Trac 1.5.1. Also, yesterday I did some minor but numerous changes related to the translations in the templates, so it might very well be that I also introduced new minor errors as a result. Increased exposure will hopefully reveal them (and others!). I plan to upgrade +testing later today, and t.e.o later this week, with a 1.3.2 milestone next week if nothing big shows up. -- Christian -- You received this message because you are subscribed to the Google Groups "Trac Development" group. To unsubscribe from this group and stop receiving emails from it, send an email to trac-dev+unsubscr...@googlegroups.com. To post to this group, send email to trac-dev@googlegroups.com. Visit this group at https://groups.google.com/group/trac-dev. For more options, visit https://groups.google.com/d/optout.
