Merge branch 'master' of github.com:pinax/pinax

Conflicts: pinax/projects/intranet_project/requirements.txt pinax/projects/social_project/requirements.txt
pinax · Sep 2, 2009 · f543cbb · f543cbb
2 parents ba8d6a6 + 629190c
commit f543cbb
Show file tree

Hide file tree

Showing 4 changed files with 4 additions and 4 deletions.
diff --git a/pinax/apps/tasks/forms.py b/pinax/apps/tasks/forms.py
@@ -67,7 +67,7 @@ def __init__(self, user, group, *args, **kwargs):
             assignee_queryset = self.fields["assignee"].queryset
 
         self.fields["assignee"].queryset = assignee_queryset.order_by("username")
-        self.fields['summary'].widget.attrs["size"] = 55
+        self.fields['summary'].widget.attrs["size"] = 65
         self.fields.keyOrder = ["summary","tags", "status", "assignee", "state", "resolution"]
 
         if self.instance.assignee != user:

diff --git a/pinax/projects/code_project/requirements.txt b/pinax/projects/code_project/requirements.txt
@@ -29,7 +29,7 @@ django-avatar==1.0.2
 django-uni-form==0.6.0
 django-wikiapp==0.2.0
 django-attachments==0.3
-django-markup==0.2
+django-markup==0.3
 django-sorting>=0.1
 django-filter==0.5.1
 template_utils==0.4p2

diff --git a/pinax/projects/intranet_project/requirements.txt b/pinax/projects/intranet_project/requirements.txt
@@ -29,7 +29,7 @@ django-avatar==1.0.2
 django-uni-form==0.6.0
 django-wikiapp==0.2.0
 django-attachments==0.3
-django-markup==0.2
+django-markup==0.3
 django-bookmarks==0.1.0
 django-filter==0.5.1
 template_utils==0.4p2

diff --git a/pinax/projects/social_project/requirements.txt b/pinax/projects/social_project/requirements.txt
@@ -54,6 +54,6 @@ django-voting==0.1_pre
 django-wikiapp==0.2.0
 django-photologue==2.3
 django-attachments==0.3
-django-markup==0.2
+django-markup==0.3
 template_utils==0.4p2
 django-staticfiles==0.1.2