2013 Commits

Author SHA1 Message Date
root
3df97c9e61 Fixed display issue with the base template 2015-01-29 18:46:21 +00:00
root
6838444501 Fixed display issue with the base template 2015-01-29 18:46:21 +00:00
root
a82a65f8ec Added setting user passwords to uuid4 so forgotten password should work 2015-01-29 16:04:19 +00:00
root
1ad47107c1 Added setting user passwords to uuid4 so forgotten password should work 2015-01-29 16:04:19 +00:00
tomtom5152
dd88b5361f Fixed added the ability to import 2015-01-28 18:45:40 +00:00
tomtom5152
4d667b64a4 Fixed added the ability to import 2015-01-28 18:45:40 +00:00
tomtom5152
fd36688147 Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs 2015-01-28 16:59:54 +00:00
tomtom5152
d9e8e4d03f Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs 2015-01-28 16:59:54 +00:00
tomtom5152
29edcebb88 Added missing fields to event form and detail 2015-01-28 16:49:10 +00:00
tomtom5152
e24a95ec7a Added missing fields to event form and detail 2015-01-28 16:49:10 +00:00
tomtom5152
1c29b9275d Fixes for the selection of current rigs.
Added checked in field for dry hires
2015-01-28 16:30:32 +00:00
tomtom5152
41bd6bc384 Fixes for the selection of current rigs.
Added checked in field for dry hires
2015-01-28 16:30:32 +00:00
root
8339ec70d3 Fixes for the importer 2015-01-28 16:28:59 +00:00
root
1e16542747 Fixes for the importer 2015-01-28 16:28:59 +00:00
tomtom5152
ca1fd274e2 Improved the way current events is queried 2015-01-28 15:29:00 +00:00
tomtom5152
df67788865 Improved the way current events is queried 2015-01-28 15:29:00 +00:00
root
b2b5438e12 Updated some email settings to be used in production 2015-01-27 16:56:46 +00:00
root
f5f4770247 Updated some email settings to be used in production 2015-01-27 16:56:46 +00:00
tomtom5152
1aff7bcadb Minor fix for importer adding @nottingham.ac.uk to empty emails.
Small test case for email fixer to make sure that emails are fixed correctly.
2015-01-27 16:51:58 +00:00
tomtom5152
ce3536714e Minor fix for importer adding @nottingham.ac.uk to empty emails.
Small test case for email fixer to make sure that emails are fixed correctly.
2015-01-27 16:51:58 +00:00
tomtom5152
75f9d2ffc4 Fixed some dependency version issues. 2015-01-27 16:43:12 +00:00
tomtom5152
47e67e4c94 Fixed some dependency version issues. 2015-01-27 16:43:12 +00:00
root
8c8a724566 Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs
Merge in requirements error fix
2015-01-27 01:06:09 +00:00
root
ea9803f70a Merge branch 'master' of https://bitbucket.org/nottinghamtec/pyrigs
Merge in requirements error fix
2015-01-27 01:06:09 +00:00
root
ef708b3a9a Fixed typo in z3c.rlm -> z3c.rml 2015-01-27 01:01:46 +00:00
root
a4c824fc6a Fixed typo in z3c.rlm -> z3c.rml 2015-01-27 01:01:46 +00:00
Tom Price
343e34662b Added archive link
Added legacy redirect urls
2015-01-26 16:09:22 +00:00
Tom Price
4a908fd95f Added archive link
Added legacy redirect urls
2015-01-26 16:09:22 +00:00
Tom Price
6f27474a88 Performance optimisation of the related models by letting the DB deal with the relation straight off 2015-01-26 15:19:37 +00:00
Tom Price
5b1cdbf182 Performance optimisation of the related models by letting the DB deal with the relation straight off 2015-01-26 15:19:37 +00:00
Tom Price
9c9dc07929 Everyone's favourite, past events, now working and loading in ~800ms 2015-01-26 15:06:39 +00:00
Tom Price
c4bb7fbee6 Everyone's favourite, past events, now working and loading in ~800ms 2015-01-26 15:06:39 +00:00
Tom Price
13ce96809b Corrected permissions to duplicate a rig 2015-01-26 11:11:11 +00:00
Tom Price
93feaaf334 Corrected permissions to duplicate a rig 2015-01-26 11:11:11 +00:00
Tom Price
98ef7539e9 Improved person/organisation cross referencing via events 2015-01-22 22:06:24 +00:00
Tom Price
941bd2319e Improved person/organisation cross referencing via events 2015-01-22 22:06:24 +00:00
Tom Price
c6aed3db75 Moved the table element from the main rigboard out to something reusuable.
Added the ability to view organisations by people and vice versa, as well as the option to see all the rigs associated with orgs/people/venues.

Added helper properties for the above
2015-01-22 20:48:37 +00:00
Tom Price
ff9bca1e61 Moved the table element from the main rigboard out to something reusuable.
Added the ability to view organisations by people and vice versa, as well as the option to see all the rigs associated with orgs/people/venues.

Added helper properties for the above
2015-01-22 20:48:37 +00:00
Tom Price
e2d01cc6c5 Fix for issue #5. Added verbose name to Event.mic 2015-01-22 19:34:25 +00:00
Tom Price
346c05759a Fix for issue #5. Added verbose name to Event.mic 2015-01-22 19:34:25 +00:00
Tom Price
c4a14e97c2 Fix for issue #4. Changed edited by username to standard name format. 2015-01-22 19:31:43 +00:00
Tom Price
387a7566c7 Fix for issue #4. Changed edited by username to standard name format. 2015-01-22 19:31:43 +00:00
Tom Price
e3e57554c6 Fixed issue with item modals not displaying.
Moved item modal code to an includable file.
2015-01-22 19:26:16 +00:00
Tom Price
5c236819f4 Fixed issue with item modals not displaying.
Moved item modal code to an includable file.
2015-01-22 19:26:16 +00:00
Tom Price
33ec095612 Improved Event UI 2015-01-22 19:12:01 +00:00
Tom Price
7f2c4d2f18 Improved Event UI 2015-01-22 19:12:01 +00:00
Tom Price
2d41815f9d Recollected static 2015-01-22 19:11:23 +00:00
Tom Price
bd4127f064 Recollected static 2015-01-22 19:11:23 +00:00
Tom Price
b6aa8ce1e2 Updated bootstrap asset files to V3.3.3 2015-01-22 18:52:32 +00:00
Tom Price
85dc7746a2 Updated bootstrap asset files to V3.3.3 2015-01-22 18:52:32 +00:00