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
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
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
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
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 … (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
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