Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merge of DC changes to date. #103

Open
wants to merge 93 commits into
base: staging
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
93 commits
Select commit Hold shift + click to select a range
9f42a8e
Updates from DC
fnbauer Jan 2, 2021
0a8e774
Hugo updates
fnbauer Jan 4, 2021
9f7761f
More Hugo updates
fnbauer Jan 4, 2021
1a1eeda
more updates to get it working
fnbauer Jan 10, 2021
a326321
more hugo updates
fnbauer Jan 13, 2021
95c50ae
yet more
fnbauer Jan 14, 2021
59233ea
queues
fnbauer Jan 15, 2021
cd3f4e2
YMHU
fnbauer Jan 15, 2021
3e3a66c
YMHS
fnbauer Jan 19, 2021
3ba7595
more
fnbauer Jan 19, 2021
537d924
z
fnbauer Jan 19, 2021
84342b9
z
fnbauer Jan 19, 2021
4d1a6d5
s
fnbauer Jan 19, 2021
70a7d0d
style1
fnbauer Jan 19, 2021
b5dc001
header
fnbauer Jan 19, 2021
c83aac9
red
fnbauer Jan 19, 2021
0e3e134
more fix
fnbauer Jan 20, 2021
54e936b
grammer fix in login email
fnbauer Jan 20, 2021
daa72df
tweaking
fnbauer Jan 22, 2021
a9261ae
DC local updates
fnbauer Jan 23, 2021
bdf5a8d
Update menu to include ballot mention
fnbauer Jan 23, 2021
5723b8b
generic nominaters import
fnbauer Jan 23, 2021
cf3244b
Generic Nominators import
fnbauer Jan 23, 2021
6ae0b10
generic nominator import
fnbauer Jan 23, 2021
df1813d
DC updates
fnbauer Jan 24, 2021
cee70ba
Highlight form saving instructions
fnbauer Jan 24, 2021
38fd099
Fix migrations to not break DC when run
fnbauer Jan 24, 2021
a7db116
DC-specific updates
fnbauer Jan 24, 2021
c165fc5
DC-specific updates
fnbauer Jan 24, 2021
baacd31
Nominator import
fnbauer Jan 25, 2021
ee30d73
DC Hugo fixes
fnbauer Jan 25, 2021
a77c7a4
Hugo nomination mailer for DC
fnbauer Jan 26, 2021
292c406
Hugo updates
fnbauer Jan 28, 2021
902ad1c
Fix URL error
fnbauer Feb 1, 2021
58c2b5c
Change hardcoding from Chi to DC
fnbauer Feb 1, 2021
c1c6cc4
DC specific fixes
fnbauer Feb 1, 2021
7d22aeb
update
fnbauer Feb 15, 2021
b28e100
more
fnbauer Feb 15, 2021
d03f715
mopre
fnbauer Feb 15, 2021
e51fe38
more
fnbauer Feb 15, 2021
c01ad3a
more
fnbauer Feb 15, 2021
164ba4e
Update README.md
fnbauer Feb 18, 2021
ea70d66
Update README.md
fnbauer Feb 18, 2021
702743e
Update README.md
fnbauer Feb 18, 2021
058678e
Update README.md
fnbauer Feb 18, 2021
54093ab
Update README.md
fnbauer Feb 18, 2021
5a3a702
dc cleanup
fnbauer Mar 6, 2021
5566073
Merge branch 'staging' of https://github.com/fnbauer/wellington into …
fnbauer Mar 6, 2021
965a7ca
trim spaces
fnbauer Mar 9, 2021
e914967
more space trim
fnbauer Mar 9, 2021
98fcb80
remove all extra spaces
fnbauer Mar 9, 2021
11ccdd3
Logo update
fnbauer Apr 7, 2021
97d7551
add staging environment to allow debug control
fnbauer Apr 28, 2021
862780b
more staging stuff
fnbauer Apr 28, 2021
2c8cde3
fix
fnbauer Apr 28, 2021
a546625
Allow HTML in finalist names
fnbauer Apr 28, 2021
4b50c22
html in finalist names
fnbauer Apr 29, 2021
a78ac29
hugo mail color fix
fnbauer May 8, 2021
553ac59
more color tweaks
fnbauer May 8, 2021
79aca8b
raw format in rank email
fnbauer May 8, 2021
a535906
more
fnbauer May 9, 2021
fcb65d7
fu
fnbauer May 9, 2021
2fc2741
a
fnbauer May 9, 2021
ba6462e
FIx hugo voting bugs
fnbauer May 10, 2021
1b29c3c
hugo language tweak
fnbauer May 10, 2021
cff4046
zero preferncee language
fnbauer May 10, 2021
abd121e
Accessability updates
fnbauer May 25, 2021
d5ff328
Hugo voting updates
fnbauer May 25, 2021
88973e8
Typo fix
fnbauer May 25, 2021
02461e8
meta fix
fnbauer Jun 11, 2021
7e6f643
Hugo packet on Spaces
fnbauer Jun 13, 2021
6331466
All before Stripe update
fnbauer Sep 6, 2021
b56bd59
Merge branch 'staging' of https://github.com/fnbauer/wellington into …
fnbauer Sep 7, 2021
e43268f
Update login link timeout
fnbauer Oct 19, 2021
22cf18d
Site selection updates
fnbauer Oct 19, 2021
a914984
Add short names
fnbauer Oct 19, 2021
fdcacdc
Stripe checkout & WeChat Pay
Oct 20, 2021
f3eeb93
Merge pull request #1 from wecohere/bh/stripe-checkout-and-wepay
fnbauer Oct 22, 2021
f923d14
Merge branch 'staging' of https://github.com/fnbauer/wellington into …
fnbauer Oct 19, 2021
a8c8254
Initial Site Selection Payment code
fnbauer Oct 24, 2021
f97c9ef
Initial Site Selection Payment WCPay
fnbauer Oct 24, 2021
3b2623e
Site Selection push to staging
fnbauer Oct 24, 2021
786d249
Pull real token data for Site Selection
fnbauer Oct 24, 2021
be0ba7d
Update site selection text and mailers
fnbauer Oct 25, 2021
6dcfade
Add mailling addess to site selection
fnbauer Oct 25, 2021
2d9df26
cleanup for Site Selection
fnbauer Oct 26, 2021
65c88ed
Remove debug from Hugo Voting
fnbauer Oct 27, 2021
454148f
fix typos
fnbauer Oct 27, 2021
4a26890
Add descriptions back to Stripe payments
fnbauer Nov 1, 2021
e1edd65
Add mobility rentals link
fnbauer Nov 12, 2021
24170b6
Mobility changes
fnbauer Nov 12, 2021
8559c0e
More mobility changes
fnbauer Nov 12, 2021
06cf8d5
site selection and discord
fnbauer Dec 15, 2021
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -19,8 +19,8 @@ FROM ruby:2.7.1-alpine as base
# we need _a_ worldcon number
ARG WORLDCON_NUMBER

# and by default that'll be Chicago :)
ENV WORLDCON_NUMBER ${WORLDCON_NUMBER:-worldcon80}
# and by default that'll be Chicago/xxxxxxxx DC :)
ENV WORLDCON_NUMBER ${WORLDCON_NUMBER:-worldcon79}

RUN apk add \
build-base \
Expand Down
1 change: 1 addition & 0 deletions Gemfile
Original file line number Diff line number Diff line change
Expand Up @@ -38,6 +38,7 @@ gem "redcarpet" # markdown parser for displaying simple markup on tex
gem "seedbank" # For customizing seeds for all cons
gem "sidekiq" # Background jobs processor
gem "sidekiq-scheduler" # Background jobs processor scheduler
gem "strip_attributes" # ActiveModel extension to remove leading and trailing spaces
gem "stripe", "~> 4" # payment provider, locked for https://github.com/rebelidealist/stripe-ruby-mock/pull/643
gem "tiny_tds" # adapters for Dave's Hugo integration
gem "webpacker" # a JavaScript module bundler, takes modules with dependencies and generates static assets
Expand Down
Loading