Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
466 commits
Select commit Hold shift + click to select a range
117a20c
Fixed admin for category to be a dropdown
sesas Jun 18, 2017
55c5b59
Merge pull request #107 from pybay/fix-admin-category
PirosB3 Jun 18, 2017
3d40e2a
Implemented speaker detail page and enchanced model
Jun 14, 2017
01686d1
logos for registration
ccsv Jun 21, 2017
8f594d8
Merge pull request #112 from ccsv/ccbranch
PirosB3 Jun 21, 2017
70c4d7d
addressed comments
Jun 21, 2017
25ac296
Merge pull request #108 from pybay/details_page_2
PirosB3 Jun 21, 2017
2c96cdc
pybay/views: stop importing all views by name to avoid conflicts on m…
epsy Jun 21, 2017
ada373b
Added proposal.speaker_and_talk_history to api call
sesas Jun 21, 2017
09d5b83
Merge pull request #118 from epsy/urlspy
sesas Jun 21, 2017
7fc5ad0
Merge pull request #119 from pybay/speaker-talk-hisotry
sesas Jun 21, 2017
f192b7d
Fixing undecided_proposals api call
sesas Jun 21, 2017
2d800d0
Merge pull request #120 from pybay/speaker-talk-hisotry
sesas Jun 21, 2017
d6db1dc
Listen for https traffic in prod nginx config
simeonf Jun 22, 2017
766fe27
fix unclosed <strong> tag on registration (#122)
epsy Jun 22, 2017
2d26696
add photo fallback for speakers
Jun 21, 2017
65210b5
404 page styling, remove unused 404 page
ccsv Jun 21, 2017
666634d
Underline get in touch link on home page
ccsv Jun 21, 2017
1586c84
Remove CFP link from menu bar (#129)
epsy Jun 22, 2017
2cc199b
add Scholarships to menu bar
epsy Jun 22, 2017
4346e1a
Allow HTML in FAQ excerpts
epsy Jun 21, 2017
5889ca9
Show the schedule (#109)
epsy Jun 25, 2017
9ac0d6f
Sfranklin/featured speakers (#133)
PirosB3 Jun 26, 2017
edd4f35
Revert "Sfranklin/featured speakers (#133)"
epsy Jun 26, 2017
08482d5
Verbiage changes on sponsorship-prospectus page (#138)
j-driller Jun 26, 2017
85525ce
Restyle the tagline to highlight tutorial/talk days
epsy Jun 28, 2017
6da808a
Color the tito widget appropriately
epsy Jun 26, 2017
dc0a3e5
Reveal talk descriptions on the schedule on hover
Jun 25, 2017
4be6d28
interlink speaker and schedule pages (#140)
epsy Jun 28, 2017
b617abf
use bootstrap containers in the sponsor list and fix the image size (…
epsy Jun 30, 2017
e0407e2
Fix google fonts being loaded unsecurly over https (#146)
epsy Jun 30, 2017
3af0cc6
Fix jquery.min.js being fetched insecurely (#147)
epsy Jun 30, 2017
c007312
Add email and phone to admin talk listing
mzdaniel Jul 2, 2017
fa1db58
schedule: always order rooms the same way (#144)
epsy Jul 4, 2017
ab6608b
Adding featured speakers app
simeonf Jun 21, 2017
52669e8
Add featured_speakers and dependency to INSTALLED_APPS
simeonf Jun 21, 2017
5c33761
Add featured speakers to frontpage template
simeonf Jun 21, 2017
36e6955
Use name in admin dropdown list
simeonf Jun 21, 2017
cf8e0e3
One row, many speakers
simeonf Jun 21, 2017
60863fc
Many hoops to customize the string display of Speaker model in admin
simeonf Jun 21, 2017
0073cfd
Use default speaker image
simeonf Jun 23, 2017
936120f
just make the page background white
epsy Jun 26, 2017
e62351c
Improve the featured speakers heading style
Jun 25, 2017
f4156ce
Use a dedicated field for featured speaker bio. Delete featured speak…
epsy Jun 26, 2017
b88afc3
fix social block clipping and appearing when useless
epsy Jun 26, 2017
edfd7b5
Match the size of featured speaker description and picture
epsy Jul 4, 2017
40efa91
Various style fixes (#150)
epsy Jul 6, 2017
4cb3810
Allow talk.abstract to have linebreaks in speakers_detail.html (#151)
fjsj Jul 6, 2017
d3f12bd
Remove loader (#149)
epsy Jul 6, 2017
b96f8e8
schedule: collapse the time and special slots together (#145)
epsy Jul 6, 2017
8ec4912
Style fixes for the schedule on mobile (#143)
epsy Jul 6, 2017
53fef8d
Schedule header style fixes (#152)
epsy Jul 8, 2017
c1e7330
Chunk speaker list (#154)
PirosB3 Jul 9, 2017
f8523b2
submenus in navbar
epsy Jul 9, 2017
168e07e
remove the desktop sidebar
epsy Jul 9, 2017
146576e
add link to blog
epsy Jul 9, 2017
d4303aa
Improve the sponsor footer
epsy Jul 9, 2017
934bb74
fix crash when a sponsor has no picture
epsy Jul 9, 2017
64c611b
Replace default speaker photo
epsy Jul 10, 2017
f8af47e
Add SVG source for default speaker photo
epsy Jul 10, 2017
cf35097
Fill the canvas with the speaker graphic
epsy Jul 10, 2017
ecdfd9a
Update schedule filters (#160)
epsy Jul 10, 2017
730ce8c
add schedule and speakers to menu
epsy Jul 10, 2017
3280d13
Fix schedule links in menubar (#162)
epsy Jul 10, 2017
6845fab
Fix clipping of new speaker photo
epsy Jul 10, 2017
8ba405e
schedule: fix multiple-category filter not working (#163)
epsy Jul 10, 2017
458e222
add lightbox images
epsy Jul 10, 2017
d71870d
fix glyphicon font urls
epsy Jul 10, 2017
b14df81
use {% static %} tag from staticfiles
epsy Jul 10, 2017
ffa6a31
Have travis run collectstatic before running tests
epsy Jul 10, 2017
5970de7
Use ManifestStaticFilesStorage so that browser caches get busted
epsy Jul 10, 2017
9ce8342
parse schedule description (#168)
epsy Jul 12, 2017
0ad1702
add CANONICAL_HOST to template context
epsy Jul 12, 2017
0b24003
add meta tags for card previews
epsy Jul 12, 2017
e49e70c
Tweak to description text
Jul 12, 2017
5b3c3a8
Added address for Pre-conference workshop venue on registration page
arturolei Jul 13, 2017
cf3d54c
use markdown in talk description on speaker abstract page
epsy Jul 12, 2017
be1b9f7
use markdown in speaker biographies
epsy Jul 12, 2017
127b754
add new nerdwallet image and anchor tag
Jul 15, 2017
a0b3960
Added rel="noopener noreferrer"
Jul 15, 2017
c1bd44c
Fix the address for main conference location
grace-law Jul 16, 2017
498ed89
remove width constraint on flatpages
epsy Jul 16, 2017
18d06d1
tito-widget: let the ticket descriptions span a larger part of the line
epsy Jul 16, 2017
1bc1edd
Background is gray (again)
epsy Jul 16, 2017
d87e130
Remove white background from featured speakers
epsy Jul 16, 2017
bf88644
add unregistered db migration
epsy Jul 15, 2017
c36ba21
load tito synchronously and only on the registration page
epsy Jul 16, 2017
23d3548
display both tutorials and talks on speaker page
epsy Jul 15, 2017
bdacda2
display speakers who only have accepted tutorials on the speaker list…
epsy Jul 16, 2017
6a3d421
display ticket link for workshops on speaker page
epsy Jul 16, 2017
f4aab01
Add a location override for tutorials
epsy Jul 16, 2017
72179ff
fix the featured_speakers heading being too close to its bounding box
epsy Jul 16, 2017
4a8c67a
Use markdown in featured speakers
epsy Jul 16, 2017
6a51069
fix target=_blank urls exposing the page's context to external sites
epsy Jul 10, 2017
403aa3b
add target=_blank on external links
epsy Jul 10, 2017
0c99177
fix the color of the tito link in the widget
epsy Jul 16, 2017
7d039ca
Display category in the schedule cards (#189)
epsy Jul 19, 2017
55137a4
improve the layout of featured speakers (#188)
epsy Jul 19, 2017
7298f14
make the gray background appear behind headings in the sponsor list p…
epsy Jul 19, 2017
e720f8e
Gray faq boxes (#186)
epsy Jul 19, 2017
574c4b4
make parts of the sponsorship page gray (#185)
epsy Jul 19, 2017
e2fb225
center the companies' logos in "Committed to your education" on regis…
epsy Jul 19, 2017
e20ec05
add pre-conference workshops to the menu
epsy Jul 16, 2017
0741adb
Move pre-conf workshops menu to the right place
epsy Jul 19, 2017
e343749
schedule: description appears without warping layout
epsy Jul 9, 2017
69fd9bc
Add id to each talk
simeonf Jul 20, 2017
699e210
Add custom admin for tutorials
simeonf Jul 20, 2017
3642c6f
Add django-columns
simeonf Jul 20, 2017
006a9ab
Add columns to INSTALLED_APPS
simeonf Jul 20, 2017
c8fdee1
Add custom template and templatetags for use with tutorials flatpage
simeonf Jul 20, 2017
203b39b
Fix problem with ul on speakers page
simeonf Jul 20, 2017
42825cf
updated continuing education company blurb and link to faq
jttyeung Jul 24, 2017
7cb33f4
also fix ordered list styling on speaker pages
epsy Jul 19, 2017
d03824b
Change timezone to pacific in development mode to match other envs (#…
epsy Jul 25, 2017
8d42b6f
Reimplement the countdown
epsy Jul 24, 2017
b4d5373
improve the admin and debug displays for countdowns
epsy Jul 25, 2017
8dfc650
potential styling
jttyeung Jul 25, 2017
da92901
revised venue locations and images
jttyeung Jul 26, 2017
4d6b7c1
add conference location menubar link and page anchor
jttyeung Jul 26, 2017
17d0979
undo template changes
jttyeung Jul 26, 2017
866d7a7
added google maps
jttyeung Jul 26, 2017
8d6115f
revise navbar menu naming for registration
jttyeung Jul 26, 2017
2c8d99f
renamed navbar menu item
jttyeung Jul 26, 2017
0fdd974
added analytics script to base.html
arturolei Jul 31, 2017
c024501
Updated navbar links and speaker page headers (#198)
jttyeung Aug 2, 2017
dc860b6
schedule: allow html in slots' content_override
epsy Aug 4, 2017
16ea33f
Update Bloomberg workshop address
mzdaniel Aug 8, 2017
3431a78
Delete duplicated content
simeonf Aug 11, 2017
ead6603
schedule: fix mobile layout using popover-style expandos
epsy Aug 12, 2017
a308004
schedule: fix padding around speaker name when a speaker photo was pr…
epsy Aug 12, 2017
1730f40
base: fix sponsors footer making page too wide
epsy Aug 12, 2017
76e900a
style.css: fix unclosed media query
epsy Aug 12, 2017
499f110
Add ordered_model support and admin ui for Faq & Category models
simeonf Jan 3, 2018
71cbfb7
Use a two part TOC + extended list UI for faq page
simeonf Jan 3, 2018
209e7de
Add generic-flatblock app and demonstrate usage
simeonf Jan 4, 2018
2dce113
added Pipfile
knowsuchagency Feb 19, 2018
77a8140
new email provider (#204)
PirosB3 Feb 19, 2018
62fd24c
Update flatblocks dependency
simeonf Feb 20, 2018
d86ae4c
Filter faqs in admin
simeonf Feb 20, 2018
25629fd
Initial generic_flatblocks content model and templates
simeonf Feb 20, 2018
3981fcc
Activate blockstuff app
simeonf Feb 20, 2018
088d2ef
Just because its bugging me :)
simeonf Feb 20, 2018
07a5c38
Add flatblocks all the places
simeonf Feb 21, 2018
43075b1
Add menu app
simeonf Feb 22, 2018
e1fa7f2
Activate menu app
simeonf Feb 22, 2018
ad80aa4
Use admin driven menu
simeonf Feb 22, 2018
c92132a
Typo dammit
simeonf Feb 22, 2018
94f976b
Add sponsor benefit app with models and admin
simeonf Feb 22, 2018
e0697b4
Add sorting to sponsorbenefit admin
simeonf Feb 22, 2018
9623ce0
added more blocks (#211)
PirosB3 Mar 1, 2018
1a62275
update 'sponsorship opportunities' chart (#212)
Mar 1, 2018
0892f3a
sponsor
Mar 1, 2018
28a74b3
Added phone field to model for talk proposal (CFP page) (#213)
Mar 6, 2018
6de4e79
Change web title to PyBay2017
mariocj89 Mar 10, 2018
b71eb26
Changed CFP categories to reflect 2018 talk tracks.
BethanyG Mar 18, 2018
443980f
Added migration file for CFP category changes.
BethanyG Mar 18, 2018
3aa8978
fixed extra comma in list of CFP topics.
BethanyG Mar 18, 2018
233d8fb
Corrected malformed arument to format on line 122. Change **data to …
BethanyG Mar 18, 2018
4108fcf
Changed form test to check for new 2018 category.
BethanyG Mar 18, 2018
db0b4a4
Changed _get_data category name to lowercase python.
BethanyG Mar 18, 2018
b920d78
Reverted change to line 122 and remade *data into **data
BethanyG Mar 18, 2018
a5595f8
Modified model, form and style to support additional talk length drop…
BethanyG Mar 18, 2018
452ebc2
Migration file for talk length field addition.
BethanyG Mar 18, 2018
138f8ef
Adjusted model to add default value of 25min to talk_lenght field.
BethanyG Mar 18, 2018
9a2237d
Adjusted test suite for new talk_lenght field.
BethanyG Mar 18, 2018
0752e66
Changed test to check for new form length of 16 fields instead of 15.
BethanyG Mar 18, 2018
a159b17
Changed cfp talk category descriptions. (#218)
BethanyG Mar 19, 2018
03a0963
Use sponsorbenefit app for table
simeonf Mar 25, 2018
da8363a
Update index.html
nickdirienzo Mar 22, 2018
4f01f94
Cfpcategories (#219)
BethanyG Mar 25, 2018
8bbbef2
Addcfpcategories (#224)
BethanyG Mar 25, 2018
acc3079
SQL migration to hotfix db
simeonf Mar 26, 2018
8cdff62
Altered wording of first cfp category to Python Fundamentals & Popula…
BethanyG Mar 30, 2018
f97cd86
Updated graphs (#207)
ccsv Apr 3, 2018
040d3ce
Show the 'show on' checkboxes in admin listview (#232)
simeonf Apr 5, 2018
39d030a
chane the copy (#233)
PirosB3 Apr 5, 2018
45f307c
Set validation rule on form to match model. This is why ModelForms
simeonf Apr 6, 2018
83f877c
Added 2017 Tweets to slideshow on homepage. (#235)
BethanyG Apr 9, 2018
38d04b0
Update base.html to set the Twitter title to 2018 (#236)
nickdirienzo Apr 9, 2018
a07895f
Added remaining fields to email confirmation template. (#237)
BethanyG Apr 9, 2018
6229e3f
Removed footer from sponsor table at GLs request. (#238)
BethanyG Apr 9, 2018
08001e9
Added two spaces after every line (how to create newline in markdown …
arturolei Apr 10, 2018
a2cd836
Additional mkdn formatting to clean up txt email. (#241)
BethanyG Apr 10, 2018
f2feb41
Additional mkdn formatting for email. (#242)
BethanyG Apr 10, 2018
c1cf5e7
I keep saying it'll be the last email edit. I keep being wrong. (#243)
BethanyG Apr 10, 2018
da300b6
Pipfile fixes and recommend pipenv in README (#239)
epsy Apr 10, 2018
59b837c
Added 2017 highlight to homepage. (#245)
BethanyG Apr 14, 2018
30d4fe4
rename to themes (#246)
PirosB3 Apr 14, 2018
e50d110
Use a protocol relative URL for YT thumbs (#247)
stefanor Apr 19, 2018
8153cb9
Add filtering by theme and show submittal date
simeonf Apr 19, 2018
ca7a1db
Serve site on a single canonical URL (#249)
stefanor Apr 21, 2018
be50a3f
Add talk length to proposals api (#254)
darlenew Apr 29, 2018
8bfc5c3
updated dependencies to include dbg in dev
knowsuchagency May 1, 2018
6c02a12
Add better categories display, more records per page, search, and lis…
simeonf May 8, 2018
8e678bf
Dammit. Hotfix to search speakername
simeonf May 8, 2018
9933551
Add redirects system and make Tickets page redirect to tito. (#258)
nickdirienzo May 31, 2018
4cbd08b
Staging (#259)
PirosB3 Jun 7, 2018
364b36d
remove never used css 'theme' files
epsy Mar 31, 2018
6db8549
add SASS processor
epsy Apr 10, 2018
f39c669
add SASS stylesheet
epsy Apr 12, 2018
dca5657
break style.css apart
epsy Apr 13, 2018
9798538
compile sass during build
epsy Apr 13, 2018
17ecc46
travis.yml: use Pipfile in travis config
epsy Apr 15, 2018
4cab40a
added yann requirements
Apr 14, 2018
1c65dbb
Enable HSTS with 1-year TTL (#250)
stefanor Jun 22, 2018
927102a
The .pybay.com was being masked by the port 443 server (#253)
stefanor Jun 22, 2018
e59a1c4
Support Diversity sponsors (#261)
stefanor Jun 22, 2018
7ad62a4
change G block (#262)
PirosB3 Jun 28, 2018
6d24b2e
Make countdowns render horizontally (#263)
stefanor Jun 28, 2018
6b0e29e
proposal sort key (#265)
PirosB3 Jun 28, 2018
90223e6
Sfranklin/speakers (#264)
simeonf Jun 28, 2018
7f6ce19
Add a new card for social sharing (#267)
stefanor Jun 30, 2018
182e34c
Simplify talk themes data and get filters working (#266)
stefanor Jun 30, 2018
e240fdd
Don't strip HTML from talk abstracts (#268)
stefanor Jun 30, 2018
3762469
Put some some space around the theme bullets (#269)
stefanor Jun 30, 2018
ad474fe
Re-jig some gblocks for @grace-law (#270)
stefanor Jul 1, 2018
6f8437c
Add a new sponsor level - Media (#271)
stefanor Jul 1, 2018
a684f81
reapplies schedule fix
Jul 2, 2018
3563372
Add templatetag to get logo if possible
simeonf Jul 5, 2018
79b4cd8
Show logo if possible in sponsor template
simeonf Jul 5, 2018
72a565f
Add a subscribe button and js to send to ti.to
simeonf Jul 6, 2018
b6b96bc
Bold text in subscription form
simeonf Jul 11, 2018
7d7f5e4
Don't forget the JS
simeonf Jul 11, 2018
0be50e5
De-duplicate footer sponsor logos by sponsor name
stefanor Aug 12, 2018
a5f462b
But keep them sorted
stefanor Aug 13, 2018
77f83c7
frontend: add generic block for adding tags in the head section (#275)
seanfarley Aug 13, 2018
4f6a41b
Add history to flatpages
simeonf Feb 10, 2019
e53060e
Update requirements
simeonf Feb 11, 2019
e9b05f3
Better name for additional admin
simeonf Feb 11, 2019
7d36f3f
Dev package in pipfile with relative path causes Pipenv to crash. Rem…
simeonf Feb 13, 2019
e2530bf
Travis builds fail under 3.6 with error about required positional arg…
simeonf Feb 13, 2019
a12d191
Testing travis integration
simeonf Feb 13, 2019
bac39fd
Try following advice in pipenv warning
simeonf Feb 13, 2019
66c52ce
Env section prompts job per variable.
simeonf Feb 13, 2019
8cc2f5d
Can't just delete offending entry in pipfile.lock. Regen with pipenv …
simeonf Feb 14, 2019
f8b0c99
Adding a changelog
simeonf Feb 19, 2019
071fcad
Update twitter card
simeonf Feb 25, 2019
65be2b8
2018 -> 2019 in template
simeonf Feb 25, 2019
33ceecf
Add jobs app
simeonf Mar 14, 2019
614dee5
Add job submission form
simeonf Mar 20, 2019
c95d685
Various UI requests from Grace
simeonf Mar 20, 2019
f873edd
Use heavy blue headers for jobs page
simeonf Mar 20, 2019
45fe1c6
Add trailing slash to url
simeonf Mar 20, 2019
d43a24c
Minor UX update
simeonf Mar 20, 2019
3df28ed
Label details->summary and limit to 400 chars
simeonf Mar 21, 2019
b56ccee
Clean up breadcrumb nav on jobs
simeonf Mar 21, 2019
9a4c0db
Updated dev environment and deployment instructions.
SeanMGonzalez Apr 3, 2019
bcc4d5b
Update README.md
simeonf Apr 15, 2019
0263274
Add fixtures for menu
simeonf Apr 29, 2019
5f622a2
Add fixtures for faqs
simeonf Apr 29, 2019
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
9 changes: 9 additions & 0 deletions .gitignore
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,8 @@ var/
*.egg-info/
.installed.cfg
*.egg
symposion
pyenv

# PyInstaller
# Usually these files are written by a python script from a template
Expand Down Expand Up @@ -87,3 +89,10 @@ ENV/

# Rope project settings
.ropeproject

dev.db

pybay/site_media/*

# jetbrains
.idea/
15 changes: 15 additions & 0 deletions .travis.yml
Original file line number Diff line number Diff line change
@@ -0,0 +1,15 @@
language: python
python:
- 3.5
- 3.6
install:
- pip install pipenv
- pipenv sync # Install only what is specified in Pipfile.lock
script:
- pipenv run python -c 'import django;print(django.get_version())'
- pipenv run ./manage.py migrate
- pipenv run ./manage.py compilescss
- pipenv run ./manage.py collectstatic --no-input
- pipenv run ./manage.py test
env:
- TRAVIS=true PIPENV_IGNORE_VIRTUALENVS=1 # Pipenv running in a virtualenv causes problems because it also creates a virtualenv
11 changes: 11 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -0,0 +1,11 @@
# Changelog

Notable changes to this project should be documented in this file.


## 2019-02-19

- Add django-reversion and integrate with flatpage admin. Important:
run `./manage.py createinitialrevisions` to use the admin
integration. See the history button in the admin which lets you view
previous versions of a model.
44 changes: 44 additions & 0 deletions Pipfile
Original file line number Diff line number Diff line change
@@ -0,0 +1,44 @@
[[source]]
url = "https://pypi.python.org/simple"
verify_ssl = true
name = "pypi"

[packages]
django-appconf = "==1.0.1"
django-bootstrap-form = "==3.2.1"
django-columns = "==0.1.0"
django-crispy-forms = "==1.6.1"
django-generic-flatblocks = "==1.2"
django-jsonfield = "==1.0.1"
django-markup = "==1.2"
django-markitup = "==2.2.2"
django-model-utils = "==2.4"
django-ordered-model = "==1.4.1"
django-reversion = "==2.0.13"
django-sitetree = "==1.5.1"
django-taggit = "==0.18.0"
django-timezone-field = "==2.0"
django-timezones = "==0.2"
django-user-accounts = "==2.0"
django = "==1.9.2"
easy-thumbnails = "==2.3"
eventlog = "==0.8.0"
symposion = {git = "https://github.com/pybay/symposion.git"}
"html5lib" = "==0.9999999"
markdown = "==2.6.5"
metron = "==1.3.5"
olefile = "==0.44"
pillow = "*"
pinax-boxes = "==2.1.2"
pinax-theme-bootstrap = "==5.7.2"
pytz = "==2015.7"
rollbar = "==0.13.2"
model-mommy = "==1.3.2"
django-sass-processor = "*"
django-compressor = "*"
libsass = "*"
sqlparse = "==0.2.4"

[dev-packages]
mysqlclient = "==1.3.10"
django-debug-toolbar = "*"
Loading