Merge branch 'master' of gitorious.org:statusnet/mainline

diff --git a/classes/Notice.php b/classes/Notice.php
index ae7e2e54022a2c27e3740b7549b78cfaf4c976a7..8552248bad2c4cc3dfea6290803a4b653733f1f9 100644 (file)
--- a/classes/Notice.php
+++ b/classes/Notice.php
@@ -42,10 +42,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
  */
 require_once INSTALLDIR.'/classes/Memcached_DataObject.php';
 
-/* We keep the first three 20-notice pages, plus one for pagination check,
+/* We keep 200 notices, the max number of notices available per API request,
  * in the memcached cache. */
 
-define('NOTICE_CACHE_WINDOW', 61);
+define('NOTICE_CACHE_WINDOW', 200);
 
 define('MAX_BOXCARS', 128);
 

diff --git a/theme/biz/css/display.css b/theme/biz/css/display.css
index ea09ef4c0fcc6ac458f0a1538a536c8bc9cb6661..e735d8683fff24b3a949669ce653fec38a049544 100644 (file)
--- a/theme/biz/css/display.css
+++ b/theme/biz/css/display.css
@@ -7,7 +7,7 @@
  * @link      http://status.net/
  */
 
-@import url(base.css) screen, projection, tv, print;
+@import url(base.css);
 
 @media screen, projection, tv {
 html {

diff --git a/theme/default/css/display.css b/theme/default/css/display.css
index 5e3748cb7abed2b22fded0a6e70008365fc63dcc..9a1dabb51546c906ad87305c1aa67686e92be582 100644 (file)
--- a/theme/default/css/display.css
+++ b/theme/default/css/display.css
@@ -7,7 +7,7 @@
  * @link      http://status.net/
  */
 
-@import url(../../base/css/display.css) screen, projection, tv, print;
+@import url(../../base/css/display.css);
 
 @media screen, projection, tv {
 body,

diff --git a/theme/identica/css/display.css b/theme/identica/css/display.css
index 440dd8be22404cf5c3d3cc8cafda134fef1361f5..d7f150bcb0ad9c17974966f904e830acc6a5de85 100644 (file)
--- a/theme/identica/css/display.css
+++ b/theme/identica/css/display.css
@@ -7,7 +7,7 @@
  * @link      http://status.net/
  */
 
-@import url(../../base/css/display.css) screen, projection, tv, print;
+@import url(../../base/css/display.css);
 
 @media screen, projection, tv {
 body,

diff --git a/theme/pigeonthoughts/css/display.css b/theme/pigeonthoughts/css/display.css
index e584683fcdcd686ab3f9a6283804669337bc936a..3d6db00e142e1f84a5cab460891501ed01bb8de4 100644 (file)
--- a/theme/pigeonthoughts/css/display.css
+++ b/theme/pigeonthoughts/css/display.css
@@ -7,7 +7,7 @@
  * @link      http://status.net/
  */
 
-@import url(base.css) screen, projection, tv, print;
+@import url(base.css);
 
 @media screen, projection, tv {
 html {