commit/galaxy-central: 2 new changesets
2 new commits in galaxy-central: https://bitbucket.org/galaxy/galaxy-central/commits/4569b8f31c88/ Changeset: 4569b8f31c88 Branch: next-stable User: jmchilton Date: 2014-12-01 16:26:20+00:00 Summary: Merge stable. Affected #: 9 files diff -r 3a30a79840d4e5e4896910dcf2f161a38d7977b0 -r 4569b8f31c883e6f38f6b04c665f93cb2af534ee .hgtags --- a/.hgtags +++ b/.hgtags @@ -20,4 +20,4 @@ ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 -acc8d1e2bc88530aa8d8651cf5f88649f6769304 latest_2014.10.06 +acb2548443ae42d39ef200d035ccc0481d6b930c latest_2014.10.06 diff -r 3a30a79840d4e5e4896910dcf2f161a38d7977b0 -r 4569b8f31c883e6f38f6b04c665f93cb2af534ee templates/display_base.mako --- a/templates/display_base.mako +++ b/templates/display_base.mako @@ -214,7 +214,7 @@ %else: Private ${get_class_display_name( item.__class__ )} %endif - | ${get_item_name( item )} + | ${get_item_name( item ) | h} <div style="float: right"> ${self.render_item_links( item )} diff -r 3a30a79840d4e5e4896910dcf2f161a38d7977b0 -r 4569b8f31c883e6f38f6b04c665f93cb2af534ee templates/embed_base.mako --- a/templates/embed_base.mako +++ b/templates/embed_base.mako @@ -49,7 +49,7 @@ <div style="float: right;"> ${self.render_item_links( item )} </div> - <h4><a class="toggle-embed" href="${display_href}" title="Show or hide ${item_display_name} content">Galaxy ${get_class_display_name( item.__class__ )} | ${get_item_name( item )}</a></h4> + <h4><a class="toggle-embed" href="${display_href}" title="Show or hide ${item_display_name} content">Galaxy ${get_class_display_name( item.__class__ )} | ${get_item_name( item ) | h}</a></h4> %if hasattr( item, "annotation") and item.annotation: <div class="annotation">${item.annotation}</div> %endif diff -r 3a30a79840d4e5e4896910dcf2f161a38d7977b0 -r 4569b8f31c883e6f38f6b04c665f93cb2af534ee templates/export_base.mako --- a/templates/export_base.mako +++ b/templates/export_base.mako @@ -42,7 +42,7 @@ </%def><%def name="title()"> - Export ${get_class_display_name( item.__class__ )} '${get_item_name( item )}' + Export ${get_class_display_name( item.__class__ )} '${get_item_name( item ) | h}' </%def><%def name="stylesheets()"> @@ -108,7 +108,7 @@ <% item_name = get_item_name(item) %> - <h2>Download or Export ${self.item_class_name} '${item_name}'</h2> + <h2>Download or Export ${self.item_class_name} '${item_name | h}'</h2> ${self.render_download_to_file(item)} diff -r 3a30a79840d4e5e4896910dcf2f161a38d7977b0 -r 4569b8f31c883e6f38f6b04c665f93cb2af534ee templates/ind_share_base.mako --- a/templates/ind_share_base.mako +++ b/templates/ind_share_base.mako @@ -83,7 +83,7 @@ %><div class="toolForm"> - <div class="toolFormTitle">Share ${item_class_name} '${item_name}' with Another User</div> + <div class="toolFormTitle">Share ${item_class_name} '${item_name | h}' with Another User</div><div class="toolFormBody"><form action="${h.url_for(controller=item_controller, action='share', id=trans.security.encode_id( item.id ) )}" method="POST"><div class="form-row"> diff -r 3a30a79840d4e5e4896910dcf2f161a38d7977b0 -r 4569b8f31c883e6f38f6b04c665f93cb2af534ee templates/sharing_base.mako --- a/templates/sharing_base.mako +++ b/templates/sharing_base.mako @@ -35,7 +35,7 @@ </%def><%def name="title()"> - Sharing and Publishing ${get_class_display_name( item.__class__ )} '${get_item_name( item )}' + Sharing and Publishing ${get_class_display_name( item.__class__ )} '${get_item_name( item ) | h}' </%def><%def name="javascripts()"> @@ -122,7 +122,7 @@ item_name = get_item_name(item) %> - <h2>Share or Publish ${item_class_name} '${item_name}'</h2> + <h2>Share or Publish ${item_class_name} '${item_name | h}'</h2> ## Require that user have a public username before sharing or publishing an item. %if trans.get_user().username is None or trans.get_user().username is "": diff -r 3a30a79840d4e5e4896910dcf2f161a38d7977b0 -r 4569b8f31c883e6f38f6b04c665f93cb2af534ee templates/webapps/galaxy/history/embed.mako --- a/templates/webapps/galaxy/history/embed.mako +++ b/templates/webapps/galaxy/history/embed.mako @@ -19,7 +19,7 @@ </div><h4><a class="toggle-embed" href="${display_href}" title="Show or hide history contents"> - Galaxy History | ${get_item_name( item )} + Galaxy History | ${get_item_name( item ) | h} </a></h4> %if hasattr( item, "annotation") and item.annotation: diff -r 3a30a79840d4e5e4896910dcf2f161a38d7977b0 -r 4569b8f31c883e6f38f6b04c665f93cb2af534ee templates/webapps/galaxy/mobile/history/list.mako --- a/templates/webapps/galaxy/mobile/history/list.mako +++ b/templates/webapps/galaxy/mobile/history/list.mako @@ -20,7 +20,7 @@ <li><a href="${h.url_for(controller='mobile', action="history_detail", id=history.id )}"> - ${history.name} + ${history.name | h} <div class="secondary">${h.date.distance_of_time_in_words( history.update_time, h.date.datetime.utcnow() )} ago</div> https://bitbucket.org/galaxy/galaxy-central/commits/d094b6d5953c/ Changeset: d094b6d5953c User: jmchilton Date: 2014-12-01 16:26:58+00:00 Summary: Merge next-stable. Affected #: 9 files diff -r 7b208a4b38f934cdea8f4f331f2721adcc7c1166 -r d094b6d5953c1379a69050d4cadef03c55413f06 .hgtags --- a/.hgtags +++ b/.hgtags @@ -20,4 +20,4 @@ ca45b78adb4152fc6e7395514d46eba6b7d0b838 release_2014.08.11 548ab24667d6206780237bd807f7d857a484c461 latest_2014.08.11 2092948937ac30ef82f71463a235c66d34987088 release_2014.10.06 -acc8d1e2bc88530aa8d8651cf5f88649f6769304 latest_2014.10.06 +acb2548443ae42d39ef200d035ccc0481d6b930c latest_2014.10.06 diff -r 7b208a4b38f934cdea8f4f331f2721adcc7c1166 -r d094b6d5953c1379a69050d4cadef03c55413f06 templates/display_base.mako --- a/templates/display_base.mako +++ b/templates/display_base.mako @@ -214,7 +214,7 @@ %else: Private ${get_class_display_name( item.__class__ )} %endif - | ${get_item_name( item )} + | ${get_item_name( item ) | h} <div style="float: right"> ${self.render_item_links( item )} diff -r 7b208a4b38f934cdea8f4f331f2721adcc7c1166 -r d094b6d5953c1379a69050d4cadef03c55413f06 templates/embed_base.mako --- a/templates/embed_base.mako +++ b/templates/embed_base.mako @@ -49,7 +49,7 @@ <div style="float: right;"> ${self.render_item_links( item )} </div> - <h4><a class="toggle-embed" href="${display_href}" title="Show or hide ${item_display_name} content">Galaxy ${get_class_display_name( item.__class__ )} | ${get_item_name( item )}</a></h4> + <h4><a class="toggle-embed" href="${display_href}" title="Show or hide ${item_display_name} content">Galaxy ${get_class_display_name( item.__class__ )} | ${get_item_name( item ) | h}</a></h4> %if hasattr( item, "annotation") and item.annotation: <div class="annotation">${item.annotation}</div> %endif diff -r 7b208a4b38f934cdea8f4f331f2721adcc7c1166 -r d094b6d5953c1379a69050d4cadef03c55413f06 templates/export_base.mako --- a/templates/export_base.mako +++ b/templates/export_base.mako @@ -42,7 +42,7 @@ </%def><%def name="title()"> - Export ${get_class_display_name( item.__class__ )} '${get_item_name( item )}' + Export ${get_class_display_name( item.__class__ )} '${get_item_name( item ) | h}' </%def><%def name="stylesheets()"> @@ -108,7 +108,7 @@ <% item_name = get_item_name(item) %> - <h2>Download or Export ${self.item_class_name} '${item_name}'</h2> + <h2>Download or Export ${self.item_class_name} '${item_name | h}'</h2> ${self.render_download_to_file(item)} diff -r 7b208a4b38f934cdea8f4f331f2721adcc7c1166 -r d094b6d5953c1379a69050d4cadef03c55413f06 templates/ind_share_base.mako --- a/templates/ind_share_base.mako +++ b/templates/ind_share_base.mako @@ -83,7 +83,7 @@ %><div class="toolForm"> - <div class="toolFormTitle">Share ${item_class_name} '${item_name}' with Another User</div> + <div class="toolFormTitle">Share ${item_class_name} '${item_name | h}' with Another User</div><div class="toolFormBody"><form action="${h.url_for(controller=item_controller, action='share', id=trans.security.encode_id( item.id ) )}" method="POST"><div class="form-row"> diff -r 7b208a4b38f934cdea8f4f331f2721adcc7c1166 -r d094b6d5953c1379a69050d4cadef03c55413f06 templates/sharing_base.mako --- a/templates/sharing_base.mako +++ b/templates/sharing_base.mako @@ -35,7 +35,7 @@ </%def><%def name="title()"> - Sharing and Publishing ${get_class_display_name( item.__class__ )} '${get_item_name( item )}' + Sharing and Publishing ${get_class_display_name( item.__class__ )} '${get_item_name( item ) | h}' </%def><%def name="javascripts()"> @@ -122,7 +122,7 @@ item_name = get_item_name(item) %> - <h2>Share or Publish ${item_class_name} '${item_name}'</h2> + <h2>Share or Publish ${item_class_name} '${item_name | h}'</h2> ## Require that user have a public username before sharing or publishing an item. %if trans.get_user().username is None or trans.get_user().username is "": diff -r 7b208a4b38f934cdea8f4f331f2721adcc7c1166 -r d094b6d5953c1379a69050d4cadef03c55413f06 templates/webapps/galaxy/history/embed.mako --- a/templates/webapps/galaxy/history/embed.mako +++ b/templates/webapps/galaxy/history/embed.mako @@ -19,7 +19,7 @@ </div><h4><a class="toggle-embed" href="${display_href}" title="Show or hide history contents"> - Galaxy History | ${get_item_name( item )} + Galaxy History | ${get_item_name( item ) | h} </a></h4> %if hasattr( item, "annotation") and item.annotation: diff -r 7b208a4b38f934cdea8f4f331f2721adcc7c1166 -r d094b6d5953c1379a69050d4cadef03c55413f06 templates/webapps/galaxy/mobile/history/list.mako --- a/templates/webapps/galaxy/mobile/history/list.mako +++ b/templates/webapps/galaxy/mobile/history/list.mako @@ -20,7 +20,7 @@ <li><a href="${h.url_for(controller='mobile', action="history_detail", id=history.id )}"> - ${history.name} + ${history.name | h} <div class="secondary">${h.date.distance_of_time_in_words( history.update_time, h.date.datetime.utcnow() )} ago</div> Repository URL: https://bitbucket.org/galaxy/galaxy-central/ -- This is a commit notification from bitbucket.org. You are receiving this because you have the service enabled, addressing the recipient of this email.
participants (1)
-
commits-noreply＠bitbucket.org