eliseuamaro
/
gnu-social
forked from GNUsocial/gnu-social
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity
13,060 Commits 8 Branches 0 Tags 309 MiB
Commit Graph

618 Commits

Author SHA1 Message Date
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
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
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