Changes between Version 32 and Version 33 of TracDev/Proposals/Jinja

Timestamp:

Jan 10, 2017, 1:32:19 AM (7 years ago)

Author:

Christian Boos

Comment:

update branch name and status

TracDev/Proposals/Jinja

@@ -15 +15 @@
 There is an experimental branch which supports this proposal: [source:cboos.git@jinja2]. A mirror is available in [https://github.com/cboos/trac.git github].
 
-Automatic builds for the `jinja2` branch: [[Image(https://travis-ci.org/cboos/trac.svg?branch=jinja2,link=https://travis-ci.org/cboos/trac,valign=bottom)]] on Travis, 
-[[Image(https://ci.appveyor.com/api/projects/status/kqgv4awct01hsl7t/branch/jinja2?svg=true,link=https://ci.appveyor.com/project/cboos/trac/branch/jinja2,valign=bottom)]] on AppVeyor. //(Current build failures are unrelated to jinja2; they are due to the use of a recent pytz package together with an outdated "trunk" basis for the branch)//
+Automatic builds for the `jinja2-trunk-r15341` branch:
+ - [[Image(https://travis-ci.org/cboos/trac.svg?branch=jinja2-trunk-r15341,link=https://travis-ci.org/cboos/trac,valign=bottom)]] on Travis,
+ - [[Image(https://ci.appveyor.com/api/projects/status/kqgv4awct01hsl7t/branch/jinja2-trunk-r15341?svg=true,link=https://ci.appveyor.com/project/cboos/trac/branch/jinja2,valign=bottom)]] on AppVeyor. 
 
 [=#Status Status] of the branch (2016-07-30):
- - TODO: rebase on current trunk
+ - TODO: merge on trunk (#12639)
+ - DONE: rebase on current trunk
  - TODO: verify what happens with templates in plugins (e.g. SpamFilter plugin)
  - ported all Genshi templates from trac/tracopt (10703 Jinja2 lines corresponding to 8059 Genshi lines)