Commit Graph

143 Commits

Author SHA1 Message Date
tomtom5152
af1396a168 Added the ability to invoice an event 2015-01-30 00:27:02 +00:00
tomtom5152
bbce968478 Added more invoice buttons 2015-01-30 00:25:45 +00:00
tomtom5152
8086d13756 Enabled invoices button 2015-01-30 00:22:48 +00:00
tomtom5152
a0e3f6bfc1 Added default value to Invoice.void (False) 2015-01-30 00:16:29 +00:00
tomtom5152
2ce45b9297 Basic working invoice system. Need to add a way to create invoices. 2015-01-29 23:18:04 +00:00
tomtom5152
5f88e1e759 Merge remote-tracking branch 'origin/master' 2015-01-29 20:02:40 +00:00
tomtom5152
f913b94345 Started making use of gravatar icons. 2015-01-29 20:02:18 +00:00
tomtom5152
391c874508 Started making use of gravatar icons. 2015-01-29 20:00:07 +00:00
root
3df97c9e61 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
tomtom5152
dd88b5361f 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
29edcebb88 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
root
8339ec70d3 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
root
b2b5438e12 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
75f9d2ffc4 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
ef708b3a9a 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
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
9c9dc07929 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
98ef7539e9 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
e2d01cc6c5 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
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
33ec095612 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
b6aa8ce1e2 Updated bootstrap asset files to V3.3.3 2015-01-22 18:52:32 +00:00
CI TEC
542eb91f9e Fixed an error with the glypicon fonts having the wrong URL 2015-01-22 18:46:39 +00:00
CI TEC
c9c4ac03f8 Updated css files to latest version with new bootstrap 2015-01-22 18:40:12 +00:00
Tom Price
58af9e743b Added the ability to clone an event to a new event. 2015-01-22 18:20:37 +00:00
Tom Price
c47721a42c Untested changes to models and adding a new finance system. Cannot test
ATM so will do so ASAP.
2015-01-21 16:38:02 +00:00
Tom Price
b52da8c2c0 Changes to importer:
Added delete method to all importers
Added nonrig importing
Venue import optimisation

Reran importer for empty DB
Reset password appropriately

Added view permission to all models where needed.
Migrated DB to reflect.

Fixed all print buttons on event detail.
2014-12-08 02:42:18 +00:00
Tom Price
5c8faf60e8 Reset password for TheBergenator 2014-12-08 01:00:37 +00:00
Tom Price
48d6570e37 Rig paperwork printing enabled 2014-12-08 00:59:08 +00:00
Tom Price
04d917f1fd Migrated reportlab and rml to requirements.txt following working compiler 2014-12-07 19:46:47 +00:00
Tom Price
7ba11a2db9 Added printing requirements 2014-12-07 17:32:25 +00:00
Tom Price
c76d12d877 Add lxml to requirements 2014-12-07 17:15:44 +00:00
Tom Price
66b5d233e5 Added reportlab and z3c.RML Related things 2014-12-05 00:31:09 +00:00
Tom Price
b616ff8ae1 Improvements to layout of event form notes section
Added nl2br support in interactions
2014-12-05 00:24:06 +00:00
Tom Price
d1eb78da3f Work event item frontend 2014-12-05 00:16:47 +00:00
Tom Price
6f6f033104 Fixed frontend for updating existing items 2014-12-04 23:35:56 +00:00
Tom Price
9e7e6dc707 Event Items now saved using JSON rather than an AJAX request 2014-12-04 22:18:53 +00:00
Tom Price
eb4e3bdb14 Tidied the errors on the loginform 2014-12-03 22:55:16 +00:00
Tom Price
969a2af4aa Removed red text on danger rigs as there was no need for it 2014-12-03 22:44:13 +00:00