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

744 Commits

Author SHA1 Message Date
Siebrand Mazeland
4651c9d94a Fix L10n/i18n. 
Some remaining people tag -> list.
Favor -> like
Update translator documentation.
Whitespace updates.
 2011-04-29 18:59:47 +02:00
Siebrand Mazeland
5d72b600a1 Localisation updates from http://translatewiki.net. 2011-04-27 14:53:02 +02:00
Siebrand Mazeland
2f48f0f914 Localisation updates from http://translatewiki.net. 2011-04-21 20:54:12 +02:00
Siebrand Mazeland
cb8eb4d307 Localisation updates from http://translatewiki.net. 2011-04-20 10:19:58 +02:00
Siebrand Mazeland
13ae3ab259 Localisation updates from http://translatewiki.net. 2011-04-18 13:41:15 +02:00
Siebrand Mazeland
0d431cd6ee Localisation updates from http://translatewiki.net. 2011-04-18 00:38:35 +02:00
Siebrand Mazeland
5f3dbc3e98 Localisation updates http://translatewiki.net. 2011-04-17 20:30:47 +02:00
Siebrand Mazeland
4ab995dd1e Complete "people tag" to "list" in UI messages. 
Update translator documentation accordingly.

Probably a few cases left where "tag[ged[" has to be replaced by "list[ed]".
 2011-04-17 20:08:03 +02:00
Siebrand Mazeland
4c00b830bf Localisation updates from http://translatewiki.net. 2011-04-17 01:15:30 +02:00
Siebrand Mazeland
c27b9c0722 Update translator documentation. 
i18n/L10n updates.
Whitespace updates.
 2011-04-15 15:07:35 +02:00
Shashi Gowda
53af608ef8 People tags -> Lists (only UI changes, for experimentation) 2011-04-14 19:49:42 +00:00
Siebrand Mazeland
409550e1dc Localisation updates from http://translatewiki.net. 2011-04-13 15:48:18 +02:00
Siebrand Mazeland
124070e63d Update punctuation for exceptions. 2011-04-13 15:13:14 +02:00
Zach Copley
43f542c3a2 Script to delete bad OStatus hub URIs (until we have better error handling for broken hubs) 2011-04-12 02:29:02 -07:00
Siebrand Mazeland
0644cdb6d0 Localisation updates from http://translatewiki.net. 2011-04-11 15:10:09 +02:00
Siebrand Mazeland
b83e0fd0e8 Update translator documentation. 
i18n fixes (gettext domain).
L10n updates.
Whitespace updates.
Some tabs to spaces.
 2011-04-11 00:39:51 +02:00
Zach Copley
e75c9988eb Merge branch 'people_tags_rebase' into 1.0.x 
Conflicts:
	EVENTS.txt
 2011-04-10 08:10:01 +00:00
Siebrand Mazeland
396a0c08b3 Localisation updates from http://translatewiki.net. 2011-04-09 20:53:29 +02:00
Shashi Gowda
a0ac51c22f use notifyDeferred for tag/untag so that it gets queued offline 2011-04-09 17:18:33 +05:30
Shashi Gowda
ad86eb78d3 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 
Conflicts:
	js/util.min.js
	lib/default.php
 2011-04-07 23:13:45 +05:30
Evan Prodromou
36b331d469 Merge branch '1.0.x' into testing 
Conflicts:
	plugins/Event/RSVP.php
 2011-04-05 13:16:28 -04:00
Shashi Gowda
57198a7464 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 
Conflicts:
	actions/tagother.php
	lib/subscriberspeopleselftagcloudsection.php
	lib/subscriptionspeopleselftagcloudsection.php
 2011-04-04 13:26:27 +05:30
Siebrand Mazeland
09523a19d7 Localisation updates from http://translatewiki.net. 2011-04-03 15:35:52 +02:00
Siebrand Mazeland
d2a2575648 Localisation updates from http://translatewiki.net. 2011-04-01 22:59:31 +02:00
Siebrand Mazeland
4ac471f380 Localisation updates from http://translatewiki.net. 2011-03-31 23:30:07 +02:00
Siebrand Mazeland
14456cbbb2 Fix gettext domain for messages in plugins "_()" to "_m()". 
Some other i18n and L10n updates, too.

i18n/L10n review not complete.
 2011-03-30 22:31:23 +02:00
Shashi Gowda
5a2bab07b2 Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 
Conflicts:
	actions/tagother.php
	classes/Profile.php
	classes/Profile_tag.php
	js/util.min.js
 2011-03-30 15:47:42 +05:30
Evan Prodromou
a74eda4e9a don't send private notices over OStatus 2011-03-28 16:37:35 -04:00
Ian Denhardt
d36f0707a4 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline 2011-03-28 03:25:40 -04:00
Siebrand Mazeland
5502e535de Localisation updates from http://translatewiki.net. 2011-03-26 12:21:36 +01:00
Siebrand Mazeland
4e64bd4e5b Localisation updates from http://translatewiki.net. 2011-03-24 16:08:03 +01:00
Shashi Gowda
bf121a695a Merge remote-tracking branch 'mainline/1.0.x' into people_tags_rebase 
Conflicts:
	classes/Profile.php
 2011-03-22 07:59:06 +05:30
Shashi Gowda
31c1177970 Merge branch '1.0.x' into people_tags_rebase 
Conflicts:
	EVENTS.txt
	actions/peopletag.php
	actions/tagother.php
	classes/Notice.php
	js/util.js
	js/util.min.js
	lib/accountprofileblock.php
	lib/action.php
	lib/activityobject.php
	lib/command.php
	lib/personalgroupnav.php
	plugins/OStatus/OStatusPlugin.php
 2011-03-22 07:56:25 +05:30
Brion Vibber
541dfa04fe Switch things from calling Group_member::join & leave & calling events manually to running through Profile::joinGroup() && Profile::leaveGroup(), with the events encapsulated. 2011-03-21 14:35:29 -07:00
Brion Vibber
a390e3e888 Fixes for GroupPrivateMessage, OStatus due to changes in group output events, and some internal bugs using wrong vars 2011-03-18 15:00:02 -07:00
Siebrand Mazeland
5bb6fae307 Localisation updates from http://translatewiki.net. 2011-03-18 20:59:45 +01:00
Evan Prodromou
7cf12f093e Merge branch '1.0.x' into testing 
Conflicts:
	lib/common.php
 2011-03-17 09:20:32 -04:00
Ian Denhardt
27ef3b1d90 Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline 
Conflicts:
	actions/public.php
 2011-03-15 12:42:58 -04:00
Shashi Gowda
c335db4bbc OStatus support for people tags 2011-03-07 00:45:34 +05:30
Siebrand Mazeland
7a9b989349 Localisation updates from http://translatewiki.net. 
Location information removed from translation files with msgmerge --no-location to decrease size of files and reduce diff size. Unfortunately there does not appear to be a setting in msgmerge or msgattrib to remove the extracted comments ("#.") from translation files. If you do know of such a switch, please let me know!
 2011-03-06 02:52:28 +01:00
Siebrand Mazeland
5fd9767e80 Localisation updates from http://translatewiki.net. 
* Fix previous commit. Pot files were built against master instead of 1.0.x.
 2011-03-03 18:39:12 +01:00
Brion Vibber
641018e950 Merge branch 'master' into 0.9.x 2011-03-02 13:52:22 -08:00
Brion Vibber
9ad00f726f Add unsubscribe option to resub-feed.php 2011-03-02 12:49:37 -08:00
Zach Copley
b7d0746694 Merge branch '0.9.x' into 1.0.x 
Conflicts:
	actions/confirmaddress.php
	actions/emailsettings.php
	actions/hostmeta.php
	actions/imsettings.php
	actions/login.php
	actions/profilesettings.php
	actions/showgroup.php
	actions/smssettings.php
	actions/urlsettings.php
	actions/userauthorization.php
	actions/userdesignsettings.php
	classes/Memcached_DataObject.php
	index.php
	lib/accountsettingsaction.php
	lib/action.php
	lib/common.php
	lib/connectsettingsaction.php
	lib/designsettings.php
	lib/personalgroupnav.php
	lib/profileaction.php
	lib/userprofile.php
	plugins/ClientSideShorten/ClientSideShortenPlugin.php
	plugins/Facebook/FBConnectSettings.php
	plugins/Facebook/FacebookPlugin.php
	plugins/NewMenu/NewMenuPlugin.php
	plugins/NewMenu/newmenu.css
 2011-02-28 15:39:43 -08:00
Siebrand Mazeland
a86d293c93 Localisation updates from http://translatewiki.net. 2011-02-14 19:43:16 +01:00
Brion Vibber
c92358fa7b add --all and --suspicious options for update-profile-data.php 2011-02-11 12:23:03 -08:00
Brion Vibber
f30744c7c5 refactor for multi.... 2011-02-11 12:13:33 -08:00
Brion Vibber
f7b431d60b woops 2011-02-11 12:08:35 -08:00
Brion Vibber
91535365b3 Work in progress: update-profile-data.php to update ostatus profile info from the current feed 2011-02-11 11:55:23 -08:00
Evan Prodromou
dc424ab63a Merge branch 'master' of gitorious.org:statusnet/mainline 2011-02-10 22:23:06 -05:00
Brion Vibber
b09276635c Merge branch 'master' into 0.9.x 2011-02-10 12:04:13 -08:00
Evan Prodromou
8fa44e58f9 Try not to wipe out good data with empty values in Ostatus_profile::updateProfile() 
Output from 0.9.6 PuSH feeds seems to have a rump <author> but no
<activity:actor>. It was overwriting valid and useful data set up at
subscribe time.

This fix tries to avoid overwriting data. However, it may prevent
updates that delete data.

Bug: 3028
 2011-02-10 09:39:40 -05:00
Evan Prodromou
10500e7f85 ensure*() functions throw exceptions for errors 2011-02-09 03:08:52 -05:00
Evan Prodromou
22e8893fba OStatus uses Plugin::path() 2011-02-03 11:09:26 -05:00
Siebrand Mazeland
308e615a3f Localisation updates from http://translatewiki.net. 2011-02-03 01:31:31 +01:00
Brion Vibber
9573f725c1 Merge branch '0.9.x' into testing 2011-01-31 11:08:15 -08:00
Siebrand Mazeland
3fc323f8f9 Localisation updates from http://translatewiki.net. 2011-01-31 00:04:03 +01:00
Siebrand Mazeland
e6e402cefd Localisation updates from http://translatewiki.net. 2011-01-29 23:10:15 +01:00
Brion Vibber
ee9e368aa8 Fix ticket #3016: when using non-AJAX form of the ostatus subscription initiation for non-local group joins, show the "group" field instead of a blank "user" field 2011-01-26 14:57:52 -08:00
Evan Prodromou
2a59453d4c Merge branch 'testing' into moveaccount 2011-01-17 17:34:03 -05:00
Evan Prodromou
a3c08faddd Erroneous code ensuring Webfinger accounts 
Ostatus_profile::ensureProfileURI() was accidentally falling through to
the default switch case, and was also calling common_log() incorrectly.
 2011-01-17 17:32:44 -05:00
Evan Prodromou
a2aa87fbff OStatusPlugin does discovery in Profile::fromURI() 2011-01-17 15:45:03 -05:00
Evan Prodromou
0fa57948f2 move linkheader.php to core 2011-01-16 17:15:26 -05:00
Evan Prodromou
7d1f609bf0 Move discovery library from OStatus plugin to core 2011-01-16 17:15:26 -05:00
Siebrand Mazeland
f1820459a8 Localisation updates from http://translatewiki.net. 2011-01-15 01:30:01 +01:00
Evan Prodromou
5c25364141 remove extraneous <dl> and <dt> tags 2011-01-14 15:36:06 -05:00
Siebrand Mazeland
380ca7187c Localisation updates from http://translatewiki.net. 2011-01-14 12:10:05 +01:00
Brion Vibber
7ec456198a Ticket #2732: add some regression tests for groups to OStatus remote-tests.php 
Note that these tests won't pass on master branch yet as the join/leave don't work, and there's a bug in Activity parsing which prevents interop between new feeds and old remote subscribers (both fixed in this branch).
 2011-01-06 15:13:38 -08:00
Brion Vibber
1d15145993 Salmon signature checks on incoming slaps now check both old and new signature formats. 2011-01-06 00:01:42 +00:00
Brion Vibber
437ac120b0 Outgoing Salmon slaps now use the corrected signature format; if the first hit is rejected with an HTTP error, we try again with the old format. 
(This is not 100% ideal; possibly should try to distinguish between server errors and rejections, etc.)
 2011-01-05 23:54:16 +00:00
Brion Vibber
946a4ac17b Add test cases for internal change in Salmon signing; fix for the new code. 
Updated sig passes Tuomas's verifier, which is a good sign
 2011-01-05 23:26:39 +00:00
Brion Vibber
e25c34a2b6 Salmon slap / magicsig test script 
Given a notice in the local system, we package it up as an Atom entry and MagicSig it up.
We run the magicenv verification on it locally to make sure our own functions can decode it.
Optionally with --verify we can send to Tuomas Koski's verification test service (not sure if this is working 100%)
If given --slap= with a target Salmon endpoint, we'll sent it on and see if it liked it. (Note that StatusNet will reject if there's not a relevant mention, but will report acceptance for dupes so you can use a message that's already been delivered as a test.)
 2011-01-05 14:27:53 -08:00
Brion Vibber
51d1535f15 Added doc comments on Salmon magicsig-related stuff to help in figuring out what's going on 2011-01-05 14:05:59 -08:00
Evan Prodromou
32eb4c5e2d Merge remote branch 'gitorious/0.9.x' into 1.0.x 
Conflicts:
	lib/common.php
 2010-12-30 15:52:08 -08:00
Evan Prodromou
d3b10959f4 Merge branch '0.9.x' into noactor 2010-12-29 15:29:29 -08:00
Evan Prodromou
b54ea6767a New event for Salmon including target 2010-12-27 10:51:59 -08:00
Evan Prodromou
ab92496ddc Stop using <activity:subject> for atom feeds 2010-12-27 10:03:34 -08:00
Evan Prodromou
67bde86f7c accept bookmarks over PuSH 2010-12-23 09:42:42 -08:00
Brion Vibber
26baad63f2 Merge branch '0.9.x' into 1.0.x 2010-12-22 15:25:38 -08:00
Evan Prodromou
9a6ceb3303 Merge branch 'righttoleave' into 0.9.x 2010-12-22 11:22:51 -08:00
Brion Vibber
f82dd4e14f Merge branch '0.9.x' into 1.0.x 2010-12-20 14:28:43 -08:00
Brion Vibber
b83e7005ed Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x 
Conflicts:
	plugins/OStatus/classes/FeedSub.php
 2010-12-20 14:23:15 -08:00
Brion Vibber
46123e3754 *cough* don't commit the code that breaks your code that you used to test the debug code :D 2010-12-20 13:06:58 -08:00
Brion Vibber
a4e2f38356 Slightly fancier debug code for PuSH hmac mismatches -- save the post to a temp file if feedsub/debug is on in config. 2010-12-20 13:05:17 -08:00
Ian Denhardt
e36399974e Merge branch '1.0.x' of git://gitorious.org/statusnet/mainline 
Conflicts:
	lib/action.php
	plugins/OStatus/actions/ostatusinit.php
 2010-12-20 15:19:33 -05:00
Brion Vibber
dd48bdb1c4 Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke 2010-12-20 10:48:02 -08:00
Brion Vibber
c71d701a3f Logging helper for bogus hmacs on PuSH in -- record the url & hub with the err msg to help tell what broke 2010-12-20 10:46:23 -08:00
Evan Prodromou
16fc5314fb move code to get an author object for a feed to a library from Ostatus_profile 2010-12-17 13:09:37 -05:00
Brion Vibber
e79034e163 Merge branch '0.9.x' into 1.0.x 
Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
 2010-12-16 15:56:19 -08:00
Siebrand Mazeland
cf824621b9 Localisation updates from http://translatewiki.net. 2010-12-16 16:30:30 +01:00
Brion Vibber
0330bad688 Cleaner code to avoid a couple PHP notices from accessing uninitialized variables in ostatus profile discovery (these cases hit checking diaspora accounts) 2010-12-15 12:14:25 -08:00
Brion Vibber
9df856e667 Merge branch '0.9.x' into merge 
Conflicts:
	README
	actions/hostmeta.php
	classes/File_redirection.php
	lib/common.php
	lib/designsettings.php
	lib/router.php
	lib/util.php
	lib/xmppmanager.php
	plugins/OStatus/OStatusPlugin.php
 2010-12-07 10:50:05 -08:00
Siebrand Mazeland
6bdce2b1e5 Localisation updates from http://translatewiki.net. 2010-11-30 21:35:25 +01:00
Siebrand Mazeland
ee67a0673d Localisation updates from http://translatewiki.net. 2010-11-30 18:53:04 +01:00
Matt Lee
adb98ce5d1 updated 2010-11-29 16:02:17 -05:00
Matt Lee
675d902cab updated 2010-11-29 16:01:19 -05:00
Matt Lee
3277523448 updated 2010-11-29 16:00:54 -05:00
Matt Lee
4da41d95ee updated 2010-11-29 16:00:17 -05:00
Matt Lee
f4dd6c2916 updated 2010-11-29 15:58:41 -05:00
Matt Lee
67db18d30b updated 2010-11-29 15:57:28 -05:00
Matt Lee
432237178f updated 2010-11-29 15:55:58 -05:00
Siebrand Mazeland
ed0e91c7a1 Localisation updates from http://translatewiki.net. 2010-11-29 20:28:28 +01:00
Evan Prodromou
005a14272d Make OStatusPlugin define push feed rel 2010-11-26 22:10:18 -05:00
Evan Prodromou
fcc0825b14 Make userxrd part of the default hostmeta 2010-11-26 21:46:51 -05:00
Evan Prodromou
0a4911552e Move user xrd action to core and use hooks to extend 
Moved the Webfinger user XRD action from the OStatus plugin to core.
Added hooks to add OStatus-specific stuff, but kept general stuff in
the core.
 2010-11-26 21:38:38 -05:00
Craig Andrews
3f3b38766f move xrd and hostmeta out of the OStatus plugin and into core 
add event for setting up hostmeta, and use them in the OStatus plugin
 2010-11-26 21:12:14 -05:00
Brion Vibber
b716d01a41 Merge branch '0.9.x' into 1.0.x 2010-11-03 16:09:49 -07:00
Siebrand Mazeland
ec79572964 Localisation updates from http://translatewiki.net. 2010-11-03 00:04:26 +01:00
Siebrand Mazeland
973a48bded i18n/L10n fixes and translator documentation addded/updated. 2010-11-02 23:48:36 +01:00
Brion Vibber
0229c22d23 Merge branch '1.0.x' into schema-x 2010-11-02 15:02:55 -07:00
Brion Vibber
04ca706601 Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x 
Conflicts:
	actions/confirmaddress.php
	actions/othersettings.php
 2010-11-02 15:02:10 -07:00
Brion Vibber
5a9bb0adc4 Tossing in a basic i18n message export to script code. Plugins can hook StartScriptMessage/EndScriptMessage, or directly add needed mappings in Action::getScriptMessages(). Exported entries are accessible as SN.msg(key) at runtime. 
StatusNet core code now sets the tooltip text on .attachment.more links when they receive their attachment-expansion magic; this will override the hardcoded tooltip text saved from OStatus plugin when displaying timelines in the web UI.
 2010-11-02 13:05:16 -07:00
Brion Vibber
e7c7fd39fc Merge branch '1.0.x' into schema-x 
Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
 2010-10-28 16:27:53 -07:00
Brion Vibber
b26eccf33c Merge branch '0.9.x' into 1.0.x 2010-10-28 16:26:34 -07:00
Siebrand Mazeland
7a564276a9 Localisation updates from http://translatewiki.net. 2010-10-28 01:58:43 +02:00
Brion Vibber
b483a0549f Merge branch '1.0.x' into schema-x 
Conflicts:
	plugins/CacheLog/locale/nb/LC_MESSAGES/CacheLog.po
 2010-10-25 13:14:33 -07:00
Brion Vibber
ca489631db Merge branch '0.9.x' into 1.0.x 
Conflicts:
	actions/subscriptions.php
	lib/router.php
	lib/xmppmanager.php
	lib/xmppoutqueuehandler.php
 2010-10-25 13:08:57 -07:00
Siebrand Mazeland
1545c1228b Localisation updates from http://translatewiki.net. 2010-10-23 20:50:55 +02:00
Brion Vibber
3b6f738ab7 Convert SamplePlugin to new-style table defs, tweak some stuff to test basic checkschema 2010-10-19 17:25:56 -07:00
Brion Vibber
a67160e01e Merge branch '1.0.x' into schema-x 
Conflicts:
	lib/common.php
 2010-10-19 15:19:46 -07:00
Brion Vibber
3593f3f132 Merge branch '0.9.x' into 1.0.x 2010-10-19 15:18:07 -07:00
Brion Vibber
f1bfbece06 Merge branch '1.0.x' into schema-x 2010-10-18 15:26:20 -07:00
Siebrand Mazeland
3c10602561 Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x 2010-10-18 22:11:33 +02:00
Siebrand Mazeland
e6df1b19df Localisation updates from http://translatewiki.net 2010-10-18 22:03:29 +02:00
Brion Vibber
140308bb03 Merge branch '0.9.x' into 1.0.x 2010-10-18 12:49:20 -07:00
Brion Vibber
aa80d8fee3 Clean up edge cases in OStatus FeedDiscoveryTest 2010-10-18 12:45:55 -07:00
Brion Vibber
7765ddae81 Merge branch '0.9.x' into 1.0.x 
Conflicts:
	README
	lib/default.php
 2010-10-18 12:17:11 -07:00
Brion Vibber
e04a6ef93e Make HTTP timeout configurable on OStatus's remote-tests.php (needs to be pumped up a fair amount when doing Salmon pings with queues off on the test boxes, especially without the fast math library) 2010-10-18 11:27:22 -07:00
Brion Vibber
4c3aebd396 Merge branch '1.0.x' into schema-x 2010-10-15 11:40:40 -07:00
Craig Andrews
0721d8d3e2 Merge remote branch 'statusnet/0.9.x' into 1.0.x 2010-10-14 15:27:17 -04:00
Evan Prodromou
ecb582e419 accept profile URL as a LRDD identifier 2010-10-14 11:07:37 -04:00
Evan Prodromou
23ac961624 Show Webfinger, URI and profile page as subject and aliases 2010-10-14 11:06:57 -04:00
Brion Vibber
4101de7dd7 Merge branch '1.0.x' into schema-x 2010-10-13 15:46:45 -07:00
Brion Vibber
bca215563f Clean up remote avatar temporary files if we fail before saving them into avatars directory (OMB core, OStatus, WikiHowProfile, YammerImport) 2010-10-13 11:10:04 -07:00
Brion Vibber
5f81f6119b Merge branch '0.9.x' into 1.0.x 2010-10-12 16:33:36 -07:00
Siebrand Mazeland
5215423ea9 Localisation updates from http://translatewiki.net. 2010-10-09 16:15:48 +02:00
Brion Vibber
aa02f6020e Merge branch '0.9.x' into 1.0.x 2010-10-08 11:47:50 -07:00
Brion Vibber
67dc78b621 Merge branch 'fatals' into 0.9.x 2010-10-08 11:28:51 -07:00
Brion Vibber
69b13cb279 Normalize execution guards on OStatus php files; mostly helps cut down on annoying 'class not found' errors when something spiders the dirs. :P 2010-10-08 10:42:59 -07:00
Brion Vibber
6c959c83ce Merge branch '0.9.x' into 1.0.x 2010-10-07 13:32:26 -07:00
Brion Vibber
fd0768be29 Merge branch 'master' into 0.9.x 2010-10-07 13:30:34 -07:00
Brion Vibber
458f93bddd OStatus fixup-shadow.php: add check for user_group entries with 'uri' entry shadowing an actual local_group -- this can cause trouble now that we sometimes actually use the uri field for lookups, and leaving the entries around would break updating the table to fill out formerly missing uris, since the unique index entry would already be taken by the bad entry. 2010-10-07 11:26:07 -07:00
Brion Vibber
a9654beb5d Fix regression in OStatus remote group delivery: local group check was bogus in updated Ostatus_profile::localGroupFromUrl() 2010-10-07 10:56:10 -07:00
Brion Vibber
99194e03fa Merge branch '1.0.x' into schema-x 
Conflicts:
	plugins/OStatus/classes/Ostatus_profile.php
 2010-10-06 17:16:13 -07:00
Brion Vibber
8ff45823ba Merge branch '0.9.x' into 1.0.x 2010-10-05 11:40:49 -07:00
Siebrand Mazeland
007866d340 Localisation updates from http://translatewiki.net 2010-10-05 00:59:47 +02:00
Brion Vibber
f58008ebaf Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x 2010-10-04 15:22:02 -07:00
Brion Vibber
d6b3d7fb1a Fix unescaped dollar signs in double-quoted strings due to localization updates (%1$s etc) 2010-10-04 14:24:04 -07:00
Brion Vibber
2295bbec9e Extra debug helper line in push callback 2010-10-04 14:22:32 -07:00
Brion Vibber
5c4723919f Merge branch '0.9.x' into 1.0.x 2010-10-04 13:06:40 -07:00