1405 Commits

This Branch

This Branch

All Branches

Author	SHA1	Message	Date
Tom Price	9dad6bb773	Setup useradminform correctly for profiles enabling admins to change passwords.	2015-10-15 13:38:24 +01:00
David Taylor	6d18d6bc83	Merge branch 'rig_non_rig'	2015-10-11 12:02:55 +01:00
David Taylor	d1d389eeaf	Merge branch 'rig_non_rig'	2015-10-11 12:02:55 +01:00
David Taylor	67dfc4bcab	Fixed changing between rig/non-rig	2015-10-11 11:39:49 +01:00
David Taylor	932b4a6852	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
David Taylor	48b7e7cf18	Added test for rig/non-rig changing	2015-10-11 11:39:33 +01:00
Tom Price	0c11da4665	Add a careful reminder about booking rigs	2015-10-06 22:59:05 +01:00
Tom Price	ee361341c4	Add a careful reminder about booking rigs	2015-10-06 22:59:05 +01:00
Tom Price	2195f0a9e9	Add a license	2015-09-28 18:14:21 +01:00
Tom Price	a3f2f6587b	Add a license	2015-09-28 18:14:21 +01:00
Tom Price	d0fe102dcd	Refactor container ignores	2015-09-09 17:00:22 +01:00
Tom Price	d048f48740	Refactor container ignores	2015-09-09 17:00:22 +01:00
Tom Price	8fcacd7126	Update readme to have wercker status in it	2015-09-09 16:59:25 +01:00
Tom Price	4b6e05d11c	Update readme to have wercker status in it	2015-09-09 16:59:25 +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	6d306dc224	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	d30806472d	Add implicit_delay's everywhere they MIGHT be needed (where a request is made)	2015-09-09 16:33:29 +01:00
Tom Price	d372b09778	Run collect static to prevent the manifest being out of date, resulting in tests failing	2015-09-09 16:13:54 +01:00
Tom Price	0676e51044	Run collect static to prevent the manifest being out of date, resulting in tests failing	2015-09-09 16:13:54 +01:00
Tom Price	60d4d7d1ca	Tidy up repo by adding wercker files to .gitignore and removing .idea/ files from the repo (despite them being in .gitignore already)	2015-09-09 15:33:30 +01:00
Tom Price	84c0e6203e	Tidy up repo by adding wercker files to .gitignore and removing .idea/ files from the repo (despite them being in .gitignore already)	2015-09-09 15:33:30 +01:00
Tom Price	cb9611c164	Revert to using sqlite as tests just fail instantly with postgres due to incorrect number formatting when >= 10	2015-09-09 15:30:12 +01:00
Tom Price	fcd87a082d	Revert to using sqlite as tests just fail instantly with postgres due to incorrect number formatting when >= 10	2015-09-09 15:30:12 +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
Tom Price	7ccf140512	Add a small delay to waiting for animations to cope with async threads sometimes misbehaving.	2015-09-09 13:09:13 +01:00
Tom Price	79438fd13b	Update wrecker.yml to run all the tests	2015-09-09 00:44:43 +01:00
Tom Price	9ebd1e3894	Update wrecker.yml to run all the tests	2015-09-09 00:44:43 +01:00
Tom Price	620df4a721	Add wrecker config	2015-09-08 18:39:17 +01:00
Tom Price	1794fdf148	Add wrecker config	2015-09-08 18:39:17 +01:00
David Taylor	34e4273647	Merge branch 'duplicate-event'	2015-09-04 21:47:15 +01:00
David Taylor	653e02f6b1	Merge branch 'duplicate-event'	2015-09-04 21:47:15 +01:00
David Taylor	d2464012ad	Added comments to EventItem creation	2015-08-28 00:12:29 +01:00
David Taylor	b316dde25d	Added comments to EventItem creation	2015-08-28 00:12:29 +01:00
David Taylor	0eb820000c	Merge branch 'master' into duplicate-event	2015-08-27 23:59:50 +01:00
David Taylor	ec844a446e	Merge branch 'master' into duplicate-event	2015-08-27 23:59:50 +01:00
David Taylor	135f2a176a	Merge branch 'registration-hotfix'	2015-08-27 23:43:34 +01:00
David Taylor	d3aa14bacc	Merge branch 'registration-hotfix'	2015-08-27 23:43:34 +01:00
Tom Price	8e478dd7a9	Remove implicit fields as these are not needed in the form definition. ... Passes all tests.	2015-08-27 22:46:50 +01:00
Tom Price	1f14c53f78	Remove implicit fields as these are not needed in the form definition. ... Passes all tests.	2015-08-27 22:46:50 +01:00
David Taylor	91866b3a57	Removed unnecessary username field definition	2015-08-27 01:48:10 +01:00
David Taylor	5a2b15d91c	Removed unnecessary username field definition	2015-08-27 01:48:10 +01:00
David Taylor	c7585f6bbb	Added missing email field to registration form	2015-08-27 01:36:44 +01:00
David Taylor	0436cbd8fb	Added missing email field to registration form	2015-08-27 01:36:44 +01:00
David Taylor	0cf62f983f	Added data save check to registration (currently fails)	2015-08-27 01:35:27 +01:00
David Taylor	23408ffc57	Added data save check to registration (currently fails)	2015-08-27 01:35:27 +01:00
David Taylor	04d389dce5	Merge branch 'calendars'	2015-08-17 23:57:08 +01:00
David Taylor	8517f4455a	Merge branch 'calendars'	2015-08-17 23:57:08 +01:00
David Taylor	6c5e520a9f	Merge branch 'tooltips'	2015-08-17 23:47:14 +01:00