David Taylor
44ccead0a4
Added merge tests
...
I feel like it should be possible to abstract some of these so that they're not copied out for each model, but not sure how to go about it...
2016-04-05 15:32:13 +01:00
David Taylor
99dfdcd253
Make confirmation more useful
2016-04-05 12:53:04 +01:00
David Taylor
03ca65602f
Allow sorting by number of events
2016-04-05 12:08:19 +01:00
David Taylor
ca6cddb392
Add comments display to versioning history (because why not).
...
Maybe in future we could have a box people can type in before they save changes to an event... But that's a separate project
2016-04-05 11:50:34 +01:00
David Taylor
33ce4b622d
Fixed bug with versioning interface when related objects are deleted
2016-04-05 04:18:53 +01:00
David Taylor
46434977fb
Created merge admin action for Person, Venue and Organisation models. Added template.
2016-04-05 04:18:19 +01:00
Tom Price
8cfda69717
Set wercker up to use postgres for tests again.
...
Modify the tests to be postgres compatible by using more pointers to things rather than getting them everytime.
2016-03-31 16:03:07 +01:00
Tom Price
463c4d147c
Update settings for django10 support
...
Allow env.EMAIL_PORT to be None without error
Change template context preprocessor in favour of the new syntax.
2016-03-31 15:14:54 +01:00
Tom Price
6da688cc9e
Migrate VAT rate to use a single date field rather than datetime.
...
There is never any need to track the time as VAT rate hardly ever changes and will always do so at midnight. We were already assuming this anyway but it was generating loads of warnings/errors.
This will break your local VAT rate database if using sqlite, but it is tested with postgres and works fine.
2016-03-31 13:15:53 +01:00
Tom Price
c1d164bd73
Remove the db.sqlite3 file
...
This was loooong overdue
2016-03-31 13:12:35 +01:00
Tom Price
d43e4b2465
Update settings and urls to fix new deprecations
2016-03-31 12:33:46 +01:00
Tom Price
98ee9bb0db
Fix imports in tests
2016-03-31 12:13:11 +01:00
Tom Price
cd2aed00d7
Update login URL in settings so redirects work correctly.
2016-03-31 12:09:04 +01:00
Tom Price
0ee37b1cd3
Fix issues with python2 imports
2016-03-31 12:07:07 +01:00
Tom Price
486c66b198
Update requirements.txt before starting to test for issues
2016-03-31 11:59:21 +01:00
davidtaylorhq
f13303490a
Merge pull request #211 from nottinghamtec/wercker
...
Wercker
2016-03-24 12:34:00 +00:00
David Taylor
84b0a57e14
Fixed line breaks for new items. Closes #212
2016-03-24 12:22:37 +00:00
Tom Price
2ee7c064af
Add a dirty work around for wercker not quite working correctly.
2016-03-18 16:48:43 +00:00
Tom Price
b2b8546e3c
Add test for events_in_bounds
2016-03-18 16:41:13 +00:00
Tom Price
2945a607bf
Add more tests for models.Event properties
2016-03-18 16:27:20 +00:00
Tom Price
4370cf60d1
And yet some more waits
2016-03-17 18:44:03 +00:00
Tom Price
e7496a9d82
Add some more waits for animations in failing test
2016-03-17 18:37:15 +00:00
Tom Price
77f7a25fa8
Try maximising firefox so it is large enough to pass the test
2016-03-17 18:06:37 +00:00
Tom Price
10c5ea3e7c
Add a wait for the animation to complete during event creation.
2016-03-17 17:47:02 +00:00
Tom Price
cd82712742
Merge pull request #207 from nottinghamtec/fixed_jquery
...
Fixed jquery version.
Closes #192
2016-03-17 17:34:58 +00:00
Tom Price
3067dcdda5
Update wercker in README.md
...
Only show builds from master
[ci skip]
2016-03-17 17:31:14 +00:00
Tom Price
94679d6783
Update seleium version for Wercker
2016-03-17 17:23:21 +00:00
Tom Price
54dc29b4b2
Switch to jquery CDN who provide a sha256 hash to validate against.
...
Advise is now to always use HTTPS for libraries as somebody else manages the certificate it will always validate and it makes sure that a large target doesn't get subject to MITM attack.
2016-03-17 17:18:42 +00:00
Tom Price
e699826ce9
Merge branch 'master' into fixed_jquery
2016-03-17 17:10:35 +00:00
David Taylor
33fa19c15e
Merge branch 'version_history_diff', second time lucky
2016-03-16 15:21:53 +00:00
David Taylor
d6e9b030fd
Merge branch 'master' into version_history_diff
2016-03-16 15:21:13 +00:00
David Taylor
f0a3c968a7
Added unicode support
2016-03-16 15:15:12 +00:00
David Taylor
d8760a00ba
Revert "Merge branch 'version_history_diff'"
...
This reverts commit 8ee43ef3ab9964d33cc0
2016-03-16 14:54:09 +00:00
David Taylor
8ee43ef3ab
Merge branch 'version_history_diff'
2016-03-16 14:37:09 +00:00
David Taylor
1b6ce32deb
Merge branch 'master' into version_history_diff
2016-03-16 14:36:24 +00:00
Tom Price
9964d33cc0
Update wercker in README.md
...
[ci skip]
2016-03-16 14:32:38 +00:00
David Taylor
1e81b718f6
Merge branch 'deleting_duplicates'
2016-03-16 13:09:02 +00:00
David Taylor
551737b882
Merge branch 'master' into deleting_duplicates
2016-03-16 13:05:54 +00:00
David Taylor
77dd36d4b4
Merge branch 'web_calendar'
2016-03-16 12:55:26 +00:00
David Taylor
9bace9a6da
Merge branch 'master' into web_calendar
2016-03-16 12:52:57 +00:00
David Taylor
c6b45da72c
Made tests more reliable - wait for success page to load before checking item exists in database
2016-03-16 12:49:42 +00:00
David Taylor
0721d61bef
Merge branch 'master' into web_calendar
2016-03-16 12:30:22 +00:00
David Taylor
56bc084e60
Made interface more compact
2016-03-16 12:28:37 +00:00
David Taylor
481f56a4bd
Added highlighting styles
2016-03-16 12:17:26 +00:00
David Taylor
11e9931438
Fixed compass config
2016-03-16 12:16:57 +00:00
David Taylor
ea840eb43c
Added diff-match-patch to requirements
2016-03-16 12:08:41 +00:00
David Taylor
2ed0a4bcf9
Updated changes view to use diff where appropriate.
2016-03-16 10:08:26 +00:00
Harry Bridge
5d48d75f34
Make protocol-agnostic
2016-03-12 18:17:03 +00:00
Harry Bridge
92beb8bf79
Fixed jquery version
2016-03-12 18:12:39 +00:00
David Taylor
ed552b402a
Based on event with no MIC - closes #163
2016-03-10 11:56:09 +00:00
