Changeset 22eb5de in OpenWorkouts-current for ow/templates/dashboard.pt


Ignore:
Timestamp:
Jan 29, 2019, 12:58:08 PM (5 years ago)
Author:
Segundo Fdez <segun.2@…>
Branches:
current, feature/docs, master
Children:
594fbe8
Parents:
3e48af6 (diff), ed7e9d7 (diff)
Note: this is a merge changeset, the changes displayed below correspond to the merge itself.
Use the (diff) links above to see all the changes relative to each parent.
Message:

Merge branch 'master' into feature/ui

# Conflicts:
# ow/static/js/ow.js

File:
1 edited

Legend:

Unmodified
Added
Removed

  • ow/templates/dashboard.pt

    r3e48af6 r22eb5de  
    204204    <script type="text/javascript">
    205205     var week_chart = owjs.week_chart({
    206          chart_selector: 'div.js-week-stats',
     206         chart_selector: 'div.js-week-stats svg',
    207207         url: "${request.resource_url(context, 'week')}",
    208208         current_day_name: "${current_day_name}"
Note: See TracChangeset for help on using the changeset viewer.