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

420 commits

Author SHA1 Message Date
David Ray
64a39b8706 resolve merge conflict 2014-03-14 15:12:16 -04:00
Rebecca Lovewell
c5aad692ff Show message when user does not have permission to access proposal submission page 2014-03-14 15:02:38 -04:00
Rebecca Lovewell
1861ad2926 Redirect to dashboard if there are no benefits to edit. 
The sponsor object has been created, and we only need to collect details
about the potential-sponsor's benefits. If there are no benefits, the user
should be redirected to the dashboard rather than forced to submit what
appears to be the same form twice.
 2014-03-14 14:59:51 -04:00
David Ray
0ce5e36c24 add tests for build schedule form 2014-03-03 13:48:24 -05:00
David Ray
62289cad36 make private methods more robust 2014-03-03 13:48:02 -05:00
David Ray
6102c4e5e4 adding back in ws 2014-03-03 08:38:47 -05:00
David Ray
5f27b01452 remove unecessary check 2014-02-28 12:17:48 -05:00
David Ray
4d1e9cf78e work on #6, needs tests 2014-02-28 10:55:54 -05:00
Rebecca Lovewell
6de322216d Show message when user does not have permission to access proposal submission page 2014-02-25 21:36:32 -05:00
Rebecca Lovewell
bc3dfd6c4c Redirect to dashboard if there are no benefits to edit. 
The sponsor object has been created, and we only need to collect details
about the potential-sponsor's benefits. If there are no benefits, the user
should be redirected to the dashboard rather than forced to submit what
appears to be the same form twice.
 2014-02-11 11:26:56 -05:00
David Ray
cf09df2204 Merge branch 'pyflakes' 2014-01-16 10:49:06 -05:00
David Ray
c654c5aabb restore settings import as django-appconf relies on it being there 2014-01-16 10:48:39 -05:00
David Ray
f369e1d8ad Merge pull request #4 from pyohio/future-django 
Changes for Django 1.5+
 2014-01-16 05:17:42 -08:00
David Ray
5d4b81ae86 Merge pull request #5 from pyohio/update-requirements 
Update requirements
 2014-01-16 05:14:04 -08:00
David Ray
132ce087e5 Merge pull request #2 from pyohio/1-south-support 
Adding South Support; Work on #1
 2014-01-15 12:43:22 -08:00
Rebecca Lovewell
2413421324 Remove old tests file 2014-01-15 09:58:20 -05:00
Rebecca Lovewell
e799ead094 Remove outdated fixture_gen files 
http://github.com/alex/fixture_generator has not been updated since
Django 1.2.
 2014-01-15 09:58:20 -05:00
Rebecca Lovewell
dff5c4b1bb Use hashlib rather than django.utils.hashcompat 2014-01-15 09:36:49 -05:00
Rebecca Lovewell
e9c97a9586 mimetype -> content_type 
mimetype is deprecated and to be removed in Django 1.7.
 2014-01-15 09:36:49 -05:00
Rebecca Lovewell
280a2c2d20 Use {% load url from future %} in dashboard template 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:49 -05:00
Rebecca Lovewell
b2f41b81f4 Use {% load url from future %} in team templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:35 -05:00
Rebecca Lovewell
41aab58d7b Use {% load url from future %} in sponsorship templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:35 -05:00
Rebecca Lovewell
9e2ceec7c4 Use {% load url from future %} in speakers templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:35 -05:00
Rebecca Lovewell
76a5e08e2f Use {% load url from future %} in schedule templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:35 -05:00
Rebecca Lovewell
4c912da4ac Use {% load url from future %} in reviews templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:35 -05:00
Rebecca Lovewell
ed7278e926 Use {% load url from future %} in proposals templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:15 -05:00
Rebecca Lovewell
935ec48032 Use {% load url from future %} in emails templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:15 -05:00
Rebecca Lovewell
55d37c13bd Use {% load url from future %} in conference templates 
Using https://github.com/futurecolors/django-future-url
 2014-01-15 09:36:15 -05:00
Rebecca Lovewell
8857e7b760 Use {% load url from future %} in cms templates 
Using https://github.com/django-future-url
 2014-01-15 09:36:15 -05:00
Rebecca Lovewell
b495eddc61 direct_to_template -> TemplateView 2014-01-15 09:36:15 -05:00
Rebecca Lovewell
84bd8f8971 Update urls import format 2014-01-15 09:35:36 -05:00
David Ray
cca9ad0793 add dependencies for proper migration order 2014-01-14 11:06:41 -05:00
David Ray
8e75bb77fb Remove project specific models 2014-01-14 10:37:05 -05:00
David Ray
ef66c7ed12 Adding South Support; Work on #1 2014-01-14 09:47:49 -05:00
Rebecca Lovewell
70b0906bc5 Remove unused managers 2014-01-13 16:50:01 -05:00
Rebecca Lovewell
5e5de6c6ea Pyflakes clean across the entire project 2014-01-13 16:49:40 -05:00
Martin Brochhaus
5c07d3e945 Django 1.6 compatibility 2014-01-11 14:50:04 +08:00
James Tauber
7c3d4f2912 Merge pull request #35 from taavi/better-word-limit-error-message 
Provides a better error message when a sponsor benefit text field is lon...
 2013-07-03 16:52:45 -07:00
James Tauber
349422fae8 Merge pull request #38 from taavi/review-assignments-script 
Adds a manage.py script to assign reviewers to talks.
 2013-07-03 16:51:47 -07:00
Luke Hatcher
d93bd38758 don't assume category on presentations 2013-07-03 16:08:33 -04:00
Taavi Burns
e180c7f00b Adds a manage.py script to assign reviewers to talks. 
Requires that a 'reviewers' group exist, and that there are people assigned to it (otherwise it won't find any reviewers to add!).

It will assign up to 3 reviewers, where those reviewers are NOT one of the speakers, and that reviewer has not opted out of reviewing that talk. It will choose random reviewers from those with the fewest existing not-opted-out assignments.
 2013-06-25 22:53:18 -04:00
Brian Rosner
6c1cfd1a53 cleaned up code style 2013-06-11 11:10:29 -06:00
Taavi Burns
0a597d38bf Provides a better error message when a sponsor benefit text field is longer than the allowed limit. 
It tells you how many words you've written!
 2013-05-17 09:31:55 -04:00
florapdx
306dc683b8 removed proposalbase import from previous version 2013-04-29 14:14:47 -07:00
florapdx
22b7265649 removed user_reviews template tag; now being handled by review_section view 2013-04-29 14:13:10 -07:00
florapdx
9911a68a7a removed block for template tag user_reviewed 2013-04-29 14:11:55 -07:00
florapdx
c3404459e1 added markup to render new all, user reviewed, and user not-reviewed pages 2013-04-29 14:06:25 -07:00
florapdx
f136a7c13b added code in review_section iterator to add links to all, user reviewed, and user not-reviewed 2013-04-29 14:05:27 -07:00
florapdx
c2b429bacf added urls for reviewed and not-reviewed by section 2013-04-29 14:03:37 -07:00
florapdx
0ad89365e9 added code to review_section view to sort by all, reviewed, and not reviewed 2013-04-29 14:02:39 -07:00
florapdx
40b04240d4 added Meta class ordering by name to order speaker lists and dropdowns 2013-04-29 14:00:58 -07:00
florapdx
f1b37c9833 add markup for listing proposals user has yet to review 2013-04-25 15:39:15 -07:00
florapdx
db7f8fac5d added user_not_reviewed to templatetags 2013-04-25 15:37:38 -07:00
florapdx
9ab34b8ea5 deleted my inline comment 2013-04-24 16:08:31 -07:00
florapdx
8f0e4cf6a1 change behavior so that admin can add sponsor logos/text in-dashboard 2013-04-24 13:47:42 -07:00
Luke Hatcher
8f0fa92983 bump version for dev 2013-03-14 04:56:04 -04:00
Luke Hatcher
133f190b8e dev2 release 2013-03-14 04:54:43 -04:00
Luke Hatcher
fbf5258bf1 bump version for beta 2 2013-03-14 04:53:48 -04:00
Brian Rosner
29c95fc967 added create_slot schedule helper 2013-02-21 11:32:12 -07:00
Luke Hatcher
15403668ed bump version to dev55 2013-02-20 01:21:22 -05:00
James Tauber
96830f3c21 more tweaks to field label and help text to be more generic for different types of proposal 2013-02-20 01:04:20 -05:00
James Tauber
826b8e960a made the help text a little more generic 2013-02-20 00:55:41 -05:00
Luke Hatcher
40a8253a19 bump version 2013-02-20 00:06:06 -05:00
Luke Hatcher
b21bd83451 match proposal kind slugs with hyphens 2013-02-20 00:04:14 -05:00
Luke Hatcher
c582b2b3e2 include keynote in presentation slots, release, bump dev version 2013-02-01 00:54:04 -05:00
Luke Hatcher
9e2d42f972 bump version to dev52 2013-01-29 06:28:21 -05:00
Luke Hatcher
9c68e4c326 use section name instead of section for box slugs 2013-01-29 06:11:34 -05:00
Luke Hatcher
8017226382 bump to dev51 2013-01-29 06:05:06 -05:00
Luke Hatcher
adc01c3e0b add schedule specific boxes 2013-01-29 06:03:49 -05:00
Luke Hatcher
fc37e171ed bump dev version 2013-01-29 03:17:01 -05:00
Luke Hatcher
148ac18c26 bump dev version 2013-01-29 03:14:56 -05:00
Luke Hatcher
c7592bc33e add published and hidden attributes to schedules 2013-01-29 03:14:56 -05:00
Luke Hatcher
a4d94594af bump dev version 2013-01-29 03:14:56 -05:00
Luke Hatcher
daf145f987 include section name in schedule view 2013-01-29 03:14:56 -05:00
Luke Hatcher
1b57961061 orderings on schedules 2013-01-29 03:14:56 -05:00
Steve Holden
8afa17b1c1 Update symposion/templates/sponsorship/_sponsor_link.html 
Improved reference format and used pk rather than id 
- thanks to trbs for the suggestion
 2013-01-21 09:20:11 -08:00
Steve Holden
2e7f8259d8 Add ids to sponsor images to allow linking to each sponsor's entry. 2013-01-21 00:08:05 -08:00
trbs
17f9e53ef4 allow dashes in slugs of schedule names 2013-01-15 18:27:22 +01:00
Luke Hatcher
292bf16a3e bump version 2013-01-03 03:45:18 -05:00
Luke Hatcher
97e1086b1d only include schedule if presentation has a slot 2013-01-03 03:44:49 -05:00
Luke Hatcher
729e20af94 bump dev version to 46 2013-01-02 20:58:02 -05:00
Luke Hatcher
a8e33f14ea Merge pull request #16 from mattsenate/master 
FF AdBlocker Bug Fix and README Update
 2012-12-19 23:01:45 -08:00
Luke Hatcher
582597b7b8 only yield actual users 2012-12-20 01:55:14 -05:00
Luke Hatcher
ca462422ba include presentation in the context for breadcrumbs 2012-12-20 01:55:00 -05:00
Luke Hatcher
4461c2f510 redirect to specific schedule url instead of general 2012-12-20 01:54:38 -05:00
Luke Hatcher
96541b968f tweak email 2012-12-20 01:53:56 -05:00
Luke Hatcher
da4848f307 add link to delete reviews 2012-12-20 01:53:44 -05:00
Luke Hatcher
d98f9b82a8 add default ordering to schedule models 2012-12-20 01:53:22 -05:00
Luke Hatcher
8cc9603814 add caching to schedule templates 2012-12-20 01:52:45 -05:00
Luke Hatcher
c1ff1546fe show all speakers of a presentation 2012-12-20 01:51:52 -05:00
Luke Hatcher
6f172da50a allow scheduling of tutorial types 2012-12-20 01:50:26 -05:00
Luke Hatcher
14d127a122 bulk accept fix 2012-12-20 01:50:07 -05:00
Luke Hatcher
2a68242a54 add overall conference schedule 2012-12-20 01:49:32 -05:00
Luke Hatcher
4c194ed94c add community pages 2012-12-20 01:48:19 -05:00
Luke Hatcher
50fa632127 update schedule templates 2012-12-19 23:59:48 -05:00
Luke Hatcher
9d3db5b216 bump version 2012-12-14 04:56:11 -05:00
Luke Hatcher
bff5fb4656 bump version 2012-12-14 04:27:58 -05:00
Luke Hatcher
d708b5539e fix rowspan in schedule templates 2012-12-14 04:26:28 -05:00
Luke Hatcher
5a5c30e701 bump dev version 2012-11-25 19:20:22 -05:00
Luke Hatcher
8139e43285 bump to dev42 2012-11-25 19:13:34 -05:00