Commit graph

2212 commits

Author SHA1 Message Date
James Polley
359640cfa1 Remove extraneous imports 2017-09-30 03:02:40 +10:00
James Polley
01de499a72 Need a later version of django-countries to support django v1.11 2017-09-30 02:56:02 +10:00
James Polley
953dafa7c3 Remove generate_badges.py symlink. 2017-09-30 02:36:55 +10:00
James Polley
660690c5cf git subrepo pull vendor/registripe
Also update vendored_requirements to make sure we pull this in.

subrepo:
  subdir:   "vendor/registripe"
  merged:   "9fc3645"
upstream:
  origin:   "git@gitlab.com:tchaypo/registrasion-stripe.git"
  branch:   "lca2018"
  commit:   "9fc3645"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"
2017-09-30 02:30:56 +10:00
James Polley
6eaddfc1d8 Give registripe subrepo a parent 2017-09-30 02:28:49 +10:00
James Polley
5789cbd05e git subrepo init vendor/registripe
subrepo:
  subdir:   "vendor/registripe"
  merged:   "5ebd581"
upstream:
  origin:   "none"
  branch:   "master"
  commit:   "5ebd581"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"
2017-09-30 02:06:10 +10:00
James Polley
3001324d5e git subrepo pull vendor/registrasion
subrepo:
  subdir:   "vendor/registrasion"
  merged:   "3545a80"
upstream:
  origin:   "git@gitlab.com:tchaypo/registrasion.git"
  branch:   "lca2018"
  commit:   "3545a80"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"
2017-09-30 01:49:37 +10:00
James Polley
19e4185cd9 Revert "NotImplmented refund"
This reverts commit a162559a05.
2017-09-30 01:48:53 +10:00
James Polley
e546b7d814 Fix qhasuery modification so that conditions are combined
Borrowed from the pyconau-2017 fork

To explain the impact of this - without this patch, if a user has
their invoice refunded, they are able to buy a new ticket; but
t-shirts, dinner tickets and so on do not become available to them
again because they are listed has already been in a cart for them.

Applying the patch now correctly checks to see if they currently have
a ticket.

From 731eee0a4c42a5013ee312b1ff50548e4d89a2ff Mon Sep 17 00:00:00 2001
From: Richard Jones <r1chardj0n3s@gmail.com>
Date: Sun, 4 Jun 2017 13:22:34 +1000
Subject: [PATCH] Fix query modification so that conditions are combined

Previously it was checking if the user has a product from the category
in a cart, and if there is no cart that is released (refunded).
Not *if the user has a product in a cart that is not released*.

This patch combines them. In the absence of a __ne operation in the
joining syntax, a double equality check is needed.

Signed-off-by: Richard Jones <r1chardj0n3s@gmail.com>
2017-09-30 00:44:21 +10:00
James Polley
105e6988e5 Merge migrations with upstream
Find urlencode, wherever it may hide

Further work to using latest upstream registrasion
2017-09-30 00:44:21 +10:00
James Polley
162b5edc20 git subrepo clone git@gitlab.com:tchaypo/registrasion.git vendor/registrasion
subrepo:
  subdir:   "vendor/registrasion"
  merged:   "7cf314a"
upstream:
  origin:   "git@gitlab.com:tchaypo/registrasion.git"
  branch:   "lca2018"
  commit:   "7cf314a"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"
2017-09-30 00:44:21 +10:00
James Polley
2580584597 Prepare to use the newly-revendored registrasion 2017-09-30 00:44:14 +10:00
James Polley
3c29e3db8c git subrepo pull vendor/registrasion
subrepo:
  subdir:   "vendor/registrasion"
  merged:   "c1e194a"
upstream:
  origin:   "git@gitlab.com:tchaypo/registrasion.git"
  branch:   "lca2018"
  commit:   "c1e194a"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"
2017-09-30 00:44:14 +10:00
James Polley
26f40ce904 git subrepo init --remote=git@gitlab.com:tchaypo/registrasion.git --branch=lca2018 vendor/registrasion
subrepo:
  subdir:   "vendor/registrasion"
  merged:   "8851e20"
upstream:
  origin:   "git@gitlab.com:tchaypo/registrasion.git"
  branch:   "lca2018"
  commit:   "8851e20"
git-subrepo:
  version:  "0.3.1"
  origin:   "???"
  commit:   "???"
2017-09-30 00:44:13 +10:00
James Polley
5409d4974a The 2018ificiation
I think this removes most references to "hobart", "pycon", and "2017"

There are still some references to some images that we don't have a
replacement for.
2017-09-30 00:44:13 +10:00
James Polley
fbdf841f33 Reorder dockerfile
This creates more intermediates, but moves those that are less likely
to change to the top of the file. In theory this will produce faster
builds on a developer's machine as they won't need to apt-get update
every time.
2017-09-30 00:44:13 +10:00
James Polley
54fceededa Just one void invoices button is sufficient thanks
And yes, this is changing it back to a button; having it as a link
isn't quite what we want.
2017-09-30 00:44:13 +10:00
James Polley
2c2fb35557 Merge branch 'ticket-testing' into 'master'
Update inventory for 2018

See merge request LCA2018/symposion_app!49
2017-09-27 14:42:34 +00:00
James Polley
ed2753d284 Update inventory for 2018 2017-09-24 19:30:40 +10:00
James Polley
8afaa650fe Merge branch 'tidyups' into 'master'
Tidyups

See merge request LCA2018/symposion_app!46
2017-09-24 08:02:48 +00:00
James Polley
bd1031e2cd Neaten "void invoices" button
Only want to show this once - not once per invoice.
It's not something most people will need to use so it doesn't need to
be a button. Restyle it to be a link
2017-09-24 17:53:53 +10:00
James Polley
18047f7549 Show paid/cancelled invoices
An errant ``{% if pending %}`` meant that we were only showing paid
and cancelled invoices - and the ability to buy new products - if
there was currently a pending invoice.

This change remove the errant check and allows for anyone with a paid
invoice to inspect it; or to add products.
2017-09-24 17:53:53 +10:00
James Polley
a401f061c4 Add symposion docs
Copied from pyconau-2017 fork of symposion.
2017-09-24 11:37:03 +10:00
James Polley
fa64473d58 Merge branch 'ticket-testing' into 'master'
Expand proposal admin; add CFP management links

See merge request LCA2018/symposion_app!42
2017-09-24 00:55:55 +00:00
James Polley
ba98c36868 Add admin links to review sections that the user can manager 2017-09-22 22:46:21 +10:00
James Polley
1e20731e32 Fix list of teams 2017-09-22 22:46:21 +10:00
James Polley
750902c5c3 Restore messages to site_base template 2017-09-22 22:46:08 +10:00
James Polley
d1f5acbf64 Fix miniconf fixture dates
Some proposalsections were still set to open immediately. Change that
to 1 Nov.
2017-09-22 20:28:27 +10:00
James Polley
d22f8e8e35 expand proposal admin 2017-09-22 20:13:48 +10:00
James Polley
9b0d830538 Finish adding models/forms/admin for new miniconfs
NB: all the proposal sections for the miniconfs here are set to open
on 2017-11-01. To make them available sooner, visit
/admin/symposion_proposals/proposalsection and change the start date.
2017-09-22 16:45:02 +10:00
James Polley
2a882678db (re)create miniconf proposals
This is a partial revert of  6d864e8ce5
- plucking out the bits we want to re-use
2017-09-22 16:45:02 +10:00
James Polley
7c273cdc3d Fix display of teams on dashboard 2017-09-22 16:19:04 +10:00
James Polley
a7e7c56058 Merge branch 'restore_docs' into 'master'
Restore docs

See merge request LCA2018/symposion_app!34
2017-09-21 02:25:54 +00:00
James Polley
dd77229fab Add perfunctory notes on the process of setting up a miniconf 2017-09-21 12:23:18 +10:00
James Polley
75a4bf673f Add gitlab ci config to build docs 2017-09-21 12:23:17 +10:00
James Polley
53b3217075 Restore docs
These were removed in d95d66d but still seem slightly userful.
2017-09-21 12:23:17 +10:00
James Polley
d5054456e7 Merge branch 'ticket-testing' into 'master'
Py3 compatibility

See merge request LCA2018/symposion_app!32
2017-09-17 12:42:23 +00:00
James Polley
03d98a1a33 Update sitetree from prod 2017-09-17 22:12:44 +10:00
James Polley
4b3dd5f8e3 Re-format sitetree fixture in preparation for update
This is just a reformat with "python -m json.tool"
2017-09-17 22:09:44 +10:00
James Polley
183dea0b6e Python3 compatibility in timetable listing
itertools changed a little between py2 and py3
2017-09-17 22:08:39 +10:00
James Polley
d22273b1c5 Merge branch 'ticket-testing' into 'master'
Update sitetree to allow multi-level menus

See merge request LCA2018/symposion_app!31
2017-09-17 10:21:25 +00:00
James Polley
f058ed7d71 Enable multi-level site-tree
* Remove the outdated compiled javascript once again
* Update the sitetree_header template to use more detail.

The extra detail here is taken from the menu_bootstrap3.html template
distributed with django-sitetree
2017-09-17 20:17:45 +10:00
James Polley
6a479055a0 More transparent support for symposion-fixtures dir
symposion-fixtures being a really crappy name for a folder that has
some utility stuff for helping populate a site with dummy data
2017-09-17 20:17:45 +10:00
James Polley
6bf38337fd Merge branch 'ticket-testing' into 'master'
Update bulk_update functionality

See merge request LCA2018/symposion_app!30
2017-09-17 03:43:37 +00:00
James Polley
b6a7b8b120 Set review-table class to get goodness on notification page
Flagging this as a review table means we get sorting, pagination, and
search. Much awesome, esp when we want to do this like "show me all
the ones that haven't been notified yet"
2017-09-17 13:16:06 +10:00
James Polley
494d9a6add Merge speaker migrations
Two different changes have updated the speaker model; this creates a
migration that merges the changes.
2017-09-17 13:16:06 +10:00
James Polley
62df4ec3de Allow flags for migrations
Switch Dockerfile from CMD to ENTRYPOINT so that flags can be passed
to the makemigrations command

This is required in cases where we need to use django's makemigrations
--merge to merge two migrations.
2017-09-17 13:16:06 +10:00
James Polley
ecd4bc97bc Expand bulk_accept to generic bulk_update
Allows for bulk rejection/undecided/standby in addition to bulk accept.
2017-09-17 13:15:56 +10:00
James Polley
fa18ef68fb Merge branch 'no-history' into 'master'
Remove jquery.history.js reference

See merge request LCA2018/symposion_app!28
2017-09-16 12:27:11 +00:00
James Polley
b89e6e9b56 Merge branch 'remove-stale-js' into 'master'
Fix review buttons by removing stale compiled JS; also some styling

See merge request LCA2018/symposion_app!27
2017-09-16 12:26:47 +00:00