Commit Graph

298 Commits

Author SHA1 Message Date
Tom Price
9eabc60d04 Rename EvenRevision EventDiff to be more concise. 2015-04-25 19:08:48 +01:00
Tom Price
b5b8b0918b Basic diff between source -> HEAD or source -> dest. 2015-04-25 19:03:28 +01:00
Tom Price
7999378d71 Merge from master 2015-04-25 18:04:11 +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
16fb238a24 Merged in table-responsive (pull request #26)
Fixed UI issues by making tables responsive #84
2015-04-25 15:59:49 +01:00
Tom Price
409ba21fc3 Actually correct SMTP settings 2015-04-25 00:19:21 +01:00
Tom Price
6cbfc469a9 Enable TLS on emails 2015-04-25 00:15:36 +01:00
Tom Price
b0244143ef Enable logging 2015-04-25 00:07:22 +01:00
Tom Price
82e8a0e121 Added login requirement to view the rigboard. 2015-04-24 23:07:11 +01:00
Tom Price
47f479ad96 Add updating sequences to importer. 2015-04-24 22:36:19 +01:00
Tom Price
830ac42fcb Add missing migration 2015-04-24 22:07:21 +01:00
Tom Price
bb14a217fc Disable debug again 2015-04-24 18:11:07 +01:00
Tom Price
abf9ce8b92 Fix for incorrect base_dir 2015-04-24 18:09:26 +01:00
Tom Price
ae0836e497 Enable debug to get everything up and running 2015-04-24 18:06:00 +01:00
Tom Price
10053540c7 Readd definition for databases 2015-04-24 17:07:37 +01:00
Tom Price
dc425122e6 Fix typo 2015-04-24 17:06:22 +01:00
Tom Price
dbf89ad7f9 Readd settings line 2015-04-24 16:59:50 +01:00
David Taylor
8d92a5490f Fixed UI issues by making tables responsive 2015-04-24 16:59:28 +01:00
Tom Price
6954501496 Setup ready for Heroku 2015-04-24 16:44:26 +01:00
Tom Price
024c6c253b Add Heroku requirements 2015-04-24 16:27:09 +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
56d20ead75 Merged in ical-interface (pull request #24)
Removed last trace of timezone.
Fixed start/end time.
2015-04-24 15:02:50 +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
Tom Price
0cae8029d6 Merged in autocomplete-ui (pull request #17)
Made a nice new UI for autocompleting
2015-04-24 00:30:30 +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
75f4427020 Improved backend & logging associated items 2015-04-23 02:29:47 +01:00
David Taylor
450559fb10 Working revision view 2015-04-23 00:57:58 +01:00
David Taylor
c77d7d30b3 Merge branch 'master' into revision-view 2015-04-22 21:08:15 +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
David Taylor
a4829e8890 Working date picker fallback. This breaks item modals because... no idea 2015-04-22 18:14:21 +01:00
David Taylor
093b216518 Requested additions to invoice_detail 2015-04-22 17:18:13 +01:00
David Taylor
559634e452 Fixed display in firefox 2015-04-22 17:01:10 +01:00
David Taylor
9b53d7ee69 Don't serve cancelled rigs 2015-04-22 16:11:11 +01:00
David Taylor
01b684d08a Better help info 2015-04-22 15:57:00 +01:00
David Taylor
c060ceff05 Back to 12 month query 2015-04-22 15:31:50 +01:00
David Taylor
c0970fa6f5 Apparently google doesn't work without www. 2015-04-22 15:29:17 +01:00
David Taylor
f712e8f375 Added more help 2015-04-22 14:54:42 +01:00
David Taylor
b5d8984c5b Added google calendar instructions 2015-04-22 14:41:06 +01:00
David Taylor
b4806b943e Stripped out all timezone references. Also reduced query to past 3 months 2015-04-22 14:35:05 +01:00