Merge branch 'master' into open

FIX: Minor code improvements
FIX: Use a setting for cooldown
2026-01-18 14:02:15 +00:00 · 2020-02-29 11:29:05 +00:00 · 2020-01-26 17:39:38 +00:00 · 2020-01-26 15:35:04 +00:00 · 2020-01-26 15:34:44 +00:00 · 2020-01-26 13:51:37 +00:00
1 changed files with 32 additions and 32 deletions
--- a/requirements.txt
+++ b/requirements.txt
@@ -1,41 +1,41 @@
-beautifulsoup4==4.8.2
+beautifulsoup4==4.6.0
-contextlib2==0.6.0.post1
+contextlib2==0.5.5
-diff-match-patch==20181111
+diff-match-patch==20121119
 dj-database-url==0.5.0
 dj-static==0.0.6
-Django==3.0.3
+Django==2.0.13
-django-filter==2.2.0
+django-filter==2.0.0
-django-widget-tweaks==1.4.5
+django-widget-tweaks==1.4.3
-django-debug-toolbar==2.2
+django-debug-toolbar==1.9.1
-django-ical==1.7.0
+django-ical==1.4
-django-recaptcha==2.0.6
+django-recaptcha==1.4.0
-django-registration-redux==2.7
+django-registration-redux==2.4
-django-reversion==3.0.7
+django-reversion==2.0.13
 django-toolbelt==0.0.1
-premailer==3.6.1
+premailer==3.2.0
 git+git://github.com/jazzband/django-widget-tweaks.git@1.4.2
-gunicorn==20.0.4
+gunicorn==19.8.1
-icalendar==4.0.4
+icalendar==4.0.1
-lxml==4.5.0
+lxml==4.2.1
-Markdown==3.2.1
+Markdown==2.6.11
-Pillow==7.0.0
+Pillow==6.2.0
-psycopg2==2.8.4
+psycopg2==2.7.4
-Pygments==2.5.2
+Pygments==2.2.0
 PyPDF2==1.26.0
-python-dateutil==2.8.1
+python-dateutil==2.7.3
-pytz==2019.3
+pytz==2018.4
-raven==6.10.0
+raven==6.8.0
-reportlab==3.5.34
+reportlab==3.4.0
-selenium==3.141.0
+selenium==3.12.0
-simplejson==3.17.0
+simplejson==3.15.0
-six==1.14.0
+six==1.11.0
-sqlparse==0.3.0
+sqlparse==0.2.4
 static3==0.7.0
 svg2rlg==0.3
 yolk==0.4.3
-whitenoise==5.0.1
+whitenoise==4.1.2
-z3c.rml==3.9.1
+z3c.rml==3.5.0
-zope.event==4.4
+zope.event==4.3.0
-zope.interface==4.7.1
+zope.interface==4.5.0
-zope.schema==4.9.3
+zope.schema==4.5.0
 pypom==2.2.0
Author	SHA1	Message	Date
Arona Jones	3868cb39a2	Merge branch 'master' into open	2020-02-29 11:29:05 +00:00
FreneticScribbler	196d3d3e1d	FIX: Minor code improvements	2020-01-26 17:39:38 +00:00
FreneticScribbler	18f771d508	FIX: Use a setting for cooldown	2020-01-26 15:35:04 +00:00
FreneticScribbler	3157741860	CHORE: Squash migrations	2020-01-26 15:34:44 +00:00
FreneticScribbler	7aad1b2983	FIX: Wrong perms syntax for history pages	2020-01-26 13:51:37 +00:00
FreneticScribbler	8ad2a899f9	FIX: Remove event modal history deadlink for basic users Also removes some links on the RIGS homepage that will deadlink for them	2020-01-26 13:51:36 +00:00
FreneticScribbler	f19286efb0	FEAT: Add a fifteen min cooldown between emails to admins Probably not the right way to go about it...but it does work! TODO: How to handle cooldown-emailing shared mailbox addresses?	2020-01-25 02:15:48 +00:00
FreneticScribbler	c049874e5f	FIX: Whoops, undo accidental whitespace change	2020-01-24 00:58:04 +00:00
FreneticScribbler	806b8a3f00	FEAT: Add admin email notif when an account is activated and awaiting approval No async or time-since shenanigans yet!	2020-01-24 00:56:44 +00:00
FreneticScribbler	0da392563c	FIX: Remove mitigation for #264 Someone quietly fixed it, it appears	2020-01-23 16:45:02 +00:00
FreneticScribbler	4dd89c0b73	FIX: Re-prevent basic seeing reversion This is to prevent financials/client data leaking when changed. Hopefully can show them a filtered version in future.	2020-01-23 16:29:10 +00:00
FreneticScribbler	20a6cca9d3	FIX: Use has_oembed decorator for events	2020-01-23 16:20:46 +00:00
FreneticScribbler	b74dfac33d	Merge remote-tracking branch 'origin/master' into open	2020-01-23 16:11:11 +00:00
FreneticScribbler	0ee393725e	FIX: Require login on events and event embeds again Little too far to the open side there Arona... Whooooooops!	2020-01-11 20:31:05 +00:00
FreneticScribbler	ea12bfa607	Prevent unapproved users logging in through embeds Test suite doing its job...!	2020-01-11 19:25:50 +00:00
FreneticScribbler	4d722fd5cb	Superusers bypass approval check This should fix the remainder of the tests	2020-01-11 19:16:42 +00:00
FreneticScribbler	b7d1d86486	Add testing of approval mechanism This fixes the other functional tests failing because the user cannot login without being approved.	2020-01-11 19:08:25 +00:00
FreneticScribbler	7458b56138	FIX: Legacy Profiles are now auto-approved correctly	2020-01-11 18:33:11 +00:00
FreneticScribbler	d06273c215	CHORE: Fix CI	2020-01-11 18:26:35 +00:00
FreneticScribbler	479977ef58	CHANGE: New user signups now require admin approval Given that I intend to reveal much more data to new users this seems necessary...	2020-01-11 18:18:08 +00:00
FreneticScribbler	68af9c8779	Merge remote-tracking branch 'origin/master' into open	2020-01-10 14:40:47 +00:00
FreneticScribbler	30b323cd7b	CHANGE: First pass at opening up RIGS #233 Whilst it makes it something of a misnomer, the intent is to make the 'view_event' perm a permission to view event details like client/price. I don't see the point in giving everyone 'view_event' and adding a new 'view_event_detail'...Open to arguments the other way.	2019-11-27 21:14:02 +00:00