David Taylor
7a4f5ba8bf
Merge pull request #217 from nottinghamtec/python-deps
...
[WIP] Update Python dependencies
2017-05-12 16:54:55 +01:00
David Taylor
16a993123b
Merge branch 'master' into python-deps
2017-05-12 16:49:14 +01:00
David Taylor
e547e3e858
Delete unused wercker config
2017-05-10 23:54:23 +01:00
David Taylor
ea26823fec
Add dependency badge to README
...
Add dependency badge to README
2017-05-10 23:45:54 +01:00
David Taylor
1f4e53ad27
Add dependency badge to README
2017-05-10 23:40:48 +01:00
David Taylor
374c31e8b4
Fix date/time/datetime field types
2017-05-10 23:03:35 +01:00
David Taylor
0d726b2b60
Fix paperwork printing
2017-05-10 20:25:41 +01:00
David Taylor
38a8ac1eb4
Add failing tests for event paperwork printing
2017-05-10 20:25:14 +01:00
David Taylor
872e5e72f3
Update the requirements.txt file, always a useful thing to do
2017-05-10 20:11:12 +01:00
David Taylor
d916c1ca19
Update all the things, and fix some upgrade issues
2017-05-10 20:05:36 +01:00
David Taylor
9b1cc965c7
Update to Django 1.10
2017-05-10 18:41:17 +01:00
David Taylor
83028418fe
Fix deprecation warnings for django 1.10
2017-05-10 18:30:17 +01:00
David Taylor
7f680dcffb
Fix activity feed
2017-05-10 18:06:17 +01:00
David Taylor
e573088c5e
Fix some issues caused by changes made over the last year
2017-05-10 17:51:55 +01:00
David Taylor
7ac9eef7a2
Merge master into python-deps
...
# Conflicts:
# PyRIGS/settings.py
# RIGS/admin.py
# RIGS/models.py
# RIGS/test_functional.py
# RIGS/urls.py
# requirements.txt
# wercker.yml
2017-05-10 17:32:21 +01:00
David Taylor
286e4314f5
Require users to have nottinghamtec.co.uk address before allowing them to send messages to clients
2017-05-10 15:39:13 +01:00
Tom Price
6b05938953
Set authorisation button text to be more verbose
2017-05-09 19:21:35 +01:00
Tom Price
602ba1d051
Fix order of importing bootstrap variables.
2017-05-09 18:48:03 +01:00
Tom Price
1710c3f01f
Send HTML confirmation emails.
...
Also tidy up the PDF and some of the source.
2017-05-09 18:43:27 +01:00
Tom Price
f57ac3acb1
Add sending of html email for the request
2017-05-09 18:35:29 +01:00
Tom Price
331dab20f7
Add basic tracking of when an event authorisation request was sent.
...
Designed and requested by Ross because he can't remember if he's push a button...
2017-04-19 18:14:36 +01:00
Tom Price
d9076a4f5f
Quantize event totals to prevent issues with mixed precision on client authorisation form.
2017-04-19 15:27:12 +01:00
Tom Price
56d4e438b6
Fix test missing EventAuthorisation.sent_by
2017-04-11 16:50:49 +01:00
Tom Price
430862b24d
Add tracking of who sent the link
2017-04-11 15:52:38 +01:00
Tom Price
e12367bde7
Few tweaks to printed documents following a conversation with Marilyn from treasury
2017-04-11 14:32:06 +01:00
Tom Price
c0f4884242
Add missing PO field.
...
Noticed in testing, that could have gone badly.
2017-04-11 14:10:00 +01:00
Tom Price
36638e4df6
Add some more disclaimers explaining things better to internal clients.
2017-04-11 14:02:58 +01:00
Tom Price
a0440e1587
Add useful email addresses for reference.
2017-04-11 13:48:51 +01:00
Tom Price
6e78f16c33
Add changes suggested by DT
2017-04-11 11:45:08 +01:00
Tom Price
82b6f1cbf8
Fix string formatting issue.
...
I used python 3 syntax, we aren't yet using python 3...
2017-04-10 23:43:42 +01:00
Tom Price
5be3842aea
Fix test client login because we are still using Django 1.8
2017-04-10 23:28:00 +01:00
Tom Price
067e03b757
Remove Event.purchase_order in favour of a simple EventAuthorisation object.
2017-04-10 23:16:50 +01:00
Tom Price
391d9ef28f
Update PDF templates and enable sending of PDF via email.
...
PDFs now state QUOTE, INVOICE or RECEIPT.
Single copy and all but INVOICE includes terms of hire.
2017-04-10 22:45:27 +01:00
Tom Price
5d17d642ec
Update templates to include the new authorisation fields
2017-04-10 21:43:18 +01:00
Tom Price
22119a3d08
Add test for sending authorisation email to client
2017-04-10 20:50:28 +01:00
Tom Price
306c11bb2f
Add tooltip JavaScript
2017-04-10 20:47:19 +01:00
Tom Price
3fa9795cde
Change mic name to use the full name rather than the display name on RIGS
2017-04-10 20:40:51 +01:00
Tom Price
7fd0c50146
Add sending of emails to clients.
...
Add email sending methods.
Add TEC side sending of emails.
2017-04-10 20:39:19 +01:00
Tom Price
97b11eabbd
Add test for sending emails.
...
Add backup email if there isn't an MIC
2017-04-10 19:28:35 +01:00
Tom Price
3b2aa02ae5
Add success notification emails.
...
Enable RevisionMixin for EventAuthorisation.
Add signal receivers for RIGS.
Expand RIGS into an explicitly defined app to support signals.
2017-04-10 19:16:45 +01:00
Tom Price
cf11e8235f
Add ID tagging to auth form to autoscroll on error
2017-04-10 18:15:47 +01:00
Tom Price
1670b190c2
Add tests for the client side authorisation
2017-04-10 18:11:49 +01:00
Tom Price
e65e97b1a3
Client facing authorisation procedures.
...
Add forms, views, templates and URLs.
Remove created at in favour of the built in versioning as that's much more accurate.
Switch to a OneToOneField with EventAuthorisation -> event as a result of this.
Move validation from models to forms where it probably belongs.
Provide more descriptive errors.
Add success page for authorisation.
2017-04-07 02:14:33 +01:00
Tom Price
c2787d54b0
Add authorisation models.
...
Add EventAuthorisation model + migrations
Add authorised property to Event.
Add appropriate tests
2017-03-29 20:46:40 +01:00
Tom Price
9b7c84cf08
Change invoice filename format
...
Change the invoice filename format to include the event number.
Closes #279
2017-03-28 16:58:06 +01:00
David Taylor
3269e92ef2
Merge pull request #277 from nottinghamtec/davidtaylorhq-patch-1
...
Explicitly define height in oembed JSON
2017-03-10 15:29:29 +00:00
David Taylor
0ae7bcaf7c
Explicitly define height in oembed JSON
2017-03-10 15:26:00 +00:00
Tom Price
9694d407ae
Merge pull request #275 from nottinghamtec/hotfix/home-links
...
Make forum go to actual forum
2017-02-06 15:47:12 +00:00
Sam Osborne
82aa2785ea
Make forum go to actual forum
...
Currently goes to old forum :(
2017-02-06 15:35:29 +00:00
David Taylor
337dbd74fd
Merge pull request #273 from nottinghamtec/hotfix/restore-pagination
...
Restore pagination to invoice waiting (requested by Emma)
2016-11-04 13:36:21 +00:00