Changeset - 9721593cc0e4
Parent rev.
Child rev.
[Not reviewed]
Merge
0 12 0
Patrick Altman - 9 years ago 2014-12-15 21:16:28
paltman@gmail.com
Merge branch 'mbrochh-django1.6-compatibility'
12 files changed with 30 insertions and 32 deletions:
symposion/boxes/urls.py
1
2
symposion/cms/urls.py
2
2
symposion/conference/urls.py
1
2
symposion/proposals/models.py
8
9
symposion/proposals/urls.py
1
2
symposion/proposals/views.py
6
1
symposion/reviews/urls.py
1
2
symposion/schedule/models.py
3
2
symposion/schedule/urls.py
2
2
symposion/speakers/urls.py
1
2
symposion/sponsorship/urls.py
3
4
symposion/teams/urls.py
1
2
0 comments (0 inline, 0 general)
symposion/boxes/urls.py
➞
Show inline comments
 
# flake8: noqa
 
from django.conf.urls.defaults import url, patterns
 
from django.conf.urls import url, patterns
 

			




        

    


    
    

    

        

                

                    symposion/cms/urls.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
# flake8: noqa


			




	
	
	
		
 
from django.conf.urls.defaults import url, patterns


			




	
	
	
		
 
from django.conf.urls import url, patterns


			




	
	
	
		
 

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    symposion/conference/urls.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
# flake8: noqa


			




	
	
	
		
 
from django.conf.urls.defaults import patterns, url


			




	
	
	
		
 
from django.conf.urls import patterns, url


			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    symposion/proposals/models.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
import datetime


			




	
	
	
		
 
import os


			




	...
	
		
 
@@ -8,2 +7,3 @@ from django.db.models import Q


			




	
	
	
		
 
from django.utils.translation import ugettext_lazy as _


			




	
	
	
		
 
from django.utils.timezone import now


			




	
	
	
		
 

			




	...
	
		
 
@@ -39,6 +39,5 @@ class ProposalSection(models.Model):


			




	
	
	
		
 
    def available(cls):


			




	
	
	
		
 
        now = datetime.datetime.now()


			




	
	
	
		
 
        return cls._default_manager.filter(


			




	
	
	
		
 
            Q(start__lt=now) | Q(start=None),


			




	
	
	
		
 
            Q(end__gt=now) | Q(end=None),


			




	
	
	
		
 
            Q(start__lt=now()) | Q(start=None),


			




	
	
	
		
 
            Q(end__gt=now()) | Q(end=None),


			




	
	
	
		
 
            Q(closed=False) | Q(closed=None),


			




	...
	
		
 
@@ -49,6 +48,5 @@ class ProposalSection(models.Model):


			




	
	
	
		
 
            return False


			




	
	
	
		
 
        now = datetime.datetime.now()


			




	
	
	
		
 
        if self.start and self.start > now:


			




	
	
	
		
 
        if self.start and self.start > now():


			




	
	
	
		
 
            return False


			




	
	
	
		
 
        if self.end and self.end < now:


			




	
	
	
		
 
        if self.end and self.end < now():


			




	
	
	
		
 
            return False


			




	...
	
		
 
@@ -104,3 +102,3 @@ class ProposalBase(models.Model):


			




	
	
	
		
 
    submitted = models.DateTimeField(


			




	
	
	
		
 
        default=datetime.datetime.now,


			




	
	
	
		
 
        default=now,


			




	
	
	
		
 
        editable=False,


			




	...
	
		
 
@@ -177,3 +175,4 @@ class SupportingDocument(models.Model):


			




	
	
	
		
 
    uploaded_by = models.ForeignKey(User)


			




	
	
	
		
 
    created_at = models.DateTimeField(default=datetime.datetime.now)


			




	
	
	
		
 

			




	
	
	
		
 
    created_at = models.DateTimeField(default=now)


			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    symposion/proposals/urls.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
# flake8: noqa


			




	
	
	
		
 
from django.conf.urls.defaults import *


			




	
	
	
		
 
from django.conf.urls import patterns, url


			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    symposion/proposals/views.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -9,3 +9,8 @@ from django.http import Http404, HttpResponse, HttpResponseForbidden


			




	
	
	
		
 
from django.shortcuts import render, redirect, get_object_or_404


			




	
	
	
		
 
from django.utils.hashcompat import sha_constructor


			




	
	
	
		
 

			




	
	
	
		
 
try:


			




	
	
	
		
 
    from hashlib import sha1 as sha_constructor


			




	
	
	
		
 
except ImportError:


			




	
	
	
		
 
    from django.utils.hashcompat import sha_constructor


			




	
	
	
		
 

			




	
	
	
		
 
from django.views import static


			




        

    


    
    

    

        

                

                    symposion/reviews/urls.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
# flake8: noqa


			




	
	
	
		
 
from django.conf.urls.defaults import patterns, url


			




	
	
	
		
 
from django.conf.urls import patterns, url


			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    symposion/schedule/models.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	...
	
		
 
@@ -82,4 +82,5 @@ class Slot(models.Model):


			




	
	
	
		
 
        if self.content and self.content.slot_id:


			




	
	
	
		
 
            self.content.slot = None


			




	
	
	
		
 
            self.content.save()


			




	
	
	
		
 
            presentation = self.content


			




	
	
	
		
 
            presentation.slot = None


			




	
	
	
		
 
            presentation.save()


			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    symposion/schedule/urls.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
# flake8: noqa


			




	
	
	
		
 
from django.conf.urls.defaults import url, patterns


			




	
	
	
		
 
from django.conf.urls import url, patterns


			




	
	
	
		
 

			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    symposion/speakers/urls.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
# flake8: noqa


			




	
	
	
		
 
from django.conf.urls.defaults import *


			




	
	
	
		
 
from django.conf.urls import patterns, url


			




	
	
	
		
 

			




        

    


    
    

    

        

                

                    symposion/sponsorship/urls.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
# flake8: noqa


			




	
	
	
		
 
from django.conf.urls.defaults import patterns, url


			




	
	
	
		
 
from django.views.generic.simple import direct_to_template


			




	
	
	
		
 
from django.conf.urls import patterns, url


			




	
	
	
		
 
from django.views.generic import TemplateView


			




	
	
	
		
 

			




	...
	
		
 
@@ -6,3 +5,3 @@ from django.views.generic.simple import direct_to_template


			




	
	
	
		
 
urlpatterns = patterns("symposion.sponsorship.views",


			




	
	
	
		
 
    url(r"^$", direct_to_template, {"template": "sponsorship/list.html"}, name="sponsor_list"),


			




	
	
	
		
 
    url(r"^$", TemplateView.as_view(template_name="sponsorship/list.html"), name="sponsor_list"),


			




	
	
	
		
 
    url(r"^apply/$", "sponsor_apply", name="sponsor_apply"),


			




        

    


    
    

    

        

                

                    symposion/teams/urls.py
                

                

                  
                      
                        

                      ➞

                      
                        
                  

                  
                      
                  
                      
                  
                      
                  
                      
                  
                  
                

                

                    Show inline comments
                    
                

        

        

            



	
	
	
		
 
# flake8: noqa


			




	
	
	
		
 
from django.conf.urls.defaults import *


			




	
	
	
		
 
from django.conf.urls import patterns, url


			




	
	
	
		
 

			




        

    



    


    



    



      

      





    
    0 comments (0 inline, 0 general)
    





    


  

  







    


    

  


    








    
        Server instance: kapok.sfconservancy.org-10255
    
    
        This site is powered by
            Kallithea 0.6.3,
        which is
        © 2010–2020 by various authors & licensed under GPLv3.
            – Support
        – Privacy Policy