Commit graph

1854 commits

Author SHA1 Message Date
Scott Bragg
b4356a1551 Merge pull request #61 from faulteh/lca2017
Increase slot name since it's made up of room names and our room name…
2016-11-13 15:32:55 +11:00
Scott Bragg
02d7066c44 Increase slot name since it's made up of room names and our room names are long. 2016-11-13 15:31:08 +11:00
Christopher Neugebauer
4fa9903998 Merge pull request #76 from faulteh/schedule_edit_fix
Style fixes to make the proposal selection modal display.
2016-11-04 11:25:28 +11:00
Scott Bragg
857e8623d9 Style fixes to make the proposal selection modal display. 2016-11-03 23:46:03 +11:00
Scott Bragg
ebfd7aa192 Add ACE editor for reviews 2016-10-31 22:21:30 +11:00
Christopher Neugebauer
c76c0f6f4b Merge branch 'chrisjrn/20161014-b'
Fixes #63
2016-10-14 16:52:59 -07:00
Christopher Neugebauer
6a37134172 Stops relying on a form 2016-10-14 16:26:36 -07:00
Christopher Neugebauer
ed2327bedd Cleans up the architecture for report views 2016-10-14 16:10:36 -07:00
Christopher Neugebauer
67ac01e599 Adds a tag to take the CSV version of a report 2016-10-14 11:36:31 -07:00
Christopher Neugebauer
517da70536 CSV fixes 2016-10-14 11:19:10 -07:00
Christopher Neugebauer
2637930996 Adds CSV output support 2016-10-14 11:11:27 -07:00
Christopher Neugebauer
ea7a8d9ae7 Indentation 2016-10-14 10:28:38 -07:00
Christopher Neugebauer
320f6ab6eb First step refactoring ReportView into a class 2016-10-14 10:27:22 -07:00
Christopher Neugebauer
4e3f4aa9ad Merge branch 'chrisjrn/20161013' 2016-10-13 11:23:54 -07:00
Christopher Neugebauer
ff342bb06e Merge branch 'master' into chrisjrn/20161013 2016-10-13 11:23:46 -07:00
Christopher Neugebauer
3f192c2626 Zeroed & paid invoices that are voided now release the cart.
Fixes #95.
2016-10-13 11:23:41 -07:00
Christopher Neugebauer
c9c9d2a2b2 Cancelled presentations no longer enable SpeakerCondition.
Fixes #94
2016-10-13 10:50:48 -07:00
Christopher Neugebauer
6a5e4ff92d Merge branch 'chrisjrn/20161013' 2016-10-13 09:37:26 -07:00
Christopher Neugebauer
17cc088a6e Adds an “invoices” view 2016-10-13 09:32:30 -07:00
Christopher Neugebauer
232dc9e452 Invoices are tested for cart validity before display.
Fixes #99.
2016-10-13 09:19:18 -07:00
Christopher Neugebauer
e05265edd2 Adds test for invoice becoming invalid over time.
Tests for #99
2016-10-13 08:31:11 -07:00
Christopher Neugebauer
0cd7d47805 Template fixer-upper 2016-10-10 08:52:51 -07:00
Christopher Neugebauer
833eebc46d Fixes presentation of the 18+ question 2016-10-06 13:10:39 -07:00
Christopher Neugebauer
dec0a759ca Merge branch 'chrisjrn/20161006' 2016-10-06 12:50:33 -07:00
Christopher Neugebauer
3ca2be8c4b Attendee data page is now slightly more useful 2016-10-06 12:49:37 -07:00
Christopher Neugebauer
6dbc303e7c Adds ability for staff to extend a user’s reservations 2016-10-06 12:44:06 -07:00
Christopher Neugebauer
d31d812001 Adds functionality to increase the reservation duration 2016-10-06 12:33:53 -07:00
Christopher Neugebauer
b323c0eb25 Cart reservation durations now take the residual from the last reservation duration into account. 2016-10-06 12:12:50 -07:00
Christopher Neugebauer
360175f86a Adds tests for reservation duration 2016-10-06 11:52:46 -07:00
Christopher Neugebauer
06e61fd92c Merge branch 'chrisjrn/20161005' 2016-10-05 13:08:08 -07:00
Christopher Neugebauer
1129a4605c Fixes a bug, hopefully 2016-10-05 13:07:44 -07:00
Christopher Neugebauer
36d658e57f More query optimisation 2016-10-05 12:52:56 -07:00
Christopher Neugebauer
62858b0f6e Optimises some queries on attendee profile page 2016-10-05 12:28:43 -07:00
Christopher Neugebauer
ace7aa3efa Final query optimisation for attendee_data view 2016-10-05 12:17:40 -07:00
Christopher Neugebauer
ffe5194893 Query optimisation on attendee_data form 2016-10-05 12:07:38 -07:00
Christopher Neugebauer
7058260e5c Resolves values of related fields 2016-10-05 11:59:08 -07:00
Christopher Neugebauer
bf21d478a8 Adds ability to group by category instead of by product
Fixes #98.
2016-10-05 11:09:13 -07:00
Christopher Neugebauer
f0ab1f944f paid_invoices_by_date now counts invoices with a $0 value. Fixes #96 2016-10-05 10:38:03 -07:00
Christopher Neugebauer
99ba4c1770 1) Fixes list display
2) Lets us put links in category descriptions
2016-10-05 10:25:44 -07:00
Christopher Neugebauer
42892ea3c8 Fixes payment behaviour. 2016-10-03 16:43:04 -07:00
Christopher Neugebauer
dba220d678 Fixes list alignment inside fieldsets 2016-10-03 11:51:37 -07:00
Christopher Neugebauer
922a7ff1d9 Adds product/categories to admin view for group member flag 2016-10-02 10:40:10 -07:00
Christopher Neugebauer
a3474fd9cd Adds registration to the website (#69)
* Updates settings and requirements

* First pass at attendee profile

* Imports the registration templates; defines attendee profile models etc.

* First pass at themeing the registration form.

* First page of the registration form: done!

* Makes form validation nicer

* Adds populate_inventory

* Improves the additional items page

* Allows for rendering of formsets.

* Adds support for formset extending.

* Removes formset delete buttons

* Review page is LCA-ified

* Fixes some formset behaviour

* Fixes urls.py

* LCA-ifies product_category.html

* Invoices

* Credit card payments

* s/register/tickets/

* Show registration features only whilst products are available (think about this better, later)

* Updates the attendee profile form page

* Form tidy-up

* Makes it so that address info is copied from attendee profile to the address details are autofilled in Stripe.

* Adds feature to offer Australians a dropdown list of states rather than free text.

* Allow toggling of void invoices.

* Adds backgrounds to the headers in the registration process

* Improves the review page

* Adds “Linux Australia” to invoice details.

* Do not show balance due on void/refunded invoices.

* More thumbing

* Adds a link back to reports on each report.

* Tokenisation language.

* Another bug in credit card processing.

* Adds stripe refunds to options

* Removes spurious dashboard button.

* Tidies up the presentation of discounts.

* Tidies up presentation of voucher form.

* Fixes sponsor logo appearance with adblock.

* Front page tweaks

* Lets us specify alternative URLs in homepage panels

* more

* Updates discount amounts.

* More website fixes

* Changes language on pay invoice button

* Adds contact details to the invoice template.

* Updates the currency message in the invoice template.

* Explicitly includes e-mail address, because theme_contact_email doesn’t propagate

* Changes payment text.

* s/registration/selections/

* Removes final face palm

* Fixes lack of speaker dinner tickets for actual presenters.

* Adjusts wording in invoice e-mails

* Invoice wording.

* (FIX)

* Fixes margins on lists and tables

* Improvements arising from those CSS fixes.

* Changes description tags.
2016-09-30 20:46:05 +10:00
Scott Bragg
42372791d5 Don't notify everyone when a proposal changes, only the admins 2016-09-27 19:21:57 +10:00
Scott Bragg
882902d7a3 Add ADMIN_USERNAMES setting for selective proposal change notification 2016-09-27 19:18:40 +10:00
Scott Bragg
35bb710250 More cfps (#75)
* Law, Testing and Knowledge Miniconf CFP

* Admin registration for latest CFPs
2016-09-27 18:10:41 +10:00
Scott Bragg
52d443790f Last minute fixes to get miniconf cfp going (form fields missing) 2016-09-27 07:47:31 +10:00
Christopher Neugebauer
2aa0074bdc Removes speaker assistance options from the profile form. 2016-09-26 11:18:05 +10:00
Christopher Neugebauer
25c6dd666f Makes lists look less awful 2016-09-26 11:07:05 +10:00
Scott Bragg
2e2333ed70 Forgot to add games to admin 2016-09-25 16:21:08 +10:00