Merge branch 'master' of git@stigma:platforma

diff --git a/apps/api/admin.py b/apps/api/admin.py
index efa64f3..332935d 100644 (file)
--- a/apps/api/admin.py
+++ b/apps/api/admin.py
@@ -1,6 +1,9 @@
 from django.contrib import admin
 
-import api.models
+from api import models
 
-admin.site.register(api.models.PullRequest)
-admin.site.register(api.models.PartCache)
+class PullRequestAdmin(admin.ModelAdmin):
+    list_display = ('comitter', 'timestamp', 'comment', 'document', 'source_revision')
+
+admin.site.register(models.PullRequest, PullRequestAdmin)
+admin.site.register(models.PartCache)

diff --git a/apps/api/handlers/library_handlers.py b/apps/api/handlers/library_handlers.py
index a328582..942ea0e 100644 (file)
--- a/apps/api/handlers/library_handlers.py
+++ b/apps/api/handlers/library_handlers.py
@@ -388,7 +388,7 @@ class DocumentGalleryHandler(BaseHandler):
                     
                 gallery['pages'].append( quote(url.encode('utf-8')) )
 
-#            gallery['pages'].sort()
+            gallery['pages'].sort()
             galleries.append(gallery)
 
         return galleries

diff --git a/apps/api/handlers/manage_handlers.py b/apps/api/handlers/manage_handlers.py
index b94ca72..f9caf7b 100644 (file)
--- a/apps/api/handlers/manage_handlers.py
+++ b/apps/api/handlers/manage_handlers.py
@@ -110,7 +110,7 @@ class PullRequestHandler(BaseHandler):
             # sync state with repository
             prq.status = 'A'
             prq.merged_revision = str(src_doc.shared().revision)
-            prq.merged_timestamp = datetime.now()
+            prq.merged_timestamp = datetime.datetime.now()
             prq.save()
 
             return SuccessAllOk().django_response({

diff --git a/platforma/static/css/html.css b/platforma/static/css/html.css
index 9cfb772..6bc118d 100644 (file)
--- a/platforma/static/css/html.css
+++ b/platforma/static/css/html.css
@@ -118,7 +118,7 @@
 }
 
 .htmlview .dzielo_nadrzedne {
-    font-size: 0.375em;
+    font-size: 1.5em;
     display: block;
     line-height: 1.5em;
     margin-bottom: -0.25em;
@@ -246,11 +246,11 @@
 
 /* .htmlview *[wl2o\:editable] {
     background-color: pink;
-} */
+}
 
 .htmlview *[wl2o\:editable] *[wl2o\:editable] {
     background-color: red;
-}
+} */
 
 
 .htmlview .annotation:hover {

diff --git a/requirements.txt b/requirements.txt
index 07b94b5..acc34d9 100644 (file)
--- a/requirements.txt
+++ b/requirements.txt
@@ -3,7 +3,7 @@
 Django==1.1.1
 lxml==2.2.2
 mercurial==1.3.1
-librarian==1.2.6
+librarian>=1.3.dev,<1.4
 django-piston==0.2.3rc1
 django-cas-consumer==0.1dev
 # MySQL-python>=1.2,<2.0