Conservancy/symposion_app
6
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
2307 commits 2 branches 0 tags 57 MiB
Commit graph

2307 commits

This branch
This branch
All branches
Author SHA1 Message Date
James Polley
c2b40fabbc Merge branch 'ticket-testing' into 'master' 
Update profile form and datatables

See merge request LCA2018/symposion_app!60
 2017-10-08 05:32:19 +00:00
James Polley
d0f4b1c455 Update datatables libraries 
This fixes some display issues and adds functionality.
 2017-10-08 16:14:28 +11:00
James Polley
f0933d897d Add notes to profile form about being able to edit form 
Also about the known issue with some emoji
 2017-10-08 15:10:34 +11:00
James Polley
3ee9c6ef4d Merge branch 'ticket-testing' into 'master' 
Datatable improvements: bigger uwsgi buffers, work for all tables

See merge request LCA2018/symposion_app!58
 2017-10-04 14:37:34 +00:00
James Polley
8aa1148f7a Make datatable work for each table on the page, not just the first 2017-10-05 00:55:30 +11:00
James Polley
8f28a444a2 Increase uwsgi buffer size 
The DataTables sets a lot of data into some cookies. It's currently
overwhelming the uwsgi buffer size.
 2017-10-05 00:38:05 +11:00
James Polley
e3c0aa510a Merge branch 'ticket-testing' into 'master' 
Revert "Split out dev/prod docker builds into parallel jobs."

See merge request LCA2018/symposion_app!57
 2017-10-04 13:16:24 +00:00
James Polley
df389b9ce5 Revert "Split out dev/prod docker builds into parallel jobs." 
This reverts commit d7065ee43d.

Dev build re-uses prod build, so they can't be split (and dev build
won't take much extra time anyway)
 2017-10-04 23:56:28 +11:00
James Polley
d48573073c Merge branch 'ticket-testing' into 'master' 
Remove errant debugging line from profile form

See merge request LCA2018/symposion_app!56
 2017-10-04 12:54:44 +00:00
James Polley
d7065ee43d Split out dev/prod docker builds into parallel jobs. 2017-10-04 23:49:16 +11:00
James Polley
f6b629bd60 Remove debugging line left on profile form. 2017-10-04 23:49:16 +11:00
James Polley
84f198e0e3 Merge branch 'ticket-testing' into 'master' 
Add datatables to ticket reports

See merge request LCA2018/symposion_app!55
 2017-10-04 12:27:14 +00:00
James Polley
af5fec11ff Utilise multi-stage docker build for consistent dev/prod base 
* developers can use --target symposion_dev to get a responsive site
  that reads from their homedir and reacts to changed files instantly
* without a specified target the default is to build the prod image,
  which is identical except for running uwsgi instead of the django
  built-in server
* Enable debug when running in a developer's test environment
* Remove the makemigrations script and dockerfile
 2017-10-04 20:43:01 +11:00
James Polley
45512e815a Add datatables tools to ticket reports 2017-10-04 20:43:00 +11:00
James Polley
64f9b3fb6c Merge branch 'clarify_profile_buttons' into 'ticket-testing' 
Clarify function of buttons on profile form

See merge request LCA2018/symposion_app!54
 2017-10-04 07:12:43 +00:00
James Polley
3c6c98021d Clarify function of buttons on profile form 
* "return to dashboard" throws away changes, so change the label to
  "cancel" to make this more clear.
* "Save profile" is probably the button you're looking for, so flag it
  as btn-success to make this clear.
 2017-10-04 18:06:23 +11:00
James Polley
4ce5f1daa0 Merge branch 'ticket-testing' into 'master' 
speakers_dinner_ticket requires acceptance of T&Cs

See merge request LCA2018/symposion_app!53
 2017-10-01 23:33:38 +00:00
James Polley
dd5f789ef3 speakers_dinner_ticket requires acceptance of T&Cs 2017-10-02 09:13:05 +11:00
James Polley
74a56d6bf3 Merge branch 'ticket-testing' into 'master' 
Enable adding voucher from the review screen

See merge request LCA2018/symposion_app!52
 2017-10-01 14:03:37 +00:00
James Polley
a4398ad483 Add symlink to incoporate registrasion docs 2017-10-02 00:47:36 +11:00
James Polley
ec71df90c8 Enable adding voucher from the review screen 2017-10-02 00:44:01 +11:00
James Polley
c0f839c0dd Merge branch 'ticket-testing' into 'master' 
Ready to go live *gulp*

See merge request LCA2018/symposion_app!51
 2017-10-01 13:36:22 +00:00
James Polley
abe4f5ad7a Fix some rules that were overly generous 2017-10-02 00:05:21 +11:00
James Polley
0103f9a91f Remove erroneous debug logging statements 2017-10-01 23:11:00 +11:00
James Polley
b0de856255 Clarify wording about complimentary products 2017-10-01 22:56:20 +11:00
James Polley
362ed28be2 Alter guided_registrasion logic to handle new page 
This is required for the new method of accepting terms and conditions
 2017-10-01 22:56:19 +11:00
James Polley
b8dcbd89b7 Draw more attention to the need to select complimentary items 
A big complaint from 2017 was that people overlooked things like
shirts and dinner tickets as those are complimentary, so they assumed
they didn't need to choose them.

This change adds some labels and some explanatory text to try to make
this more clear.
 2017-10-01 20:02:58 +11:00
James Polley
e325454fab Move agreement to terms to a Category 
- Remove field from attendee model
 - Create the category instead
 - Add a product as well
 2017-10-01 20:02:45 +11:00
James Polley
348e1c5c82 Javascript hack to make it more clear that postcode is mandatory 
On the two pages that display the profile form, add some javascript to
flag the postcode as required whenever the Country is AU
 2017-10-01 18:45:29 +11:00
James Polley
38a99f7ae5 And "discount" to EB discount descriptions 2017-10-01 14:50:53 +11:00
James Polley
3f4050d96f Use a YesNo field for T&C/CoC agreement 
Using a checkbox doesn't make it obvious that this is required.
 2017-10-01 14:48:59 +11:00
James Polley
ac0ef79b73 "Create" an attendee profile 2017-10-01 14:46:50 +11:00
James Polley
7965ac4111 De-dupe discount header/text 
The version with the header was better, so let's use that in both
places by moving it inside the template.
 2017-10-01 14:44:41 +11:00
James Polley
8d84438543 Remove antiquated compiled js 
afaict this is no longer in use anywhere
 2017-10-01 12:01:19 +11:00
James Polley
c76c850c80 Switch to the upstream registrasion docs 2017-10-01 11:32:12 +11:00
James Polley
73964cd820 Update shirt details to match plans 2017-09-30 23:40:46 +10:00
James Polley
68b6fe8f1e Offset polution with correct spelling. 2017-09-30 23:40:16 +10:00
James Polley
287d412ccf Catch TypeErrors from bleach 2017-09-30 22:50:13 +10:00
James Polley
e51ad76384 Add a "Back" button to the guided_registration stages 
"Next" is green, indicating that it's the default path, the way
forward. "Back" is available but blue.

For extra consistency, the initial "Get ticket" button is now also a btn-success
 2017-09-30 18:45:57 +10:00
James Polley
4605ee0d98 Require attendees to agree to Code of Conduct 2017-09-30 18:45:50 +10:00
James Polley
9d7be5f6df Update YesNoField coercion 
I am not sure if this is related to a py2/py3 change, or if it's
because django 1.11 changed the way it handles booleans; but either
way, this works.
 2017-09-30 18:11:05 +10:00
James Polley
271d9e05cd Style stripe payment form 
It's rough but it at least outlines the box for credit card details
 2017-09-30 13:24:14 +10:00
James Polley
35b75b6f96 Badger should fail gracefully if auth_groups hasn't been populated 
Let's say you've just installed symposion for the first time, and
you're running the intial `./manage.py migrate`

In that circumstance, there isn't an auth_group table. Naturally this
means you get Some Errors when trying to look for a particular group.

This change handles that error and drives on.
 2017-09-30 11:01:39 +10:00
James Polley
4e183317d0 Add requirement for lxml 2017-09-30 11:01:23 +10:00
James Polley
50145c03fe Copy stripe js template into pinaxcon 
Shouldnt be neccessary, template loader should be finding the template provided by the installed app.

but it's not, and I want rego to go live today, so here we go.

One day when things are nice this commit can be reverted and I will be crying a little less on the inside.
 2017-09-30 10:51:43 +10:00
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