arona/PyRIGS
1
0
Fork 0
mirror of https://github.com/nottinghamtec/PyRIGS.git synced 2026-01-17 05:22:16 +00:00
Code Issues Projects Releases Wiki Activity
1,629 Commits 54 Branches 0 Tags
b77615b9b940bee255d6acdd309efec7ba20c7e5
Commit Graph

1629 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
David Taylor
0a45b047a2 Add warnings when editing an event that has already been sent to a client 2017-05-18 17:34:49 +01:00
David Taylor
4e79f00551 Add pound signs to confirmation emails 2017-05-18 17:22:59 +01:00
David Taylor
b4ab29393e Allow confirmation emails to fail without blocking the interface 2017-05-18 16:42:13 +01:00
David Taylor
703fb8561a Move font definition into div, doesn’t seem to be picked up in body 2017-05-18 15:32:54 +01:00
David Taylor
f3c020b613 Update email templates to avoid using bootstrap. Should improve speed, and also cross-email-client compatability 2017-05-18 15:27:50 +01:00
Tom Price
4b87b0a196 Add some visual indicators that authorisations have been submitted. 
This will show teccies and clients that RIGS is processing emails which can take a short while.
Should prevent duplicate sending.
 2017-05-17 19:08:51 +01:00
David Taylor
7cc715cedc Merge pull request #290 from nottinghamtec/hotfix/event-times-dissapearing 
Hotfix/event times dissapearing
 2017-05-16 15:15:50 +01:00
David Taylor
4b032944ac Fix the time formatting 2017-05-16 14:50:33 +01:00
David Taylor
cb23fd183e Add failing test 2017-05-16 14:50:18 +01:00
David Taylor
fbc039c274 Fix tests so they can actually run locally (I failed) 2017-05-16 13:58:05 +01:00
David Taylor
b3156dbb0d Merge pull request #289 from nottinghamtec/feature/chrome-testing 
Use Chrome for tests, and sauce-labs for CI integration tests
 2017-05-15 21:56:09 +01:00
David Taylor
fdce2fa53d Update selenium, use chrome for tests, and use sauce-labs for CI integration tests 2017-05-15 21:46:00 +01:00
David Taylor
55d24e96cb Adds basic tests to check that versioning views load successfully 
More comprehensive tests should be added when versioning.py is updated for the new version of django-reversion
 2017-05-15 20:40:03 +01:00
David Taylor
36d258253f Fix issues caused by dependency upgrades 2017-05-12 21:32:17 +01:00
David Taylor
865bb131a5 Add merge migration 2017-05-12 21:02:48 +01:00
David Taylor
eb1e8935f4 Fix reversion in signals.py 2017-05-12 20:56:01 +01:00
David Taylor
f8aaf9f36e Merge branch 'master' into feature/online-auth 
# Conflicts:
#	RIGS/rigboard.py
#	RIGS/test_functional.py
#	RIGS/urls.py
#	requirements.txt
 2017-05-12 20:53:00 +01:00
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