wamo/gnu-social
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

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

Browse Source
This commit is contained in:
Evan Prodromou 2010-07-26 10:32:30 -04:00
commit db90bcb329
5 changed files with 6 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
classes/Notice.php
View File

@ -42,10 +42,10 @@ if (!defined('STATUSNET') && !defined('LACONICA')) {
*/ */
require_once INSTALLDIR.'/classes/Memcached_DataObject.php'; 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. */ * in the memcached cache. */
define('NOTICE_CACHE_WINDOW', 61); define('NOTICE_CACHE_WINDOW', 200);
define('MAX_BOXCARS', 128); define('MAX_BOXCARS', 128);

2
theme/biz/css/display.css
View File

@ -7,7 +7,7 @@
* @link http://status.net/ * @link http://status.net/
*/ */
@import url(base.css) screen, projection, tv, print; @import url(base.css);
@media screen, projection, tv { @media screen, projection, tv {
html { html {

2
theme/default/css/display.css
View File

@ -7,7 +7,7 @@
* @link http://status.net/ * @link http://status.net/
*/ */
@import url(../../base/css/display.css) screen, projection, tv, print; @import url(../../base/css/display.css);
@media screen, projection, tv { @media screen, projection, tv {
body, body,

2
theme/identica/css/display.css
View File

@ -7,7 +7,7 @@
* @link http://status.net/ * @link http://status.net/
*/ */
@import url(../../base/css/display.css) screen, projection, tv, print; @import url(../../base/css/display.css);
@media screen, projection, tv { @media screen, projection, tv {
body, body,

2
theme/pigeonthoughts/css/display.css
View File

@ -7,7 +7,7 @@
* @link http://status.net/ * @link http://status.net/
*/ */
@import url(base.css) screen, projection, tv, print; @import url(base.css);
@media screen, projection, tv { @media screen, projection, tv {
html { html {