Brion Vibber
d9e56e15cc
Merge branch 'master' into testing
2010-06-26 10:16:27 -04:00
Zach Copley
9eb5a976b0
Have API methods for search subclass ApiPrivateAuthAction
2010-06-24 18:11:50 -07:00
Brion Vibber
a6408be566
Regression fix for Recaptcha on SSL registration page; their API is served on a different hostname for SSL.
2010-06-24 15:21:04 +00:00
Zach Copley
72e486a322
Fix for ticket http://status.net/open-source/issues/2380 "Autofocus
...
shouldn't override scroll" -- Thanks @michaeltwofish!
2010-06-23 11:29:13 -07:00
Craig Andrews
dad0b06a38
Throw an error if queueing is disable when using an IM plugin
2010-06-22 22:01:13 -04:00
Zach Copley
1eec7f779f
- Add profile_info tag to Atom author
...
- Normalize xmlns:statusnet links in the API
2010-06-22 16:28:06 -07:00
Siebrand Mazeland
b59aba9543
Update pot file.
2010-06-21 20:17:32 +02:00
Siebrand Mazeland
87125a1395
Improve error message per discussion on http://translatewiki.net/wiki/Thread:Support/Unclear_message .
...
Spotted by Peter17 and changed per suggestion of McDutchie with approval of Brion.
2010-06-21 20:15:26 +02:00
Siebrand Mazeland
f31a6de311
Localisation updates from http://translatewiki.net
2010-06-21 20:10:37 +02:00
Brion Vibber
1852eae36f
quick-fix for localization typo per #2366 (also fixed upstream in translatewiki)
2010-06-21 08:07:12 -07:00
Brion Vibber
2e98a48f2b
RecaptchaPlugin: fix for missing captcha on iPhone/Android.
...
MobileProfile serves pages out to iPhone and Android as application/xhtml+xml, which doesn't work with the default we we were loading recaptcha (as it used document.write). Switched to filling out a <div> from the AJAX API, which doesn't use document.write in the XHTML context.
Tested that view & submission works ok in following browsers:
Mobile: iPhone 3.1, Android 2.1, iPad 3.2 (this last doesn't trigger mobile theme tweaks)
Ubuntu 10.04: Firefox 3.6.3, Chrome 6
Mac 10.6: Safari 5/OS X 10.6.4
Windows 7: IE 8, Opera 10.56
2010-06-20 19:30:12 +00:00
Brion Vibber
9d890e2be0
Catch a couple of missing XML namespace declarations on API XML output. Missing NS declarations were breaking XML parsing for some clients since beaecb18d5
2010-06-18 09:59:11 -07:00
Zach Copley
105c1a22d6
Include source client's related URL (if any) in source attribution for
...
Atom notice feeds
2010-06-17 23:08:40 +00:00
James Walker
b667092153
adding a Status_network::updateKeys() method, since DB_DataObject update doesn't do keys.
2010-06-17 13:44:17 -04:00
Zach Copley
a6ce4eef0d
Fix problem with AvatarLink in which it was sometimes leaving the width attribute empty
2010-06-16 18:27:51 -07:00
Zach Copley
ba2bffa76e
Merge branch 'master' of gitorious.org:statusnet/mainline
...
* 'master' of gitorious.org:statusnet/mainline:
Switch OpenID server's redirects from 307 to 303 to avoid prompt for form data resubmission if we were sent here from a POST request, such as when verifying the site for the first time doing an OpenID login from Drupal.
2010-06-16 16:37:15 -07:00
Siebrand Mazeland
6d237abe44
Localisation updates from http://translatewiki.net
2010-06-17 00:28:05 +02:00
Zach Copley
d3d499879c
- More useful group info from api/statusnet/group/show
...
- Add statusnet:group_info tag to group Atom feeds
2010-06-16 14:29:24 -07:00
Craig Andrews
1a62d1b493
Use presence of IM plugins to decide if "IM" options should be available
2010-06-16 16:00:54 -04:00
Brion Vibber
d65d982681
Merge branch 'master' into testing
2010-06-16 12:37:14 -07:00
Brion Vibber
ce7176d987
Switch OpenID server's redirects from 307 to 303 to avoid prompt for form data resubmission if we were sent here from a POST request, such as when verifying the site for the first time doing an OpenID login from Drupal.
2010-06-16 12:30:37 -07:00
Luke Fitzgerald
0b2bbd20aa
Added Phergie PHP IRC library
2010-06-16 01:55:39 +01:00
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
Evan Prodromou
327ed5b87e
fix URL regex for tags to use UTF-8
2010-06-14 15:51:49 -04:00
Brion Vibber
a1b25b46bc
Merge branch 'master' into testing
2010-06-14 10:53:22 -07:00
Evan Prodromou
bfbebe5977
admin panel for setting site-claim metadata
2010-06-13 15:23:23 -04:00
Evan Prodromou
4b750b75da
show site claim keys on top page
2010-06-13 14:58:06 -04:00
Brion Vibber
3da8914edb
Fix for DB error reporting in installer (MySQL path)
2010-06-11 12:38:22 -07: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