Merge remote-tracking branch 'origin/master' into 1304-reset-db

ckan · Nov 18, 2013 · 0e990f6 · 0e990f6
2 parents acdcef1 + 0666cf3
commit 0e990f6
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 7 deletions.
diff --git a/bin/travis-install-dependencies b/bin/travis-install-dependencies
@@ -16,7 +16,7 @@ fi
 # We need this ppa so we can install postgres-8.4
 sudo add-apt-repository -yy ppa:pitti/postgresql
 sudo apt-get update -qq
-sudo apt-get install solr-jetty postgresql-$PGVERSION
+sudo apt-get install postgresql-$PGVERSION solr-jetty libcommons-fileupload-java:amd64=1.2.2-1
 
 sudo service postgresql reload
 

diff --git a/ckan/public/base/css/main.css b/ckan/public/base/css/main.css
@@ -6126,6 +6126,7 @@ textarea {
 }
 .js .image-upload .btn-remove-url .icon-remove {
   margin-right: 0;
+}
 .add-member-form .control-label {
   width: 100%;
   text-align: left;
@@ -7716,6 +7717,9 @@ h4 small {
   -moz-box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
   box-shadow: 0 1px 2px rgba(0, 0, 0, 0.2);
 }
+.activity .item.no-avatar p {
+  margin-left: 40px;
+}
 .activity .load-less {
   margin-bottom: 15px;
 }
@@ -7733,9 +7737,28 @@ h4 small {
   float: right;
   text-decoration: none;
 }
+.popover .popover-content {
+  font-size: 14px;
+  line-height: 20px;
+  color: #444444;
+  word-break: break-all;
+}
+.popover .popover-content dl {
+  margin: 0;
+}
+.popover .popover-content dl dd {
+  margin-left: 0;
+  margin-bottom: 10px;
+}
 .activity .item .icon {
   background-color: #999999;
 }
+.activity .item.failure .icon {
+  background-color: #b95252;
+}
+.activity .item.success .icon {
+  background-color: #69a67a;
+}
 .activity .item.added-tag .icon {
   background-color: #6995a6;
 }
@@ -7986,6 +8009,21 @@ h4 small {
   font-size: 16px;
   margin: 3px 0;
 }
+.datapusher-status-link:hover {
+  text-decoration: none;
+}
+.datapusher-status.status-unknown {
+  color: #bbb;
+}
+.datapusher-status.status-pending {
+  color: #FFCC00;
+}
+.datapusher-status.status-error {
+  color: red;
+}
+.datapusher-status.status-complete {
+  color: #009900;
+}
 body {
   background: #005d7a url("../../../base/images/bg.png");
 }

diff --git a/doc/_themes/sphinx-theme-okfn b/doc/_themes/sphinx-theme-okfn
diff --git a/doc/authorization.rst b/doc/authorization.rst
@@ -1,6 +1,6 @@
-=============
-Authorization
-=============
+===============================
+Organizations and authorization
+===============================
 
 .. versionchanged:: 2.0
    Previous versions of CKAN used a different authorization system.

diff --git a/doc/conf.py b/doc/conf.py
@@ -80,7 +80,7 @@
 master_doc = 'index'
 
 # General information about the project.
-project = u'CKAN Documentation'
+project = u'CKAN'
 project_short_name = u'CKAN'
 copyright = u'''&copy; 2009-2013, <a href="http://okfn.org/">Open Knowledge Foundation</a>.
     Licensed under <a

diff --git a/doc/configuration.rst b/doc/configuration.rst
@@ -1097,7 +1097,7 @@ DataPusher Settings
 .. _ckan.datapusher.formats:
 
 ckan.datapusher.formats
-^^^^^^^^^^^^^^^^^^
+^^^^^^^^^^^^^^^^^^^^^^^
 
 Example::
   ckan.datapusher.formats = csv xls xlsx