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

2003 commits

This branch
This branch
All branches
Author SHA1 Message Date
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
James Polley
3ad7059e09 Merge branch 'djstorage' into 'master' 
dj-gapc-storage fix for num_retries went upstream

See merge request LCA2018/symposion_app!26
 2017-09-16 12:26:13 +00:00
James Polley
a45e44a1f6 Merge branch 'notification_help' into 'master' 
Correct list of tags available in notification templates.

See merge request LCA2018/symposion_app!25
 2017-09-16 12:25:01 +00:00
James Polley
f4d6fd1db4 Merge branch 'tabindex-for-hack' into 'master' 
Don't tab stop on Hack links in proposal creation

See merge request LCA2018/symposion_app!13
 2017-09-16 12:23:14 +00:00
James Polley
6e17b6d13d Remove jquery.history.js reference 
* This reference was added in the very distant past
* But jquery.history.js itself has never been in the repo
* pyconau-2017 team resolved the dilemma but dropping
  jquery.history.js into the repo
* But as near as I can tell, this does nothing except in obsolete
  older browsers. The fact that it's been broken ever since it was
  "added" is highly suggestive of it never having ever been used or
  needed
* So, trim the fat. It's possible that this might break an older
  browser that needs the functionality jquery.history.js provides -
  except that such a browser would *already* be broken because
  jquery.history.js has never actually been around to be used.
* If we ever do need this functionality, we can revert this
  change.. and then we'd have to drop in jquery.history.js. In that
  circumstance,
  https://github.com/pyconau2017/symposion/commit/34bc7c0 may be of interest.
 2017-09-16 21:21:12 +10:00
James Polley
5a84a57420 Fix review buttons by removing stale compiled JS; also some styling 
Essentially cognate with 0673e35 from the pyconau-2017 fork.
 2017-09-16 20:55:10 +10:00
Sachi King
aec594c2f2 dj-gapc-storage fix for num_retries went upstream 
Fix for an attribute error in this module has been merged upstream and
been released as 0.4.1

https://github.com/eldarion/django-gapc-storage/pull/17
 2017-09-15 10:06:49 +10:00
James Polley
8962a1f66d Correct list of tags available in notification templates. 2017-09-14 20:50:54 +10:00
James Polley
7a4ddcee6d Merge branch 'restore_extra_script' into 'master' 
restore extra_script

See merge request !24
 2017-09-13 13:37:14 +00:00
James Polley
d0755eadf6 restore extra_script 
This fell out of the template at some point, but is needed for some
javascripty things to work.
 2017-09-13 23:10:30 +10:00