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
Evan Prodromou
0f68fd203d
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-18 16:43:08 -04:00
Evan Prodromou
749fe8ca2e
OpenX plugin admin panel
2010-10-18 16:42:43 -04: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
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
Brion Vibber
59119482ca
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
actions/hostmeta.php
actions/imsettings.php
classes/User.php
lib/adminpanelaction.php
lib/channel.php
lib/default.php
lib/router.php
lib/util.php
2010-10-04 12:54:36 -07:00
Brion Vibber
5b49366f49
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/AnonymousFave/AnonymousFavePlugin.php
2010-10-04 11:42:16 -07:00
Brion Vibber
7d0d89ddea
Merge branch 'master' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-04 11:37:41 -07:00
Brion Vibber
5dee862b2c
Fix broken code in OStatus feed maint/test scripts (using field name from older dev code, would load up wrong record)
2010-10-04 10:27:03 -07:00
Siebrand Mazeland
1652ded48c
i18n/L10n review, extension credits added.
2010-10-04 00:02:24 +02:00
Siebrand Mazeland
362f395e03
Add documentation URL.
2010-10-03 23:56:13 +02:00
Siebrand Mazeland
67f97194e4
i18n/L10n review, plugin credits added.
2010-10-03 23:54:57 +02:00
Siebrand Mazeland
458512aafd
Localisation updates from http://translatewiki.net
2010-10-03 22:46:38 +02:00
Siebrand Mazeland
0f4f6fdb01
* i18n/L10n review.
...
* add onPluginVersion()
2010-10-02 22:25:32 +02:00
Brion Vibber
5c2b073a50
NoticeTitle plugin: link the post title to detail view of the post
2010-10-01 17:54:47 -07:00
Siebrand Mazeland
08054e85fe
Localisation updates from http://translatewiki.net .
2010-10-01 22:34:59 +02:00
Siebrand Mazeland
3dd921332d
Add plugin description thanks to Brion.
2010-10-01 22:21:12 +02:00
Siebrand Mazeland
04b70219db
* i18n review/translator hints added.
...
* whitespace updates.
* added @todo because of missing plugin description. I wasn't able to find out what this does exactly quick enough.
2010-10-01 22:15:26 +02:00
Siebrand Mazeland
2188b6d501
* i18n review/translator documentation added.
...
* onPluginVersion() added.
2010-10-01 22:11:38 +02:00
Siebrand Mazeland
f415e2353d
* i18n review
...
* onPluginVersion
2010-10-01 22:01:18 +02:00
Siebrand Mazeland
267d7b6bff
* i18n review
...
* onPluginVersion() added
2010-10-01 21:53:20 +02:00
Siebrand Mazeland
06ca06fbd1
* L10/i18n review.
...
* Translator hints added
* whitespace updates
2010-10-01 21:45:19 +02:00
Zach Copley
33b16be0a4
Better markup for anon fave tally
2010-10-01 11:31:44 -07:00
Zach Copley
8439774cf7
Allow turning off Anonymous Favoring for specific users' notices
2010-10-01 11:12:53 -07:00
Brion Vibber
d8df140ebb
ShareNotice plugin -- basic buttons per-notice to share the text & a link to the notice on other sites.
...
Default settings list Twitter, Facebook, and Identi.ca as targets.
Using icons built-in, and no magic offsite JS or anything so it won't slow down or break if third-party site goes down.
Default styles are a little limited, but can be customized in theme should one be so inclined.
2010-09-30 18:05:45 -07:00
Brion Vibber
6e58a926e3
ForceGroup plugin: optionally force new users to join a particular group or set of groups on registration; and/or to force posts by members of particular groups to be posted into those groups even if not explicitly mentioned. The posting feature requires a couple quick hook additions in core.
2010-09-30 18:05:44 -07:00
Brion Vibber
8c85f83300
GroupFavorited plugin: adds 'Popular' tab to group navigation showing a popular pages subset for just posts in the group. Not necessarily terribly efficient, should be tested and benchmarked on non-trivial sites
2010-09-30 18:05:44 -07:00
Brion Vibber
ff906331d6
fix comment
2010-09-30 18:05:44 -07:00
Brion Vibber
cb449682e3
Initial SlicedFavorites plugin to allow for customized variants of 'Popular' tab (favorited action) that include or exclude a given set of users. No added UI tabs in this version, beware!
2010-09-30 18:05:44 -07:00
Brion Vibber
46167d6b35
ShareNotice plugin -- basic buttons per-notice to share the text & a link to the notice on other sites.
...
Default settings list Twitter, Facebook, and Identi.ca as targets.
Using icons built-in, and no magic offsite JS or anything so it won't slow down or break if third-party site goes down.
Default styles are a little limited, but can be customized in theme should one be so inclined.
2010-09-30 18:03:25 -07:00
Zach Copley
d8d557cadf
Merge branch 'restricted-disqus' into 0.9.x
2010-09-30 17:00:13 -07:00
Zach Copley
84fba0271d
Forgot to update a call in DisqusPlugin
2010-09-30 16:59:05 -07:00
Zach Copley
1770bcaa60
Merge branch 'restricted-disqus' into 0.9.x
2010-09-30 16:53:44 -07:00
Zach Copley
cdd43d8da9
Less intrusive insertion of Disqus notice count into notice lists
2010-09-30 16:51:19 -07:00
Zach Copley
0d5dadc81d
Change Disqus plugin to allow restricting to users with "richedit" role
2010-09-30 16:39:56 -07:00
Brion Vibber
55a080ea4e
ForceGroup plugin: optionally force new users to join a particular group or set of groups on registration; and/or to force posts by members of particular groups to be posted into those groups even if not explicitly mentioned. The posting feature requires a couple quick hook additions in core.
2010-09-30 16:25:15 -07:00
Brion Vibber
2ecbae308d
GroupFavorited plugin: adds 'Popular' tab to group navigation showing a popular pages subset for just posts in the group. Not necessarily terribly efficient, should be tested and benchmarked on non-trivial sites
2010-09-30 15:56:38 -07:00
Brion Vibber
5c11ad15e1
fix comment
2010-09-30 14:52:00 -07:00
Brion Vibber
3ed726bbcc
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-09-30 14:47:53 -07:00
Brion Vibber
143897bf45
Initial SlicedFavorites plugin to allow for customized variants of 'Popular' tab (favorited action) that include or exclude a given set of users. No added UI tabs in this version, beware!
2010-09-30 14:46:32 -07:00
Zach Copley
23c45d6c49
Merge branch 'anon-fave-plugin' into 0.9.x
2010-09-30 13:59:02 -07:00
Zach Copley
8a28d9cc4d
Merge branch 'anon-fave-plugin'
2010-09-30 13:57:39 -07:00
Brion Vibber
8ad933c86f
Add 'restricted' option to NoticeTitle; if set, only users with 'richedit' role get the fancy extra title field.
2010-09-30 13:33:25 -07:00
Brion Vibber
d7f03dab9e
Added an option to TinyMCE plugin to restrict the rich-text editor to users who have the 'richedit' role. This allows enabling it for a subset of accounts on a site while leaving other users using the regular posting system, which is more stable.
2010-09-30 13:33:20 -07:00
Brion Vibber
bc2b72a872
Add 'restricted' option to NoticeTitle; if set, only users with 'richedit' role get the fancy extra title field.
2010-09-30 13:30:39 -07:00
Brion Vibber
8c37b86e73
Added an option to TinyMCE plugin to restrict the rich-text editor to users who have the 'richedit' role. This allows enabling it for a subset of accounts on a site while leaving other users using the regular posting system, which is more stable.
2010-09-30 13:22:25 -07:00
Brion Vibber
93bea7ff28
Fix for OpenID-only private sites: we were removing the 'login' and 'register' actions from the routing system entirely, which meant that login links & redirects from unauthenticated views on private sites (as well as various re-auth situations even on non-private sites) would break and send to the main page instead.
...
Changed it to leave the 'login' and 'register' actions in the system; we're already taking them over and redirecting them to the OpenID login page, so they won't be reached by accident; but now those redirects can be reached on purpose. ;)
Better long-term fix may be to allow some aliasing, so we can have common_local_url('login') actually send us straight to the OpenID login page instead of having to go through an intermediate redirect, but this'll do.
2010-09-30 12:35:25 -07:00
Brion Vibber
20f2167425
Merge branch 'master' of gitorious.org:statusnet/mainline into feedfix
2010-09-30 11:31:29 -07:00
Brion Vibber
1acc7d66c6
Always specify UTF-8 targt charset for html_entity_decode(); default is 8-bit ISO-8859-1 which causes things to break when we later pass them through things that expect to work with UTF-8. For instance, running through preg_replace() with the /u option results in NULL, leading to problems with OStatus and SubMirror generating their plaintext versions and doing length-cropping.
2010-09-30 11:29:31 -07:00
Zach Copley
8e7532245a
Remove debugging statements
2010-09-29 16:35:17 -07:00