Commit graph

1989 commits

Author SHA1 Message Date
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
Steve Kowalik
866217bf35 Switch score calculation to pure Python
Rip out the score expression madness, and calculate the score in Python,
since I hear that Python is better at math than SQL is.
2017-08-08 16:41:02 +10:00
Sachi King
084c78e2cd Fix score calculation hack
I have no idea why we do this in the database as some magic after we
call save().  I also have no idea why MySQL is seeming to think we want
type BIGINT UNSIGNED at the end of the
((2 * '+2' + '+1') - ( '-1' + 2 * '-2')) but it does.

Setting it to 2.0 or float(2) doesn't get the ORM to get this right, but
we are going to Decimal and making the 2 multiplier be of type Decimal
manages to make the ORM pull it's shit together and use something that
seems like we're okay with.

+1, -2 = 1 / 2 = -0.5 Score == True
Looks like it works.

UPDATE `symposion_reviews_proposalresult` SET `score` = CASE WHEN `symposion_reviews_proposalresult`.`vote_count` = 0 THEN '0' ELSE ((((2 * `symposion_reviews_proposalresult`.`plus_two`) + `symposion_reviews_proposalresult`.`plus_one`) - (`symposion_reviews_proposalresult`.`minus_one` + (2 * `symposion_reviews_proposalresult`.`minus_two`))) / (`symposion_reviews_proposalresult`.`vote_count` * 1)) END WHERE `symposion_reviews_proposalresult`.`id` = 1
2017-08-08 15:37:33 +10:00
Sachi King
e1ce26eb62 Cleanup more user exploitable input with bleach
My eyes hurt.  More user exploitable XSS on inputs.
2017-08-07 20:13:10 +10:00
Sachi King
ade44d6a1b Merge branch 'fix_speaker_Addittion_Template' into 'master'
{{ dashboard_url ]} fixup

See merge request !19
2017-08-07 01:53:24 +00:00
Sachi King
c32dbb2a07 Build an ephemeral dev container for rego testing
Create a ephemeral dev container to facilitate testing of
populate_inventory.  It can be created, tweeked in the admin interface,
files updated in admin's populate_inventory, then redeployed to deal
with those changes.

A branch based one will need to be created to so we can do this work
without polluting the master branch.
2017-08-07 11:50:03 +10:00
Sachi King
db1f3f9792 Improve image update workflow
This improves the administrative workflow of deploying updated images to
the k8s cluster.  Still tag latest however, as that's important to
old-workflow.

Would be good to block this and have it fail on a db migration so it
doesn't happen accidently, and make the deployer deal with it.
2017-08-07 11:30:11 +10:00
Sachi King
75c82aad37 Fix miniconf editing - No attribute issue
Editing a miniconf, on save, the code looks in settings for
ADMIN_USERNAMES, and as it does not exist, we stack-trace and 502 to the
user.

Add the attribute to settings.py
2017-08-04 15:19:32 +10:00
James Polley
473bc8efed {{ dashboard_url ]} fixup 2017-08-04 14:17:44 +10:00
Sachi King
5cc9f81d37 Merge branch 'fix_hobart' into 'master'
Travel assistance to sydney please

See merge request !17
2017-08-01 10:25:42 +00:00
James Polley
bba5649360 Travel assistance to sydney please
* Tweaks help_text to indicate that travel assistance is to Sydney
* Includes the required migration

This migration doesn't change the DB so it's safe to apply with the system live.
2017-07-31 22:48:49 +10:00
Bruce Crawley
56dc089d59 Merge branch 'review-order' into 'master'
Order by ID rather than at last update time

See merge request !16
2017-07-16 00:43:39 +00:00
Sachi King
5b4e1ec01d Revert "Removes speaker assistance options from the profile form."
This reverts commit 2aa0074bdc.
2017-07-16 00:21:10 +10:00
Sachi King
89e74a6f11 Order by ID rather than at last update time
The current ordering is based on what appears to be a random ordering
that happens to correlate to the last time the paper was submitted or
updated.  Oldest to most recent.

This changes it to submission order so ordering doesn't change and ID is
a static, making it easier to move through a list of papers.  "I last
looked at 24, so 25 is assured to be the next one I want to look at.

There's the thought of updated papers being looked at and voted on, but
it does not seem to me that this is supported or possible.  In general
one would look at their un-reviewed list, and go off it, which puts
updates out the window.

We can certainly order on other fields if desired, but this one makes
the most since to me.
2017-07-14 21:19:28 +10:00
Sachi King
565a90f618 Add a note to get the permission required for papers review
So not obvious...
2017-07-08 14:37:38 +10:00
Sachi King
31375f9e91 Remove default name from create_review_permssions
This was removed somewhere in 1.8, which means this results in a
failure.  If I understand correctly, this "name" is now derived from the
model name's __str__ or something like that.
2017-07-07 00:16:08 +10:00
Sachi King
e668bf03c2 Merge branch 'addfavicon' into 'master'
Change favicon to an LCA-appropriate favicon.

See merge request !14
2017-07-04 09:13:37 +00:00
Sachi King
38b231c5d9 Merge branch 'monospace-wrap' into 'master'
Fix word-wrap of monospace text

See merge request !15
2017-07-03 12:04:08 +00:00
Joel Addison
82450bfb42 Fix word-wrap of monospace text 2017-07-03 21:48:46 +10:00
Sachi King
7e5fbc27ea Syntax: How'd that get there 2017-07-03 21:29:16 +10:00
Sachi King
b85ab46ed4 Configure a production email server 2017-07-03 21:18:57 +10:00
James Polley
f990dfd212 Rename directory to match the calendar 2017-07-03 17:39:28 +10:00
James Polley
db328d9354 Change favicon to an LCA-appropriate favicon.
This isn't the same one we're using for the static site - but honestly I think this one is probably better.
2017-07-03 17:36:39 +10:00
Jamie Lennox
df78fec26a Don't tab stop on Hack links in proposal creation
It's really annoying when you are adding a proposal and you hit tab and
end up on the link to the Hack website. There's no need for this and at
least on newer browsers we can pretty easily skip the links for tab.

Unfortunately because this is model text it generates migrations. As we
know these migrations don't actually do anything, so they are annoying
but not actually harmful.
2017-07-02 22:52:53 +10:00
James Polley
13bed8999c Merge branch 'other-migrations' into 'master'
Other suggested django migrations

See merge request !12
2017-07-02 12:43:38 +00:00
James Polley
7710f334bd Merge branch 'miniconf-release' into 'master'
Add release materials check boxes to miniconf proposal

See merge request !11
2017-07-02 12:43:06 +00:00
Jamie Lennox
59207eb0c9 Other suggested django migrations
So django keeps strict synchronization between its code and migrations
so that it can help generating new migrations. These are the additional
suggested migrations. A lot of these are a null effect, some are things
like transforming an unsigned integer to a signed integer. So not super
urgent on a small scale, but worth doing to keep django happy.
2017-07-02 22:38:38 +10:00
Jamie Lennox
10b6358b92 Add release materials check boxes to miniconf proposal
We need to have people who are submitting a miniconf proposal agree to
releasing the material. The easiest way to do this is to just make it a
proposal like the other two types. We don't have audience type for
miniconf, instead of deleting it just have a default - it's easier.

WARNING: This requires a real migration to be performed before use.
2017-07-02 22:31:56 +10:00
James Polley
7262ed8943 Merge branch 'not-pycon' into 'master'
Use Linux Australia for release and not pycon

See merge request !10
2017-07-02 12:14:57 +00:00
Jamie Lennox
4847f13de0 Use Linux Australia for release and not pycon
Update the recording and materials release to say Linux Australia, not
Pycon Australia. This generates a migration because the model text has
change - but also because in the 0001_initial migration it appears that
this help text is stored as a byte string.

This is a bit weird, but realistically running this migration is not
going to cause us any problems so just add it so we don't end up
fighting django along the way.
2017-07-02 22:11:18 +10:00
James Polley
52737d4c05 Merge branch 'toc' into 'master'
Add the T&C and COC to the accept box

See merge request !9
2017-07-02 11:40:33 +00:00
James Polley
282bd59b43 Merge branch 'py3' into 'master'
Specify python3 when creating a virtualenv in README

See merge request !7
2017-07-02 11:03:17 +00:00
Jamie Lennox
274f8ac966 Add the T&C and COC to the accept box
Link to the T&C and Code of conducts so people know what they are
accepting. Create this as a static link because i don't know how django
would accept this being something dynamic on the model.

This annoyingly creates a migration, but it's not a real change and
easier to accept it now than fight django forever.
2017-07-02 16:08:15 +10:00
Jamie Lennox
60308952fd Specify python3 when creating a virtualenv in README
This app is now python3 only so we must specify python3 when creating a
virtualenv. Yes this assumes that most people are using python2 as
default, most distros still ship this way.
2017-07-02 11:01:46 +10:00
Sachi King
db3e6bbffe This is why we can't have nice things 2017-06-26 22:46:11 +10:00
Sachi King
e52dbd9c54 Missed an import 2017-06-26 22:43:58 +10:00
Sachi King
22680dd663 dashboard at / 2017-06-26 22:20:20 +10:00
Sachi King
1a54b0f9d6 Collect Static so admin works
Thanks tchaypo and jammielennox

Closes #11
2017-06-26 21:11:15 +10:00
Sachi King
dc935261e2 Port 2017-06-24 17:28:36 +10:00
Sachi King
5c87adbaad System dep: libmysqlclinet18 2017-06-24 17:16:04 +10:00
Sachi King
ed81eb3e88 Is a dict 2017-06-24 17:01:25 +10:00
Sachi King
ad08aabc21 Double requirement 2017-06-24 16:47:02 +10:00
Sachi King
ccfab1f227 Merge branch 'master' of gitlab.com:LCA2018/symposion_app 2017-06-24 16:04:30 +10:00
Sachi King
f07b20aebd DATABASE_URL as ENV_VAR 2017-06-24 15:59:46 +10:00
Sachi King
65033b0937 Use uWSGI as the backing runner 2017-06-24 14:09:33 +10:00
Sachi King
99e5d2ce04 Merge branch 'superuser' into 'master'
Specify how to create a superuser account in dev

See merge request !5
2017-06-10 03:29:40 +00:00
Sachi King
d106efb6ce Fix static content serving
What?  Why did this stop working?
2017-06-10 13:19:40 +10:00
Jamie Lennox
5c19dbf236 Specify how to create a superuser account in dev
To do development you will need a local super user account. This is
a standard Django practice but should be documented here as well.
2017-06-10 13:18:54 +10:00
Sachi King
ad21281840 Merge branch 'remove-sponsor-fixtures' into 'master'
Remove sponsor fixtures

See merge request !2
2017-06-10 02:45:35 +00:00