David Taylor
92acd17e64
Merge pull request #312 from nottinghamtec/js-dependencies
...
Update JS dependencies
2017-09-22 21:45:33 +01:00
David Taylor
ff83bcc14a
Merge branch 'master' into js-dependencies
2017-09-22 21:36:05 +01:00
David Taylor
f17e0e199c
Update bootstrap-select CSS
2017-09-22 21:30:55 +01:00
David Taylor
7b3b05677c
Merge pull request #313 from nottinghamtec/requires-io-master
...
[requires.io] dependency update on master branch
2017-09-22 17:46:06 +01:00
requires.io
403549f449
[requires.io] dependency update
2017-09-22 17:41:17 +01:00
David Taylor
aee4ccb5a2
Update JS dependencies
2017-09-22 16:33:04 +01:00
David Taylor
f8c2551eeb
Merge pull request #311 from nottinghamtec/pep8
...
Pep8
2017-09-22 15:57:12 +01:00
David Taylor
1bab3464b7
Merge branch 'master' into pep8
2017-09-22 15:10:40 +01:00
David Taylor
2b863b91b3
[requires.io] dependency update on master branch ( #308 )
...
* [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-09-22 15:04:39 +01:00
David Taylor
5c4181a5cc
Add PEP8 linting to Travis
2017-09-22 14:57:32 +01:00
David Taylor
f9389e3996
PEP8 all the things
2017-09-22 14:57:14 +01:00
David Taylor
131ff3e612
Fix chromedriver issues, and run headless on travis ( #310 )
...
* Fix chromedriver issues, and run headless on travis
* Explicitly set chrome window size
* Use travis chrome
* Try chrome beta
* Update chromedriver
* Remove virtual display from travis config
2017-09-22 14:24:20 +01:00
David Taylor
7dd7378e6c
Merge pull request #307 from nottinghamtec/hotfix/migrations
...
Hotfix/migrations
2017-09-05 00:05:53 +01:00
David Taylor
4d0da2fdc1
Add missing migration
2017-09-04 23:59:53 +01:00
David Taylor
ddbc0699ee
Add manage.py checks to travis build
...
This should prevent any migration fails reaching production
2017-09-04 23:59:11 +01:00
David Taylor
5f14001d01
Merge pull request #296 from nottinghamtec/python-3
...
Python 3
2017-09-04 23:42:26 +01:00
David Taylor
91f1e6d290
Change heroku runtime to 3.x
2017-09-04 23:19:22 +01:00
David Taylor
00d46274f1
Update travis python version
2017-09-04 23:19:22 +01:00
David Taylor
0aec836b1a
Fix iCal tests
2017-09-04 23:19:22 +01:00
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
