Commit Graph

455 Commits

Author SHA1 Message Date
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
dae29bd5a7 Fix incorrect location of .slugignore. 2015-05-18 18:01:10 +01:00
Tom Price
cecc998ebc Merged in hotfixes (pull request #34)
Various Hotfixes
2015-05-18 17:27:54 +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
b8c7e718f2 Change date format to match rest of system 2015-05-18 16:01:07 +01:00
Tom Price
855e5832c5 Change to using verbose names 2015-05-18 15:32:27 +01:00
Tom Price
295032639e Enable correct extending for ajax in history 2015-05-18 15:22:53 +01:00
Tom Price
ab558c1ccc Add event history view 2015-05-18 15:21:44 +01:00
Tom Price
0898e91fcb Tidy up version history file layout 2015-05-18 15:04:37 +01:00
Tom Price
e63b7d5166 Tidy up requirements.
Removed duplicate entries
2015-05-18 14:37:23 +01:00
Tom Price
5803421fec Merge branch 'master' into revision-view 2015-05-18 14:36:23 +01:00
Tom Price
a02c4034f8 Merge branch 'master' into timezone-fixes 2015-05-18 14:22:15 +01:00
Tom Price
b67548f166 Merged in favicon (pull request #4) (at last)
Added favicon and smartphone icon meta tags to template #18
2015-05-18 14:11:18 +01:00
Nathan Penney
c940b4276e Merged in hotfixes (pull request #32)
Various fixes
2015-05-05 16:51:44 +01:00
David Taylor
d21d70e433 Merged master into hotfixes 2015-05-02 15:37:21 +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
Tom Price
31357c6674 Move to using enviromental variables for important settings.
This makes it more difficult to fuck up.
2015-04-30 22:52:30 +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
Nathan Penney
45b3348b27 Merged in paperwork (pull request #30)
Paperwork Changes
2015-04-28 14:46:51 +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
David Taylor
a9a030a5fd Change timezone and turn off timezone support 2015-04-28 01:05:40 +01:00
Tom Price
20f2a644af Fix with the correct up-to-date terms URL 2015-04-26 18:19:27 +00: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
b2b511e267 TESTING FAIL! 2015-04-25 23:33:09 +01:00
Tom Price
10fea0fa4e Ignore files which have nothing to do with the production environment 2015-04-25 23:29:24 +01:00
Tom Price
39eae276a1 Reconfigure various options in the settings.
Add list of allowed hostnames

Add list of admins

Correctly setup logging
2015-04-25 23:27:19 +01:00
Tom Price
0dcbd002db EVent Item changelog rendering 2015-04-25 22:30:40 +01:00
Tom Price
94abfae3ea Added logic for comparing eventitems 2015-04-25 20:47:27 +01:00
Tom Price
fc08848e76 Actually rename the correct line... 2015-04-25 19:54:22 +01:00
Tom Price
34501cc587 Rename EvenRevision EventDiff to be more concise. 2015-04-25 19:08:48 +01:00
Tom Price
aadb8db022 Basic diff between source -> HEAD or source -> dest. 2015-04-25 19:03:28 +01:00
Tom Price
9afc7177c1 Merge from master 2015-04-25 18:04:11 +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