Arona Jones 77fa2cca67 Merge branch 'master' into markdown ...

# Conflicts:
#	RIGS/static/scss/screen.scss
#	RIGS/templates/RIGS/event_detail.html
#	RIGS/templates/RIGS/event_form.html
#	RIGS/templates/RIGS/event_table.html
#	RIGS/templates/RIGS/item_row.html
#	RIGS/templates/RIGS/item_table.html
#	RIGS/templates/RIGS/organisation_detail.html
#	RIGS/templates/RIGS/organisation_form.html
#	RIGS/templates/RIGS/person_detail.html
#	RIGS/templates/RIGS/person_form.html
#	RIGS/templates/RIGS/rigboard.html
#	RIGS/templates/RIGS/venue_detail.html
#	RIGS/templates/RIGS/venue_form.html
#	RIGS/templates/event_print.xml
#	RIGS/templates/event_print_page.xml
#	RIGS/templates/item_modal.html
#	RIGS/tests/test_unit.py
#	assets/templates/asset_create.html
#	assets/templates/asset_update.html
#	assets/templates/partials/asset_detail_form.html
#	requirements.txt
#	templates/base.html

2021-12-22 11:41:18 +00:00

..

partials

Fix up the copy button stuff

2021-12-13 12:07:42 +00:00

registration

Revamp registration form

2021-09-13 16:13:47 +01:00

400.html

Update Python Dependencies (#404)

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

401.html

Update Python Dependencies (#404)

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

403.html

Update Python Dependencies (#404)

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

404.html

Update Python Dependencies (#404)

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

500.html

Update Python Dependencies (#404)

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

admin_associate_merge.html

Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... (#412)

2021-01-23 22:22:37 +00:00

analytics.html

Add conditional to analytics code.

2015-04-01 17:40:28 +01:00

base_ajax_nomodal.html

Redesigned homepage

2015-05-23 23:03:41 +01:00

base_ajax.html

FIX: Mark safe page title in modal header

2021-10-09 14:21:19 +01:00

base_client_email.html

More optimisation and cleanup (#420)

2021-03-02 11:29:57 +00:00

base_client.html

Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... (#412)

2021-01-23 22:22:37 +00:00

base_embed.html

More optimisation and cleanup (#420)

2021-03-02 11:29:57 +00:00

base.html

Merge branch 'master' into markdown

2021-12-22 11:41:18 +00:00

bootstrap.html

Toolchain/Dependency Upgrade (#418)

2021-01-31 04:05:33 +00:00

closemodal.html

Set up authentication system

2014-10-23 22:13:03 +01:00

form_errors.html

Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... (#412)

2021-01-23 22:22:37 +00:00

generic_detail.html

Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... (#412)

2021-01-23 22:22:37 +00:00

generic_form.html

Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... (#412)

2021-01-23 22:22:37 +00:00

generic_list.html

Toolchain/Dependency Upgrade (#418)

2021-01-31 04:05:33 +00:00

index.html

More optimisation and cleanup (#420)

2021-03-02 11:29:57 +00:00

login_redirect.html

Update Python Dependencies (#404)

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

pagination.html

Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... (#412)

2021-01-23 22:22:37 +00:00

robots.txt

More optimisation and cleanup (#420)

2021-03-02 11:29:57 +00:00

search_help.html

Refactor buildsystem to NPM/Gulp, port to BS4 & rewrite RIGS tests accordingly... (#412)

2021-01-23 22:22:37 +00:00