diff options
| author | Evan Prodromou <evan@status.net> | 2010-07-26 10:32:30 -0400 |
|---|---|---|
| committer | Evan Prodromou <evan@status.net> | 2010-07-26 10:32:30 -0400 |
| commit | db90bcb3293985818e2645827ed5a568f27d1511 (patch) | |
| tree | 649860cb04044f11defaf93657681cf6a87651e5 | |
| parent | dbb5e9e1914c9dc67019a4abb1948d40171df0d4 (diff) | |
| parent | 3040a5ff858c88651f9ef01a9822d2c567f86467 (diff) | |
Merge branch 'master' of gitorious.org:statusnet/mainline
| -rw-r--r-- | classes/Notice.php | 4 | ||||
| -rw-r--r-- | theme/biz/css/display.css | 2 | ||||
| -rw-r--r-- | theme/default/css/display.css | 2 | ||||
| -rw-r--r-- | theme/identica/css/display.css | 2 | ||||
| -rw-r--r-- | theme/pigeonthoughts/css/display.css | 2 |
5 files changed, 6 insertions, 6 deletions
diff --git a/classes/Notice.php b/classes/Notice.php index ae7e2e540..8552248ba 100644 --- 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 ea09ef4c0..e735d8683 100644 --- 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 5e3748cb7..9a1dabb51 100644 --- 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 440dd8be2..d7f150bcb 100644 --- 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 e584683fc..3d6db00e1 100644 --- 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 { |