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

2121 Commits

Author SHA1 Message Date
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
Siebrand Mazeland a7d818bcdb Remove superfluous whitespace 2010-10-18 21:44:51 +02:00
Brion Vibber d67a9b437c Avoid notice in DirectionDetectorPlugin when dealing with empty string. 2010-10-18 12:23:01 -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
Siebrand Mazeland 77191f455a Change incorrect use of e.g. to i.e. 
Spotted by The Evil IP address.
 2010-10-16 14:20:30 +02:00
Siebrand Mazeland 1d6d0cbcbd Use common case instead of WARNING in all caps. 
Spotted by The Evil IP address.
 2010-10-16 14:15:02 +02: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
Evan Prodromou ddb60a8191 Merge remote branch 'gitorious/0.9.x' into 0.9.x 2010-10-13 15:18:32 -04:00
Brion Vibber 6c77d86b7f Merge branch 'master' into 0.9.x 2010-10-13 12:04:20 -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 90e54f6cf0 ModHelper -> silence only, don't let them sandbox (it's too confusing atm without a good audit trail) 2010-10-13 10:00:16 -07:00
Brion Vibber 5f81f6119b Merge branch '0.9.x' into 1.0.x 2010-10-12 16:33:36 -07:00
Brion Vibber bc0d7f14db Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x 2010-10-12 14:54:04 -07:00
Brion Vibber 93172cc828 Initial version of ModHelper plugin, with basic functionality but the UI stripped out until it's easier to get it done. 
* users need to have 'modhelper' role manually added via userrole.php for now
* modhelper users can sandbox/unsandbox and silence/unsilence any user
** note that no new logging has been added for these moderator actions
* no user deletion for modhelpers
* probably no UserFlags special views for modhelpers
 2010-10-12 12:33:57 -07:00
Evan Prodromou f11c1c77ca Merge remote branch 'gitorious/0.9.x' into 0.9.x 2010-10-12 11:16:14 -04: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 34e9549756 execution guard fixes in Facebook plugin files 2010-10-08 11:26:57 -07:00
Brion Vibber a30ea4568f Normalize execution guards in OpenID plugin files; avoids annoying fatal errors when .php files get spidered. 2010-10-08 11:23:53 -07:00
Brion Vibber 5fe59322bc Check for Twitter foreign link actually existing before trying to delete it; friendlier error message in TwittersettingsAction 2010-10-08 11:12:36 -07:00
Brion Vibber 7adc6027ff Fix fatal error in FacebookremoveAction if we end up getting called double and the foreign_link entry has already been removed. 2010-10-08 11:06:30 -07:00
Brion Vibber e23ad7392f Normalize execution guards in imap plugin files. 2010-10-08 11:01:13 -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 603e1dc563 Add a README for BitlyUrlPlugin 2010-10-07 13:23:18 -07:00
Brion Vibber bd5925a6db Tweak bit.ly admin panel messages to distinguish the admin settings from config.php globals 2010-10-07 13:17:20 -07:00
Brion Vibber fbfd96dfb9 Drop out the 'allow user override' checkbox on bit.ly admin panel until we find a good way to shove the user settings in. :) 2010-10-07 13:08:23 -07:00
Brion Vibber cad4805516 Clean up bit.ly admin panel behavior, and hide it from the shorteners list if it's not fully configured. 2010-10-07 13:05:51 -07:00
Brion Vibber 80f0b9421f bit.ly admin panel to set the API keys to use. 2010-10-07 12:50:12 -07:00
Brion Vibber 51254ed85e Pull up the guts of my fixed bit.ly plugin from an old work branch (that had made other changes we weren't happy with in the plugin management). Now works if given a global API key. 2010-10-07 12:03:33 -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
Evan Prodromou 1e3d5f8025 hide notice form if not able to post 2010-10-07 10:32:29 -04:00
Evan Prodromou 8d2ccee3f6 PHPCS-clean RequireValidateEmail 2010-10-07 09:13:38 -04: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