Merge branch 'master' into 'status-plots'
# Conflicts: # atdb/taskdatabase/templates/taskdatabase/graphs/status_graph.html # atdb/taskdatabase/templates/taskdatabase/graphs/status_graph_input_form.html # atdb/taskdatabase/templates/taskdatabase/index.html
No related branches found
No related tags found
Checking pipeline status
Showing
- atdb/atdb/settings/dev.py 2 additions, 2 deletionsatdb/atdb/settings/dev.py
- atdb/atdb/static/admin/css/base.css 251 additions, 147 deletionsatdb/atdb/static/admin/css/base.css
- atdb/atdb/static/admin/css/changelists.css 72 additions, 85 deletionsatdb/atdb/static/admin/css/changelists.css
- atdb/atdb/static/admin/css/dashboard.css 3 additions, 0 deletionsatdb/atdb/static/admin/css/dashboard.css
- atdb/atdb/static/admin/css/forms.css 62 additions, 55 deletionsatdb/atdb/static/admin/css/forms.css
- atdb/atdb/static/admin/css/login.css 2 additions, 1 deletionatdb/atdb/static/admin/css/login.css
- atdb/atdb/static/admin/css/responsive.css 52 additions, 85 deletionsatdb/atdb/static/admin/css/responsive.css
- atdb/atdb/static/admin/css/responsive_rtl.css 5 additions, 1 deletionatdb/atdb/static/admin/css/responsive_rtl.css
- atdb/atdb/static/admin/css/rtl.css 93 additions, 18 deletionsatdb/atdb/static/admin/css/rtl.css
- atdb/atdb/static/admin/css/widgets.css 82 additions, 53 deletionsatdb/atdb/static/admin/css/widgets.css
- atdb/atdb/static/admin/js/SelectBox.js 4 additions, 0 deletionsatdb/atdb/static/admin/js/SelectBox.js
- atdb/atdb/static/admin/js/SelectFilter2.js 90 additions, 40 deletionsatdb/atdb/static/admin/js/SelectFilter2.js
- atdb/atdb/static/admin/js/actions.js 39 additions, 5 deletionsatdb/atdb/static/admin/js/actions.js
- atdb/atdb/static/admin/js/admin/DateTimeShortcuts.js 3 additions, 10 deletionsatdb/atdb/static/admin/js/admin/DateTimeShortcuts.js
- atdb/atdb/static/admin/js/admin/RelatedObjectLookups.js 92 additions, 7 deletionsatdb/atdb/static/admin/js/admin/RelatedObjectLookups.js
- atdb/atdb/static/admin/js/autocomplete.js 17 additions, 25 deletionsatdb/atdb/static/admin/js/autocomplete.js
- atdb/atdb/static/admin/js/calendar.js 19 additions, 1 deletionatdb/atdb/static/admin/js/calendar.js
- atdb/atdb/static/admin/js/core.js 17 additions, 3 deletionsatdb/atdb/static/admin/js/core.js
- atdb/atdb/static/admin/js/inlines.js 22 additions, 11 deletionsatdb/atdb/static/admin/js/inlines.js
- atdb/atdb/static/admin/js/prepopulate_init.js 5 additions, 1 deletionatdb/atdb/static/admin/js/prepopulate_init.js
Loading
Please register or sign in to comment