FreneticScribbler 70995a0d0b Merge branch 'master' into bs4 ...

# Conflicts:
#	assets/models.py
#	assets/templates/asset_update.html
#	assets/templates/partials/asset_buttons.html
#	assets/templates/partials/asset_list_table_body.html
#	assets/views.py
#	templates/base_assets.html

2020-04-15 16:28:44 +01:00

..

partials

Merge branch 'master' into bs4

2020-04-15 16:28:44 +01:00

asset_audit_list.html

Merge branch 'master' into bs4

2020-04-15 16:28:44 +01:00

asset_audit.html

Create initial asset audit framework (#403)

2020-04-14 21:11:09 +01:00

asset_detail.html

Merge branch 'master' into bs4

2020-04-15 16:28:44 +01:00

asset_embed.html

Update Python Dependencies (#404)

2020-03-07 16:21:48 +00:00

asset_form.html

Use the right autocompleter.js...

2020-04-12 18:47:09 +01:00

asset_list.html

Versioning template improvements

2020-04-06 03:15:43 +01:00

asset_update_search_results.html

Create the Asset Database (#363)

2019-12-04 23:14:27 +00:00

base_assets.html

Merge branch 'master' into bs4

2020-04-15 16:28:44 +01:00

cable_type_form.html

Add 'CableTypes' (#406)

2020-04-13 15:54:43 +01:00

cable_type_list.html

Add 'CableTypes' (#406)

2020-04-13 15:54:43 +01:00

supplier_detail.html

Asset list table improvements

2020-04-06 02:43:20 +01:00

supplier_list.html

Improvements to generic lists

2020-03-22 12:47:32 +00:00

supplier_update.html

Add the usual set of fields to supplier and update form accordingly

2020-03-17 20:07:14 +00:00