Commit Graph

254 Commits

Author SHA1 Message Date
Tom Price
0b787aeb33 Merged hotfixes into master 2015-05-21 14:51:42 +01:00
Tom Price
5eb1ff6722 Fix typo 2015-05-19 18:31:55 +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
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
d35fbacc6d Merge branch 'master' into autocomplete 2015-05-19 15:58:22 +01:00
Tom Price
703bbb6d4c Tidy up page title.
Fix for #116.
2015-05-19 00:02:50 +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
6c37095ec7 Merge branch 'hotfixes' of bitbucket.org:nottinghamtec/pyrigs into hotfixes 2015-05-18 23:43:57 +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
42bfe39c2c Change invoice icon #107. 2015-05-18 20:08:15 +01:00
Tom Price
6c52d35f35 Add pipe 2015-05-18 20:04:54 +01:00
Tom Price
ee0ffb9169 Major bugfix with new modal. Minified CSS. 2015-05-18 18:34:18 +01:00
Tom Price
9ea2512b3c Add missing overflow 2015-05-18 17:10:46 +01:00
Tom Price
1714ccbcca Add ... to long email addresses. #29 2015-05-18 17:06:06 +01:00
Tom Price
d7ec14b2c9 Change where the event title shows up. 2015-05-18 16:19:21 +01:00
Tom Price
8e102f7759 Add some new buttons #108 2015-05-18 16:12:48 +01:00
Tom Price
0cd6090e7b Change datetime format to show correct format #110 2015-05-18 16:04:35 +01:00
Tom Price
60b7361a40 See diff 2015-04-30 23:27:31 +01:00
David Taylor
7492881c2f Added save button to bottom of rig edit. Issue #95 2015-04-30 22:59:51 +01:00
David Taylor
2bd4733ae1 Fixed #58 2015-04-30 22:54:04 +01:00
Nathan Penney
28e7b75f85 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
48a5557080 Fix for edit item table issue on small screens 2015-04-28 01:39:50 +01:00
David Taylor
40373dce5f Removed VAT statement 2015-04-28 01:29:32 +01:00
David Taylor
eef3ebe515 Swapped email/web with phone 2015-04-28 01:27:47 +01:00
Nathan Penney
a56427d355 Merged in recaptcha (pull request #28)
Add recaptcha to all public facing pages.
2015-04-26 19:12:28 +01:00
Nathan Penney
04271a9417 Merged in hotfixes (pull request #25)
Hotfix for #83
2015-04-26 19:11:31 +01:00
Tom Price
c21a2229c1 Add recaptcha to password reset form.
This should be all public facing pages covered.
2015-04-25 17:04:15 +01:00
Tom Price
ed4a0e4478 Add recaptcha to login page 2015-04-25 16:54:01 +01:00
Tom Price
269f9af081 Add recaptcha field to form 2015-04-25 16:30:42 +01:00
Tom Price
fa16e7e1a1 Merged in heroku (pull request #27)
Update master brance to Heroku
2015-04-25 16:16:51 +01:00
Tom Price
82e8a0e121 Added login requirement to view the rigboard. 2015-04-24 23:07:11 +01:00
Tom Price
830ac42fcb Add missing migration 2015-04-24 22:07:21 +01:00
David Taylor
8d92a5490f Fixed UI issues by making tables responsive 2015-04-24 16:59:28 +01:00
Tom Price
0ffb79c7e8 Merged in purchase-order (pull request #23)
Added PO field to event form #82
2015-04-24 15:13:15 +01:00
Tom Price
d239a55fb6 Relocate new select scripts to in theory always load before ready() fires #83 2015-04-24 15:09:15 +01:00
David Taylor
4f615d7158 Fixed typo 2015-04-24 14:24:48 +01:00
David Taylor
e48619c15a Fixed midnight issues in ical, web calendar & event_table 2015-04-24 14:22:08 +01:00
David Taylor
c3cc546d60 Removed last trace of timezone 2015-04-24 13:55:32 +01:00
David Taylor
39eea79ee5 Changed to PO in detail view 2015-04-24 01:24:03 +01:00
David Taylor
937f7e2f1c Changed to 'PO' and corrected capitalisation in 'Collected by' 2015-04-24 01:22:46 +01:00
David Taylor
75bbe58a37 Merge commit '289556771efd2d74f51afa16ce504ab00a9ee40c' into purchase-order 2015-04-24 01:21:24 +01:00
Tom Price
c9063d6327 Merged in paginiation-ui (pull request #20)
Fixed display in firefox #77
2015-04-24 00:47:58 +01:00
Tom Price
3f2c06bf25 Merged in invoice-ui (pull request #21)
Requested additions to invoice_detail
2015-04-24 00:47:26 +01:00
Tom Price
16fc9841bf Merged in ical-interface (pull request #19)
Stripped out all timezone references & added help info
2015-04-24 00:46:54 +01:00
Tom Price
3efed59522 Merged in js-datepicker (pull request #22)
JS Datepicker - issue #79
2015-04-24 00:42:36 +01:00
David Taylor
011cadf9d0 Corrected comment 2015-04-24 00:10:14 +01:00
David Taylor
2b79b17fbf Added PO field to event form 2015-04-23 23:58:54 +01:00
David Taylor
c87944d79a Merge branch 'master' into autocomplete-ui 2015-04-22 18:38:07 +01:00
David Taylor
c7766abc79 Fixed by not loading transition.js (conflicts with JQuery UI). We can make do without an animated date picker 2015-04-22 18:29:01 +01:00