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

1122 commits

This branch
This branch
All branches
Author SHA1 Message Date
Scott Bragg
6b7618cc54 Able to load local_settings for production environment. 2016-06-10 13:38:24 +10:00
Scott Bragg
bfcfb54d1b Update requirements on lca2017 branch so pip doesn't get confused with 
different Django and Symposion versions
 2016-06-10 11:25:46 +10:00
Christopher Neugebauer
ec882bdbdd Update requirements.txt 
To point at registrasion 0.1.1 (which has a working Wheel file)
 2016-05-10 11:41:44 -07:00
Christopher Neugebauer
2d4f0a4acd Update readme.rst 2016-05-10 11:40:56 -07:00
Christopher Neugebauer
998ae6e6be Points requirements.txt at the lca2017 fork of symposion 2016-05-10 11:00:13 -07:00
Christopher Neugebauer
e8e20dd6d3 Coverage, Migrations. 2016-04-27 10:33:44 +10:00
Christopher Neugebauer
7116eeb294 Merge remote-tracking branch 'pinaxcon/master' 2016-04-26 19:19:54 +10:00
James Tauber
c33c15d314 added MIT license 2016-04-26 17:18:28 +08:00
Christopher Neugebauer
42c97e6848 Merge remote-tracking branch 'pinaxcon/master' 2016-04-26 19:13:33 +10:00
Christopher Neugebauer
c56c749870 Prepares registrasion-demo to match the 0.1 release of registrasion. 2016-04-26 19:11:06 +10:00
Christopher Neugebauer
6c94eb9e91 Adds Registrasion support to the templates and apps. 2016-04-12 20:15:50 +10:00
Patrick Altman
56e46dfce3 Merge pull request #5 from jefftriplett/update-proposal-fields 
Fixes *_html proposal fields
 2016-04-04 21:49:07 -05:00
Jeff Triplett
1f16614fc4 Fixes *_html proposal fields 2016-04-04 18:36:01 -05:00
Patrick Altman
770e2ca88d Clean up some of the voting status UI 2016-03-17 13:59:46 -05:00
Patrick Altman
430d3dad99 Fix up review nav 2016-03-17 13:45:40 -05:00
Patrick Altman
ad8181091a Merge pull request #130 from pydata/unpublished-conference-schedule 
Show unpublished conference schedule to staff.
 2016-03-15 19:48:07 -05:00
Anna Ossowski
6789b25e69 Update README.md 2016-03-15 17:37:18 +01:00
Martey Dodoo
251f9ea280 Show unpublished conference schedule to staff. 
This is an addendum to #123 to allow the `schedule_conference` view to
show unpublished conference schedules to staff members.
 2016-03-15 12:17:46 -04:00
Patrick Altman
d10d313f64 Merge pull request #128 from jefftriplett/speaker-twitter-username 
Adds twitter username to Speaker
 2016-03-15 08:54:58 -05:00
Patrick Altman
0a487cb269 Merge pull request #129 from pydata/slot-admin-content 
Display content_override in slot admin list view.
 2016-03-15 08:54:14 -05:00
Anna Ossowski
88fc54994b Update README.rst 2016-03-15 13:22:29 +01:00
Anna Ossowski
f5558d5f0c Update README.rst 2016-03-15 13:21:19 +01:00
Martey Dodoo
6fb529aad2 Display content_override in slot admin list view. 
Fix typo and use `content_override` field (instead of `content`) for a
Slot's `list_display`.
 2016-03-15 05:47:25 -04:00
Jeff Triplett
c7ce7fe020 Adds twitter_username to Speaker 
This change is based on the PyOhio fork located at: https://github.com/PyCon/pycon/search?utf8=%E2%9C%93&q=twitter_username
 2016-03-14 22:24:14 -05:00
Patrick Altman
2717e4c819 Merge pull request #127 from pydata/not-reviewed-error 
Fix queryset used in "Not Reviewed" view.
 2016-03-10 21:07:25 -06:00
Martey Dodoo
78d13a9ffa Fix queryset used in "Not Reviewed" view. 
The `speaker` field on the `Proposal` model corresponds to a `Speaker`,
not a `User`, so the old queryset created a ValueError.
 2016-03-10 20:35:41 -05:00
Patrick Altman
4d8832bb40 Update with actual url 2016-02-27 19:07:32 -06:00
Patrick Altman
170f5f189f Update deploy config 2016-02-27 18:54:26 -06:00
Patrick Altman
7dc167f7df Update copyright year 2016-02-27 18:34:46 -06:00
Patrick Altman
60810af13a Fix pinax-boxes modal editors 2016-02-27 18:32:03 -06:00
Patrick Altman
b2468f54bf Remove build artifacts 2016-02-27 18:31:43 -06:00
Patrick Altman
dd8f0ba9c5 Update to latest build system 
Closes #3
 2016-02-27 17:23:35 -06:00
Patrick Altman
0b1da0e85e Upgrades 2016-02-27 16:55:59 -06:00
Patrick Altman
7b77b9aa29 Drop deprecated url patterns format 2016-02-27 16:54:42 -06:00
Patrick Altman
1ab7a30435 Update for BI changes in django-reversion 2016-02-27 16:38:27 -06:00
Patrick Altman
efe413a837 Bump requirements 2016-02-27 16:35:06 -06:00
Anna Ossowski
c27be5e4c7 Update README.md 2016-02-27 00:14:55 +01:00
Anna Ossowski
8a744925b9 Update README.rst 2016-02-26 23:34:34 +01:00
Anna Ossowski
90768e786f Update README.rst 2016-02-26 23:33:32 +01:00
Patrick Altman
3b635d9cb7 Merge pull request #120 from appropriatetech/master 
Python3 compatibility
 2016-02-20 17:06:57 -06:00
Patrick Altman
27cb1cf776 Merge pull request #118 from pydata/loosen-django-requirement 
Loosen Django package requirement.
 2016-02-20 17:06:27 -06:00
Patrick Altman
a1cbcdddd5 Add back in parsing the content override into html 2016-02-20 17:06:09 -06:00
Patrick Altman
6e83588f31 Merge pull request #119 from pydata/fix-duplicate-slot-save-method 
Remove duplicate Slot.save method.
 2016-02-20 17:05:29 -06:00
Patrick Altman
6bee00dff7 Merge pull request #122 from pydata/sponsor-listing-text-is-none 
Make sponsor description default empty string.
 2016-02-20 17:04:32 -06:00
Patrick Altman
73a087c801 Merge pull request #123 from pydata/unpublished-schedule 
Don't show unpublished schedule info to non-staff.
 2016-02-20 17:03:26 -06:00
Martey Dodoo
6b41b5c477 Don't show unpublished schedule info to non-staff. 
Add checks to schedule_list, schedule_list_csv, and
schedule_presentation_detail views to verify that either schedule is
published or that current user is staff before displaying information.

See c7592bc33e.
 2016-02-20 08:39:12 -05:00
Anna Ossowski
277ec03278 Update README.md 2016-02-02 18:24:13 +01:00
Anna Ossowski
47b65ac330 Update README.rst 2016-02-01 20:45:16 +01:00
Martey Dodoo
a487f78f7e Make sponsor description default empty string. 
Set sponsor listing text to an empty string instead of None. If a
sponsor doesn't have a benefit named "Sponsor Description", this will
prevent the text "None" from displaying in the Django template.
 2016-01-25 15:17:23 -05:00
Anna Ossowski
4f59d7a9a1 Update README.rst 2016-01-21 01:16:12 +01:00