257 Commits

Author	SHA1	Message	Date
David Taylor	3ccbdff737	Added balance to invoice page - closes #235	2016-05-29 22:51:41 +01:00
David Taylor	0990f0bfbb	Only display invoice print button for external clients	2016-05-29 22:46:49 +01:00
David Taylor	f43635ee89	Added more useful information to the invoice tables	2016-05-29 22:42:17 +01:00
David Taylor	0ff0d06eaf	Fix counter on outstanding invoices page ('length' property doesn't work because of the custom SQL query)	2016-05-29 22:04:48 +01:00
David Taylor	83302c4439	Invoice UI improvements. Renamed pages, added description, and added total number of events	2016-05-29 21:30:05 +01:00
David Taylor	ba020b43f1	Merge branch 'master' into develop	2016-05-29 20:28:52 +01:00
David Taylor	a725ef5caf	Removed add to google calendar link, closes #237	2016-05-29 17:09:52 +01:00
Tom Price	cc2450ff87	Make total conditional if defined	2016-05-24 17:50:48 +01:00
Tom Price	7ccc8faf20	Add total for waiting events	2016-05-24 17:32:58 +01:00
Tom Price	6030288956	Cheap and dirty active totals	2016-05-24 17:17:52 +01:00
Tom Price	e286d8bdee	Merge pull request #229 from nottinghamtec/develop	2016-05-23 00:38:31 +01:00
David Taylor	1faf8f95c8	Fixed colour coding on invoice waiting page	2016-05-22 23:13:23 +01:00
Tom Price	2913b254b4	Fix an overflow issue with dropdown fields. Closes #204	2016-05-19 14:33:33 +01:00
Tom Price	ef81536066	Add tooltips to rig type selectors. Closes #227	2016-05-19 14:21:21 +01:00
David Taylor	98f28aaafd	Based on has name as well as MIC - Fix #224	2016-04-12 20:15:13 +01:00
David Taylor	767b5512e3	Fail, missed a change, actually closes #185 now	2016-04-07 00:53:57 +01:00
David Taylor	f1bd1ca674	Make 'created' noun class-specific. Closes #185	2016-04-07 00:52:33 +01:00
David Taylor	99dfdcd253	Make confirmation more useful	2016-04-05 12:53:04 +01:00
David Taylor	ca6cddb392	Add comments display to versioning history (because why not). ... Maybe in future we could have a box people can type in before they save changes to an event... But that's a separate project	2016-04-05 11:50:34 +01:00
David Taylor	46434977fb	Created merge admin action for Person, Venue and Organisation models. Added template.	2016-04-05 04:18:19 +01:00
David Taylor	84b0a57e14	Fixed line breaks for new items. Closes #212	2016-03-24 12:22:37 +00:00
David Taylor	1b6ce32deb	Merge branch 'master' into version_history_diff	2016-03-16 14:36:24 +00:00
David Taylor	0721d61bef	Merge branch 'master' into web_calendar	2016-03-16 12:30:22 +00:00
David Taylor	56bc084e60	Made interface more compact	2016-03-16 12:28:37 +00:00
David Taylor	2ed0a4bcf9	Updated changes view to use diff where appropriate.	2016-03-16 10:08:26 +00:00
David Taylor	ed552b402a	Based on event with no MIC - closes #163	2016-03-10 11:56:09 +00:00
David Taylor	1681ab8fee	Allowed linking to specific views/dates on the calendar - closes #153	2016-02-29 20:35:53 +00:00
David Taylor	73517ed443	Revision history link on non-rigs - closes #186	2016-02-29 19:55:04 +00:00
David Taylor	f59e11ecc4	Updated VAT Registration Number - Closes #197	2016-02-29 19:37:59 +00:00
David Taylor	67dfc4bcab	Fixed changing between rig/non-rig	2015-10-11 11:39:49 +01:00
David Taylor	0eb820000c	Merge branch 'master' into duplicate-event	2015-08-27 23:59:50 +01:00
David Taylor	04d389dce5	Merge branch 'calendars'	2015-08-17 23:57:08 +01:00
David Taylor	6c5e520a9f	Merge branch 'tooltips'	2015-08-17 23:47:14 +01:00
David Taylor	63cb5022df	Added helpful tooltips for each input field in event_form	2015-08-16 23:24:02 +01:00
David Taylor	c36a90ba37	Added a day to end dates, if there is no end time (ical and fullcalendar.js use non-inclusive end dates). Issue #154	2015-08-16 21:06:32 +01:00
David Taylor	26d671ea0d	EventDuplicate now presents an edit view before saving	2015-08-16 19:31:35 +01:00
David Taylor	6944d98c4e	Added paperwork generation date, user & versioning	2015-07-29 22:06:44 +01:00
Tom Price	9bbdb9fbe0	Merge branch 'master' into web-calendar	2015-07-29 18:39:36 +01:00
Tom Price	f619f83c09	Revert changes in 1fdeed7	2015-07-29 17:59:01 +01:00
Tom Price	5bb7283f2d	Merge branch 'vagrant' into hotfixes	2015-07-23 21:08:44 +01:00
David Taylor	160c43f927	Merge branch 'ui-changes'	2015-07-21 00:19:32 +01:00
David Taylor	163c77880b	Merge branch 'vat-rate'	2015-07-20 22:20:14 +01:00
David Taylor	c4eb855620	Removed id numbers from page titles for person, venue & organisation detail views	2015-07-19 16:25:41 +01:00
David Taylor	5641a998f3	Removed unnecessary variable & updated test	2015-07-19 16:14:40 +01:00
David Taylor	8b5d8e6056	Only put params in URL if not default values	2015-06-30 15:05:35 +01:00
David Taylor	507823a26a	Added options to ical interface - issue #80	2015-06-30 14:31:28 +01:00
David Taylor	8450c36971	Fixed some #timezoneIssues	2015-06-29 21:07:10 +01:00
David Taylor	68e624f460	Streamlined web-calendar logic, also fixed issue #94	2015-06-29 20:25:46 +01:00
David Taylor	c27960456e	Merge branch 'hotfixes' into web-calendar	2015-06-29 19:40:01 +01:00
David Taylor	3c21355375	Rewrote web calendar UI to have bootstrap interface. Also has go-to-date function - issue #109	2015-06-29 17:38:47 +01:00