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

1804 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Bragg
9dc93ea49a Fixed import (#72) 
* Games Miniconf CFP

* Fixed CFPs using the wrong base class

* Forgot to import the model
 2016-09-25 16:02:14 +10:00
Scott Bragg
7115ced57c Fixed CFPs using wrong base class (#71) 
* Games Miniconf CFP

* Fixed CFPs using the wrong base class
 2016-09-25 15:56:33 +10:00
Scott Bragg
df808d52f3 Games Miniconf CFP (#70) 2016-09-25 15:38:15 +10:00
Christopher Neugebauer
c25f19d66e Increases search space for access codes. 2016-09-25 11:33:07 +10:00
Christopher Neugebauer
7a7aa95874 Fixes issue with accessing stripe page without access code. 2016-09-25 09:56:16 +10:00
Christopher Neugebauer
33eb1a6c0b Temporarily Removes Symposion as a dependency 2016-09-24 09:30:37 +10:00
Scott Bragg
57ed5e546b CFPs that are ready (#68) 
* CFPs that are ready

* Updated choices for sysadmin
 2016-09-23 21:23:46 +10:00
Christopher Neugebauer
5be0c8be19 Lets us define homepage panels as “compact” (#67) 
* Lets us define homepage panels as “compact”

* right-floating-image now only does things in wide screens
 2016-09-23 21:23:20 +10:00
Christopher Neugebauer
fd5754e679 Allows unauthenticated payments. Links Credit Note Refunds to the Stripe Charge. 2016-09-23 16:42:47 +10:00
Christopher Neugebauer
aec9e58edf Removes avenue for crash in reporting attendees. 2016-09-23 15:21:57 +10:00
Christopher Neugebauer
2d434432d9 Oops 2016-09-22 20:32:10 +10:00
Christopher Neugebauer
4b1d109714 Fixes issues with rendering stripe widgets securely. 2016-09-22 20:30:03 +10:00
Christopher Neugebauer
26b249d48d Always immediately capture payments. 2016-09-22 11:44:30 +10:00
Christopher Neugebauer
ed1087d9d3 Fixes bug in payment form 2016-09-22 11:38:12 +10:00
Christopher Neugebauer
fb3f1411c7 Puts setup.py in the right place (oops) 2016-09-22 11:30:28 +10:00
Christopher Neugebauer
e47e11acfd setup.py because heroku needs it apparently 2016-09-22 11:28:38 +10:00
Christopher Neugebauer
e775e5afd9 Documentation fix. 2016-09-22 11:23:56 +10:00
Christopher Neugebauer
abee9e3c62 Adds support for refunds 2016-09-22 11:04:43 +10:00
Christopher Neugebauer
6c87b9d08a Documentation, and edge case. 2016-09-22 09:38:22 +10:00
Christopher Neugebauer
cbf3f5814b DRYs up the way to define a Stripe-style form field. 2016-09-21 19:36:57 +10:00
Christopher Neugebauer
830864df2c Adds verification data to the payments form. 2016-09-21 19:07:10 +10:00
Christopher Neugebauer
8334d40fe9 Adds stripe.js-based form for processing credit card payments 2016-09-21 18:52:31 +10:00
Christopher Neugebauer
a16cb71463 Fixes issue in for_id_or_404 2016-09-21 15:58:58 +10:00
Christopher Neugebauer
79fa80ea33 Adds urls.py 2016-09-21 10:41:02 +10:00
Christopher Neugebauer
f932841cda Commits an initial django app. 2016-09-21 10:24:26 +10:00
Christopher Neugebauer
21613a357d Initial commit 2016-09-21 10:17:55 +10:00
Christopher Neugebauer
a445eed239 Merge branch 'chrisjrn/reports_20160919' 2016-09-20 19:41:47 +10:00
Christopher Neugebauer
94a8c3e3d9 Adds speaker registration data. 
Addresses #77
 2016-09-20 19:18:21 +10:00
Christopher Neugebauer
7c5c155370 Shows an email address. 2016-09-20 18:44:23 +10:00
Christopher Neugebauer
2d469bb398 One more addition. 2016-09-20 14:04:38 +10:00
Christopher Neugebauer
bcd7043862 Merge branch 'chrisjrn/reports_20160919' 2016-09-20 13:48:34 +10:00
Christopher Neugebauer
2ed0a47f15 Adds attendance by field report 
Fixes #93
 2016-09-20 13:48:08 +10:00
Christopher Neugebauer
e3b662fb67 Adds attendee profile data to the attendee page 2016-09-20 13:47:59 +10:00
Christopher Neugebauer
6611546a35 Moves get_object_from_name into util. 2016-09-20 13:47:59 +10:00
Christopher Neugebauer
6e4d2fab16 Adds ATTENDEE_PROFILE_MODEL as a thing that needs to be specified in settings.py. 
Fixes #65
 2016-09-20 13:47:50 +10:00
Christopher Neugebauer
e2d027f71b Adds a report for consumption of a discount. 
Fixes #78
 2016-09-20 13:47:39 +10:00
Christopher Neugebauer
f41bd9c65b Adds paid invoices by date report 2016-09-19 15:03:21 +10:00
Christopher Neugebauer
851c37508a Factors out annotating objects by cart status 2016-09-19 13:39:39 +10:00
Christopher Neugebauer
2c99114d9f Improves wording on reconciliation report 2016-09-19 13:26:46 +10:00
Christopher Neugebauer
7e74a2e0da Updates the treasurer’s reconciliation view to be MUCH more comprehensive. 2016-09-19 13:25:02 +10:00
Scott Bragg
e96bce62ab Merge pull request #57 from lca2017/chrisjrn/september_rebase 
Symposion changes for schedule announcement
 2016-09-18 20:41:44 +10:00
Christopher Neugebauer
ff16f71df6 September website changes - Pre-registration (#66) 
* Factors rendering of external links into its own template. Automagical!

* Adds wagtail templates for keynotes on the front page

* Migrates to Wagtail 1.6

* Migrates content pages to be a streamfield. Flexibility++.

* Fixes editing of ContentPage bodies

* Adds floating images to content pages

* Fixes the layout of floating images

* Adds anchor links to content pages.

* Adds presentation link to the keynote speaker block model

* LCA-ifies the schedule list

* Refactors cms_pages/content_page into a new base template

* cms_pages/content_page now derives from abstract_content_page

* news_index_page now derives from abstract_content_page

* news_page now derives from abstract_content_page.html

* utility_page now uses the content_page base template

* Factors out _right_floating_image.html

* Themes the presentation detail page

* Themes the speaker profile page.

* Themes the schedule list page.

* Minor work on schedule_conference.html

* Themes schedule_detail.html

* Replaces cradle.svg

* Adds a background image to the schedule pages

* Adds libravatar fallback for speaker profile images

* Adds new background images (must update colophon)

* Adds some magic so that we can have slightly different presentation backgrounds for different pages.

* Adds the sponsor block to the bottom of the page.

* Adds sponsor logos to footer.

* All migrations are now in this tree

* Fixes wagtail migrations

* Adjusts presentation_detail to allow for miniconfs (i.e. no target audience)

* Adds unpublishing to presentation detail

* Adds ScheduleHeaderParagraph, which allows us to add some text to the header of schedule pages.

* Adds NamedHeaderParagraph. It allows us to store header paragraphs in the CMS.

* Date formatting in the schedule

* First step for fixing images

* Allows us to automagically load the colophon

* Adds “publish changes” button.

* Can login with email address
 2016-09-18 20:40:55 +10:00
Christopher Neugebauer
699b32b938 Adds “publish changes” behaviour to views so that we can publish edits to abstracts. 2016-09-18 15:52:45 +10:00
Christopher Neugebauer
f42766beef Respects unpublishing in lists. 2016-09-18 15:52:45 +10:00
Christopher Neugebauer
970e002157 Do not show a presentation if it is unpublished 2016-09-18 15:52:45 +10:00
Christopher Neugebauer
3b4a51e6d4 Adds “unpublish” option to presentations (to temporarily hide from the schedule and from view by non-staff) 2016-09-18 15:52:45 +10:00
Scott Bragg
5caedcc09f Merge pull request #53 from lca2017/chrisjrn/better_mailer 
Better send_mail function
 2016-09-18 12:41:33 +10:00
Scott Bragg
50ee66d200 Merge branch 'chrisjrn/better_mailer' of https://github.com/lca2017/symposion into chrisjrn/better_mailer 
Conflicts:
	symposion/utils/mail.py
 2016-09-18 12:40:45 +10:00
Christopher Neugebauer
96683b6d7d Refactors to be a bit less obtuse 2016-09-18 12:37:08 +10:00
Christopher Neugebauer
d54d47487e send_mail is no longer hardwired to point at symposion/emails (who does that?!) 2016-09-18 12:37:08 +10:00