Commit Graph

274 Commits

Author SHA1 Message Date
Tom Price
90c92c255f Merged in timezone-fixes (pull request #40)
Timezone Fixes
2015-05-25 22:06:20 +01:00
David Taylor
fb0fc3506b Fixed MIC photo logic 2015-05-24 14:21:24 +01:00
David Taylor
06f9bf6eec Uncommented captcha 2015-05-24 12:14:43 +01:00
David Taylor
1c95f7ef8b Fixed linebreaks in paperwork descriptions 2015-05-24 12:09:20 +01:00
Tom Price
b3a3aef167 Merged in paperwork (pull request #41)
Added invoice paperwork functionality
2015-05-23 22:19:32 +01:00
Tom Price
005bd90975 Merge registration into master, pull request #38. 2015-05-23 22:12:17 +01:00
David Taylor
fe0dcb65f1 Removed payment terms from invoice 2015-05-22 17:02:06 +01:00
David Taylor
5898fa75ff Fixed impending fail 2015-05-22 15:44:48 +01:00
David Taylor
caf0e6cf45 Added invoice paperwork functionality 2015-05-22 15:20:43 +01:00
Tom Price
e685fa2f7c Change adding extra user data to on a signal instead.
Not sure if this data is clean or not.
2015-05-21 21:45:01 +01:00
David Taylor
e05185181f Corrected pyrigs.nottinghamtec to rigs.nottinghamtec 2015-05-21 16:40:02 +01:00
David Taylor
8c9977e464 Removed meet-info from event description 2015-05-21 16:38:21 +01:00
David Taylor
d2458fbf22 Changed file timezone to match django settings 2015-05-21 16:32:52 +01:00
Tom Price
a95dd34bea Working saving of registration data, need this doesn't create the required registration profile though.
Might need to find a way to invoke automatically then just append the new user data to the end.
2015-05-21 16:04:12 +01:00
David Taylor
2da09bfd0f Merge branch 'master' into timezone-fixes 2015-05-21 16:01:01 +01:00
Tom Price
66b33685cc Merged hotfixes into master 2015-05-21 14:51:42 +01:00
Tom Price
8b26103776 Fix typo 2015-05-19 18:31:55 +01:00
Tom Price
47fefd5252 Better hiding of save buttons as needed on the form.
Issue #99
2015-05-19 18:27:39 +01:00
Tom Price
6d237de743 Remove debug print statement 2015-05-19 17:54:15 +01:00
Tom Price
8ade2b234c Enable searching by multiple options seperated by a space.
No idea what the effect will be if we have somebody with more than one
space in their name.
This behavoir might be quite unpredictable.
2015-05-19 17:23:05 +01:00
Tom Price
3deff11376 Merge branch 'master' into autocomplete 2015-05-19 15:58:22 +01:00
Tom Price
6f81db7e93 Tidy up page title.
Fix for #116.
2015-05-19 00:02:50 +01:00
Tom Price
67dbfe8771 Change font to Open Sans and actually import it.
I am a moron.
2015-05-18 23:52:59 +01:00
Tom Price
8e3e95b781 Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes 2015-05-18 23:43:57 +01:00
Tom Price
ff4dd46c87 Re-enable timezones and add iCal converstion to UTC.
This should work on Google Cal but won't be able to test till in production.
2015-05-18 23:41:17 +01:00
Nathan Penney
0f10b78b2d Changed font in fullcalendar.css to Open Sans from Courier New. 2015-05-18 22:45:32 +01:00
Tom Price
a0a30b73e4 Merge branch 'master' into timezone-fixes 2015-05-18 20:22:56 +01:00
Tom Price
e87d8b984a Change invoice icon #107. 2015-05-18 20:08:15 +01:00
Tom Price
28cf152590 Add pipe 2015-05-18 20:04:54 +01:00
Tom Price
c96e9ae5b4 Major bugfix with new modal. Minified CSS. 2015-05-18 18:34:18 +01:00
Tom Price
676a3a7f8c Add missing overflow 2015-05-18 17:10:46 +01:00
Tom Price
52682cee1d Add ... to long email addresses. #29 2015-05-18 17:06:06 +01:00
Tom Price
51943d5eac Change where the event title shows up. 2015-05-18 16:19:21 +01:00
Tom Price
a1e29afbed Add some new buttons #108 2015-05-18 16:12:48 +01:00
Tom Price
e56b916e48 Change datetime format to show correct format #110 2015-05-18 16:04:35 +01:00
Tom Price
a02c4034f8 Merge branch 'master' into timezone-fixes 2015-05-18 14:22:15 +01:00
Tom Price
bdf3020f55 See diff 2015-04-30 23:27:31 +01:00
David Taylor
f19995bae7 Added save button to bottom of rig edit. Issue #95 2015-04-30 22:59:51 +01:00
David Taylor
4169e20c46 Fixed #58 2015-04-30 22:54:04 +01:00
Nathan Penney
f439da1574 Merged in mobile-ui (pull request #31)
Fix for edit item table issue on small screens
2015-04-28 14:48:35 +01:00
David Taylor
bd50e65e5b Fix for edit item table issue on small screens 2015-04-28 01:39:50 +01:00
David Taylor
5c7d016dda Removed VAT statement 2015-04-28 01:29:32 +01:00
David Taylor
03d8f67389 Swapped email/web with phone 2015-04-28 01:27:47 +01:00
David Taylor
61b2a9e7ad Stop stripping timezone info (no longer necessary) 2015-04-28 01:06:47 +01:00
David Taylor
16a026bca5 Add explicit timezone declaration to ical interface 2015-04-28 01:06:08 +01:00
Nathan Penney
d5390c6ccd Merged in recaptcha (pull request #28)
Add recaptcha to all public facing pages.
2015-04-26 19:12:28 +01:00
Nathan Penney
29a722f9b8 Merged in hotfixes (pull request #25)
Hotfix for #83
2015-04-26 19:11:31 +01:00
Tom Price
291e6d5c26 Add recaptcha to password reset form.
This should be all public facing pages covered.
2015-04-25 17:04:15 +01:00
Tom Price
42e8de7d9d Add recaptcha to login page 2015-04-25 16:54:01 +01:00
Tom Price
6b1ac008c5 Add recaptcha field to form 2015-04-25 16:30:42 +01:00