David Taylor
ee930aa86a
Replace assertItemsEqual with assertCountEqual in model tests.
...
While the name is misleading, it does appear that this test does exactly the same as assertItemsEqual: https://docs.python.org/3/library/unittest.html?highlight=assertcountequal#unittest.TestCase.assertCountEqual
2017-09-04 23:19:22 +01:00
David Taylor
a88f4d0cb2
Fix paperwork printing
2017-09-04 23:19:22 +01:00
David Taylor
50c997b568
Fixed profile picture encoding
2017-09-04 23:19:22 +01:00
David Taylor
3035320e82
Run through 2-to-3 converter. This is not in a working state
2017-09-04 23:19:22 +01:00
David Taylor
98182143ec
[requires.io] dependency update on master branch ( #304 )
...
* [requires.io] dependency update
* [requires.io] dependency update
2017-08-18 08:33:56 +01:00
David Taylor
bffbaeb4c6
[requires.io] dependency update ( #303 )
2017-08-04 19:53:29 +01:00
David Taylor
8f1c640bea
[requires.io] dependency update on master branch ( #301 )
...
* [requires.io] dependency update
* [requires.io] dependency update
* [requires.io] dependency update
* [requires.io] dependency update
* [requires.io] dependency update
2017-08-01 13:52:09 +01:00
David Taylor
827a2cdd25
[requires.io] dependency update on master branch ( #300 )
...
* [requires.io] dependency update
* [requires.io] dependency update
2017-07-18 15:32:36 +01:00
David Taylor
3202981fbe
[requires.io] dependency update ( #299 )
2017-07-10 20:01:06 +01:00
David Taylor
f0edd5020e
[requires.io] dependency update on master branch ( #297 )
...
* [requires.io] dependency update
* [requires.io] dependency update
* [requires.io] dependency update
* [requires.io] dependency update
* [requires.io] dependency update
* [requires.io] dependency update
2017-07-10 19:01:11 +01:00
David Taylor
cf1c7ae725
Merge pull request #298 from nottinghamtec/telegram-build-notification
...
Add telegram travis notification
2017-07-02 18:24:39 +01:00
David Taylor
1ac637bfd7
Add telegram travis notification
2017-07-02 18:15:54 +01:00
David Taylor
37933650d3
Merge pull request #295 from nottinghamtec/reversion-upgrade
...
Reversion upgrade and versioning.py refactor
2017-07-02 18:14:51 +01:00
David Taylor
1266dd419c
Use KVM based travis
2017-07-02 18:09:29 +01:00
Tom Price
74747e8700
Explicitly specify python runtime.
...
This follows a change to the heroku buildpack which now defaults to 3.6.1
https://devcenter.heroku.com/changelog-items/1178
2017-07-02 17:05:33 +01:00
David Taylor
34ffd62436
Add many tests for the versioning backend and interfaces
2017-06-21 03:12:26 +01:00
David Taylor
22c520e841
Refactored versioning.py (and associated templates) to improve readability and testability.
...
Takes inspiration from, but does not use, django-reversion-compare. We do a lot of RIGS-specific stuff that requires a lot of hacking to get working nicely with django-reversion-compare. The main example of this is event-item “many-to-one” fields. The performance difference of my code compared to django-reversion-compare was found to be negligible.
2017-06-21 03:09:46 +01:00
David Taylor
3fa9191150
Update requirements.txt
2017-06-19 23:59:19 +01:00
David Taylor
ae4f05a661
Update versioning.py to work with latest django-reversion
2017-06-19 23:53:00 +01:00
David Taylor
c178a293a1
Fix model registration and RevisionMixin lookups. Also much more efficient and DRY now
2017-06-19 23:51:56 +01:00
David Taylor
aebaa16311
Use EventAuthorisation post_save signal for EventAuthorisation email instead of the (now removed) reversion hook
2017-06-19 23:03:13 +01:00
David Taylor
175807f664
Merge pull request #294 from nottinghamtec/hotfix/spelling
...
Fix spelling in rig authorisation
2017-06-03 20:30:41 +01:00
Johnathan Graydon
abb56af222
Fix spelling in rig authorisation
2017-06-02 12:52:01 +01:00
David Taylor
48139b29cf
Merge pull request #293 from nottinghamtec/feature/use_native_chrome
...
Use chrome natively on Travis, instead of sauce labs
Reduces test times to 2:30, from around 10:00
2017-05-25 14:28:08 +01:00
David Taylor
7ec09fb774
Use chrome natively on Travis, hopefully faster
2017-05-25 14:23:34 +01:00
David Taylor
e37d1c663b
Merge pull request #292 from nottinghamtec/hotfix/event_authorisation_activity_feed
...
Add EventAuthorisation to the activity feed
2017-05-25 13:32:32 +01:00
David Taylor
bdd7f02fe2
Add EventAuthorisation to the activity feed
2017-05-25 13:09:52 +01:00
Tom Price
b4ea818992
Merge pull request #283 from nottinghamtec/feature/online-auth
...
Add online RIGS authorisation
2017-05-24 17:03:21 +01:00
Tom Price
7cb9e97ecb
Fix text on quote paperwork for external clients
...
Actually finish fixing PDF footer formatting.
2017-05-24 16:34:32 +01:00
Tom Price
7fdafd854e
Add payments to invoice PDF
2017-05-23 19:18:19 +01:00
Tom Price
d85ebb63a1
Minor PDF styling fixes
2017-05-23 19:04:57 +01:00
Tom Price
c6b7bbc219
Change to just using online auth for internal clients.
...
This effectively reverts 067e03b
2017-05-23 18:19:02 +01:00
David Taylor
4d316c7a4a
Stop authorisation information being duplicated with an event
2017-05-18 18:02:44 +01:00
David Taylor
75a3059c88
Add failing duplicate test
2017-05-18 18:02:29 +01:00
David Taylor
b6e4c0ed14
Merge branch 'master' into feature/online-auth
...
# Conflicts:
# RIGS/test_functional.py
2017-05-18 17:49:54 +01:00
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
