520 Commits

Author	SHA1	Message	Date
David Taylor	ece075e948	Made activity stream more useful for form changes	2016-05-23 01:04:54 +01:00
David Taylor	d611bf3905	Versioning UI now utilises decorators to register classes, in line with reversion, to allow expansion without adding dependencies	2016-05-23 01:02:46 +01:00
David Taylor	879060a171	Added link to event_detail page	2016-05-23 01:02:28 +01:00
Tom Price	e286d8bdee	Merge pull request #229 from nottinghamtec/develop	2016-05-23 00:38:31 +01:00
David Taylor	1faf8f95c8	Fixed colour coding on invoice waiting page	2016-05-22 23:13:23 +01:00
Tom Price	2913b254b4	Fix an overflow issue with dropdown fields. Closes #204	2016-05-19 14:33:33 +01:00
Tom Price	ef81536066	Add tooltips to rig type selectors. Closes #227	2016-05-19 14:21:21 +01:00
David Taylor	29aa13316d	Fix for versioning when event has been deleted, closes #226	2016-04-27 20:49:42 +01:00
David Taylor	98f28aaafd	Based on has name as well as MIC - Fix #224	2016-04-12 20:15:13 +01:00
David Taylor	f8a2a7a959	Made items display in version history again	2016-04-07 09:23:35 +01:00
David Taylor	767b5512e3	Fail, missed a change, actually closes #185 now	2016-04-07 00:53:57 +01:00
David Taylor	f1bd1ca674	Make 'created' noun class-specific. Closes #185	2016-04-07 00:52:33 +01:00
David Taylor	b47cfed5a9	Fixed versioning UI for revisions containing multiple event versions, hopefully	2016-04-07 00:19:18 +01:00
Tom Price	df61225b73	Optimise imports ... So many unused imports, these have been banished	2016-04-06 21:57:54 +01:00
Tom Price	823db68a6a	PEP8 format files	2016-04-06 21:53:38 +01:00
Tom Price	ebe08c3bf1	Update tests to check items that aren't selected aren't affected. ... PEP8 format the file	2016-04-06 21:52:25 +01:00
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
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