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
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
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
0ee37b1cd3
Fix issues with python2 imports
2016-03-31 12:07:07 +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
David Taylor
f0a3c968a7
Added unicode support
2016-03-16 15:15:12 +00:00
David Taylor
1b6ce32deb
Merge branch 'master' into version_history_diff
2016-03-16 14:36:24 +00:00
David Taylor
551737b882
Merge branch 'master' into deleting_duplicates
2016-03-16 13:05:54 +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
2ed0a4bcf9
Updated changes view to use diff where appropriate.
2016-03-16 10:08:26 +00:00
David Taylor
ed552b402a
Based on event with no MIC - closes #163
2016-03-10 11:56:09 +00:00
David Taylor
e3adfecd17
Added database migration
2016-02-29 20:43:11 +00:00
David Taylor
1681ab8fee
Allowed linking to specific views/dates on the calendar - closes #153
2016-02-29 20:35:53 +00:00
David Taylor
a77bc65d7b
Changed delete condition to SET_NULL - closes #199
2016-02-29 20:12:41 +00:00
David Taylor
73517ed443
Revision history link on non-rigs - closes #186
2016-02-29 19:55:04 +00:00
David Taylor
f59e11ecc4
Updated VAT Registration Number - Closes #197
2016-02-29 19:37:59 +00:00
samozzy
581f28757a
Update konami.js
...
Disable Weirdness Factor 12 on devices without an 'escape' key.
2016-02-01 17:10:06 +00:00
Tom Price
29126a558b
Make the captcha Foxtrot Oscar from the functional tests
2016-01-04 23:38:17 +00:00
Tom Price
0a30a99e1f
Absolish the captcha from the login page.
2016-01-04 23:37:11 +00:00
Tom Price
b7018d5c44
Refactor NoneType test to make use of the __str__ method thus including that method in the test as well.
2015-12-22 23:07:15 +00:00
Tom Price
48969ed95c
Fix NoneType exception by only adding initials if they are set.
...
Closes #171
2015-12-22 23:03:30 +00:00
Tom Price
b933a5322f
Add test to reproduce NoneType exception from #171
2015-12-22 23:01:30 +00:00
Tom Price
2743112f1b
Reformat file to correct standard
2015-12-22 22:59:12 +00:00
David Taylor
adf9b8ba75
Merge branch 'admin-users'
2015-10-16 11:44:56 +01:00
Tom Price
0a3a35bf1b
Setup useradminform correctly for profiles enabling admins to change passwords.
2015-10-15 13:38:24 +01:00
David Taylor
67dfc4bcab
Fixed changing between rig/non-rig
2015-10-11 11:39:49 +01:00
David Taylor
0b5936be90
Added test for rig/non-rig changing
2015-10-11 11:39:33 +01:00
Tom Price
93b2d37727
Manually undo 28f5158 and move the session wide implicitly_wait to setUp methods.
2015-09-09 16:56:45 +01:00
Tom Price
28f51589d3
Add implicit_delay's everywhere they MIGHT be needed (where a request is made)
2015-09-09 16:33:29 +01:00
Tom Price
0402dd44b2
Add a small delay to waiting for animations to cope with async threads sometimes misbehaving.
2015-09-09 13:09:13 +01:00
