Commit graph

2187 commits

Author SHA1 Message Date
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
Sachi King
3c2c2543fd Revert "Don't populate inventory"
This reverts commit 0d06fc08eb.
2017-09-13 17:11:56 +10:00
James Polley
008c33a221 Merge branch 'dev_dockerfile' into 'master'
Add support for developers

See merge request !18
2017-09-03 07:51:25 +00:00
James Polley
37fb435e18 Add devmode_settings.py for local dev
* Adds an env variable to .env to turn on dev mode
* Uses the inbuilt django auth rather than saml when in dev mode
* For laziness, re-uses the admin login form for the non-admin login

make_dev_container now comes up ready to be logged into by any
user. No non-admin users are preconfigured; but you can add one at
http://localhost:28000/admin/auth/user/add/, log out, and then hit
http://localhost:28000/ to log in as the new user.
2017-08-28 17:12:05 +10:00
James Polley
0d06fc08eb Don't populate inventory 2017-08-28 17:12:03 +10:00
James Polley
fe8da10c22 make_dev_container
Expand on support for devs by scripting the process of creating,
starting, and initialising a dev container.

Take container name as an optional parameter
2017-08-28 17:11:10 +10:00
James Polley
fb5d0b8941 Create a dev docker container for makemigrations
* Adds a laptop-mode-env file which docker can read env variables from
* Adds a Dockerfile.makemigrations; mostly identical to the main
  Dockerfile. Important difference: instead of the source being copied
  into the docker image at build time, it's mounted from the local
  machine at run time.
* Adds a makemigrations shell script which builds an imagine using the
  Dockefile.makemigrations and then uses it to run makemigrations
* Because the source is mounted from the local machine, any new
  migrations created are dumped in the developer's git checkout ready
  for adding to git.

Rename .env -> docker/laptop-mode-env
2017-08-28 16:54:34 +10:00
Sachi King
855c71eaca Update testing fixtures to add admin users
This allows testing deployments to have accounts that can log in as
admin.
2017-08-16 14:51:29 +10:00
Sachi King
71a612baa4 Build dev container for ticket testing 2017-08-16 13:44:23 +10:00
James Polley
c93fa5d812 Merge branch 'transactify' into 'master'
Make review changes atomic

See merge request !22
2017-08-09 03:59:33 +00:00
James Polley
5114076afa Make review changes atomic
This follows from investigations in
https://rt.lca2018.org/Ticket/Display.html?id=283&results=eac0bd3c49f782d054f87d6b160ca36b;
in short, it seems that because this very long and complex method
creates several different objects at differnt times, the DB has been
getting out of sync; there are more votes recorded then there are
reviews, becuase the table that stores the vote count is updated
before the table that stores the vote and review information

This change is intended to make this operation (and the other
operations that the revew_detail handler performs) atomic, to prevent
things getting further out of step. It does *not* fix the existing
incosistency.

review_delete has been atomicified as well as it likely needs the same
treatment, but this has not been examined in detail.
2017-08-09 12:27:41 +10:00
James Polley
89cafa8aa1 Merge branch 'admin_reviews' into 'master'
Add reviews to admin interface

See merge request !21
2017-08-09 00:54:07 +00:00
James Polley
e63f7b7a7e Add reviews to admin interface 2017-08-09 10:35:16 +10:00
James Polley
7fe5a09bfb Return an integer for the slice index.
Resolves:

    File "/app/symposion_app/vendor/symposion/reviews/views.py", line 230, in review_random_proposal
    proposals = proposals[:(len(proposals) + 1) / 2]
    TypeError: slice indices must be integers or None or have an __index__ method
2017-08-08 23:00:36 +00:00
Sachi King
7b58bfafa6 Fix container name reference for deploy command
In the pod, the container is not called frontend
2017-08-08 18:36:47 +10:00
Sachi King
5a97c93861 Merge branch 'two-small-fixes' into 'master'
Two small fixes

See merge request !20
2017-08-08 06:51:11 +00:00
Steve Kowalik
dede5dec18 Correct some spelling in README
README had some typos, correct them.
2017-08-08 16:41:10 +10:00