Commit Graph

1666 Commits

Author SHA1 Message Date
David Taylor
6dde74232d Added descriptive stuff 2015-05-21 21:47:22 +01:00
David Taylor
d1ec5d1475 Added descriptive stuff 2015-05-21 21:47:22 +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
Tom Price
49db64ee93 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
083fdad1fd Added header to first column 2015-05-21 17:29:50 +01:00
David Taylor
0c0ca887cf Added header to first column 2015-05-21 17:29:50 +01:00
David Taylor
c669a18571 Merge branch 'master' into revision-view 2015-05-21 17:01:59 +01:00
David Taylor
77c4a72900 Merge branch 'master' into revision-view 2015-05-21 17:01:59 +01:00
David Taylor
e05185181f Corrected pyrigs.nottinghamtec to rigs.nottinghamtec 2015-05-21 16:40:02 +01:00
David Taylor
793639edaf 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
7a583f68c0 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
David Taylor
629eb663f7 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
Tom Price
6e9e54c83c 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
David Taylor
8bc0648fc8 Merge branch 'master' into timezone-fixes 2015-05-21 16:01:01 +01:00
David Taylor
3e0e788819 Added david as superuser to dev database 2015-05-21 15:05:52 +01:00
Tom Price
0b787aeb33 Merged hotfixes into master 2015-05-21 14:51:42 +01:00
Tom Price
66b33685cc Merged hotfixes into master 2015-05-21 14:51:42 +01:00
Tom Price
379545eaf1 Merged in autocomplete (pull request #37)
Autocomplete by multiple names at once
2015-05-21 14:50:30 +01:00
Tom Price
9a2b74592a Merged in autocomplete (pull request #37)
Autocomplete by multiple names at once
2015-05-21 14:50:30 +01:00
Tom Price
8b26103776 Fix typo 2015-05-19 18:31:55 +01:00
Tom Price
5eb1ff6722 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
233f6e0177 Better hiding of save buttons as needed on the form.
Issue #99
2015-05-19 18:27:39 +01:00
Tom Price
4ca3482638 Remove debug print statement 2015-05-19 17:54:15 +01:00
Tom Price
6d237de743 Remove debug print statement 2015-05-19 17:54:15 +01:00
Tom Price
675f9b9e42 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
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
d35fbacc6d Merge branch 'master' into autocomplete 2015-05-19 15:58:22 +01:00
Tom Price
3deff11376 Merge branch 'master' into autocomplete 2015-05-19 15:58:22 +01:00
Tom Price
dfd2941620 Merged in hotfixes (pull request #35)
Hotfix improvements
2015-05-19 00:05:21 +01:00
Tom Price
43c383248b Merged in hotfixes (pull request #35)
Hotfix improvements
2015-05-19 00:05:21 +01:00
Tom Price
6f81db7e93 Tidy up page title.
Fix for #116.
2015-05-19 00:02:50 +01:00
Tom Price
703bbb6d4c 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
5ce09d87ce 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
6c37095ec7 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
Tom Price
4e8cfb91d1 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
Nathan Penney
f4a99ed764 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
f4ea410900 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
42bfe39c2c 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