Commit Graph

9909 Commits

Author SHA1 Message Date
Craig Andrews
4ee2c12507 Use presence of IM plugins to decide if "IM" menu option should be shown in Connect 2010-06-15 17:04:15 -04:00
Brion Vibber
004200f958 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-06-11 12:09:55 -07:00
Brion Vibber
7f3b3620af Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 2010-06-11 12:05:53 -07:00
Brion Vibber
47665e845a Merge branch 'testing' of gitorious.org:statusnet/mainline into testing 2010-06-11 12:04:03 -07:00
Brion Vibber
ec15546476 Fix a couple bad format entries in router setup (format param had 'xmljson' instead of 'xml|json').
Warning: the format strings aren't actually being enforced here which is probably why they weren't caught earlier. Not quite sure why, it should be looked at!
2010-06-11 11:52:06 -07:00
Siebrand Mazeland
e81f17e911 Localisation updates from http://translatewiki.net 2010-06-11 00:55:14 +02:00
Brion Vibber
b1a68e15b7 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
Conflicts:
	lib/default.php
	lib/util.php
	plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
2010-06-10 15:37:06 -07:00
Brion Vibber
7cc58b97fe Fix for compile error (misnamed function) in 4211b7f011 2010-06-10 15:23:57 -07:00
Brion Vibber
352a3edfb3 Ticket #2350: fix for incorrect FOAF sioc:follows entries for users who are followed by, but don't themselves follow the user whose FOAF we're displaying. 2010-06-10 11:42:58 -07:00
Brion Vibber
1768bfa04b Ticket #2349: fix for Geonames semantic reference URLs in FOAF output (corrects a typo in the patch added in 4463768b) 2010-06-10 10:30:07 -07:00
Brenda Wallace
e121d472e7 Revert "added notice.location to group by"
This reverts commit 48dc899acb.
2010-06-09 16:30:50 +12:00
Brenda Wallace
5afd07e5e8 added missing author 2010-06-08 16:46:32 +12:00
Brenda Wallace
4617545ece added missing authors 2010-06-08 16:34:16 +12:00
Brenda Wallace
dc0f7189f2 added missing authors 2010-06-08 16:32:53 +12:00
Brenda Wallace
1cd029753f added 2 missing authors, foudn automatically in git logs 2010-06-08 16:27:10 +12:00
Brion Vibber
054ac909bf Merge branch 'integration' into testing 2010-06-07 18:19:12 -07:00
Brion Vibber
09208f8d65 Basic custom CSS and theme uploading features. 'local' subdir can now be customized to a distinct directory and URL path to make it easier to separate custom themes for a multi-site farm running a common code base.
Currently only one custom theme may be uploaded per site, saved with the name 'custom' and stored into the local/themes subdirectory.
Administrators can upload a .ZIP archive containing a theme through the design admin panel; its contents are validated to ensure that only legit files are saved, and a 5M size quota is enforced.
Theme upload requires the zip extension for PHP; if not present, theme uploading is disabled by default.

Uploading and the custom CSS can be controlled via $config['theme_upload']['enabled'] and $config['custom_css']['enabled'].

Configurable directory/path/server for 'local' subdirectory (currently only as used for themes; local plugins not yet switched over)

Can set $config['local']['dir'] etc; not currently exposed in the admin panels.

Per-site directories on a separate themes server could be set up such as:
  $config['local']['dir'] = '/path/to/themes/local/' . $_nickname;
  $config['local']['server'] = 'themes.example.com';
  $config['local']['path'] = '/local/' . $_nickname;
  $config['local']['ssl'] = 'never';
2010-06-07 18:14:16 -07:00
Brion Vibber
8e33cdd36a break up the giant form function in design admin panel into individual sections to make it a little more manageable 2010-06-07 18:14:15 -07:00
Brion Vibber
5a96b9e805 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-06-07 10:34:00 -07:00
Brion Vibber
d88b208edc Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
Conflicts:
	plugins/OpenID/openid.php
2010-06-07 10:19:40 -07:00
Brion Vibber
41e9dba729 OStatus plugin: Rolling batch queueing for PuSH output to >50 subscribing sites. Keeps latency down for other things enqueued while we work... 2010-06-07 10:03:43 -07:00
Zach Copley
02c68ff523 Add gNewBook to notice sources 2010-06-04 13:16:47 -07:00
Evan Prodromou
3a34d7e4ea Only show local public notices in sitemap
Only show local public notices in sitemap. Only do counts for them
in the sitemap index, and only show them in the notice sitemap.
2010-06-04 15:47:26 -04:00
Evan Prodromou
6d39a75137 use DB_DataObject_Cast objects in a couple of different places in the code 2010-06-04 15:29:38 -04:00
Evan Prodromou
cbdeb6fb8f Merge branch 'master' of gitorious.org:statusnet/mainline 2010-06-04 13:26:25 -04:00
Evan Prodromou
f1ea678aae memcache_dataobject supports some DB_DataObject_Cast objects as values 2010-06-04 12:52:05 -04:00
Brion Vibber
8b9436e8ae Option to divert PuSH items directly to the target site's queue when local 2010-06-03 18:06:55 -07:00
Brion Vibber
a75095fa1a Meteor realtime plugin: use persistent connections by default when pushing updates from our queue threads 2010-06-03 17:41:26 -07:00
Brion Vibber
5f4c6ec626 Skip enqueueing to outgoing bridges on incoming remote messages. Twitter, Facebook, RSSCloud, and OStatus checks were enqueued on these when they'd never do anything but churn the queue servers.
Notice::isLocal() can replace a number of manual checks for $notice->is_local being LOCAL_PUBLIC or LOCAL_NONPUBLIC.
2010-06-03 16:58:45 -07:00
Brion Vibber
791b98046d Stomp blocking writes fix 2010-06-03 16:09:47 -07:00
Siebrand Mazeland
a7e33ac89d Localisation updates from http://translatewiki.net 2010-06-04 01:06:25 +02:00
Zach Copley
1a44d4272f Add repeated attr to Atom notices_info element 2010-06-03 22:24:55 +00:00
Evan Prodromou
22d6ff25b5 Merge branch 'newmaster' 2010-06-03 15:59:59 -04:00
Evan Prodromou
1100831bc0 remove debug statements from Sitemap plugin 2010-06-03 15:19:46 -04:00
Evan Prodromou
d17dd32aac Merge branch 'sitemap' into newmaster 2010-06-03 15:13:06 -04:00
Evan Prodromou
135b398d4b Merge branch 'master' of gitorious.org:statusnet/mainline 2010-06-03 14:50:52 -04:00
Zach Copley
4bbb259baf - Fix bad argument being passed (error code) when invalid format specified
- Reformat whitespace
2010-06-03 10:52:16 -07:00
Brion Vibber
9bb48c36ea Installer tweak to aid with IIS setup: if config.php exists, but is both empty and writable, let the installer proceed and overwrite it. 2010-06-03 10:13:28 -07:00
Evan Prodromou
ef51cc9ad4 Merge branch 'sitemap' of gitorious.org:~evan/statusnet/evans-mainline into sitemap
Conflicts:
	plugins/Sitemap/SitemapPlugin.php
	plugins/Sitemap/noticesitemap.php
	plugins/Sitemap/sitemapindex.php
	plugins/Sitemap/usersitemap.php
2010-06-01 13:56:21 -07:00
Brion Vibber
17ab15a3d0 Fix memory leak in Inbox::addToInbox() (usage of raw DB_DataObject::staticGet, which leaks memory into a process-global cache).
On my test setup, this fixes inbox delivery to 10,000 local recipients from background queuedaemon running with a 32mb memory limit, completes the job within a minute from start.
2010-06-01 13:53:44 -07:00
Evan Prodromou
1066b26424 use sitemap_notice_count in sitemap index 2010-06-01 13:52:28 -07:00
Evan Prodromou
d78dfd627e cache notice counts in utility table 2010-06-01 13:52:28 -07:00
Evan Prodromou
271d7dd850 load Sitemap_notice_count 2010-06-01 13:52:28 -07:00
Evan Prodromou
416161c943 make user counts use the database table 2010-06-01 13:52:28 -07:00
Evan Prodromou
7d85b79814 Database tables to cache expensive query data
We need to bundle counts of notices and users by date. This can be
expensive for large sites. So, new tables are added to cache the
results of these queries, which don't change after the date is over.
2010-06-01 13:52:28 -07:00
Evan Prodromou
3e349a71ca mark user pages as being high priority 2010-06-01 13:52:28 -07:00
Evan Prodromou
40618b49e1 mark notice pages as being archived 2010-06-01 13:52:27 -07:00
Evan Prodromou
45e6e537ca note that sitemap actions are readonly 2010-06-01 13:52:27 -07:00
Evan Prodromou
1c858e17ea add sitemap statement to robots.txt 2010-06-01 13:52:27 -07:00
Evan Prodromou
e363b724b9 cache notice and user counts in sitemap index 2010-06-01 13:52:27 -07:00