eliseuamaro/gnu-social
1
0
Fork 0
forked from GNUsocial/gnu-social
Code Issues Pull Requests Releases Wiki Activity
9,973 Commits 8 Branches 3 Tags 310 MiB
efdf9b6d4e
Commit Graph

1564 Commits

Author SHA1 Message Date
Brion Vibber
68305d4b68 Added block link to subscription notification emails; block action can now take a profile ID on the URL; added profile details to block page so there's an indication of who you're blocking before you pull the trigger. 
Fixed typo in RedirectingAction when no return-to data provided in form submission.
RedirectingAction::returnToArgs() has been renamed to returnToPrevious() to avoid conflict with Action::returnToArgs() which returns arguments to be passed to other actions as return-to arguments. All callers should now be updated.
More profile settings actions will now redirect through a login form if visited as a GET request, as would be expected from a bookmark, link sent in e-mail etc.
 2010-05-20 14:24:44 -07:00
Brion Vibber
ad651c3535 Merge branch 'master' of gitorious.org:statusnet/mainline 2010-05-19 15:46:39 -07:00
Brion Vibber
223795a2e4 Add config option for RequireValidatedEmail plugin to skip the check for folks with a trusted OpenID association. 
Also added an event that other plugins or local config can use to override the checks.
 2010-05-19 15:45:46 -07:00
Zach Copley
8dd2924674 Hotpatch to add additional debug statements to FacebookPlugin's 
facebook posting code.
 2010-05-19 21:02:18 +00:00
Brion Vibber
c4203be9a4 Merge branch '0.9.x' into 1.0.x 2010-05-19 12:52:23 -07:00
Brion Vibber
7005ef6661 Merge branch 'testing' into 0.9.x 
Conflicts:
	plugins/OpenID/openidlogin.php
 2010-05-19 12:51:25 -07:00
Brion Vibber
a39a934dd4 Merge branch 'master' of gitorious.org:statusnet/mainline into testing 2010-05-19 10:59:14 -07:00
Brion Vibber
74a89b1fc3 Locale switch cleanup: use common_switch_locale() which is safer for updating gettext state. Also moved a few calls to reduce chance of hitting an exception before switching back. 
Should help with problems where xmppdaemon would get stuck in wrong locale.
 2010-05-19 10:10:55 -07:00
Zach Copley
6187266205 - OStatusPlugin should return true if it doesn't need to handle source 
attribution
- Remove stray break statement from NoticeList
 2010-05-18 15:16:03 -07:00
Brion Vibber
7c828ae5f8 OpenID access control options: trusted provider URL, Launchpad team restrictions. Added an admin panel for setting these and OpenID-only mode, off by default. 
To enable the admin panel:
    $config['admin']['panels'][] = 'openid';

Or to set them manually:
    $config['openid']['trusted_provider'] = 'https://login.ubuntu.net/';
    $config['openid']['required_team'] = 'my-project-cabal';
    $config['site']['openidonly'] = true;

OpenID-only mode can still be set from addPlugin() parameters as well for backwards compatibility.
Note: if it's set there, that value will override the setting from the database or config.php.

Note that team restrictions are only really meaningful if a trusted provider is set; otherwise,
any OpenID server could report back that users are members of the given team.

Restrictions are checked only at OpenID authentication time and will not kick off people currently
with a session open; existing remembered logins may also survive these changes.

Using code for Launchpad team support provided by Canonical under AGPLv3, pulled from r27 of
WordPress teams integration plugin:
    https://code.edge.launchpad.net/~canonical-isd-hackers/wordpress-teams-integration/trunk
 2010-05-18 13:28:41 -07:00
Brion Vibber
b77878f467 Include notice fragment on 'in context' links in Realtime plugin family. 2010-05-17 19:47:44 +00:00
Brion Vibber
e36df29212 Patch from g0: fix for conversation links in Realtime updates 
Previously was using the reply-to URL, which didn't match with other displays.
Now sends to the right conversation page.
 2010-05-17 19:37:47 +00:00
James Walker
1999b836c0 accept either salmon endpoint (until they're unified in the spec) 2010-05-14 16:43:41 -04:00
James Walker
275002d88a allow hyphens in subdomains for webfinger addresses 2010-05-14 16:43:41 -04:00
Brion Vibber
91367dbc21 Merge branch '0.9.x' into 1.0.x 2010-05-14 12:15:13 -07:00
Brion Vibber
065ecc5573 Merge branch 'testing' into 0.9.x 2010-05-14 12:14:02 -07:00
Brion Vibber
5d0593ec34 Fix keys() / keyTypes() mixup in SamplePlugin 2010-05-12 11:09:37 -07:00
Siebrand Mazeland
f430480ddd Update pot and add Dutch translation 2010-05-09 00:37:47 +02:00
Siebrand Mazeland
bbefcc104e Tweaks for DirectionDetector: 
* remove trailin whitespace
* update use of capital letters
* fix a few typos in comments
* add translator documentation
 2010-05-09 00:36:52 +02:00
Brion Vibber
d9c1ac9053 Merge branch '0.9.x' into 1.0.x 2010-05-06 18:49:01 -07:00
Brion Vibber
d57e1deaec Merge branch 'testing' into 0.9.x 2010-05-06 18:48:39 -07:00
Brion Vibber
7915386950 Allow plugins to load their styles for mobile view; fixes bad realtime button layout 2010-05-07 01:28:37 +00:00
Zach Copley
ce177400f8 - OStatusPlugin should return true if it doesn't need to handle source 
attribution
- Remove stray break statement from NoticeList
 2010-05-06 21:48:12 +00:00
Brion Vibber
5996d80c09 Ticket #2184: recognize Palm Pre / WebOS browsers for MobileProfile 
One-line addition of 'webos' to the keywords list.
 2010-05-06 21:29:04 +00:00
Brion Vibber
173778eab1 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 
Conflicts:
	lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
 2010-05-05 17:11:23 -07:00
Brion Vibber
e05415f621 Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	locale/ca/LC_MESSAGES/statusnet.po
	locale/de/LC_MESSAGES/statusnet.po
	locale/statusnet.pot
 2010-05-05 17:07:50 -07:00
Brion Vibber
ddc7811a7b Move XMPPHP from core extlibs to Xmpp plugin extlibs 2010-05-05 16:52:31 -07:00
Brion Vibber
8260a88f41 Quick fix for DirectionDetector: only apply <span class="rtl"> once; if it's already there in an incoming message (eg via OStatus), don't reapply it. 
Modified from patch from Everplays
 2010-05-05 11:28:05 -07:00
Brion Vibber
60825ba535 Clean up reference usage warnings in DirectionDetector plugin 2010-05-05 10:51:05 -07:00
Brion Vibber
5f5d9518bd Avoid spewing giant debug backtrace into exception in certain OStatus subscription failure cases. 
The code pattern 'new XXXException($e)' to chain exceptions doesn't actually work as intended, as exceptions are actually expecting a string message here.
This caused an implicit string conversion from HTTP_Request2_Exception, which is a PEAR_Exception, which defines an absurdly detailed __toString() method including a giant HTML table with a backtrace if you happen to be on a web request.
Simply passing $e->getMessage() instead clears this up, as we'll get the nice short message like 'Couldn't connect to tcp://blahblah:80'
 2010-05-04 17:11:43 -07:00
Craig Andrews
ecf9dc6d1b use the new maxNoticeLength and maxUrlLength functionality introduced in commit 14adb7cc41 2010-05-03 21:25:10 -04:00
Brion Vibber
67eeaa9cf4 Pull localization updates from 0.9.x branch 2010-05-03 12:27:44 -07:00
Brion Vibber
5414396a2e IM cleanup on 1.0.x branch: 
* Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them.
* fix fatal error in IM settings while waiting for a Jabber confirmation.
* Caching fix for user_im_prefs
* fix for saving multiple transport settings
* some fixes for AIM & using normalized addresses for lookups
 2010-04-30 15:29:05 -07:00
Brion Vibber
e3e90b4c27 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-04-30 14:08:35 -07:00
Siebrand Mazeland
7ec5e7cd76 Update translator documentation for OpenID plugin. 2010-04-30 23:07:19 +02:00
Brion Vibber
cae1329f3b Merge branch '0.9.x' into 1.0.x 
Conflicts:
	lib/util.php
 2010-04-30 13:16:13 -07:00
Siebrand Mazeland
193fdd8071 Update Dutch translation for OpenID plugin. 2010-04-30 02:17:30 +02:00
Siebrand Mazeland
83dcdf3b08 Re-add OpenID/locale/nl/LC_MESSAGES/OpenID.po which was accidentally removed in Commit:d811f14bedc260adcfdd0eb8216eba06e9610144 
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
 2010-04-30 02:01:55 +02:00
Siebrand Mazeland
d811f14bed Remove .po source files. Using pot files. 2010-04-30 01:57:22 +02:00
Siebrand Mazeland
5ad2d0c30c Update gettext localisation files. 2010-04-30 01:45:54 +02:00
Brion Vibber
ae2986527c Pull localization updates from 0.9.x 2010-04-29 15:52:10 -07:00
Brion Vibber
2260d6ec7c Merge branch 'testing' into 0.9.x 
Conflicts:
	index.php
 2010-04-29 15:14:51 -07:00
Craig Andrews
edc6cf39a0 Only shorten when notice length exceeds max length 2010-04-26 15:59:13 -04:00
Evan Prodromou
5c05cd2b1a Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x 2010-04-26 02:43:33 -04:00
Evan Prodromou
14adb7cc41 Give users more control over URL shortening 
Users and administrators can set how long an URL can be before it's
shortened, and how long a notice can be before all its URLs are
shortened. They can also turn off shortening altogether.

Squashed commit of the following:

commit d136b39011
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:39:00 2010 -0400

    use site and user settings to determine when to shorten URLs

commit 1e1c851ff3
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:38:40 2010 -0400

    add a method to force shortening URLs

commit 4d29ca0b91
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:41 2010 -0400

    static method for getting best URL shortening service

commit a9c6a3bace
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:37:11 2010 -0400

    allow 0 in numeric entries in othersettings

commit 767ff2f7ec
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:36:46 2010 -0400

    allow 0 or blank string in inputs

commit 1e21af42a6
Author: Evan Prodromou <evan@status.net>
Date:   Mon Apr 26 02:01:11 2010 -0400

    add more URL-shortening options to othersettings

commit 869a6be0f5
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:22:51 2010 -0400

    move url shortener superclass to lib from plugin

commit 9c0c9863d5
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:20:28 2010 -0400

    documentation and whitespace on UrlShortenerPlugin

commit 7a1dd5798f
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 14:05:46 2010 -0400

    add defaults for URL shortening

commit d259c37ad2
Author: Evan Prodromou <evan@status.net>
Date:   Sat Apr 24 13:40:10 2010 -0400

    Add User_urlshortener_prefs

    Add a table for URL shortener prefs, a corresponding class, and the
    correct mumbo-jumbo in statusnet.ini to make everything work.
 2010-04-26 02:40:36 -04:00
Brion Vibber
dd7b95c2cf Merge branch 'master' into testing 2010-04-23 14:26:57 -07:00
Brion Vibber
9c8052e755 Rerun feed discovery and update the feed, salmon, and hub for the given OStatus remote profile. Restarts subscription fresh as well. 
update-profile.php -sexample.com http://example.com/path/to/profile/url
 2010-04-23 12:54:31 -07:00
Brion Vibber
4beaba9fb0 Ticket #93: pretty up the auto-submit for OpenID logins a bit. 
* throwing in our spinner
* cleanup of texts
* "If this doesn't go through click the button" instead of just a mystery button
* slightly faster submission: immediate at end of page rather than waiting for jQuery to confirm document setup completion
 2010-04-23 11:28:50 -07:00
Craig Andrews
1de8877cad Shorten text after paste operation 
Abort ajax shorten request if the user pastes/pushes another key
 2010-04-23 12:14:55 -04:00
Brion Vibber
0f975f4215 Fix to regression in last commit; wrong field name for homepage blacklist 2010-04-23 08:24:53 -07:00
Brion Vibber
390a2a8624 Fix for Blacklist plugin: was saving an empty entry if blacklist was empty, which would match *all* possible nickname registrations, preventing all registration on mozilla.status.net. 
Now saving only non-empty lines, and only matching non-empty lines so we don't fail if we still have a bogus entry.
 2010-04-23 07:17:52 -07:00
Brion Vibber
67b8b1334f Fix keys / keyTypes for Blacklist plugin - was spewing notices for undefined array indexes when saving blacklist entries from admin panel 2010-04-23 07:10:36 -07:00
Craig Andrews
f91e992851 use onAutoload instead of always requiring 2010-04-22 18:04:03 -04:00
Craig Andrews
809e597841 Only shorten after the user presses space, or following a paste operation 2010-04-22 18:04:03 -04:00
Brion Vibber
fd9d520aeb OStatus: CLI script to force a renewal on the given PuSH subscription. May help when we get out of sync with the hub. 
php plugins/OStatus/scripts/resub-feed.php -smysite http://example.com/some/atom/feed
 2010-04-22 06:14:40 +02:00
Evan Prodromou
a129c455a2 Fix exceptions with bad gravatar URLs 2010-04-21 18:19:16 -07:00
Evan Prodromou
e28214bfe9 fix reference error in RSSCloud plugin 2010-04-21 18:11:29 -07:00
Craig Andrews
65796ba03b add ClientSideShortenPlugin 
see plugins/ClientSideShorten/README
 2010-04-21 17:14:54 -04:00
Brion Vibber
056cce4b5e Merge branch 'testing' into 0.9.x 2010-04-19 19:46:46 +02:00
Brion Vibber
2af12774bf Merge branch 'master' into testing 2010-04-19 19:46:11 +02:00
Brion Vibber
acea534044 Disable the send-notice form at the top of the page OStatus subscription confirmation page to work around bugs in Cloudy theme. 
This is really just a hack for the broken CSS in the Cloudy theme, I think; copying from other non-notice-navigation pages that do this as well. There will be plenty of others also broken.
 2010-04-19 19:45:01 +02:00
Craig Andrews
39392e03a7 Merge branch '0.9.x' into 1.0.x 
Conflicts:
	actions/confirmaddress.php
	actions/imsettings.php
 2010-04-18 19:21:15 -04:00
Craig Andrews
23bad16bba don't attempt to read a user's ldap password 2010-04-17 15:09:56 -04:00
Brion Vibber
c748933132 Merge branch 'testing' into 0.9.x 2010-04-14 15:59:12 +02:00
Brion Vibber
c95bff7744 Merge branch 'master' into testing 2010-04-14 15:58:42 +02:00
Brion Vibber
efcdfabc12 Ticket #2205: pass geo locations over Twitter bridge (will only be used if enabled on the Twitter side) 2010-04-14 15:45:00 +02:00
Siebrand Mazeland
2bb02e8698 Adding Dutch translation for OpenID plugin. 2010-04-12 00:57:02 +02:00
Brion Vibber
756dd15515 i18n cleanup: fix bad string breakdown in license agreement checkbox on registration form. 
Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.
 2010-04-09 10:12:23 -07:00
Brion Vibber
4b20d68c48 i18n cleanup: fix bad string breakdown in license agreement checkbox on registration form. 
Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.
 2010-04-09 10:11:11 -07:00
Brion Vibber
db497e80e8 Initial version of everplay's RTL direction detector plugin, sets initial direction correctly for primarily RTL notices within an LTR site layout. 2010-04-09 09:24:10 -07:00
Brion Vibber
13e8214a67 Initial version of everplay's RTL direction detector plugin, sets initial direction correctly for primarily RTL notices within an LTR site layout. 2010-04-09 09:22:33 -07:00
Brion Vibber
1f8451f4aa Merge branch 'testing' into 0.9.x 2010-04-09 08:40:15 -07:00
Craig Andrews
fc1a463b95 Redirect using HTTP 303 so that form POST data is not re-submitted to the destination page 2010-04-08 17:20:24 -04:00
Brion Vibber
ee438cf198 Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing 2010-04-08 10:16:55 -07:00
Brion Vibber
ecd31384ed Fix for error during handling of HTTP error response case in Geonames lookups 2010-04-08 10:11:52 -07:00
Brion Vibber
8a02cad424 drop onStartShowHeadElements handler from MobileProfile; just duplicated the original code path, and after removing the bogus notice-spewing code it was running those things twice. 2010-04-08 10:09:56 -07:00
Evan Prodromou
727ea5a516 Merge branch '0.9.x' into 1.0.x 2010-04-07 10:47:29 -04:00
Evan Prodromou
76cce8a3c5 Merge branch 'master' into 0.9.x 2010-04-07 10:46:23 -04:00
Brion Vibber
d352e5f5c4 Handle attempt to subscribe a local user via their remote webfinger reference more gracefully. 
The ensure* family of functions will now return an OStatusShadowException in this case, which gives us a pleasant error message instead of a giant exception backtrace when you do 'sub somebody@this.local.server'.

Can be extended later to allow actually using the local profile, since we could figure it out.
 2010-04-06 16:35:24 -07:00
Brion Vibber
878461d50d Handle attempt to subscribe a local user via their remote webfinger reference more gracefully. 
The ensure* family of functions will now return an OStatusShadowException in this case, which gives us a pleasant error message instead of a giant exception backtrace when you do 'sub somebody@this.local.server'.

Can be extended later to allow actually using the local profile, since we could figure it out.
 2010-04-06 23:32:04 +00:00
Brion Vibber
5dc169260d Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-04-06 15:22:23 -07:00
Brion Vibber
4bb75d1c8e Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing 2010-04-06 15:19:10 -07:00
Brion Vibber
cda03ff328 Set a default 2-second timeout on Geonames web service lookups. After a failure, further lookups in the same process will be skipped for the next 60 seconds (also configurable). 
Makes a Geonames outage much less disruptive to site operations.
 2010-04-06 15:14:28 -07:00
Brion Vibber
3da8989242 Merge branch 'master' into testing 2010-04-06 14:36:21 -07:00
Brion Vibber
7c3b320a7a Allow Meteor plugin to be configurable via configuration database or file. 
As there's no admin control panel yet, this is mainly meant for batch administration and using setconfig.php
 2010-04-06 14:07:46 -07:00
Brion Vibber
3172b50fc7 Add a User-Agent fragment blacklist to MobileProfile: sticking iPad on the regular theme, which works better on its larger screen (was tripped on 'mobile' in the UA though we had no explicit check for 'ipad' previously) 2010-04-06 12:21:42 -07:00
Brion Vibber
edea825c70 Comment out unreachable code spewing notices due to use of undefined variables in MobileProfile. 
This needs some cleanup...
 2010-04-06 12:13:54 -07:00
Brion Vibber
3ac3bc32fc Some localization cleanup and doc to aid in customization: 
* added locale/en/LC_MESSAGES/statusnet.po to make it easier to start customizing English texts
* added notes to locale/README about customizing and how to disable languages you haven't customized
* renamed PO templates from *.po to *.pot to match general conventions and reduce confusion for people trying to find which file they're supposed to edit
 2010-04-05 13:19:16 -07:00
Brion Vibber
dbaa93d1aa Clean up and clarify output on fix-shadow.php 2010-04-05 11:21:17 -07:00
Brion Vibber
295b2d02bb Clean up and clarify output on fix-shadow.php 2010-04-05 11:20:35 -07:00
Brion Vibber
2f4438fe24 Merge branch '0.9.x' into 1.0.x 
Conflicts:
	actions/imsettings.php
	lib/jabber.php

Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet.
Should also move over the test cases.
 2010-04-02 15:56:25 -07:00
Brion Vibber
df9eb4164a Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-31 12:48:24 -07:00
Brion Vibber
f19b95d9b7 Shared cache key option for Geonames plugin, lets multi-instance sites share their cached geoname lookups. 
Example:
  unset($config['plugins']['default']['Geonames']);
  addPlugin('Geonames', array('cachePrefix' => 'statusnet:shared'));
 2010-03-30 12:20:46 -07:00
Brion Vibber
bfb2ac4910 Shared cache key option for Geonames plugin, lets multi-instance sites share their cached geoname lookups. 
Example:
  unset($config['plugins']['default']['Geonames']);
  addPlugin('Geonames', array('cachePrefix' => 'statusnet:shared'));
 2010-03-30 12:19:25 -07:00
Zach Copley
804182e0fe Some fixes to make the twitterstatusfetcher behave better in a multi-site configuration 2010-03-30 11:51:56 -07:00
Brion Vibber
6046a6cc6a Include meta charset header in saved HTML file for long OStatus messages; without, DOMDocument::loadHTML assumed Latin-1 instead of UTF-8. 2010-03-29 16:29:57 -07:00
Brion Vibber
990bbea07e Include meta charset header in saved HTML file for long OStatus messages; without, DOMDocument::loadHTML assumed Latin-1 instead of UTF-8. 2010-03-29 16:27:50 -07:00
Brion Vibber
01a03e34c8 Merge branch '0.9.x' into 1.0.x 2010-03-29 15:15:51 -07:00
Brion Vibber
cfeb1bfa41 Merge branch 'testing' into 0.9.x 2010-03-29 15:15:11 -07:00
Brion Vibber
873b832827 Merge branch 'master' into testing 
Conflicts:
	plugins/Blacklist/BlacklistPlugin.php
 2010-03-29 15:14:25 -07:00
Zach Copley
03f6706468 RSSCloudPlugin's onRouterInitialized() should expect pass by value instead of reference 2010-03-28 17:01:16 -07:00
Sarven Capadisli
21a835596c Revert "Remove console debug line" 
This reverts commit 06ffb8bf02.
 2010-03-28 23:50:25 +02:00
Sarven Capadisli
06ffb8bf02 Remove console debug line 2010-03-28 23:49:10 +02:00
Brion Vibber
bf468e2a8d Remove debug line that crept into a commit a while back, breaking realtime when Firebug wasn't present 2010-03-28 14:41:31 -07:00
Evan Prodromou
f0d905112e Merge branch 'master' into 0.9.x 
Conflicts:
	lib/attachmentlist.php
 2010-03-28 15:25:02 -04:00
Evan Prodromou
482faf6614 don't try to get to database at initialize time 2010-03-28 15:17:44 -04:00
Zach Copley
5b7b38ab66 Some fixes to make the twitterstatusfetcher behave better in a multi-site configuration 2010-03-27 23:43:05 +00:00
Zach Copley
8fc390e5cb Some fixes to make the twitterstatusfetcher behave better in a multi-site configuration 2010-03-27 23:36:05 +00:00
Brion Vibber
766cf99f21 Drop debug statements on every regex match from Blacklist plugin; filling the logs a little faster than ops likes. :) 2010-03-26 10:47:12 -07:00
Brion Vibber
c905d7e9a0 Drop debug statements on every regex match from Blacklist plugin; filling the logs a little faster than ops likes. :) 2010-03-26 10:46:36 -07:00
James Walker
3227122ac3 move base64_url_(encode|decode) to static functions in Magicsig 2010-03-26 10:43:41 -07:00
James Walker
c6c4510192 move base64_url_(encode|decode) to static functions in Magicsig 2010-03-26 13:37:46 -04:00
Evan Prodromou
e3a46d2b83 Merge branch '0.9.x' into 1.0.x 2010-03-26 09:18:07 -04:00
Evan Prodromou
36a8e8e8a3 Merge branch 'testing' into 0.9.x 2010-03-26 09:17:47 -04:00
Evan Prodromou
75b2bf2a4e Do ostatus queue first 
We do the OStatus queue first, so if we're sending a notice to the
same server twice (e.g., with OMB), our richer and more featureful
notice comes in first.
 2010-03-26 08:45:23 -04:00
Brion Vibber
e91bf2b8a9 Tweak to OStatus long message cropping: use original source notice URL for the link in the text version, don't shorten the link for the HTML so we can append params to it in JS. 
Conflicts:

	plugins/OStatus/classes/Ostatus_profile.php
 2010-03-25 16:08:09 -07:00
Brion Vibber
013647f0ba Add doc comments on saveHTMLFile; drop the extra <div> wrapping the contents to make it easier to extract without getting extra markup. 2010-03-25 23:11:06 +01:00
Evan Prodromou
cbf321eeb3 Merge branch 'master' of git@gitorious.org:statusnet/mainline 2010-03-25 17:24:10 -04:00
Sarven Capadisli
8336e24179 Using &#8230; (hellip) instead of "more" for link text 2010-03-25 22:18:21 +01:00
Brion Vibber
c11064a539 Updated 'more' anchor for attachments to do an XHR GET 
Conflicts:

	lib/attachmentlist.php
	plugins/OStatus/classes/Ostatus_profile.php

Merge tried to delete things that it seems it shouldn't, very confusing order. Hope rest of the cherry-picking isn't a problem.
 2010-03-25 14:15:54 -07:00
Evan Prodromou
9c63ae6e44 add whitelist and blacklist for openid URLs 2010-03-25 16:58:05 -04:00
Evan Prodromou
7f6fdb528c remove debugging calls 2010-03-25 16:35:22 -04:00
Sarven Capadisli
9ea48298d5 Updated plugin to open external links on a new window that are not 
attachments
 2010-03-25 21:33:07 +01:00
Brion Vibber
29a25848de Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-25 13:04:09 -07:00
Evan Prodromou
697222575d Merge branch 'blacklisttable' into testing 2010-03-25 13:51:52 -04:00
Evan Prodromou
920acf8d96 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing 2010-03-25 13:50:49 -04:00
Evan Prodromou
6e644f77a4 Store blacklist patterns in their own tables 
We were bumping into limits on the config format in the Blacklist
plugin. So, added new tables for nickname and homepage blacklists, and
changed the plugin to use those instead of config file (actually,
still uses config file in addition, for compatibility).
 2010-03-25 13:49:12 -04:00
Brion Vibber
c3ceaa893f Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x 2010-03-24 14:11:01 -07:00
Brion Vibber
ecb009bcf5 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-24 13:57:20 -07:00
James Walker
9e0b9857f4 Make sure we're requiring the library 2010-03-24 15:26:03 -04:00
James Walker
cfca789b34 Updated Math_Biginteger from upstream - removing safe* workarounds 2010-03-24 15:18:41 -04:00
James Walker
c4273f0ef3 Check for 0.9.0 bad keys from old Crypt_RSA library 2010-03-24 15:15:20 -04:00
James Walker
10410907a0 A bit safer checking in the keypair parsing 2010-03-24 14:27:35 -04:00
Zach Copley
7b1b6045e6 Look for the first object in the Activity 2010-03-24 00:00:55 -07:00
Julien C
a3da5b24c9 Misc small fixes, plus a new hook in tag.php 2010-03-23 23:02:17 -04:00
Craig Andrews
1f73156dae Move the bundled Net/LDAP2 library to the LdapCommon directory 2010-03-23 21:57:47 -04:00
Brion Vibber
fcf86b4fdf Improve legibility of OStatus remote tests output 2010-03-23 18:56:40 -07:00
Craig Andrews
6b538cd9b3 Fix some regressions caused by refactor of LDAP plugin 2010-03-23 21:50:31 -04:00
Brion Vibber
9380eed794 add a general PuSHed post and an @-reply back to a subscribee by name to OStatus remote test cases 2010-03-23 18:44:54 -07:00
Nick Holliday
d9dcdf5b49 Converts Spotify URI/HTTP Links to pretty ones. 2010-03-23 21:31:58 -04:00
Brion Vibber
2ae61307bb Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-23 14:20:14 -07:00
Brion Vibber
df8c9090c0 Add basic subscribe/unsubscribe test to OStatus test cases 2010-03-23 14:19:12 -07:00
Brion Vibber
5f32cf32cd Don't spew XML parse warnings to output when checking a remote XRD page 2010-03-23 14:18:45 -07:00
Evan Prodromou
ad608ab9ad prevent password login actions in OpenID-only mode 2010-03-23 12:58:10 -04:00
Evan Prodromou
ff60cb4e66 start making OpenID-only mode work 2010-03-23 12:10:26 -04:00
Evan Prodromou
fcdbf421ab reformat OpenIDPlugin for PHPCS 2010-03-23 11:36:02 -04:00
Brion Vibber
a5c78a6f1a Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-23 08:21:32 -07:00
Zach Copley
5b0b6097e0 Fix reference. Look at the first ActivityObject in the list. 2010-03-22 21:48:21 -07:00
Zach Copley
b8e97ac709 Some initial media parsing 
- Activity now returns a list of activity objects
- Processing of photo objects
 2010-03-22 18:55:17 -07:00
Brion Vibber
68a5fba248 Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x 2010-03-22 17:08:05 -07:00