Arona Jones 5c5ccd244d Merge branch 'master' into python_deps_2020 ...

# Conflicts:
#	PyRIGS/settings.py
#	RIGS/templates/RIGS/event_embed.html
#	RIGS/views.py

2020-03-06 20:01:26 +00:00

..

__init__.py

Initial commit

2014-10-23 21:48:04 +01:00

0001_initial.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0002_modelcomment_person.py

Add on_delete=models.CASCADE to old migrations

2018-03-24 23:58:54 +00:00

0003_auto_20141031_0219.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0004_organisation.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0005_auto_20141104_1619.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0006_auto_20141105_1553.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0007_vatrate.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0008_auto_20141105_1908.py

Add on_delete=models.CASCADE to old migrations

2018-03-24 23:58:54 +00:00

0009_auto_20141105_1916.py

Add on_delete=models.CASCADE to old migrations

2018-03-24 23:58:54 +00:00

0010_auto_20141105_2219.py

Add on_delete=models.CASCADE to old migrations

2018-03-24 23:58:54 +00:00

0011_venue_address.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0012_auto_20141106_0253.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0013_auto_20141202_0041.py

Add on_delete=models.CASCADE to old migrations

2018-03-24 23:58:54 +00:00

0014_auto_20141208_0220.py

Add on_delete=models.CASCADE to old migrations

2018-03-24 23:58:54 +00:00

0015_auto_20141208_0233.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0016_auto_20150127_1905.py

Add on_delete=models.CASCADE to old migrations

2018-03-24 23:58:54 +00:00

0017_auto_20150129_2041.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0018_auto_20150130_0016.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0019_auto_20150131_1919.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0020_auto_20150303_0243.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0021_auto_20150420_1155.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0022_auto_20150424_2104.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0023_auto_20150529_0048.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0024_auto_20160229_2042.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0025_auto_20160331_1302.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0025_eventauthorisation.py

Add on_delete=models.CASCADE to old migrations

2018-03-24 23:58:54 +00:00

0026_auto_20170510_1846.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0026_remove_eventauthorisation_created_at.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0027_eventauthorisation_event_singular.py

Add on_delete=models.CASCADE to old migrations

2018-03-24 23:58:54 +00:00

0029_eventauthorisation_sent_by.py

Add on_delete=models.CASCADE to old migrations

2018-03-24 23:58:54 +00:00

0030_auth_request_sending.py

Add on_delete=models.CASCADE to old migrations

2018-03-24 23:58:54 +00:00

0031_merge_20170512_2102.py

Run through 2-to-3 converter. This is not in a working state

2017-09-04 23:19:22 +01:00

0032_auto_20170904_2355.py

Add missing migration

2017-09-04 23:59:53 +01:00

0033_auto_20180325_0016.py

Migrate profile to have longer last_name field (Django 2.0 updated AbstractUser model)

2018-03-25 00:20:51 +00:00

0034_event_risk_assessment_edit_url.py

Add API hook for logging risk assessment completion (#341)

2019-07-28 23:08:18 +01:00

0035_auto_20191124_1319.py

Combine client authorisation information in rig detail (#373)

2019-11-26 17:26:32 +00:00

0036_profile_is_approved.py

Add authorisation process for sign ups and allow access to EventDetail for basic users (#399)

2020-02-29 11:34:50 +00:00

0037_approve_legacy.py

Add authorisation process for sign ups and allow access to EventDetail for basic users (#399)

2020-02-29 11:34:50 +00:00

0038_auto_20200306_2000.py

Merge branch 'master' into python_deps_2020

2020-03-06 20:01:26 +00:00