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

683 commits

This branch
This branch
All branches
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
6b9fb3a49d Merge pull request #10 from pyohio/6-schedule-builder 
[6] Schedule Builder
 2014-03-04 14:23:12 -05:00
David Ray
0e4dcef2a0 fix typos 2014-03-04 08:47:19 -05:00
David Ray
55ad74ab12 add schedule docs 2014-03-03 14:10:28 -05: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
David Ray
2f75033dc5 update dep 2014-02-26 13:56:19 -05:00
David Ray
b80cdfdb29 Merge pull request #9 from pyohio/proposal-submit-messages 
User messages on proposal submit page
 2014-02-26 11:05:53 -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
3711ddf24e Merge pull request #8 from pyohio/sponsorship-redirect 
Dynamic redirect after applying to be a sponsor.
 2014-02-11 11:47:22 -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
Rebecca Lovewell
9833a6a27c Loosen django-forms-bootstrap requirement 2014-02-11 09:24:03 -05:00
Rebecca
5024e5e1f4 Merge pull request #7 from pyohio/update-requirements 
Update requirements for Django 1.5+
 2014-02-03 07:32:09 -08:00
Rebecca Lovewell
8d5461d05d Loosen Django requirement 
So that each project may control which version of Django to use. Not all
of the latest requirements are compatible with Django 1.4 anymore.
 2014-02-03 10:07:17 -05:00
Rebecca Lovewell
e92dee1e0e Update easy-thumbnails from 1.2 -> 1.4 
For Django 1.6 compatibility.
 2014-01-31 17:30:32 -05:00
Rebecca Lovewell
8e85290107 Update django-taggit from 0.9.3 -> 0.11.2 
For Django 1.6 compatibility.
 2014-01-31 17:30:05 -05:00
Rebecca Lovewell
6d4e7b1eb1 Update django-sitetree from 0.9.4 -> 1.0.0 
For Django 1.6 compatibility.
 2014-01-31 17:29:36 -05:00
Rebecca Lovewell
8b7b097314 Update django-reversion from 1.7 -> 1.8 
For Django 1.6 compatibility.
 2014-01-31 17:28:54 -05:00
Rebecca Lovewell
6ab7e498ec Upgrade django-markitup from 1.0.0 -> 2.1 
For Django 1.6 compatibility.
 2014-01-31 17:27:58 -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
1a7e346d99 Merge branch 'update-requirements' 2014-01-16 08:30:02 -05:00
David Ray
0163ded85b fix typo 2014-01-16 08:28:45 -05:00
David Ray
18896aa6da fix typo 2014-01-16 08:27:29 -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
c8087ec233 Update quickstart instructions in README 2014-01-15 10:19:40 -05:00
Rebecca Lovewell
f2c3cbb336 Add install requirements to setup.py 2014-01-15 10:07:04 -05: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
b78f7ebb91 Create a requirements file 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