Evan Prodromou
b6af5a25ba
don't try to initialize the mapstraction canvas if it doesn't exist
2010-11-12 11:48:17 -05:00
Evan Prodromou
fdf3a23da7
don't try to initialize the mapstraction canvas if it doesn't exist
2010-11-12 11:46:45 -05:00
Evan Prodromou
2d55bc0e5b
give users a chance to opt out of email summaries
2010-11-11 14:51:14 -05:00
Evan Prodromou
adb16b8098
fix update of email prefs in queue handler
2010-11-11 14:50:53 -05:00
Zach Copley
3c921f38de
Add an action to handle deauthorization callbacks from Facebook
2010-11-10 01:18:06 +00:00
Zach Copley
5b94d9e86b
Merge branch '0.9.x' into facebook-upgrade
2010-11-09 23:16:17 +00:00
Zach Copley
17ae690d59
Make a richer StatusNet profile from a user's Facebook profile
2010-11-09 23:14:50 +00:00
Evan Prodromou
e87323e426
change width of notices table to display better
2010-11-09 13:04:11 -05:00
Evan Prodromou
17ab5c31ed
some alignment in the table layout
2010-11-09 07:04:50 -05:00
Evan Prodromou
76aed36f38
set height and width of avatar td in email summary
2010-11-09 06:59:16 -05:00
Zach Copley
cd236efe12
- Still send notices to Facebook from existing Facebook app users
...
- Turns out we don't need the old REST lib to use the old REST API
(removed)
2010-11-09 00:56:53 +00:00
Evan Prodromou
974e41aa4b
change to a table for HTML output
2010-11-08 18:14:13 -05:00
Evan Prodromou
37407d8c77
stylesheet for outgoing email
2010-11-08 17:31:21 -05:00
Evan Prodromou
0a56523461
Fixup headers for HTML email
2010-11-08 17:22:16 -05:00
Evan Prodromou
797059340e
Complete email summary sending system
...
Added the necessary classes to send email summaries. First, added a
script to run on a daily basis. Second, added a queue handler for
sending email summaries for users, and another to queue summaries for
all users on the site. Fixed up the email_summary_status table to
store the last-sent notice id, rather than a datetime (since we don't
support 'since' parameters anymore). Finally, made the plugin class
load the right modules when needed.
2010-11-08 13:10:09 -05:00
Evan Prodromou
9003769609
Merge branch '0.9.x' into emailsummary
2010-11-08 13:09:25 -05:00
Evan Prodromou
35931e3a0e
first steps for email summary
2010-11-08 10:36:19 -05:00
Siebrand Mazeland
f8b2ec4b53
Localisation updates from http://translatewiki.net .
2010-11-07 22:33:23 +01:00
Siebrand Mazeland
7aa24cbc67
Localisation updates from http://translatewiki.net
2010-11-07 22:04:44 +01:00
Siebrand Mazeland
91e8e6f385
Fix typo. Spotted by EugeneZelenko.
2010-11-06 00:54:34 +01:00
Zach Copley
035081a803
Much more reliable Facebook SSO
2010-11-05 06:34:06 +00:00
Siebrand Mazeland
ca6d7f1042
Localisation updates from http://translatewiki.net .
2010-11-05 01:25:50 +01:00
Zach Copley
c0cce18913
- Some reorganizing
...
- Making the Facebook bridging work
2010-11-04 00:43:40 +00:00
Brion Vibber
b716d01a41
Merge branch '0.9.x' into 1.0.x
2010-11-03 16:09:49 -07:00
Brion Vibber
a3928e5583
UserFlagPlugin fix for ticket #2118 and ticket #2847 : flagged state wasn't reflected in profile lists such as group members page and profile search .
...
Pulled common code for the profile page and profile list cases to give them the same logic on checking. Also fixes the problem that you'd get a flag button for yourself in profile lists, while we explicitly exclude that from the profile page -- it's now skipped in both places.
2010-11-03 14:06:06 -07:00
Brion Vibber
6e03456753
Migrate some more code from manually constructing "fullname (nickname)" to using Profile->getFancyName(). Encapsulates common logic and allows for localization of the parens.
2010-11-03 13:10:42 -07:00
Brion Vibber
dc4fafbbd1
General cleanup & part of ticket #2864 : use User_group->getFancyName() instead of replicating the logic in various places. Encapsulates and allows for localization of parens.
2010-11-03 12:59:19 -07:00
Brion Vibber
5592333b73
Fix for ticket #2168 : if we've already flagged a profile from another window, let the 'Flag' form submission gracefully show the updated state instead of throwing an error (error message isn't even exposed properly in AJAX submissions)
2010-11-03 12:32:11 -07:00
Brion Vibber
607d958977
UserFlag fixes to prevent PHP notices breaking AJAX submissions when display_errors is on. Key & seq defs weren't quite right, which caused accesses to unset array indices in DB_DataObject.
2010-11-03 12:20:25 -07:00
Brion Vibber
1ceaa50cb0
Merge branch 'twitstream' into 0.9.x
2010-11-02 16:55:55 -07:00
Brion Vibber
9cbda32768
Pull out the 'tweetctl' queue for now; these should go over control signals, and actual handling isn't implemented yet anyway.
2010-11-02 16:51:07 -07:00
Brion Vibber
a2f0f68d75
fakestream.php can now take --all option to pull the latest messages from multiple locally-authed accounts when generating simulated sitestreams info
2010-11-02 16:43:01 -07:00
Brion Vibber
445b306b54
fakestream.php: script to build an emulated Twitter Site Stream from live Twitter data, for testing.
2010-11-02 16:27:14 -07:00
Brion Vibber
28703deb8f
Allow custom apiroot for site streams testing on streamtest
2010-11-02 16:26:51 -07:00
Zach Copley
e716c3ebaf
Merge branch '0.9.x' into facebook-upgrade
2010-11-02 23:17:07 +00:00
Zach Copley
5ea0461145
Facebook SSO - Log the user out of Facebook when s/he logs out of StatusNet
2010-11-02 23:16:32 +00: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
905d621b6f
Merge branch '0.9.x' into twitstream
2010-11-02 15:10:56 -07: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
c6d4612f49
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-11-02 13:14:42 -07:00
Brion Vibber
86201761ea
Use SN.msg() and onEndScriptMessages() to export localized UI messages from Realtime plugin and its descendents.
2010-11-02 13:12:58 -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
Siebrand Mazeland
194bb02252
* add POT file
...
* remove superfluous whitespace
* break lines at 80 or before in README
2010-11-02 20:49:34 +01:00
Brion Vibber
151eebcc28
Starting on making Realtime plugin's UI messages localizable: pause/play, popup button text and tooltip text are now loaded from PHP code where we can get at gettext.
2010-11-02 11:46:29 -07:00
Brion Vibber
23f69c80b5
Merge branch '0.9.x' into twitstream
2010-11-02 11:15:57 -07:00
Zach Copley
5ccc548bbc
Facebook SSO - new settings page
2010-11-02 01:41:31 +00:00
Zach Copley
b54afa0cbc
Facebook SSO - add ability to register a new user or connect to an
...
existing local account
2010-11-01 23:50:45 +00:00
Zach Copley
2306f7a7f4
Merge branch '0.9.x' into facebook-upgrade
2010-11-01 19:13:31 +00:00
Siebrand Mazeland
68bfeaa6c6
Localisation updates from http://translatewiki.net .
2010-10-31 01:38:57 +02:00
Zach Copley
5738e0e4a9
Beginnings of a new Facebook integration plugin
2010-10-30 00:44:16 +00:00
Brion Vibber
283d56bed3
tweak RSSCloud plugin to use new schema layout (but still the old event); the timestamp bits were confusing things
2010-10-29 15:36:42 -07:00
Brion Vibber
62408fef09
Work in progress on twitter import daemon
2010-10-29 14:12:40 -07:00
Brion Vibber
d743539cf7
Fixups for twitter streaming daemon
2010-10-29 13:41:15 -07:00
Brion Vibber
47eada3a95
Work in progress on site streams-aware TwitterDaemon
2010-10-29 13:18:03 -07:00
Brion Vibber
86adc575ec
TweetInQueueHandler: run incoming tweets through the queues to keep the Twitter streaming daemon clear.
2010-10-29 13:14:12 -07:00
Brion Vibber
15b108620e
Fix a couple 'continue's from old looping code in Twitter importer (-> return null)
2010-10-29 13:06:32 -07:00
Brion Vibber
e76028b629
Work in progress: starting on new TwitterDaemon using the Site Streams API -- code is incomplete, pulling bits from streamtest.php pending a chance to test the actual site-streams mode
2010-10-28 18:26:48 -07:00
Brion Vibber
e62254f8cc
Merge branch '0.9.x' into twitstream
2010-10-28 16:30:40 -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
456f4a6573
Localisation updates from http://translatewiki.net
2010-10-29 01:21:42 +02:00
Brion Vibber
48492600a8
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-10-28 00:15:59 +00:00
Brion Vibber
e43553a3d9
Tweak for OAuth headers not seen in $_SERVER
2010-10-28 00:14:45 +00:00
Siebrand Mazeland
035b4949fd
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-10-28 01:59:45 +02:00
Siebrand Mazeland
7a564276a9
Localisation updates from http://translatewiki.net .
2010-10-28 01:58:43 +02:00
Brion Vibber
9e9b7b972c
Merge branch 'instrument' into 0.9.x
2010-10-27 16:47:06 -07:00
Brion Vibber
ace655aecf
ApiLogger plugin: dumps some information about API hits to aid in researching future HTTP-level cachability improvements.
...
Data are sent to the 'info' level of logging, like so:
[lazarus.local:4812.86b23603 GET /mublog/api/statuses/friends_timeline.atom?since_id=1353]
STATLOG action:apitimelinefriends method:GET ssl:no query:since_id cookie:no auth:yes
ifmatch:no ifmod:no agent:Appcelerator Titanium/1.4.1 (iPhone/4.1; iPhone OS; en_US;)
Fields:
* action: case-normalized name of the action class we're acting on
* method: GET, POST, HEAD, etc
* ssl: Are we on HTTPS? 'yes' or 'no'
* query: Were we sent a query string? 'yes', 'no', or 'since_id' if the only parameter is a since_id
* cookie: Were we sent any cookies? 'yes' or 'no'
* auth: Were we sent an HTTP Authorization header? 'yes' or 'no'
* ifmatch: Were we sent an HTTP If-Match header for an ETag? 'yes' or 'no'
* ifmod: Were we sent an HTTP If-Modified-Since header? 'yes' or 'no'
* agent: User-agent string, to aid in figuring out what these things are
The most shared-cache-friendly requests will be non-SSL GET requests with no or very predictable
query parameters, no cookies, and no authorization headers. Private caching (eg within a supporting
user-agent) could still be friendly to SSL and auth'd GET requests.
We kind of expect that the most frequent hits from clients will be GETs for a few common timelines,
with auth headers, a since_id-only query, and no cookies. These should at least be amenable to
returning 304 matches for etags or last-modified headers with private caching, but it's very
possible that most clients won't actually think to save and send them. That would leave us expecting
to handle a lot of timeline since_id hits that return a valid API response with no notices.
At this point we don't expect to actually see if-match or if-modified-since a lot since most of our
API responses are marked as uncacheable; so even if we output them they're not getting sent back to
us.
Random subsampling can be enabled by setting the 'frequency' parameter smaller than 1.0:
addPlugin('ApiLogger', array(
'frequency' => 0.5 // Record 50% of API hits
));
2010-10-27 16:43:38 -07:00
Siebrand Mazeland
d0bbd343f0
i18n/L10n updates and superfluous whitespace removed.
2010-10-28 01:35:40 +02:00
Siebrand Mazeland
04fcfeaf6f
* Superfluous whitespace removed.
...
* i18n review (no changes needed).
2010-10-28 01:23:57 +02:00
Craig Andrews
255ba42ef1
use library function to determine if https should be used for recaptcha
2010-10-27 00:11:55 -04:00
Craig Andrews
9f9126e524
Load MS Virtual Earth javascript over https when browsing in https
2010-10-27 00:09:43 -04:00
Craig Andrews
bc6a61dc89
Use https for gravatars
...
No reason not to use https, and doing so prevents mixed content warnings when the avatars are used on https pages.
2010-10-26 23:56:59 -04:00
Craig Andrews
5476ffa944
add StrictTransportSecurity plugin
2010-10-26 23:46:18 -04:00
Brion Vibber
8ff44a1fb9
Merge branch '0.9.x' into twitstream
2010-10-26 15:39:31 -07:00
Evan Prodromou
5d56d9bb69
UI on profile settings page to opt out of following everyone
2010-10-26 15:33:35 -04:00
Evan Prodromou
7a80ebeb13
flag to let users opt out of following everyone
2010-10-26 15:21:30 -04:00
Evan Prodromou
e5a3b973b8
Plugin to follow all new users by default
2010-10-26 15:10:18 -04:00
Evan Prodromou
22633a5af6
can't subscribe to blacklisted domains/users
2010-10-26 11:48:27 -04:00
Evan Prodromou
bec00094a7
Blacklist plugin checks PuSH and Salmon notices
2010-10-26 11:20:43 -04: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
Siebrand Mazeland
3329685beb
* onPluginVersion added.
...
* i18n fix: use _m() in plugins, don't use _()
* some translator documentation added.
* superfluous whitespace removed.
2010-10-23 19:23:25 +02:00
Brion Vibber
e292d8fb65
Fix for 140-char replies being unexpectedly cropped when bridged to Twitter.
...
This drops the '@' -> ' @' hack for CURL meta-chars in outgoing Twitter bridge, added in commit 04b95c25
back in the day.
The Twitter bridge has since been switched from using direct CURL calls to using HTTPClient, which even with the CURL backend enabled doesn't trigger this issue, as POST parameters are formatted directly.
Prepending the space before we did the message cropping was leading to 140-char messages getting cropped unnecessarily, which was confusing:
Examples of broken messages:
http://identi.ca/notice/57172587 vs http://twitter.com/marjoleink/status/28398050691
http://identi.ca/notice/57172878 vs http://twitter.com/marjoleink/status/28398492563
2010-10-22 12:10:11 -07:00
Brion Vibber
6841a8d093
RegisterThrottlePlugin tweak for silencing checks: make sure we don't crash during registration if another profile registered from this address has been since deleted.
...
Followup to commit 1caa08429f
2010-10-22 11:07:19 -07:00
Evan Prodromou
1caa08429f
Collective guilt for registrants from the same IP address
...
If someone tries to register from an IP address that a silenced user
has registered from, prevent it.
When silencing someone, silence everyone else who registered from the
same IP address.
2010-10-22 13:29:51 -04:00
Evan Prodromou
07bc50eaed
Merge branch 'bettercachelog' into 0.9.x
2010-10-22 09:25:13 -04:00
Evan Prodromou
e1e79e6236
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-10-22 09:24:49 -04:00
Evan Prodromou
2484d8edc2
more detailed information in cachelogplugin
2010-10-22 09:24:19 -04:00
Zach Copley
131c339c5a
Pass OAuth authorize page's mode paramater to OpenID plugin so it can create a correct
...
returnto URL
2010-10-22 02:08:38 +00:00
Zach Copley
0b134d3e69
Re-camelcase ApiOauthAuthorizeAction so it will be accessible when
...
a site is in pivate mode
2010-10-21 18:15:11 -07:00
Zach Copley
a548861dbf
OAuth - proper callback handling and better styling for authorization
...
page when in desktop mode
2010-10-21 14:45:42 -07:00
Siebrand Mazeland
31f52ec37c
Update translator documentation and remove superfluous whitespace.
2010-10-21 02:02:37 +02:00
Brion Vibber
c24f4ddfdb
Pretty up the OpenID variant of the OAuth login form a bit; change the 'Allow' button to 'Continue' so we're not confused why we get the form again after authenticating.
2010-10-20 16:14:32 -07:00
Brion Vibber
bcc06d05e8
Initial OpenID+OAuth thingy.
2010-10-20 15:59:27 -07:00
Siebrand Mazeland
fb32108707
Localisation updates from http://translatewiki.net .
2010-10-20 19:51:49 +02:00
Siebrand Mazeland
bee51e1cec
Localisation updates from http://translatewiki.net .
2010-10-20 02:43:14 +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
Siebrand Mazeland
5ee4e52488
Localisation updates from http://translatewiki.net .
2010-10-20 01:24:09 +02: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
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
Brion Vibber
22047f6412
Merge branch '0.9.x' into twitstream
2010-10-13 15:37:54 -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
3cd03ee6ec
Merge branch '0.9.x' into twitstream
2010-10-06 13:08:33 -07:00
Brion Vibber
9c3fd10257
Prelim --all mode on streamtest.php to use site streams; doesn't use the destination user for import yet, and not actually tested yet until I'm whitelisted for the beta. :)
2010-10-05 17:08:04 -07:00
Brion Vibber
408483f771
Fix up Twitter JSON formatting to be consistent between the polling and streaming API interfaces; basic stream tester can now import your notices (ooooh)
2010-10-05 14:26:11 -07:00
Brion Vibber
0eaa26476c
Split the guts of Twitter status -> notice import from twitterstatusfetcher daemon into TwitterImport class which can be called from other places, letting us reuse code for the streaming API.
2010-10-05 13:57:32 -07:00
Brion Vibber
dc6c0f325c
Cleanup on input path
2010-10-05 13:41:15 -07:00
Brion Vibber
eb04df583a
Buncha cleanup
2010-10-05 13:25:28 -07:00
Brion Vibber
76353ede54
Clean up event handling a bit
2010-10-05 12:42:55 -07:00
Brion Vibber
5058e8fd14
Twitter streaming API reader: Cleanup input handling & split from HTTP headers to body
2010-10-05 12:17:16 -07:00
Brion Vibber
8ff45823ba
Merge branch '0.9.x' into 1.0.x
2010-10-05 11:40:49 -07:00
Brion Vibber
3b304fc0ef
Initial stub code for pulling data from Twitter's User Streams and Site Streams interfaces. This should allow us to make a much more efficient background importer which can use a relatively small number of connections getting push data for either a single user or for many users with credentials on the site.
2010-10-04 18:28:54 -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
Zach Copley
54f19da3ab
Make createAnonProfile() static
2010-09-29 16:35:16 -07:00
Zach Copley
f79f44801c
- Lookup anon profiles by ID (safer because they are guranteed to be unique) and probably faster
...
- Obfuscate the anonymous user session token to make it hard to figure out the profile ID
2010-09-29 16:35:15 -07:00
Zach Copley
0fe0f42173
Ajax update notice tally
2010-09-29 16:35:15 -07:00
Zach Copley
9109fe3c63
Set initialize_fave_tallys.php executable
2010-09-29 16:35:14 -07:00
Zach Copley
4d6973cd70
Intialize new fave tallys with total existing fave count per notice
2010-09-29 16:35:13 -07:00
Zach Copley
5b49fc25bf
- Increment/decrement notice fave tally
...
- Display tally in notice output
2010-09-29 16:35:13 -07:00
Zach Copley
73297d3749
New DB_DataObject for storing favorites tally
2010-09-29 16:35:13 -07:00
Zach Copley
c10f17dc6b
Initial plugin for allowing anonymous favoriting
2010-09-29 16:35:13 -07:00
Brion Vibber
91f25ca817
YammerImport admin UI now auto-refreshes during running BG progress, whee
2010-09-28 15:59:30 -07:00
Brion Vibber
62d9b66dff
Made YammerImport more robust against errors; can now pause/resume/reset the import state from the admin interface.
2010-09-28 15:59:29 -07:00
Brion Vibber
c62e4d0800
YammerImport: fix for importing over existing user/group nicknames; copies the new data if available onto the existing entry
2010-09-28 15:59:29 -07:00
Brion Vibber
3a1f1a49b2
YammerImport: set some more default fields for user_group registration (still need a group admin tho)
2010-09-28 15:59:29 -07:00
Brion Vibber
782046dc01
YammerImporter: 'group_id' field not always present in message data; avoid notice warning when checking it if it's missing
2010-09-28 15:59:29 -07:00
Brion Vibber
ee6b4c409d
YammerImport admin UI now auto-refreshes during running BG progress, whee
2010-09-28 15:54:44 -07:00
Brion Vibber
588758ed6d
Made YammerImport more robust against errors; can now pause/resume/reset the import state from the admin interface.
2010-09-28 15:45:00 -07:00
Brion Vibber
6cf7b24017
YammerImport: fix for importing over existing user/group nicknames; copies the new data if available onto the existing entry
2010-09-28 13:33:37 -07:00
Brion Vibber
17e5ffbe4e
YammerImport: set some more default fields for user_group registration (still need a group admin tho)
2010-09-28 13:07:55 -07:00
Brion Vibber
05682afee4
YammerImporter: 'group_id' field not always present in message data; avoid notice warning when checking it if it's missing
2010-09-28 13:02:34 -07:00
Brion Vibber
a8d0c04870
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-09-28 12:59:23 -07:00
Siebrand Mazeland
f6c1b8aa49
Localisation updates from http://translatewiki.net
...
* adding the fuzzy messages back now that translatewiki.net processes them properly again.
2010-09-28 21:06:47 +02:00
Brion Vibber
c20cfe2d8e
PHP 5.2 compat fix in YammerPlugin (can't call $var::staticFunction() directly until PHP 5.3)
2010-09-28 11:52:19 -07:00
Brion Vibber
f0b39defb2
Merge branch 'yammer' of gitorious.org:~brion/statusnet/brion-fixes into 0.9.x
2010-09-27 17:26:14 -07:00
Brion Vibber
0477101af7
update README for YammerImport
2010-09-27 17:12:06 -07:00
Brion Vibber
f528cc5548
Yammer import API keys can now be overridden by the admin.
2010-09-27 16:56:48 -07:00
Siebrand Mazeland
ec7ab3af4d
Localisation updates from http://translatewiki.net
...
* first export of L10n for languages other than English. Could use some testing/QA.
2010-09-28 01:09:29 +02:00
Siebrand Mazeland
430d1da976
Update POT files.
2010-09-28 00:03:06 +02:00
Brion Vibber
7c4fcefd31
Enhanced OStatus fixup-shadow.php cleanup script to check for direct matches against user.uri and user_group.uri (for local groups). This should catch cases that were missed before because we were only doing pattern-matching checks, and the pattern didn't match because the site has been renamed and the old URI no longer matches the current domain / path structure.
...
Could use some more thorough testing in practice!
2010-09-27 14:23:10 -07:00
Brion Vibber
585c7f35ca
Yammer import (work run via background queues) now can be started from the admin panel! :DDDD Still requires that the app be registered on your network manually first.
2010-09-27 13:34:35 -07:00
Brion Vibber
05c12c58bb
Ok, got the AJAX clicky-throughs working for yammer auth (if app is already registered), but needs prettification. Yammer ignores callback URLs unless they're pre-registered with the app, and this apparently requires manual intervention to become a 'trusted' app, you don't get it on those you register yourself. Sigh. Also can't use an iframe since it breaks out of the frame (fair 'nuff)
2010-09-27 12:34:01 -07:00
Brion Vibber
eeaab2bc00
Work in progress on fixing auth... looks like the iframe doesn't work though. Sigh.
2010-09-27 12:24:10 -07:00
Brion Vibber
80e0e60c37
Add a comment in UserxrdAction warning future maintainers not to break domain migrations if adding domain checking to the webfinger lookup in future.
2010-09-27 11:38:26 -07:00
Brion Vibber
617b6f4f7d
User user_group.uri to look up local groups for OStatus addressing checks when available. Will still fall back to the URL-scheme-checking code if there's no matching user_group record.
...
Should help with keeping remote groups working when renaming sites -- as long as user_group.uri has been filled out on the site changing its domain and other issues with POST handling are resolved.
2010-09-27 11:29:54 -07:00
Brion Vibber
a6469aeed8
Fix PHP syntax errors introduced during localization fixups in a few files.
2010-09-25 12:10:36 -07:00
Evan Prodromou
0dc5080a5d
Merge remote branch 'gitorious/master'
2010-09-25 06:30:36 -04:00
Zach Copley
dc63626641
Optionally restrict Disqus comments to specific users' notices
2010-09-24 18:29:02 -07:00
Brion Vibber
ebbbaba378
Work in progress on getting the frontend Yammer import form going....
2010-09-24 17:22:44 -07:00
Brion Vibber
19adb7c8d3
Pretty it up a bit more
2010-09-24 16:27:33 -07:00
Brion Vibber
35119f4072
Pretty up the Yammer import status display a bit
2010-09-24 16:15:45 -07:00
Brion Vibber
d962f7092f
Initial progress display of Yammer import state in admin panel
2010-09-24 14:52:51 -07:00
Evan Prodromou
210e486d80
remove unnecesssary fieldset from sitemap admin panel
2010-09-24 16:50:03 -04:00
Brion Vibber
bdd8a587e7
Ok, command-line workflow for YammerImportPlugin seems to mostly work, at least on tiny test site :D
2010-09-23 17:55:13 -07:00
Brion Vibber
dd414db9ea
Work in progress: most of the infrastructure for running import via BG queues or CLI script is now in place (untested, no UI, needs tweaks & fixes)
2010-09-23 16:40:22 -07:00
Zach Copley
62f7d6c74d
Fix strings in Disqus plugin for i18n
2010-09-23 15:46:01 -07:00
Brion Vibber
eb8be9988e
Work in progress: YammerRunner state machine wrapper for running the Yammer import in chunks.
2010-09-23 15:23:56 -07:00
Brion Vibber
5183997e35
A little more cleanup...
2010-09-23 12:52:58 -07:00
Brion Vibber
44ff13c947
More doc comments on SN_YammerClient
2010-09-22 17:53:38 -07:00
Brion Vibber
084befc32f
WORK IN PROGRESS: Starting infrastructure to initiate Yammer import from web UI and process it in the background queues. Totally not complete yet.
2010-09-22 17:51:50 -07:00
Siebrand Mazeland
870be512d2
Update POT files for plugins.
2010-09-23 00:37:16 +02:00
Brion Vibber
a005210438
Initial README for yammer importer
2010-09-22 13:12:39 -07:00
Brion Vibber
12ec7efe90
Split Yammer importer files into subdirs before I get too lost adding UI
2010-09-22 12:52:34 -07:00
Evan Prodromou
b5cfcba471
Merge branch '0.9.x' into activityexport
...
Conflicts:
plugins/OStatus/OStatusPlugin.php
2010-09-22 10:45:34 -04:00
Evan Prodromou
f0105893b0
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-09-22 10:35:27 -04:00
Brion Vibber
acd7613933
Fixes for Yammer groups import: pulling explicit list, fixed avatar fetch
2010-09-21 23:19:36 -07:00
Brion Vibber
7a381f2533
Support non-image file uploads in Yammer import
2010-09-21 22:00:25 -07:00
Brion Vibber
0ed506ee93
Add group link on Yammer import (won't work until memberships are fixed)
2010-09-21 18:21:36 -07:00
Brion Vibber
da87d4334a
Fetch more user data in Yammer imports, including the primary email address (preconfirmed, so we can do stuff like tell people to reset their passwords and log in!) and some bio info.
2010-09-21 18:15:32 -07:00
Brion Vibber
9652e77376
Yammer import: mark group posts with the proper group inbox (should we append a !foo or leave them as is, as current?)
2010-09-21 17:35:32 -07:00
Brion Vibber
db5a4ce70d
Pull group descriptions in Yammer import
2010-09-21 17:25:02 -07:00
Brion Vibber
ed3d9a11bf
Image file attachment support for Yammer import
2010-09-21 17:08:40 -07:00
Brion Vibber
47cf29b2a2
Copy favorites in Yammer importer
2010-09-21 16:27:26 -07:00
Brion Vibber
9be9d2f720
Full dump of input data in yamdump also for my reference...
2010-09-21 16:27:10 -07:00
Brion Vibber
0ff28ac8e0
Fix for replies in Yammer import
2010-09-21 16:19:02 -07:00
Brion Vibber
8091c4d291
Avatars for Yammer import
2010-09-21 16:10:44 -07:00
Brion Vibber
3e2cf3876d
Initial semi-working yammer import :D
...
* no avatars
* no details of user accounts or their auth info
* no group memberships or subscriptions
* no attachments
* will probably esplode if >20 messages in your network *whistle innocently*
2010-09-21 15:54:39 -07:00
Brion Vibber
5b9efbb501
fix notices in SN_YammerClient
2010-09-21 15:29:04 -07:00
Brion Vibber
9b1b9b711b
Poking around at import funcs...
2010-09-21 15:24:14 -07:00
Craig Andrews
2db8aa3ec3
Do not allow blank passwords when authenticating against LDAP.
2010-09-21 18:06:24 -04:00
Craig Andrews
8d019c03ee
Do not allow blank passwords when authenticating against LDAP.
2010-09-21 18:05:18 -04:00
Brion Vibber
05af14e1ca
YammerImport: initial processing code for users, groups, and messages
2010-09-21 14:56:20 -07:00
Brion Vibber
14a3697a61
Beginning stub of Yammer message->notice import
2010-09-21 13:56:30 -07:00
Brion Vibber
025184ce75
Split SN_YammerClient out to own class file
2010-09-21 13:29:44 -07:00
Brion Vibber
324fada5ea
initial work on yammer importer code
2010-09-21 13:13:37 -07:00
Brion Vibber
42dd460d3b
Merge branch 'master' into 0.9.x
2010-09-21 12:48:16 -07:00
Evan Prodromou
78ed0348b0
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-09-21 14:07:48 -04:00
Evan Prodromou
f7ec40fa42
make some static functions public for OStatus_profile
2010-09-21 06:13:19 -04:00
Brion Vibber
f9e04993dd
Bump up HTTP timeout for OStatus remote-tests.php to 60 seconds; when running without queues and with only bcmath, salmon key generation is absurdly slow.
2010-09-20 16:26:50 -07:00
Brion Vibber
64cdbe6c55
Ticket #2750 : fixes to HTTP caching behavior across login/logout boundaries
...
* now ignoring if-modified-since if we failed an etag if-none-match comparison, per spec
* now including a hash of user id/nickname in most etags, so we'll update the view properly after login/logout
For API methods, checking the API-auth'ed user. (Many change results to include things like 'you're subscribed to this user' or 'this is one of your favorites', so user info is again needed)
There'll still be some last-modified stamps that aren't including user info properly, probably.
2010-09-20 13:42:58 -07:00
Siebrand Mazeland
10f6e14134
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
2010-09-20 21:12:56 +02:00
Siebrand Mazeland
bccbe8f519
* i18n/L10n update.
...
* superfluous whitespace removed.
2010-09-20 21:12:43 +02:00
Siebrand Mazeland
a58877a2f8
* i18n/L10n update.
...
* added onPluginVersion().
* superfluous whitespace removed.
2010-09-20 21:12:07 +02:00
Siebrand Mazeland
5cc08ccd07
Superfluous whitespace removed.
2010-09-20 21:11:05 +02:00
Brion Vibber
a3de417ca5
DirectionDetector plugin: tabs to spaces
2010-09-20 12:02:04 -07:00
Brion Vibber
d055b63187
DirectionDetector plugin: cleanup on reference usage & code comments.
...
Changed getClearText() to return its value instead of changing the input to keep things clearer to maintainers.
2010-09-20 12:00:39 -07:00
Siebrand Mazeland
500f8e5a87
* i18n/L10n updates.
...
* remove superfluous whitespace.
2010-09-20 20:54:30 +02:00
Brion Vibber
2475e25e78
Update DirectionDetector plugin to 0.2.0 from everplays
2010-09-20 11:49:39 -07:00
Siebrand Mazeland
e0952bf56b
Superfluous whitespace removed.
2010-09-20 20:40:55 +02:00
Siebrand Mazeland
c0bc3b3042
Superfluous whitespace removed.
2010-09-20 20:39:28 +02:00
Siebrand Mazeland
b4887a0756
Add FIXME for bad message implementation.
2010-09-20 20:00:33 +02:00
Siebrand Mazeland
9679467201
Add onPluginVersion()
2010-09-20 19:59:13 +02:00
Siebrand Mazeland
dfa164069d
Superfluous whitespace removed.
2010-09-20 19:46:01 +02:00
Siebrand Mazeland
f975c17329
Add onPluginVersion()
2010-09-20 19:45:43 +02:00
Siebrand Mazeland
3005f26aa2
Add onPluginVersion()
2010-09-20 19:42:56 +02:00
Siebrand Mazeland
2236e2eaf0
Remove superfluous whitespace.
2010-09-20 19:38:36 +02:00
Siebrand Mazeland
7f3731e2ba
Add onPluginVersion()
2010-09-20 19:38:00 +02:00
Siebrand Mazeland
a4a39a2cc3
FIx inconsistencies in onPluginVersion()
2010-09-20 19:37:43 +02:00
Siebrand Mazeland
667cfcc84a
* add onPluginVersion()
...
* remove superfluous whitespace.
2010-09-20 19:36:09 +02:00
Siebrand Mazeland
c932c0fdc1
Update pot files for plugins.
2010-09-19 17:44:29 +02:00
Siebrand Mazeland
74785c64f8
* L10n i18n update
...
* add translator hints
* update whitespace
* added a bunch of @todos.
2010-09-19 16:32:19 +02:00
Siebrand Mazeland
ecafae8472
* Remove trailing newline in e-mail message.
...
* Superfluous whitespace removed.
2010-09-19 15:52:53 +02:00
Siebrand Mazeland
5a6f616206
* i18n/L10n update
...
* translator comments added
* remove superfluous whitespace
2010-09-19 15:17:36 +02:00
Siebrand Mazeland
8dafb4c612
Add pot files.
2010-09-19 00:26:47 +02:00
Siebrand Mazeland
cf3f693687
Remove superfluous whitespace.
2010-09-19 00:25:52 +02:00
Siebrand Mazeland
8135f7d960
Update pot files for plugins.
2010-09-19 00:24:48 +02:00
Siebrand Mazeland
f1d78942b3
L10n updates.
2010-09-19 00:23:10 +02:00
Siebrand Mazeland
53cfa5349f
* L10n update
...
* superfluous whitespace removed.
2010-09-19 00:20:16 +02:00
Siebrand Mazeland
1564b6aa49
* L10n update
...
* remove superfluous whitespace
2010-09-19 00:19:02 +02:00
Siebrand Mazeland
8b44063ca1
* L10n update
...
* superfluous whitespace removed
2010-09-19 00:17:24 +02:00
Siebrand Mazeland
159e3e7b71
Fix typo
2010-09-19 00:13:06 +02:00
Siebrand Mazeland
02299d5bd7
* i18n/L10n updates.
...
* add FIXMEs for bad i18n.
* add translator hints.
2010-09-19 00:06:21 +02:00
Siebrand Mazeland
16d234f9af
Remove superfluous whitespace
2010-09-18 23:49:49 +02:00
Siebrand Mazeland
cc62afe5b9
* i18n/L10n updates
...
* translator hints added
* superfluous whitespace removed
2010-09-18 22:31:41 +02:00
Siebrand Mazeland
a7fca907dc
DB -> database
2010-09-18 21:27:29 +02:00
Siebrand Mazeland
ba6538ed78
* i18n/L10n updates
...
* whitespace updates.
2010-09-18 17:45:18 +02:00
Siebrand Mazeland
1c5e00df30
Fix typo.
2010-09-18 17:16:48 +02:00
Siebrand Mazeland
cfe60815bc
Remove superfluous whitespace.
2010-09-18 17:14:00 +02:00
Siebrand Mazeland
326e351d44
Fix typo.
2010-09-18 15:38:15 +02:00
Siebrand Mazeland
52ccc8e521
* update L10n
...
* remove superfluous whitespace
2010-09-18 15:26:48 +02:00
Siebrand Mazeland
edb411b4ae
* L10n updates and translator documentation added.
...
* superfluous whitespace removed.
2010-09-18 15:23:17 +02:00
Siebrand Mazeland
34f95c26fd
* FIXME/CHECKMEs added for (possible) bad i18n
...
* translator hints added
* superfluous whitespace removed
2010-09-18 15:10:49 +02:00
Siebrand Mazeland
977472bcf6
remove superfluous whitespace
2010-09-18 14:39:06 +02:00
Siebrand Mazeland
09c99461e5
* update L10n
...
* remove superfluous whitespace
2010-09-18 14:35:04 +02:00
Siebrand Mazeland
03e600b797
Update i18n/L10n
2010-09-18 14:31:03 +02:00
Siebrand Mazeland
f8e91ab33f
Add translator hints.
2010-09-18 12:05:27 +02:00
Siebrand Mazeland
26a9963dad
Update L10n.
2010-09-18 11:52:35 +02:00
Siebrand Mazeland
1ee1f6621f
* update i18n/L10n
...
* remove superfluous whitespace
2010-09-18 11:50:27 +02:00
Siebrand Mazeland
f0716819ec
* update i18n/L10n
...
* remove superfluous whitespace
2010-09-18 11:45:50 +02:00
Siebrand Mazeland
2d119df6d3
* update i18n/L10n
...
* remove superfluous whitespace
2010-09-18 11:43:17 +02:00
Siebrand Mazeland
b99b0555fd
Update L10n.
2010-09-18 11:36:40 +02:00
Siebrand Mazeland
11a98ea41f
* L10n update
...
* superfluous whitespace removed.
2010-09-18 11:27:37 +02:00
Siebrand Mazeland
eed0b24f23
* i18n/L10n updates
...
* superfluous whitespace removed
2010-09-18 11:25:11 +02:00
Siebrand Mazeland
596d2c212a
Update i18n/L10n.
2010-09-18 10:41:13 +02:00
Siebrand Mazeland
90ce201684
Update L10n.
2010-09-18 10:32:54 +02:00
Siebrand Mazeland
14fa758983
Update L10n
2010-09-18 10:30:45 +02:00
Siebrand Mazeland
ca3d803f1d
Update i18n/L10n.
2010-09-18 10:25:13 +02:00
Brion Vibber
89c561c9cf
Ticket #2731 : Fix for regression in posting to remote groups (regression in 2d4e0693c8
)
...
Changes in 2d4e0693c8
changed Ostatus_profile::filterReplies() (which sorts out the local, remote, and group recipients on incoming remote messages) from checking for remote profiles with a safe call to Ostatus_profile::staticGet() to calls through Ostatus_profile::ensureProfileURL() and Ostatus_profile::ensureWebfinger(), which throw exceptions and thus abort processing.
Since this was done before checking for local groups, the filter would fail when the ensure* functions determined it was looking at a local group and rightfully refused to create a remote group profile for it.
Changing the calls to the ensure* functions was done so we can record remote reply recipients for future reply-to-reply processing (the staticGet() call was a cheaper way to do a lookup when we knew we only actually had to process groups that somebody signed up to); most important fix is simply to actually check for the exception! :)
Here I'm changing the order of processing so we do the local group lookup first -- where it's nice and safe -- and then when we do the remote checks, we'll go ahead and gracefully skip that entry if the full remote lookup fails, so we'll still process any following recipients.
2010-09-16 14:50:23 -07:00
Brion Vibber
097d0bd2fa
Ticket #2731 : Fix for regression in posting to remote groups (regression in 2d4e0693c8
)
...
Changes in 2d4e0693c8
changed Ostatus_profile::filterReplies() (which sorts out the local, remote, and group recipients on incoming remote messages) from checking for remote profiles with a safe call to Ostatus_profile::staticGet() to calls through Ostatus_profile::ensureProfileURL() and Ostatus_profile::ensureWebfinger(), which throw exceptions and thus abort processing.
Since this was done before checking for local groups, the filter would fail when the ensure* functions determined it was looking at a local group and rightfully refused to create a remote group profile for it.
Changing the calls to the ensure* functions was done so we can record remote reply recipients for future reply-to-reply processing (the staticGet() call was a cheaper way to do a lookup when we knew we only actually had to process groups that somebody signed up to); most important fix is simply to actually check for the exception! :)
Here I'm changing the order of processing so we do the local group lookup first -- where it's nice and safe -- and then when we do the remote checks, we'll go ahead and gracefully skip that entry if the full remote lookup fails, so we'll still process any following recipients.
2010-09-16 14:43:27 -07:00
Evan Prodromou
670ad53215
Merge branch '0.9.x' into activityexport
2010-09-15 23:31:20 -04:00
Brion Vibber
95b534c5ce
Move standalone plugin files into subdirectories so they can have locale data, etc added to them at leisure.
2010-09-15 14:10:18 -07:00
Evan Prodromou
b2abae433d
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-09-15 15:57:41 -04:00
Siebrand Mazeland
db1d348135
Update/add pot files for plugins.
2010-09-15 01:16:45 +02:00
Siebrand Mazeland
987651c8a4
* i18n/L10n updates
...
* superfluous whitespace removed
2010-09-14 21:45:13 +02:00
Siebrand Mazeland
04b7af4620
* i18n/L10n updates
...
* superfluous whitespace removed
2010-09-14 21:33:57 +02:00
Evan Prodromou
a881ce23e7
note on why we don't use Group_member::asActivity() in OStatusPlugin
2010-09-14 11:02:54 -04:00
Evan Prodromou
00c4662ee4
add a link to cometd.org in Comet plugin README
2010-09-14 10:41:35 -04:00
Brion Vibber
0021c16bd1
Declare public options on DisqusPlugin to avoid notice warnings on access if not set.
2010-09-13 12:06:10 -07:00
Evan Prodromou
d9b959fc64
move code for making activities from OStatus plugin to Subscription and Fave classes
2010-09-13 11:44:20 -04:00
Evan Prodromou
9aadd3cb42
Merge remote branch 'gitorious/0.9.x' into 0.9.x
2010-09-13 09:29:32 -04:00
Siebrand Mazeland
a9fad9a7ac
Add translator hint.
2010-09-12 17:08:49 +02:00
Brion Vibber
f17512cfe6
Catch exceptions during SubMirror mirror attempt; log & skip that one if found.
...
Should avoid things like RequireValidatedEmailPlugin causing infinite retry loops if the mirror-er isn't validated yet.
2010-09-10 11:50:19 -07:00
Evan Prodromou
cfcb860317
use capturing parens for matching at-mentions in twitterstatusfetcher
2010-09-10 09:32:56 -04:00
Evan Prodromou
262eb7120f
make our own twitter links if Twitter doesn't give us entities
2010-09-10 09:32:39 -04:00
Evan Prodromou
398df867de
use capturing parens for matching at-mentions in twitterstatusfetcher
2010-09-10 09:21:01 -04:00
Evan Prodromou
deb8f2a38b
make our own twitter links if Twitter doesn't give us entities
2010-09-10 09:10:53 -04:00
Evan Prodromou
4419e43f7f
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
plugins/TwitterBridge/daemons/twitterstatusfetcher.php
plugins/TwitterBridge/twitterbasicauthclient.php
2010-09-09 15:01:03 -04:00
Evan Prodromou
42f1ec85ea
change the event we use for deleting a linked status on Twitter
2010-09-08 16:40:37 -04:00
Evan Prodromou
e40ed1fd56
move notice_to_status initialization code to run-once script
2010-09-08 16:10:07 -04:00
Brion Vibber
c758b2b000
Merge branch 'testing' into 0.9.x
2010-09-08 11:48:09 -07:00
Brion Vibber
7407754c27
Merge branch 'master' into testing
2010-09-08 11:47:44 -07:00
Brion Vibber
f2574fdd01
Fix for #2663 : fix for original/96px-size avatars getting saved with bad permissions, causing failure to see images if background queues are different user from web server.
...
The original-size file is now forced to 0644 (all-readable), which should help. Not sure this is 100% ideal, but it's better than 0600!
(The other sizes were being created in other code and had sane read perms already.)
Watch out for similar issues in Twitter bridge etc; avatar import code should get cleaned up and consolidated.
2010-09-07 16:52:02 -07:00
Brion Vibber
d470c007fc
Quick fix for #2659 : unable to login with Livejournal OpenID
...
The Net::OpenID::Server perl module that LJ uses appears to be very picky about input, and rejects most request types unless the data comes in as GET parameters (apparently following OpenID 1.1 rules, rather than OpenID 2.0 rules which permit any request to be POSTed but requires that if so, the data must all be in the POST body).
Apparently something got updated on LJ at some point that's either added that behavior or (more likely) added the OpenID 2.0 namespace info to discovery, which tells the Janrain-based OpenID libraries that they should go ahead and do POST requests instead of redirects to GET requests... thus breaking everything. ;)
GET should be just fine for both 1.1 and 2.0 though, and also saves having to sit through that lame autosubmit page.
Switched the authentication submission from checking whether it should redirect to GET or do a form POST, to simply always doing the redirect to GET.
Tested against providers:
* LiveJournal
* Google
* LaunchPad
* identi.ca
2010-09-07 16:22:51 -07:00
Brion Vibber
51b272d078
Merge branch 'openid-fix' into 0.9.x
2010-09-07 16:20:27 -07:00
Brion Vibber
961aba68fc
Quick fix for #2659 : unable to login with Livejournal OpenID
...
The Net::OpenID::Server perl module that LJ uses appears to be very picky about input, and rejects most request types unless the data comes in as GET parameters (apparently following OpenID 1.1 rules, rather than OpenID 2.0 rules which permit any request to be POSTed but requires that if so, the data must all be in the POST body).
Apparently something got updated on LJ at some point that's either added that behavior or (more likely) added the OpenID 2.0 namespace info to discovery, which tells the Janrain-based OpenID libraries that they should go ahead and do POST requests instead of redirects to GET requests... thus breaking everything. ;)
GET should be just fine for both 1.1 and 2.0 though, and also saves having to sit through that lame autosubmit page.
Switched the authentication submission from checking whether it should redirect to GET or do a form POST, to simply always doing the redirect to GET.
Tested against providers:
* LiveJournal
* Google
* LaunchPad
* identi.ca
2010-09-07 16:15:32 -07:00
Evan Prodromou
5c98dfd58c
text substitution is Unicode-aware for twitterstatusfetcher
2010-09-07 15:54:06 -04:00
Evan Prodromou
2d18963b4c
Fix pkeyget call
...
Fix the pkeyget call in Twitter_synch_Status
2010-09-07 15:34:10 -04:00
Evan Prodromou
b6440a206d
staticGet -> pkeyGet in Twitter_synch_status
2010-09-07 15:29:36 -04:00
Craig Andrews
6f95ccd37d
Create Account Manager plugin implementing the Account Management specification
...
Add Account Manager support to the OpenID plugin
2010-09-07 13:45:52 -04:00
Craig Andrews
8d54809c35
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-09-07 13:45:52 -04:00
Craig Andrews
3dd734b2c3
Remove CSRF protection from username/password login and from OpenID login.
2010-09-07 13:45:52 -04:00
Evan Prodromou
d37f0da077
debug statements for setting/getting last id
2010-09-07 11:53:26 -04:00
Evan Prodromou
9793e4ceb4
Store foreign ID for synch info, not user ID
2010-09-07 10:53:11 -04:00
Evan Prodromou
21bea14140
remove data dump of retrieved statuses
2010-09-07 04:42:23 -04:00
Evan Prodromou
8facfdcfee
Correct DB_DataObject constant in Twitter_synch_status
2010-09-07 04:35:14 -04:00
Evan Prodromou
98e9fa19c8
Missing comma in column list in Twitter_synch_status
2010-09-07 04:33:28 -04:00
Evan Prodromou
49af35b44d
add modified column to twitter_synch_status
2010-09-07 04:32:01 -04:00
Evan Prodromou
e53e152d6f
use and save since_id parameter for home_timeline
2010-09-07 04:22:55 -04:00
Evan Prodromou
86b6d7b722
save synch status for different timelines
2010-09-07 04:17:36 -04:00
Evan Prodromou
a46ba0b548
save Twitter mentions as StatusNet replies
2010-09-07 04:00:59 -04:00
Evan Prodromou
c2c6acbfd2
add back in # and @ for links
2010-09-07 04:00:59 -04:00
Evan Prodromou
2de6d0b03d
add Twitter-approved links to Twitter statuses
2010-09-07 04:00:59 -04:00
Evan Prodromou
28fecf70b9
better handling of params in oauthget
2010-09-07 04:00:59 -04:00
Evan Prodromou
a844aaaea6
better param handling in hometimeline
2010-09-07 04:00:59 -04:00
Evan Prodromou
86d37ba59c
include entities in the results of home_timeline
2010-09-07 04:00:59 -04:00
Evan Prodromou
b059a19e0f
delete Twitter notice if it was posted from here
2010-09-07 04:00:59 -04:00
Evan Prodromou
ba8a24073f
Notify Twitter when StatusNet user faves/disfaves a Twitter notice
2010-09-07 04:00:59 -04:00
Evan Prodromou
5944fe57e6
using null variable in twitter_status_id()
2010-09-07 04:00:59 -04:00
Evan Prodromou
a5554bc11e
check status_id before trying to retweet it
2010-09-07 04:00:59 -04:00
Evan Prodromou
702d36257c
truncate retweeted stuff if it's too long
2010-09-07 04:00:58 -04:00
Evan Prodromou
9847bffe99
correctly mark repeats from Twitter as non-local
2010-09-07 04:00:58 -04:00
Evan Prodromou
e20dc9fec3
correctly check for local notice to status mappings when notice originated here
2010-09-07 04:00:58 -04:00
Evan Prodromou
df88624d49
use bigint for status_ids
2010-09-07 04:00:58 -04:00
Evan Prodromou
a9bb1c7528
debug output when saving new mapping
2010-09-07 04:00:58 -04:00
Evan Prodromou
d986537c43
do a uniqueness check before saving new notice-to-status mapping
2010-09-07 04:00:58 -04:00
Evan Prodromou
299da9e462
SQL syntax error when initializing notice_to_status table
2010-09-07 04:00:58 -04:00
Evan Prodromou
6c7262c8ca
Delete Notice_to_status when a notice is deleted
2010-09-07 04:00:58 -04:00
Evan Prodromou
e9e06879bb
use Notice_to_status to check for duplicates
2010-09-07 04:00:58 -04:00
Evan Prodromou
a1981770ce
Save notice-to-status mapping in its own table
...
Introduce a table mapping notices to Twitter statuses. Initialize
this table at checkSchema() time. Save the mapping when we push
or pull statuses. Use the table to determine if a notice has a
Twitter equivalent.
2010-09-07 04:00:58 -04:00
Evan Prodromou
17a16026ff
add in_reply_to_status_id if notice is from twitter
2010-09-07 04:00:58 -04:00
Evan Prodromou
928239ecf8
do our own repeating so we can pass in a uri
2010-09-07 04:00:58 -04:00
Evan Prodromou
1bf4972cc0
remove require_once for disappeared TwitterBasicAuthClient
2010-09-07 04:00:57 -04:00
Evan Prodromou
23dfadd9a6
remove basic auth code for Twitter since it's no longer supported
2010-09-07 04:00:57 -04:00
Evan Prodromou
e45b6df419
use home_timeline instead of friends_timeline
2010-09-07 04:00:57 -04:00
Evan Prodromou
a8c90d0243
switch twitterstatusfetcher from friends_timeline to home_timeline
2010-09-07 04:00:57 -04:00
Evan Prodromou
1a54291cc7
debug code to dump new status data
2010-09-07 04:00:57 -04:00
Evan Prodromou
184ee7fc1f
move inbox insert code to status saver main loop
2010-09-07 04:00:57 -04:00
Evan Prodromou
20f6ea4840
some info notices in twitter status fetch for repeats and replies
2010-09-07 04:00:57 -04:00
Evan Prodromou
5651f79466
if something's a retweet, save it as a repeat in bridge
2010-09-07 04:00:57 -04:00
Evan Prodromou
d6719760d6
do a real retweet for a local repeat
2010-09-07 04:00:57 -04:00
Evan Prodromou
2b56d3b534
push notices through the bridge if they're in reply to a twitter notice
2010-09-07 04:00:57 -04:00
Evan Prodromou
4d70ba9597
save reply status for Twitter notices
2010-09-07 04:00:57 -04:00
Evan Prodromou
ed99fd51e8
don't save statuses from protected users
2010-09-07 04:00:57 -04:00
Evan Prodromou
86a702953a
Merge branch '0.9.x' into 1.0.x
2010-09-06 10:12:17 -04:00
Evan Prodromou
a319b40c97
common_cache_key() -> Cache::key()
2010-09-06 10:07:43 -04:00
Evan Prodromou
e42d2124a3
common_keyize() -> Cache::keyize()
2010-09-06 10:03:51 -04:00
Evan Prodromou
8f81762d68
common_memcache() => Cache::instance()
2010-09-06 09:56:45 -04:00
Craig Andrews
6fe2429c41
Fix syntax error
2010-09-05 17:31:46 -04:00
Craig Andrews
c54ef9b8b6
is_otr -> isOtr
2010-09-03 17:50:29 -04:00
Craig Andrews
d68914e4f3
is_autoreply -> isAutoreply
2010-09-03 17:50:29 -04:00
Craig Andrews
9ccf65a311
get_user -> getUser
2010-09-03 17:50:29 -04:00
Craig Andrews
054111bb54
add_notice -> addNotice
2010-09-03 17:50:29 -04:00
Craig Andrews
a3725de47b
handle_incoming -> handleIncoming
2010-09-03 17:50:29 -04:00
Craig Andrews
671b0f4cd9
format_notice -> formatNotice
2010-09-03 17:50:29 -04:00
Craig Andrews
a70cceaddd
send_confirmation_code -> sendConfirmationCode
2010-09-03 17:50:28 -04:00
Craig Andrews
1eccd2a4bd
send_from_site -> sendFromSite
2010-09-03 17:50:28 -04:00
Craig Andrews
f038eacca4
enqueue_incoming_raw -> enqueueIncomingRaw
2010-09-03 17:50:28 -04:00
Craig Andrews
e7a026091c
enqueue_outgoing_raw -> enqueueOutgoingRaw
2010-09-03 17:50:28 -04:00
Craig Andrews
b05ab5fc85
daemon_screenname -> daemonScreenname
2010-09-03 17:50:28 -04:00
Craig Andrews
764e0ab962
receive_raw_message -> receiveRawMessage
2010-09-03 17:50:28 -04:00
Craig Andrews
80176b0b2c
send_notice -> sendNotice
2010-09-03 17:50:28 -04:00
Craig Andrews
6a848bcc8a
send_message -> sendMessage
2010-09-03 17:50:28 -04:00
Brion Vibber
6786bbcfbf
Drop RSSCloud queue items if the notice has a bogus profile, rather than attempting to rerun it due to the initial erroring-out. That's not a recoverable error
2010-09-03 12:34:05 -07:00
Brion Vibber
43b0c65a86
Fix output bug in DisqusPlugin -- 'Comments' link contents was in attributes instead of comments, which broke output and spewed errors
2010-09-03 11:57:33 -07:00
Evan Prodromou
4aac47de03
syntax error in exception string in discovery.php
2010-09-03 01:41:01 -04:00
Evan Prodromou
326258bfef
Merge branch '0.9.x' into 1.0.x
2010-09-02 22:57:37 -04:00
Siebrand Mazeland
1bfbe9badf
* i18n/L10n updates and FIXMEs added
...
* whitespace fixes
2010-09-03 01:35:04 +02:00
Brion Vibber
2196d00b1b
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/command.php
2010-09-02 15:04:25 -07:00
Brion Vibber
e365e709c5
Merge branch 'master' into testing
2010-09-02 14:58:11 -07:00
Evan Prodromou
925381707b
show notice title on shownotice page
2010-09-02 17:16:10 -04:00
Brion Vibber
c24458a9f0
Ticket #2638 : allow themes to specify a base theme to load with 'include' setting in a theme.ini file
2010-09-02 14:11:52 -07:00
Evan Prodromou
82b1d6daef
Merge branch 'swat0' into 0.9.x
2010-09-02 16:58:55 -04:00
Evan Prodromou
7517409bf1
Merge branch 'testing' into 0.9.x
2010-09-02 16:56:52 -04:00
Brion Vibber
4cbbfdab84
Fix for #2635 : use ssl-sometimes settings for Twitter settings & auth pages
2010-09-02 10:55:26 -07:00
Evan Prodromou
ebcd8644a5
Revert "debugging replyToID"
...
This reverts commit bb9353f6e0
.
2010-09-01 18:22:54 -04:00
Evan Prodromou
bb9353f6e0
debugging replyToID
2010-09-01 17:59:49 -04:00
Evan Prodromou
27626c3abf
Correctly check for user's id in replies in user salmon post
2010-09-01 17:10:29 -04:00
Evan Prodromou
ab88123373
correctly return oprofile from Ostatus_profile::ensureProfileURI()
2010-09-01 17:05:11 -04:00
Evan Prodromou
2d4e0693c8
save URIs of remote profiles marked for attention
2010-09-01 16:17:18 -04:00
Evan Prodromou
3baff9aa98
Handle profile-from-uri hook to return ostatus profile if there's a match
2010-09-01 16:16:38 -04:00
Evan Prodromou
c82b1cda82
send a salmon slap to mentioned person when we reply to a notice
2010-09-01 14:35:43 -04:00
Evan Prodromou
468a15db00
Merge branch 'master' into 0.9.x
2010-09-01 14:21:36 -04:00
Evan Prodromou
8ebb858964
remove noop function from OStatusPlugin
2010-09-01 14:21:24 -04:00
Craig Andrews
6df8230488
Leave session handling to StatusNet - disable phpCAS's handling.
2010-08-30 17:08:12 -04:00
Craig Andrews
6b4607f073
Upgrade from CAS 1.1.0RC6 to 1.1.2
2010-08-30 16:53:32 -04:00
Evan Prodromou
a507f04bc4
fix incorrect function name in updateostatus.php script
2010-08-25 12:32:10 -04:00
Craig Andrews
7cd0706aef
Merge remote branch 'chat-interface-plugins/irc-plugin' into 1.0.x
2010-08-18 14:13:15 -04:00
Craig Andrews
6c02c665f2
Use hash if available
2010-08-18 14:07:40 -04:00
Craig Andrews
05712ae62b
reconnect failed doesn't include a parameter in its invocation
2010-08-18 13:37:38 -04:00
Craig Andrews
b699364982
Merge remote branch 'chat-interface-plugins/msn-plugin' into 1.0.x
2010-08-18 13:34:39 -04:00
Craig Andrews
f5e4fc12e0
include mhash from php compat
2010-08-18 13:34:32 -04:00
Craig Andrews
ab89df0094
Use mhash from Compat if mhash isn't available
2010-08-18 13:33:52 -04:00
Luke Fitzgerald
79a81e5d54
Removed old code accidently left in ($data)
2010-08-18 10:27:03 -07:00
Craig Andrews
bbcc76e7e7
Remove .svn subversion control files
2010-08-18 12:42:32 -04:00
Craig Andrews
11661e62df
Merge remote branch 'chat-interface-plugins/msn-plugin' into 1.0.x
2010-08-18 12:41:50 -04:00
Brion Vibber
0cfaae48a3
Merge branch '0.9.x' into 1.0.x
2010-08-16 16:56:27 -07:00
Brion Vibber
aff54d8efb
Managed_DataObject initial sketches (pulling Drupal-style schema def into the data that DB_DataObject and Memcached_DataObject use; not yet functional. Converted OStatus_profile for demo.)
2010-08-16 14:02:31 -07:00
Brion Vibber
b77c029aa8
Merge branch 'testing'
...
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
2010-08-16 10:06:52 -07:00
Evan Prodromou
5110275a38
fix use of activity rather than act in salmonaction subclasses, too
2010-08-16 10:03:44 -07:00
Evan Prodromou
54b93aede6
typo mixing up and in salmonaction
2010-08-16 10:03:38 -07:00
Evan Prodromou
c1cab9bfb8
Notice title constructor doesn't check class of Notice
2010-08-14 18:02:08 -07:00
Evan Prodromou
7df78c7c6a
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-08-14 12:08:15 -07:00
Evan Prodromou
21bf50bad6
Merge branch 'noticetitle' into 0.9.x
2010-08-14 12:03:25 -07:00
Evan Prodromou
401cf36de3
handle deletion of notice
2010-08-14 11:58:54 -07:00
Evan Prodromou
9e4f40806a
Merge branch 'master' into noticetitle
2010-08-14 11:46:12 -07:00
Zach Copley
fa4b360ba0
- Remove extraneous style stuff from Echo plugin - that stuff should
...
be handled via CSS in the theme.
- Updated installation instructions on Echo and Disqus plugins
2010-08-14 00:07:12 +00:00
Zach Copley
20d0723dec
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-08-13 23:53:44 +00:00
Zach Copley
614b12ea51
A plugin to add Disqus commenting to notice pages
2010-08-13 23:53:05 +00:00
Evan Prodromou
341b935acc
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-08-13 14:52:16 -07:00
Evan Prodromou
1dadb8efc0
Merge branch '0.9.x' into 1.0.x
2010-08-13 14:51:51 -07:00
Evan Prodromou
926c77246b
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OStatus/classes/Ostatus_profile.php
2010-08-13 14:35:49 -07:00
Evan Prodromou
7183175429
Merge branch 'master' into 1.0.x
2010-08-13 14:33:41 -07:00
Evan Prodromou
029aa0c61c
fix use of activity rather than act in salmonaction subclasses, too
2010-08-13 14:18:54 -07:00
Zach Copley
61ab21b711
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-08-13 20:53:19 +00:00
Zach Copley
028f9a7b1d
A plugin for adding the Echo (formerly JS-Kit) commenting widget to
...
notice pages
2010-08-13 20:52:05 +00:00
Evan Prodromou
8dec16aeeb
add hooks to allow plugins to handle different kinds of activities
2010-08-13 13:14:47 -07:00
Evan Prodromou
4217277d14
typo mixing up and in salmonaction
2010-08-13 13:07:25 -07:00
Brion Vibber
16f75b95c6
Fixes for RSS subscriptions: accept posts with no ActivityStreams object-type set; be more liberal about accepting posts from feeds where the author info doesn't match (we'll post under the feed's profile and just not try to update the profile info).
2010-08-13 12:23:42 -07:00
Brion Vibber
60c36c1868
SubMirror: check feel-url discovery if profile-url discovery failed; should help when giving direct feeds to subscribe to
2010-08-13 12:23:32 -07:00
Brion Vibber
f7b2bb09e6
Suppress whinging during HTML parsing in profile page discovery for things that turn out to be XML feeds with funny namespaces.
2010-08-13 12:23:28 -07:00
Evan Prodromou
9b7536351b
hide the Whats Up Nickname if notice title enabled
2010-08-13 12:22:58 -07:00
Evan Prodromou
e6da476c16
make notice title phpcs-clean
2010-08-13 12:04:30 -07:00
Evan Prodromou
eff0b8e1aa
make notice title phpcs-clean
2010-08-13 12:01:29 -07:00
Evan Prodromou
96705b4ec5
set notice titles in RSS and Atom output
2010-08-13 11:50:33 -07:00
Brion Vibber
185f18024a
Fixes for RSS subscriptions: accept posts with no ActivityStreams object-type set; be more liberal about accepting posts from feeds where the author info doesn't match (we'll post under the feed's profile and just not try to update the profile info).
2010-08-13 11:41:44 -07:00
Evan Prodromou
91c914fa3b
show notice title for notices in a notice list
2010-08-13 11:35:36 -07:00
Evan Prodromou
67ff9ea490
helper static method to get title text based on a notice
2010-08-13 11:35:16 -07:00
Evan Prodromou
e2128b2019
save the notice title when the notice is saved
2010-08-13 11:29:18 -07:00
Brion Vibber
8569388499
SubMirror: check feel-url discovery if profile-url discovery failed; should help when giving direct feeds to subscribe to
2010-08-13 11:02:21 -07:00
Brion Vibber
115231f917
Suppress whinging during HTML parsing in profile page discovery for things that turn out to be XML feeds with funny namespaces.
2010-08-13 10:51:00 -07:00
Evan Prodromou
79b5f1cea5
add title element to notice form
2010-08-12 22:11:26 -07:00
Evan Prodromou
ac6486f12e
Plugin file and data file for notice title
2010-08-12 21:19:12 -07:00
Brion Vibber
ae696728f5
Merge branch '0.9.x' into 1.0.x
2010-08-12 12:56:23 -07:00
Brion Vibber
c3475e6ebe
Merge branch 'master' into 0.9.x
2010-08-12 12:55:36 -07:00
Brion Vibber
34995df879
TinyMCE: counter support (may not be 100% exact match to server-side count, but there's already discrepencies due to URL shortening)
...
Fix for bad char conversions also, caused short text to not be saved in some cases.
2010-08-12 12:47:07 -07:00
Luke Fitzgerald
a3fea6f673
Merge in Phergie changes
2010-08-12 11:58:53 -07:00
Brion Vibber
f14f252a16
TinyMCE: fixes to attachment handling
2010-08-12 11:39:42 -07:00
Brion Vibber
3370a326d8
work in progress: tinymce image attachments
2010-08-11 17:01:38 -07:00
Brion Vibber
6ee3f35302
work in progress: prettier attachment mode for tinymce?
2010-08-11 15:56:40 -07:00
Brion Vibber
3c28464dab
TinyMCE: only apply HTML parsing if we actually got into JS and poked the editor widget. With JS off, we'll take plaintext as usual.
2010-08-11 14:50:59 -07:00
Brion Vibber
527561cd93
TinyMCE: core tweak; switching order of input processing so length limit is applied to stripped version of the text
2010-08-11 14:41:31 -07:00
Brion Vibber
c19696afec
TinyMCE: add Shane Tomlinson's linkautodetect plugin so typed URLs get linked for you, fitting expected user behavior better. (IE apparently already does this; plugin adds similar behavior for other browsers.)
...
Plugin source: http://sourceforge.net/tracker/?func=detail&aid=2770218&group_id=103281&atid=738747
Source JS compressed manually with jsmin.
Note: the link detection doesn't match StatusNet's internal link detection right now. URLs with funky chars, especially like Wikipedia style ones, will often not automatically catch. (But you should still be able to manually link them.)
2010-08-11 13:38:09 -07:00
Brion Vibber
8bc1ab436a
TinyMCE: enable tab focus behavior matching the default textarea
2010-08-11 13:17:11 -07:00
Brion Vibber
d832b46573
TinyMCE: use inlinepopups mode, so linking dialog appears as a lightbox instead of a separate browser window (which may trigger popup blockers, plays very poorly with fullscreen netbook UIs, and is generally annoying)
2010-08-11 12:49:02 -07:00
Brion Vibber
771928c6e9
TinyMCE: enable autoresize plugin, makes the text area bigger as you're typing a giant message
2010-08-11 12:44:01 -07:00
Brion Vibber
ffc27a337f
TinyMCE: add fullscreen zoom plugin for editor (a bit awkward but better than trying to work in tiny area... need a nicer intermediate size maybe)
2010-08-11 12:14:05 -07:00
Brion Vibber
e3bc7ed4bf
TinyMCE: Switch default 'simple' layout for customized advanced layout: bold/italic/strikethrough undo/redo link/unlink/image
2010-08-11 12:10:08 -07:00
Luke Fitzgerald
d2c72d8ae1
Add an config option to change the ping interval
2010-08-11 10:49:09 -07:00
Luke Fitzgerald
daa3fef96d
Added comment to show debugging toggle
2010-08-11 10:42:11 -07:00
Luke Fitzgerald
17f6c08063
Disabled debugging output
2010-08-11 10:36:19 -07:00
Luke Fitzgerald
e10ff3475b
Disabled debugging output
2010-08-11 10:35:20 -07:00
Evan Prodromou
41dfea1634
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-08-10 23:36:13 -07:00
Evan Prodromou
3062cc2706
add last-modified header to sitemaps to keep them from getting regenerated
2010-08-10 23:35:47 -07:00
Luke Fitzgerald
10f72f62af
Merge remote branch 'statusnet/1.0.x' into idle-irc-plugin
2010-08-10 19:48:49 -07:00
Luke Fitzgerald
b7a07f0baa
Merge remote branch 'statusnet/1.0.x' into msn-plugin
2010-08-10 19:48:18 -07:00
Luke Fitzgerald
9da2368383
Retry using the waiting queue so as to preserve message ordering
2010-08-10 19:23:45 -07:00
Luke Fitzgerald
8005bdb421
Reset message to non-delay type before requeuing
2010-08-10 18:34:12 -07:00
Luke Fitzgerald
ef6813eb67
Fix some typos and missing letters
2010-08-10 17:42:18 -07:00
Luke Fitzgerald
8e925927c6
First commit of message throttling code
2010-08-10 17:27:02 -07:00
Brion Vibber
3a85318bd0
First stab redoing argument loading for TinyMCE (to avoid hacking checks for all notice saves everywhere)
2010-08-10 16:55:03 -07:00
Brion Vibber
e54d441af0
TinyMCE: workaround for save trigger aborting our AJAX form submission.
2010-08-10 15:48:02 -07:00
Brion Vibber
bb711cb98d
Update TinyMCE to release 3.3.8, jQuery version
...
Release 2010-06-30 http://tinymce.moxiecode.com/punbb/viewtopic.php?id=22165
2010-08-10 15:24:12 -07:00
Brion Vibber
819d33210d
Merge branch '0.9.x' into tinymce
2010-08-10 15:01:29 -07:00
Brion Vibber
08fc6053ec
Fix for regression with OStatus mention processing (duplicated new and old style lead to trying to save a reply entry twice).
2010-08-10 13:49:11 -07:00
Brion Vibber
4fdfc6b1ce
Fix for FeedDiscovery test cases: note that some test cases with relative URLs fail that include a schema but not a host. Not 100% sure those are legit, need to check.
2010-08-10 13:19:27 -07:00
Brion Vibber
9a53be4669
Initial support for third-party fallback hub such as Superfeedr for feed subscriptions.
...
If set up, this hub will be used to subscribe to feeds that don't specify a hub of their own.
Assumes that the fallback hub will, in fact, handle polling and updates for any feed we throw at it!
Authentication may be specified for the fallback hub.
Example:
$config['feedsub']['fallback_hub'] = 'https://superfeedr.com/hubbub ';
$config['feedsub']['hub_user'] = 'abcd';
$config['feedsub']['hub_pass'] = 'ckcmdkmckdmkcdk';
Also:
* Fix for WordPress-RSS-via-Superfeedr-Atom; if we have <author> info but no ID from a native ActivityStreams actor, don't freak out in the low-level processing code that checks for identity matches.
* enhanced messages for low-level FeedSub exceptions if they make it to outside display
2010-08-10 12:57:40 -07:00
Brion Vibber
6a2659ed67
Workaround for index setup on SubMirror until I'm done w/ arbitrary index support for Schema setup.
2010-08-10 11:45:34 -07:00
Brion Vibber
855f1f6623
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-08-09 13:11:41 -07:00
Luke Fitzgerald
322e7c4e9f
Small reordering of code (cosmetic)
2010-08-09 09:26:31 -07:00
Luke Fitzgerald
613ae551c6
Set lastPing on connect
2010-08-09 07:08:29 -07:00
Luke Fitzgerald
bc331a0155
Made private methods protected
2010-08-09 07:05:58 -07:00
Luke Fitzgerald
d321b6e76f
Requeue waiting messages on start/connection loss
2010-08-09 07:03:54 -07:00
Luke Fitzgerald
da61c8567c
Small cosmetic changes
2010-08-07 17:29:13 -07:00
Luke Fitzgerald
7cd52847a5
Added pinging to keep connection open
2010-08-07 17:25:43 -07:00
Luke Fitzgerald
067633a608
Added more commenting
2010-08-07 16:32:17 -07:00
Luke Fitzgerald
a9d9e077ba
Merged in Phergie changes
2010-08-07 16:31:30 -07:00
Luke Fitzgerald
4b12b8f396
Cosmetic comment change
2010-08-07 13:28:11 -07:00
Luke Fitzgerald
841da54301
Merge remote branch 'statusnet/1.0.x' into msn-plugin
2010-08-07 13:26:07 -07:00
Luke Fitzgerald
bee5084072
Merge remote branch 'statusnet/1.0.x' into irc-plugin
2010-08-07 13:25:56 -07:00
Luke Fitzgerald
e23ad0bdb3
Commands can now be whitelisted to allow response to the channel
2010-08-07 13:25:05 -07:00
James Walker
c8a706081e
strip whitespace from me:data and me:sig (per spec)
2010-08-07 09:48:21 -04:00
Eric Helgeson
edb62db613
Locale error message, clean up {}, Verified under 1.0.x && php 5.3
2010-08-06 23:07:34 -05:00
Eric Helgeson
fd2919be18
Fixed PHP 5.3 by & value
...
Cleaned up {}'s
2010-08-06 22:51:45 -05:00
Eric Helgeson
422a6ef518
Fixed PHP 5.3 by & value
...
Cleaned up {}'s
2010-08-06 22:48:00 -05:00
Brion Vibber
39277ebf78
And.... one more fix for queueing in SubMirror.
2010-08-06 12:04:34 -07:00
Brion Vibber
729912e36a
Missing file from SubMirror. :P
2010-08-06 12:00:31 -07:00
Brion Vibber
79485340ab
SubMirror: Drop mirror link from subscriptions list; has decoupled from subscriptions.
2010-08-06 11:55:56 -07:00
Brion Vibber
7e55fc0044
OStatus/FeedSub: tweaked PuSH feed garbage collection so other plugins can declare usage of a low-level feed or an OStatus profile besides profile subscriptions & group memberships.
...
SubMirror: redid add-mirror frontend to accept a feed URL, then pass that on to OStatus, instead of pulling from your subscriptions.
Profile: tweaked subscriberCount() so it doesn't subtract 1 for foreign profiles who aren't subscribed to themselves; instead excludes the self-subscription in the count query.
Memcached_DataObject: tweak to avoid extra error spew in the DB error raising
Work in progress: tweaking feedsub garbage collection so we can count other uses
2010-08-06 11:49:52 -07:00
Brion Vibber
300ed65d30
SubMirror plugin initial checkin: allows setting up automatic mirroring of posts from any of your subscriptions into your own stream, either via repeat or by copying the text.
...
The UI for setup and editing is a bit nasty for now. Can be reached via 'Mirroring' tab in account settings, or from a link at top of subscriptions list.
Currently relies on the OStatus plugin to handle actual setup, parsing, and importing of feeds; to support more general feed formatting we may need some further work there to accept weird feeds.
Also requires an actual live subscription, but this could be changed in future. (Ensuring that PSHB feed subscriptions remain live even if nobody's directly subscribed might be tricky.)
The repeat style is our preferred method since it retains full attribution, but right now we don't handle repeats very well across site boundaries; when pushed out to Twitter or to other StatusNet instances via OStatus, currently we end up losing some of the data and can end up with the 'RT @blah' version.
WARNING: There's no loop detection yet; it's most likely possible to set up a fun loop of profiles repeating each others' stuff forever and ever and ever and ever...
2010-08-05 18:06:36 -07:00
Luke Fitzgerald
a6e865c47a
Use nick length instead
2010-08-05 11:12:36 -07:00
Luke Fitzgerald
1f3dbe1198
Bot responds to channel commands via PM
2010-08-05 10:48:41 -07:00
Luke Fitzgerald
55ec8a7465
Always remove messages from waiting queue and requeue messages if one fails
2010-08-04 16:14:25 -07:00
Luke Fitzgerald
cb34d95197
Merge in Phergie changes
2010-08-04 16:02:24 -07:00
Luke Fitzgerald
65a741cce2
Messages with new lines split at plugin stage for reliability
2010-08-04 09:10:57 -07:00
Luke Fitzgerald
2250273942
Only attempt callback if non-null
2010-08-04 08:46:04 -07:00
Luke Fitzgerald
4cfe04a68f
Remove old debugging code
2010-08-03 20:07:59 -07:00
Evan Prodromou
9f0715a993
Merge branch '0.9.x' into 1.0.x
2010-08-03 16:05:03 -07:00
Evan Prodromou
2ba36fc242
Merge branch 'activityhooks' into 0.9.x
...
Conflicts:
classes/Notice.php
2010-08-03 16:01:18 -07:00
Evan Prodromou
f9a4728fcc
Merge branch 'testing' into 0.9.x
2010-08-03 15:57:05 -07:00
Evan Prodromou
f83171824f
correctly show <source> for atom feeds
2010-08-03 15:50:21 -07:00
Luke Fitzgerald
678911af24
Revert "Merged in Phergie changes"
...
This reverts commit a3df3b6367
.
2010-08-03 11:45:55 -07:00
Luke Fitzgerald
c71319419b
Cosmetic whitespace change
2010-08-03 10:02:47 -07:00
Luke Fitzgerald
a3df3b6367
Merged in Phergie changes
2010-08-03 09:42:02 -07:00
James Walker
5fa19a0384
Merge branch '2429' into 0.9.x
2010-08-02 16:45:23 -04:00
James Walker
8120842780
Fix for #2429 - move OStatus XML writing to XMLStringer
2010-08-02 16:42:28 -04:00
Brion Vibber
c56939d596
Remove the 'Enable Twitter import' checkbox from Twitter admin panel by default; can be re-added with setting:
...
addPlugin('TwitterBridge', array('adminImportControl' => true, ....));
Added a note on the label that it requires manual daemon setup. (Note that by default the admin panel won't be shown, so it's no biggie to be hiding this for now.)
2010-08-02 13:00:50 -07:00
James Walker
56294016a7
fix #2478 - ensure all XRD documents get proper content-type headers
2010-08-02 14:47:13 -04:00
James Walker
517c7483d1
move to rel="salmon" (per latest spec)
2010-08-02 13:24:38 -04:00
Luke Fitzgerald
68ec3f855d
Fix a bunch of bugs where DB object wasn't correctly defined
2010-07-31 10:47:58 -07:00
Luke Fitzgerald
0f7fdd4804
Changes to make plugin use database instead of polling session readiness
2010-07-30 17:12:35 -07:00
Brion Vibber
84726791d3
Fix for ticket #2286 : [mobile] Text extends beyond border of repeat confirmation dialog floater box on iPhone
...
http://status.net/open-source/issues/2286
This bit of CSS was constricting the vertical size of the popup form for repeats:
.notice-options form {
width:16px;
height:16px;
}
I can only assume this was originally meant to constrain the mini inline AJAX forms to the size of the clickable buttons, but it doesn't make a difference to how those are displayed on iPhone, Android, or Opera Mini.
Removing the statement lets the popup form go to its natural size, covering the button.
2010-07-30 14:12:37 -07:00
Evan Prodromou
a01bc6b575
Merge branch 'googleadsadminpanel' into testing
2010-07-28 17:50:49 -04:00
Evan Prodromou
659e8b26ac
add admin panel for Adsense
2010-07-28 17:50:36 -04:00
Luke Fitzgerald
9b9a36e492
Introduce error checking when calling handleEvents
2010-07-28 11:56:15 -07:00
Luke Fitzgerald
2fe1b12804
Merge in Phergie changes
2010-07-28 10:42:01 -07:00
Luke Fitzgerald
dd882be803
Merge in Phergie fixes and remove some whitespace
2010-07-27 09:14:07 -07:00
Luke Fitzgerald
3c1d7d81cf
Remove some testing/debugging code
2010-07-26 12:25:23 -07:00
Luke Fitzgerald
e911480587
Add timeout method to force call of idle to send ping
2010-07-26 11:21:11 -07:00
Luke Fitzgerald
82f44c5fa0
Fix typo
2010-07-26 11:14:18 -07:00
Luke Fitzgerald
742b302739
More Irc plugin work
2010-07-26 11:13:00 -07:00
Luke Fitzgerald
950685a466
Merged in Phergie changes
2010-07-25 16:04:12 -07:00
Luke Fitzgerald
2645133c43
Use non-statusnet class
2010-07-24 20:04:00 -07:00
Luke Fitzgerald
3b9d720df5
Change ircmanager to not use unnecessary class
2010-07-24 20:03:16 -07:00
Luke Fitzgerald
c0214ac0a4
Merged in Phergie change (Allow sec/usec = 0)
2010-07-24 11:26:20 -07:00
Luke Fitzgerald
75373e4a7a
Remove old comment
2010-07-24 10:07:02 -07:00
Luke Fitzgerald
007d9ec8ce
Updated commenting
2010-07-24 10:01:37 -07:00
Luke Fitzgerald
9f0eea69ff
Handle the case where confirmation is cancelled
2010-07-24 07:54:09 -07:00
Luke Fitzgerald
be0fb03560
Cosmetic: Rearrange code
2010-07-23 14:13:37 -07:00
Luke Fitzgerald
4dcf2a1f51
Another comment
2010-07-23 13:57:39 -07:00
Luke Fitzgerald
13c63d554d
Added some missing comments
2010-07-23 13:40:11 -07:00
Luke Fitzgerald
f1f78b3142
Remove Phergie diff file
2010-07-23 13:34:39 -07:00
Luke Fitzgerald
c4640c50d3
Lots more work - Implemented nickname checking
2010-07-23 13:33:41 -07:00
Luke Fitzgerald
f818182a37
Update classname in ircmanager too!
2010-07-21 07:39:28 -07:00
Luke Fitzgerald
3cb51e182b
Rename Phergie_Plugin_Statusnet_Callback to Phergie_Plugin_StatusnetCallback
2010-07-21 07:39:19 -07:00
Luke Fitzgerald
2e9da023c0
Rename Phergie_ExtendedBot to Phergie_StatusnetBot
2010-07-21 07:33:43 -07:00
Luke Fitzgerald
af5ecb88b1
Corrected UTF8 to UTF-8
2010-07-21 05:21:37 -07:00
Luke Fitzgerald
a34e55e1a3
Change default encoding to UTF-8
2010-07-20 11:32:09 -07:00
Luke Fitzgerald
efdf9b6d4e
Code now functional - lots of error checking and extras missing still though
2010-07-20 11:16:59 -07:00
Luke Fitzgerald
1e5198645c
Weaken send scope to protected
2010-07-20 06:26:51 -07:00
Luke Fitzgerald
ee7098c0db
Removed hard tabs
2010-07-18 12:58:06 -07:00
Luke Fitzgerald
2550971450
ircmanager.php almost complete - Need to add exception catching
2010-07-18 12:45:28 -07:00
Luke Fitzgerald
942ce88a75
Added send method to avoid having to call getDriver()
2010-07-18 12:40:07 -07:00
Luke Fitzgerald
7f2555126a
IrcPlugin.php almost complete
2010-07-18 12:26:11 -07:00
Luke Fitzgerald
4c4dc65712
Use original config class as readArray was added upstream
2010-07-18 06:30:52 -07:00
Luke Fitzgerald
7caff948f6
Merged in changes to Phergie
2010-07-18 06:28:15 -07:00
Evan Prodromou
d73feb82d8
cache sitemap notice and user counts for 4h
2010-07-14 10:38:34 -04:00
Brion Vibber
1339f1f908
Commit hubprepqueuehandler.php -- fix for OStatus bulk output.
2010-07-12 14:24:43 -07:00
Brion Vibber
d645b342ac
Commit hubprepqueuehandler.php -- fix for OStatus bulk output.
2010-07-12 14:22:36 -07:00
Evan Prodromou
bb2f5defd5
remove debugging statement and add a bit of output to updatecounts
2010-07-10 09:58:27 -04:00
Evan Prodromou
d53d0f7908
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-07-10 09:51:49 -04:00
Luke Fitzgerald
8abef1fd65
Added missing '>'
2010-07-09 16:29:42 -07:00
Evan Prodromou
869ebb7dc7
script to fill counts table from command line
2010-07-09 17:50:14 -04:00
Luke Fitzgerald
4a602eb4ba
Modified some config options
2010-07-09 04:20:00 -07:00
Luke Fitzgerald
022e92ce5d
Extended Async Processor to allow use of Statusnet driver
2010-07-09 04:18:19 -07:00
Luke Fitzgerald
03670d21d4
Extended Phergie_Bot to allow Statusnet to be the driver
2010-07-09 04:04:45 -07:00
Luke Fitzgerald
054d16426f
Added commenting
2010-07-09 04:04:18 -07:00
Luke Fitzgerald
7ef33061bb
Updated old comments
2010-07-09 03:21:51 -07:00
Luke Fitzgerald
a86cabfb19
Added Statusnet Driver to give access to sockets and send method
2010-07-09 03:19:18 -07:00
Luke Fitzgerald
ba36fb2bfe
Lots more work on ircmanager.php
2010-07-09 03:05:03 -07:00
Luke Fitzgerald
9650d48008
Added missing closing bracket
2010-07-09 02:53:58 -07:00
Luke Fitzgerald
def70cd67f
Stopped extended config adding to files array
2010-07-09 02:45:56 -07:00
Luke Fitzgerald
80516cba2f
Extended Phergie_Config to allow passing config array instead of loading from file
2010-07-09 02:43:40 -07:00
Luke Fitzgerald
9080fdd56e
Updated README
2010-07-09 02:02:50 -07:00
Luke Fitzgerald
63107beb8c
Fix Fake_Irc to store data to send, not raw socket data to send
2010-07-09 01:21:33 -07:00
Luke Fitzgerald
2f585076c0
Add StatusNet Phergie plugin to pass messages received to IM architecture
2010-07-09 01:25:18 -07:00
Zach Copley
4c5098cd32
Handle the case where a screen name has shifted from one Twitter ID to another
2010-07-08 21:17:11 +00:00
Luke Fitzgerald
4601fddad3
Ported 1.x.x NickServ plugin to 2.x.x
2010-07-07 08:42:35 -07:00
Luke Fitzgerald
2d12d7b9e4
Fixed bug in Stream driver
2010-07-07 08:42:10 -07:00
Evan Prodromou
7746611f20
create an index on user.created so sitemap generation is faster
2010-07-05 14:12:14 -04:00
Luke Fitzgerald
3dce582182
Added README
2010-07-04 10:24:22 -07:00
Luke Fitzgerald
0ef7c5559f
Initial IRC plugin work
2010-07-04 09:51:44 -07:00
Luke Fitzgerald
c4458bc40a
Removed hard tabs
2010-06-30 12:50:07 -07:00
Luke Fitzgerald
884b26229d
Merge remote branch 'statusnet/1.0.x' into irc-plugin
2010-06-30 09:37:03 -07:00
Luke Fitzgerald
bf6ecfbffc
Updated phergie library
2010-06-30 09:33:29 -07:00
Luke Fitzgerald
9a7c60a3e2
Added wait on signon failure due to update contacts failing
2010-06-30 09:18:44 -07:00
Luke Fitzgerald
4c3b420969
Fixed warning thrown and simplified list calls
2010-06-29 17:06:44 -07:00
Luke Fitzgerald
7ac937e8e0
Added required PHP extensions to README
2010-06-29 11:14:26 -07:00
Luke Fitzgerald
2e8a4e3a0f
Added README file
2010-06-29 10:57:48 -07:00
Brion Vibber
21f253c584
Fix regression in OStatus remote group subscribe -- a bug was previously masked silently (call to nonexistent getProfileUrl() method on User_group -- now replaced with homeUrl() which does the thing we wanted here)
2010-06-29 10:31:30 -04:00
Luke Fitzgerald
6aa8ce08ae
Hide list error if network is not specified
2010-06-28 17:17:51 -07:00
Luke Fitzgerald
bcb718cd31
Fixed a bug where sessions were not cleared
2010-06-28 17:03:19 -07:00
Luke Fitzgerald
8175f0f3bf
Fixed a number of bugs in the library and wrapper - Seems to work!
2010-06-26 12:55:32 -07:00
Luke Fitzgerald
46f435a742
Merge remote branch 'statusnet/1.0.x' into msn-plugin
2010-06-26 09:12:59 -07:00
Brion Vibber
00e129b013
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-26 10:18:03 -04:00
Brion Vibber
696e4ba393
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OpenID/openidserver.php (cleaned up mismatched comment)
2010-06-26 10:17:36 -04:00
Brion Vibber
d9e56e15cc
Merge branch 'master' into testing
2010-06-26 10:16:27 -04:00
Brion Vibber
a6408be566
Regression fix for Recaptcha on SSL registration page; their API is served on a different hostname for SSL.
2010-06-24 15:21:04 +00:00
Luke Fitzgerald
c5ad04c865
Lots of fixes for library. Almost have confirmation emails working
2010-06-22 20:26:23 -07:00
Brion Vibber
2e98a48f2b
RecaptchaPlugin: fix for missing captcha on iPhone/Android.
...
MobileProfile serves pages out to iPhone and Android as application/xhtml+xml, which doesn't work with the default we we were loading recaptcha (as it used document.write). Switched to filling out a <div> from the AJAX API, which doesn't use document.write in the XHTML context.
Tested that view & submission works ok in following browsers:
Mobile: iPhone 3.1, Android 2.1, iPad 3.2 (this last doesn't trigger mobile theme tweaks)
Ubuntu 10.04: Firefox 3.6.3, Chrome 6
Mac 10.6: Safari 5/OS X 10.6.4
Windows 7: IE 8, Opera 10.56
2010-06-20 19:30:12 +00:00
Luke Fitzgerald
f37228f413
Use built in email verifier
2010-06-20 15:53:36 +01:00
Luke Fitzgerald
6dd221957e
Add comma to end of list and small cosmetic change
2010-06-16 20:58:27 +01:00
Brion Vibber
d65d982681
Merge branch 'master' into testing
2010-06-16 12:37:14 -07:00
Luke Fitzgerald
d69aa725f7
Remove callback method as we're not using status changes
2010-06-16 20:35:46 +01:00
Brion Vibber
ce7176d987
Switch OpenID server's redirects from 307 to 303 to avoid prompt for form data resubmission if we were sent here from a POST request, such as when verifying the site for the first time doing an OpenID login from Drupal.
2010-06-16 12:30:37 -07:00
Luke Fitzgerald
6dbf0ab1fe
Add callback for status changes
2010-06-16 18:05:29 +01:00
Luke Fitzgerald
b313bc3cde
Remove any existing switchboard sessions when we (re)signon
2010-06-16 17:12:20 +01:00
Luke Fitzgerald
50610c2611
Added some more error handling and commenting
2010-06-16 14:15:08 +01:00
Luke Fitzgerald
a665739283
Added error reporting to SB socket writes and call endSBSession if socket is dead when we try to send a message
2010-06-16 02:31:51 +01:00
Luke Fitzgerald
6f388a8b50
Use correct array index access for switchBoardSessions in sendMessageToSBSession
2010-06-16 02:28:13 +01:00
Luke Fitzgerald
7b998f4b2a
Reduced if statements used in sendOtherNetworkMessage
2010-06-16 02:25:09 +01:00
Luke Fitzgerald
47bc0ae4c4
Implemented error checking in sendOtherNetworkMessage
2010-06-16 02:23:19 +01:00
Luke Fitzgerald
242e8905cd
Fix indentation
2010-06-16 02:16:29 +01:00
Luke Fitzgerald
3d36f24b49
Return true if OIM is sent successfully
2010-06-16 02:11:39 +01:00
Luke Fitzgerald
392ea6fd32
Correctly access length constants
2010-06-16 02:03:31 +01:00
Luke Fitzgerald
0b2bbd20aa
Added Phergie PHP IRC library
2010-06-16 01:55:39 +01:00
Luke Fitzgerald
62a7f10275
$killsession parameter not needed - we'll kill the session later anyway
2010-06-16 01:43:55 +01:00
Luke Fitzgerald
956b24f05d
Access constants and static methods properly ;)
2010-06-16 01:30:44 +01:00
Luke Fitzgerald
d52f6d5aea
Removed unnecessary else statement
2010-06-16 01:24:28 +01:00
Luke Fitzgerald
2d883eed89
Reordered methods and changed properties to constants as needed
2010-06-16 01:22:52 +01:00
Luke Fitzgerald
d41298950b
Added validate regexp and a few more comments
2010-06-16 00:04:59 +01:00
Luke Fitzgerald
27e8cfd360
Adaptation of library almost complete.
...
Bot now signs in correctly when launched using startdaemons.sh
2010-06-15 20:51:04 +01:00
Luke Fitzgerald
0a4738a806
Lots more work on adapting library. Added more commenting and fixed some stuff on the integration side.
2010-06-14 19:53:43 +01:00
Brion Vibber
a1b25b46bc
Merge branch 'master' into testing
2010-06-14 10:53:22 -07:00
Luke Fitzgerald
2ef01c5b74
Removed Run method as all code has been moved into new methods
2010-06-14 04:54:03 +01:00
Luke Fitzgerald
d1c9908282
Added better error handling to signon method
2010-06-14 04:26:41 +01:00
Luke Fitzgerald
3d6bb5a597
More work on adapting phpmsnclass
2010-06-14 03:47:44 +01:00
Evan Prodromou
bfbebe5977
admin panel for setting site-claim metadata
2010-06-13 15:23:23 -04:00
Evan Prodromou
4b750b75da
show site claim keys on top page
2010-06-13 14:58:06 -04:00
Luke Fitzgerald
f3c1e9da9a
Added some more event handlers and corrected aADL scope
2010-06-13 04:14:29 +01:00
Luke Fitzgerald
0083e58db3
- Corrected PhotoSticker bug in phpmsnclass
...
- Update time till next ping when a command is sent
2010-06-13 03:42:21 +01:00
Luke Fitzgerald
dc66503f33
Added callback for pong (to update time till next ping required)
2010-06-13 01:54:09 +01:00
Luke Fitzgerald
4007bce9aa
Added in missing properties
2010-06-12 21:21:09 +01:00
Luke Fitzgerald
52cfc0866c
Merged in changes to phpmsnclass
2010-06-12 21:19:08 +01:00
Luke Fitzgerald
89808a86d5
More work on adapting the phpmsnclass to work with the IM architecture (far from finished still)
2010-06-12 19:49:28 +01:00
Luke Fitzgerald
d97b598214
Removed phpmsnclass sample
2010-06-12 17:34:25 +01:00
Luke Fitzgerald
0264f66d76
Initial commit of msn-plugin work
2010-06-12 17:30:11 +01:00
Brion Vibber
004200f958
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-06-11 12:09:55 -07:00
Brion Vibber
7f3b3620af
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-06-11 12:05:53 -07:00
Brion Vibber
47665e845a
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-06-11 12:04:03 -07:00
Brion Vibber
b1a68e15b7
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
lib/default.php
lib/util.php
plugins/UrlShortener/UrlShortenerPlugin.php (has been removed?)
2010-06-10 15:37:06 -07:00
Brion Vibber
7cc58b97fe
Fix for compile error (misnamed function) in 4211b7f011
2010-06-10 15:23:57 -07:00
Brion Vibber
1768bfa04b
Ticket #2349 : fix for Geonames semantic reference URLs in FOAF output (corrects a typo in the patch added in 4463768b
)
2010-06-10 10:30:07 -07:00
Brion Vibber
5a96b9e805
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-06-07 10:34:00 -07:00
Brion Vibber
d88b208edc
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OpenID/openid.php
2010-06-07 10:19:40 -07:00
Brion Vibber
41e9dba729
OStatus plugin: Rolling batch queueing for PuSH output to >50 subscribing sites. Keeps latency down for other things enqueued while we work...
2010-06-07 10:03:43 -07:00
Evan Prodromou
3a34d7e4ea
Only show local public notices in sitemap
...
Only show local public notices in sitemap. Only do counts for them
in the sitemap index, and only show them in the notice sitemap.
2010-06-04 15:47:26 -04:00
Brion Vibber
8b9436e8ae
Option to divert PuSH items directly to the target site's queue when local
2010-06-03 18:06:55 -07:00
Brion Vibber
a75095fa1a
Meteor realtime plugin: use persistent connections by default when pushing updates from our queue threads
2010-06-03 17:41:26 -07:00
Brion Vibber
5f4c6ec626
Skip enqueueing to outgoing bridges on incoming remote messages. Twitter, Facebook, RSSCloud, and OStatus checks were enqueued on these when they'd never do anything but churn the queue servers.
...
Notice::isLocal() can replace a number of manual checks for $notice->is_local being LOCAL_PUBLIC or LOCAL_NONPUBLIC.
2010-06-03 16:58:45 -07:00
Evan Prodromou
1100831bc0
remove debug statements from Sitemap plugin
2010-06-03 15:19:46 -04:00
Evan Prodromou
1066b26424
use sitemap_notice_count in sitemap index
2010-06-01 13:52:28 -07:00
Evan Prodromou
d78dfd627e
cache notice counts in utility table
2010-06-01 13:52:28 -07:00
Evan Prodromou
271d7dd850
load Sitemap_notice_count
2010-06-01 13:52:28 -07:00
Evan Prodromou
416161c943
make user counts use the database table
2010-06-01 13:52:28 -07:00
Evan Prodromou
7d85b79814
Database tables to cache expensive query data
...
We need to bundle counts of notices and users by date. This can be
expensive for large sites. So, new tables are added to cache the
results of these queries, which don't change after the date is over.
2010-06-01 13:52:28 -07:00
Evan Prodromou
3e349a71ca
mark user pages as being high priority
2010-06-01 13:52:28 -07:00
Evan Prodromou
40618b49e1
mark notice pages as being archived
2010-06-01 13:52:27 -07:00
Evan Prodromou
45e6e537ca
note that sitemap actions are readonly
2010-06-01 13:52:27 -07:00
Evan Prodromou
1c858e17ea
add sitemap statement to robots.txt
2010-06-01 13:52:27 -07:00
Evan Prodromou
e363b724b9
cache notice and user counts in sitemap index
2010-06-01 13:52:27 -07:00
Evan Prodromou
5ff9c0242b
make sure notice and user sitemap are 'in' top level directory
2010-06-01 13:52:27 -07:00
Evan Prodromou
3e8172585d
cache user data for user sitemap
2010-06-01 13:52:27 -07:00
Evan Prodromou
946cd15e8b
cache results of notice sitemap query
2010-06-01 13:52:27 -07:00
Evan Prodromou
610d8021d8
use an array for notice sitemap
2010-06-01 13:52:27 -07:00
Evan Prodromou
8b9ce731f4
max users, notices per sitemap = 50K
2010-06-01 13:52:27 -07:00
Evan Prodromou
4b321f96fc
show sitemapindex with user and notice sitemaps
2010-06-01 13:52:27 -07:00
Evan Prodromou
b73c8ff441
Move NOTICES_PER_MAP to SitemapPlugin
2010-06-01 13:52:27 -07:00
Evan Prodromou
144cdb559d
bundle users by reg date
2010-06-01 13:52:27 -07:00
Evan Prodromou
9fdafaf07e
better calculation for end date in notice sitemaps
2010-06-01 13:52:27 -07:00
Evan Prodromou
35272f638c
Start of an action for sitemap index
2010-06-01 13:52:27 -07:00
Evan Prodromou
63c4eef643
change URLs for user sitemap
2010-06-01 13:52:27 -07:00
Evan Prodromou
9e592baa39
move USERS_PER_MAP to plugin
2010-06-01 13:52:27 -07:00
Evan Prodromou
d65a65756b
correct element name and namespace for sitemapactions
2010-06-01 13:52:27 -07:00
Evan Prodromou
0a04f9d49d
better query for notices by date
2010-06-01 13:52:27 -07:00
Evan Prodromou
524cd9df93
Add a Notice sitemap
2010-06-01 13:52:27 -07:00
Evan Prodromou
ce0e6cb50d
user sitemap
2010-06-01 13:52:27 -07:00
Brion Vibber
634752f0d2
Mapstraction plugin fix: set icon dimensions (24x24 px); Google Maps provider otherwise defaults to stretching them to a funny shape instead of showing square avatars.
2010-06-01 18:41:17 +00:00
Brion Vibber
b0c589de9a
Ticket #2330 : fix Google Maps provider for Mapstraction plugin
2010-06-01 18:29:01 +00:00
Brion Vibber
58fe1a597c
OpenID: add option to enable asking for a username to append to the trusted provider's base URL. Good for hooking up with sites like WikiHow, where usernames are appended to a base URL to get a profile URL which is used as the provider.
...
$config['openid']['append_username'] = true;
or check 'Append a username to base URL' in OpenID admin panel.
2010-05-28 16:52:17 -07:00
Craig Andrews
6317f7d92b
Assigning my copyrights to the Free Software Foundation
2010-05-27 18:27:33 -04:00
Brion Vibber
696aeea113
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
lib/language.php
plugins/OpenID/finishaddopenid.php
2010-05-27 14:57:32 -07:00
Brion Vibber
2f2fa10071
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-05-27 14:54:43 -07:00
Zach Copley
4211b7f011
- Implement statusesHomeTimeline() in TwitterBasicAuthClient
...
- Make TwitterStatusFetcher pull home_timeline (includes retweets) instead of friends_timeline
2010-05-27 11:21:52 -07:00
Marcel van der Boom
bcca10f526
Add implementation of API method home_timeline method
2010-05-27 11:17:49 -07:00
Zach Copley
3e9b356777
Remove settting/getting a 'verb' for Facebook stream entries / status
...
updates. Facebook has disabled the ability to store user preferences
via their old REST API, causing our application to break. Also, verbs
in status updates seem to be deprecated, and stream posts don't seem
to have a verb.
2010-05-26 20:44:57 +00:00
Brion Vibber
9193c110f1
WikiHowProfile plugin; pulls avatar from WikiHow profile pages when registering or adding account with OpenID. (Full name, location, homepage, and bio are also on the profile page but not marked up in a way they can be easily retrieved yet.)
...
OpenID plugin: Added events at OpenID account creation and update time to allow additional customizations for particular sites.
2010-05-25 17:11:46 -07:00
Zach Copley
d9a89d174a
Small update to the README: Facebook has changed the name of one of
...
its application settings fields.
2010-05-25 21:08:25 +00:00
Brion Vibber
3d4ce6f10b
Revert "Backing out locale switch change to see if this affects our mystery memory leak."
...
This reverts commit f98609204f
.
2010-05-25 12:31:16 -07:00
Brion Vibber
f98609204f
Backing out locale switch change to see if this affects our mystery memory leak.
...
Revert "Locale switch cleanup: use common_switch_locale() which is safer for updating gettext state. Also moved a few calls to reduce chance of hitting an exception before switching back."
This reverts commit 74a89b1fc3
.
2010-05-25 11:36:42 -07:00
Zach Copley
09dab2ce5a
Dequeue notice when we hit any Facebook error.
2010-05-25 15:40:38 +00:00
Zach Copley
9cde924bb3
Accidentally used the wrong log level (LOG ERROR instead of LOG_ERR)
2010-05-24 23:27:53 +00:00
Zach Copley
1f3a16bbfb
Clear up warnings I introduced by refactoring Facebook posting
2010-05-24 22:41:34 +00:00
Zach Copley
777ca74500
Upgrade Facebook posting:
...
- Use FQL to check for publish stream permission instead of old REST API
- Better error handling, especially for error code 100
- More logging / better log messages
2010-05-24 21:54:10 +00:00
Zach Copley
8d87514727
Upgrade to latest old REST API library (0.1.0)
2010-05-24 21:44:40 +00:00
Brion Vibber
dc22ed8480
Hotpatch for Facebook mirror problems: drop messages when hitting rate limit (err 341) instead of retrying forever. On unknown errors, now throwing an exception so it'll hit the message retry limits.
2010-05-22 17:43:56 -07:00
Brion Vibber
6eae5d6a7e
Merge branch 'testing' into 0.9.x
2010-05-21 13:15:08 -07:00
Brion Vibber
87b8a89aa7
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-05-21 13:12:25 -07:00
Brion Vibber
cbf2e7cfea
Avoid PHP notice about undefined array index when no avatar photo available from Google profile
2010-05-21 10:18:13 -07:00
Brion Vibber
68305d4b68
Added block link to subscription notification emails; block action can now take a profile ID on the URL; added profile details to block page so there's an indication of who you're blocking before you pull the trigger.
...
Fixed typo in RedirectingAction when no return-to data provided in form submission.
RedirectingAction::returnToArgs() has been renamed to returnToPrevious() to avoid conflict with Action::returnToArgs() which returns arguments to be passed to other actions as return-to arguments. All callers should now be updated.
More profile settings actions will now redirect through a login form if visited as a GET request, as would be expected from a bookmark, link sent in e-mail etc.
2010-05-20 14:24:44 -07:00
Brion Vibber
ad651c3535
Merge branch 'master' of gitorious.org:statusnet/mainline
2010-05-19 15:46:39 -07:00
Brion Vibber
223795a2e4
Add config option for RequireValidatedEmail plugin to skip the check for folks with a trusted OpenID association.
...
Also added an event that other plugins or local config can use to override the checks.
2010-05-19 15:45:46 -07:00
Zach Copley
8dd2924674
Hotpatch to add additional debug statements to FacebookPlugin's
...
facebook posting code.
2010-05-19 21:02:18 +00:00
Brion Vibber
c4203be9a4
Merge branch '0.9.x' into 1.0.x
2010-05-19 12:52:23 -07:00
Brion Vibber
7005ef6661
Merge branch 'testing' into 0.9.x
...
Conflicts:
plugins/OpenID/openidlogin.php
2010-05-19 12:51:25 -07:00
Brion Vibber
a39a934dd4
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-05-19 10:59:14 -07:00
Brion Vibber
74a89b1fc3
Locale switch cleanup: use common_switch_locale() which is safer for updating gettext state. Also moved a few calls to reduce chance of hitting an exception before switching back.
...
Should help with problems where xmppdaemon would get stuck in wrong locale.
2010-05-19 10:10:55 -07:00
Zach Copley
6187266205
- OStatusPlugin should return true if it doesn't need to handle source
...
attribution
- Remove stray break statement from NoticeList
2010-05-18 15:16:03 -07:00
Brion Vibber
7c828ae5f8
OpenID access control options: trusted provider URL, Launchpad team restrictions. Added an admin panel for setting these and OpenID-only mode, off by default.
...
To enable the admin panel:
$config['admin']['panels'][] = 'openid';
Or to set them manually:
$config['openid']['trusted_provider'] = 'https://login.ubuntu.net/ ';
$config['openid']['required_team'] = 'my-project-cabal';
$config['site']['openidonly'] = true;
OpenID-only mode can still be set from addPlugin() parameters as well for backwards compatibility.
Note: if it's set there, that value will override the setting from the database or config.php.
Note that team restrictions are only really meaningful if a trusted provider is set; otherwise,
any OpenID server could report back that users are members of the given team.
Restrictions are checked only at OpenID authentication time and will not kick off people currently
with a session open; existing remembered logins may also survive these changes.
Using code for Launchpad team support provided by Canonical under AGPLv3, pulled from r27 of
WordPress teams integration plugin:
https://code.edge.launchpad.net/~canonical-isd-hackers/wordpress-teams-integration/trunk
2010-05-18 13:28:41 -07:00
Brion Vibber
b77878f467
Include notice fragment on 'in context' links in Realtime plugin family.
2010-05-17 19:47:44 +00:00
Brion Vibber
e36df29212
Patch from g0: fix for conversation links in Realtime updates
...
Previously was using the reply-to URL, which didn't match with other displays.
Now sends to the right conversation page.
2010-05-17 19:37:47 +00:00
James Walker
1999b836c0
accept either salmon endpoint (until they're unified in the spec)
2010-05-14 16:43:41 -04:00
James Walker
275002d88a
allow hyphens in subdomains for webfinger addresses
2010-05-14 16:43:41 -04:00
Brion Vibber
91367dbc21
Merge branch '0.9.x' into 1.0.x
2010-05-14 12:15:13 -07:00
Brion Vibber
065ecc5573
Merge branch 'testing' into 0.9.x
2010-05-14 12:14:02 -07:00
Brion Vibber
5d0593ec34
Fix keys() / keyTypes() mixup in SamplePlugin
2010-05-12 11:09:37 -07:00
Siebrand Mazeland
f430480ddd
Update pot and add Dutch translation
2010-05-09 00:37:47 +02:00
Siebrand Mazeland
bbefcc104e
Tweaks for DirectionDetector:
...
* remove trailin whitespace
* update use of capital letters
* fix a few typos in comments
* add translator documentation
2010-05-09 00:36:52 +02:00
Brion Vibber
d9c1ac9053
Merge branch '0.9.x' into 1.0.x
2010-05-06 18:49:01 -07:00
Brion Vibber
d57e1deaec
Merge branch 'testing' into 0.9.x
2010-05-06 18:48:39 -07:00
Brion Vibber
7915386950
Allow plugins to load their styles for mobile view; fixes bad realtime button layout
2010-05-07 01:28:37 +00:00
Zach Copley
ce177400f8
- OStatusPlugin should return true if it doesn't need to handle source
...
attribution
- Remove stray break statement from NoticeList
2010-05-06 21:48:12 +00:00
Brion Vibber
5996d80c09
Ticket #2184 : recognize Palm Pre / WebOS browsers for MobileProfile
...
One-line addition of 'webos' to the keywords list.
2010-05-06 21:29:04 +00:00
Brion Vibber
173778eab1
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
lib/xmppmanager.php (resolved: code has moved to XmppPlugin.php)
2010-05-05 17:11:23 -07:00
Brion Vibber
e05415f621
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
locale/ca/LC_MESSAGES/statusnet.po
locale/de/LC_MESSAGES/statusnet.po
locale/statusnet.pot
2010-05-05 17:07:50 -07:00
Brion Vibber
ddc7811a7b
Move XMPPHP from core extlibs to Xmpp plugin extlibs
2010-05-05 16:52:31 -07:00
Brion Vibber
8260a88f41
Quick fix for DirectionDetector: only apply <span class="rtl"> once; if it's already there in an incoming message (eg via OStatus), don't reapply it.
...
Modified from patch from Everplays
2010-05-05 11:28:05 -07:00
Brion Vibber
60825ba535
Clean up reference usage warnings in DirectionDetector plugin
2010-05-05 10:51:05 -07:00
Brion Vibber
5f5d9518bd
Avoid spewing giant debug backtrace into exception in certain OStatus subscription failure cases.
...
The code pattern 'new XXXException($e)' to chain exceptions doesn't actually work as intended, as exceptions are actually expecting a string message here.
This caused an implicit string conversion from HTTP_Request2_Exception, which is a PEAR_Exception, which defines an absurdly detailed __toString() method including a giant HTML table with a backtrace if you happen to be on a web request.
Simply passing $e->getMessage() instead clears this up, as we'll get the nice short message like 'Couldn't connect to tcp://blahblah:80'
2010-05-04 17:11:43 -07:00
Craig Andrews
ecf9dc6d1b
use the new maxNoticeLength and maxUrlLength functionality introduced in commit 14adb7cc41
2010-05-03 21:25:10 -04:00
Brion Vibber
67eeaa9cf4
Pull localization updates from 0.9.x branch
2010-05-03 12:27:44 -07:00
Brion Vibber
5414396a2e
IM cleanup on 1.0.x branch:
...
* Fake_XMPP back to Queued_XMPP, refactor how we use it and don't create objects and load classes until we need them.
* fix fatal error in IM settings while waiting for a Jabber confirmation.
* Caching fix for user_im_prefs
* fix for saving multiple transport settings
* some fixes for AIM & using normalized addresses for lookups
2010-04-30 15:29:05 -07:00
Brion Vibber
e3e90b4c27
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-04-30 14:08:35 -07:00
Siebrand Mazeland
7ec5e7cd76
Update translator documentation for OpenID plugin.
2010-04-30 23:07:19 +02:00
Brion Vibber
cae1329f3b
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
lib/util.php
2010-04-30 13:16:13 -07:00
Siebrand Mazeland
193fdd8071
Update Dutch translation for OpenID plugin.
2010-04-30 02:17:30 +02:00
Siebrand Mazeland
83dcdf3b08
Re-add OpenID/locale/nl/LC_MESSAGES/OpenID.po which was accidentally removed in Commit:d811f14bedc260adcfdd0eb8216eba06e9610144
...
Signed-off-by: Siebrand Mazeland <s.mazeland@xs4all.nl>
2010-04-30 02:01:55 +02:00
Siebrand Mazeland
d811f14bed
Remove .po source files. Using pot files.
2010-04-30 01:57:22 +02:00
Siebrand Mazeland
5ad2d0c30c
Update gettext localisation files.
2010-04-30 01:45:54 +02:00
Brion Vibber
ae2986527c
Pull localization updates from 0.9.x
2010-04-29 15:52:10 -07:00
Brion Vibber
2260d6ec7c
Merge branch 'testing' into 0.9.x
...
Conflicts:
index.php
2010-04-29 15:14:51 -07:00
Craig Andrews
edc6cf39a0
Only shorten when notice length exceeds max length
2010-04-26 15:59:13 -04:00
Evan Prodromou
5c05cd2b1a
Merge branch '1.0.x' of gitorious.org:statusnet/mainline into 1.0.x
2010-04-26 02:43:33 -04:00
Evan Prodromou
14adb7cc41
Give users more control over URL shortening
...
Users and administrators can set how long an URL can be before it's
shortened, and how long a notice can be before all its URLs are
shortened. They can also turn off shortening altogether.
Squashed commit of the following:
commit d136b39011
Author: Evan Prodromou <evan@status.net>
Date: Mon Apr 26 02:39:00 2010 -0400
use site and user settings to determine when to shorten URLs
commit 1e1c851ff3
Author: Evan Prodromou <evan@status.net>
Date: Mon Apr 26 02:38:40 2010 -0400
add a method to force shortening URLs
commit 4d29ca0b91
Author: Evan Prodromou <evan@status.net>
Date: Mon Apr 26 02:37:41 2010 -0400
static method for getting best URL shortening service
commit a9c6a3bace
Author: Evan Prodromou <evan@status.net>
Date: Mon Apr 26 02:37:11 2010 -0400
allow 0 in numeric entries in othersettings
commit 767ff2f7ec
Author: Evan Prodromou <evan@status.net>
Date: Mon Apr 26 02:36:46 2010 -0400
allow 0 or blank string in inputs
commit 1e21af42a6
Author: Evan Prodromou <evan@status.net>
Date: Mon Apr 26 02:01:11 2010 -0400
add more URL-shortening options to othersettings
commit 869a6be0f5
Author: Evan Prodromou <evan@status.net>
Date: Sat Apr 24 14:22:51 2010 -0400
move url shortener superclass to lib from plugin
commit 9c0c9863d5
Author: Evan Prodromou <evan@status.net>
Date: Sat Apr 24 14:20:28 2010 -0400
documentation and whitespace on UrlShortenerPlugin
commit 7a1dd5798f
Author: Evan Prodromou <evan@status.net>
Date: Sat Apr 24 14:05:46 2010 -0400
add defaults for URL shortening
commit d259c37ad2
Author: Evan Prodromou <evan@status.net>
Date: Sat Apr 24 13:40:10 2010 -0400
Add User_urlshortener_prefs
Add a table for URL shortener prefs, a corresponding class, and the
correct mumbo-jumbo in statusnet.ini to make everything work.
2010-04-26 02:40:36 -04:00
Brion Vibber
dd7b95c2cf
Merge branch 'master' into testing
2010-04-23 14:26:57 -07:00
Brion Vibber
9c8052e755
Rerun feed discovery and update the feed, salmon, and hub for the given OStatus remote profile. Restarts subscription fresh as well.
...
update-profile.php -sexample.com http://example.com/path/to/profile/url
2010-04-23 12:54:31 -07:00
Brion Vibber
4beaba9fb0
Ticket #93 : pretty up the auto-submit for OpenID logins a bit.
...
* throwing in our spinner
* cleanup of texts
* "If this doesn't go through click the button" instead of just a mystery button
* slightly faster submission: immediate at end of page rather than waiting for jQuery to confirm document setup completion
2010-04-23 11:28:50 -07:00
Craig Andrews
1de8877cad
Shorten text after paste operation
...
Abort ajax shorten request if the user pastes/pushes another key
2010-04-23 12:14:55 -04:00
Brion Vibber
0f975f4215
Fix to regression in last commit; wrong field name for homepage blacklist
2010-04-23 08:24:53 -07:00
Brion Vibber
390a2a8624
Fix for Blacklist plugin: was saving an empty entry if blacklist was empty, which would match *all* possible nickname registrations, preventing all registration on mozilla.status.net.
...
Now saving only non-empty lines, and only matching non-empty lines so we don't fail if we still have a bogus entry.
2010-04-23 07:17:52 -07:00
Brion Vibber
67b8b1334f
Fix keys / keyTypes for Blacklist plugin - was spewing notices for undefined array indexes when saving blacklist entries from admin panel
2010-04-23 07:10:36 -07:00
Craig Andrews
f91e992851
use onAutoload instead of always requiring
2010-04-22 18:04:03 -04:00
Craig Andrews
809e597841
Only shorten after the user presses space, or following a paste operation
2010-04-22 18:04:03 -04:00
Brion Vibber
fd9d520aeb
OStatus: CLI script to force a renewal on the given PuSH subscription. May help when we get out of sync with the hub.
...
php plugins/OStatus/scripts/resub-feed.php -smysite http://example.com/some/atom/feed
2010-04-22 06:14:40 +02:00
Evan Prodromou
a129c455a2
Fix exceptions with bad gravatar URLs
2010-04-21 18:19:16 -07:00
Evan Prodromou
e28214bfe9
fix reference error in RSSCloud plugin
2010-04-21 18:11:29 -07:00
Craig Andrews
65796ba03b
add ClientSideShortenPlugin
...
see plugins/ClientSideShorten/README
2010-04-21 17:14:54 -04:00
Brion Vibber
056cce4b5e
Merge branch 'testing' into 0.9.x
2010-04-19 19:46:46 +02:00
Brion Vibber
2af12774bf
Merge branch 'master' into testing
2010-04-19 19:46:11 +02:00
Brion Vibber
acea534044
Disable the send-notice form at the top of the page OStatus subscription confirmation page to work around bugs in Cloudy theme.
...
This is really just a hack for the broken CSS in the Cloudy theme, I think; copying from other non-notice-navigation pages that do this as well. There will be plenty of others also broken.
2010-04-19 19:45:01 +02:00
Craig Andrews
39392e03a7
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/confirmaddress.php
actions/imsettings.php
2010-04-18 19:21:15 -04:00
Craig Andrews
23bad16bba
don't attempt to read a user's ldap password
2010-04-17 15:09:56 -04:00
Brion Vibber
c748933132
Merge branch 'testing' into 0.9.x
2010-04-14 15:59:12 +02:00
Brion Vibber
c95bff7744
Merge branch 'master' into testing
2010-04-14 15:58:42 +02:00
Brion Vibber
efcdfabc12
Ticket #2205 : pass geo locations over Twitter bridge (will only be used if enabled on the Twitter side)
2010-04-14 15:45:00 +02:00
Siebrand Mazeland
2bb02e8698
Adding Dutch translation for OpenID plugin.
2010-04-12 00:57:02 +02:00
Brion Vibber
756dd15515
i18n cleanup: fix bad string breakdown in license agreement checkbox on registration form.
...
Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.
2010-04-09 10:12:23 -07:00
Brion Vibber
4b20d68c48
i18n cleanup: fix bad string breakdown in license agreement checkbox on registration form.
...
Note that much of that form is duplicated several times for Twitter, Facebook, and OpenID registrations -- these need to be refactored to avoid having multiple out-of-sync copies of code and messages.
2010-04-09 10:11:11 -07:00
Brion Vibber
db497e80e8
Initial version of everplay's RTL direction detector plugin, sets initial direction correctly for primarily RTL notices within an LTR site layout.
2010-04-09 09:24:10 -07:00
Brion Vibber
13e8214a67
Initial version of everplay's RTL direction detector plugin, sets initial direction correctly for primarily RTL notices within an LTR site layout.
2010-04-09 09:22:33 -07:00
Brion Vibber
1f8451f4aa
Merge branch 'testing' into 0.9.x
2010-04-09 08:40:15 -07:00
Craig Andrews
fc1a463b95
Redirect using HTTP 303 so that form POST data is not re-submitted to the destination page
2010-04-08 17:20:24 -04:00
Brion Vibber
ee438cf198
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-04-08 10:16:55 -07:00
Brion Vibber
ecd31384ed
Fix for error during handling of HTTP error response case in Geonames lookups
2010-04-08 10:11:52 -07:00
Brion Vibber
8a02cad424
drop onStartShowHeadElements handler from MobileProfile; just duplicated the original code path, and after removing the bogus notice-spewing code it was running those things twice.
2010-04-08 10:09:56 -07:00
Evan Prodromou
727ea5a516
Merge branch '0.9.x' into 1.0.x
2010-04-07 10:47:29 -04:00
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
878461d50d
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 23:32:04 +00: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
2f4438fe24
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
actions/imsettings.php
lib/jabber.php
Made a quick attempt to merge the new JID validation into the XmppPlugin, have not had a chance to test that version live yet.
Should also move over the test cases.
2010-04-02 15:56:25 -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
01a03e34c8
Merge branch '0.9.x' into 1.0.x
2010-03-29 15:15:51 -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
e3a46d2b83
Merge branch '0.9.x' into 1.0.x
2010-03-26 09:18:07 -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
c3ceaa893f
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
2010-03-24 14:11:01 -07: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
James Walker
10410907a0
A bit safer checking in the keypair parsing
2010-03-24 14:27:35 -04:00
Zach Copley
7b1b6045e6
Look for the first object in the Activity
2010-03-24 00:00:55 -07:00
Julien C
a3da5b24c9
Misc small fixes, plus a new hook in tag.php
2010-03-23 23:02:17 -04:00
Craig Andrews
1f73156dae
Move the bundled Net/LDAP2 library to the LdapCommon directory
2010-03-23 21:57:47 -04:00
Brion Vibber
fcf86b4fdf
Improve legibility of OStatus remote tests output
2010-03-23 18:56:40 -07:00
Craig Andrews
6b538cd9b3
Fix some regressions caused by refactor of LDAP plugin
2010-03-23 21:50:31 -04:00
Brion Vibber
9380eed794
add a general PuSHed post and an @-reply back to a subscribee by name to OStatus remote test cases
2010-03-23 18:44:54 -07:00
Nick Holliday
d9dcdf5b49
Converts Spotify URI/HTTP Links to pretty ones.
2010-03-23 21:31:58 -04:00
Brion Vibber
2ae61307bb
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-23 14:20:14 -07:00
Brion Vibber
df8c9090c0
Add basic subscribe/unsubscribe test to OStatus test cases
2010-03-23 14:19:12 -07:00
Brion Vibber
5f32cf32cd
Don't spew XML parse warnings to output when checking a remote XRD page
2010-03-23 14:18:45 -07:00
Evan Prodromou
ad608ab9ad
prevent password login actions in OpenID-only mode
2010-03-23 12:58:10 -04:00
Evan Prodromou
ff60cb4e66
start making OpenID-only mode work
2010-03-23 12:10:26 -04:00
Evan Prodromou
fcdbf421ab
reformat OpenIDPlugin for PHPCS
2010-03-23 11:36:02 -04:00
Brion Vibber
a5c78a6f1a
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-23 08:21:32 -07:00
Zach Copley
5b0b6097e0
Fix reference. Look at the first ActivityObject in the list.
2010-03-22 21:48:21 -07:00
Zach Copley
b8e97ac709
Some initial media parsing
...
- Activity now returns a list of activity objects
- Processing of photo objects
2010-03-22 18:55:17 -07:00
Brion Vibber
68a5fba248
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-22 17:08:05 -07:00
Brion Vibber
3678e7b89b
OStatus remote sending test cases. Doesn't actually run within PHPUnit right now, must be run from command line -- specify base URLs to two StatusNet sites that will be able to communicate with each other.
...
Current test run includes:
* register accounts (via web form)
* local post
* @-mention using path (@domain/path/to/user)
Subscriptions, webfinger mentions, various paths to subscription and unsubscription, etc to come.
2010-03-22 17:01:50 -07:00
Brion Vibber
e89908f261
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 1.0.x
...
Conflicts:
lib/channel.php
scripts/imdaemon.php
2010-03-22 13:56:16 -07:00
Craig Andrews
eb563937df
Need to pass the password parameter to checkPassword
2010-03-22 16:04:24 -04:00
Brion Vibber
26f49de0dd
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
lib/attachmentlist.php
2010-03-22 12:37:45 -07:00
Brion Vibber
27bfd1211d
Math_BigInteger doesn't correctly handle serialization/deserialization for a value of 0, which can end up spewing notices to output and otherwise intefering with Salmon signature setup and verification when using memcached.
...
Worked around this with a subclass that fixes the wakeup, used for the stored 0 value in the subclassed Crypt_RSA.
2010-03-22 12:17:45 -07:00
Brion Vibber
3bb639699c
Confirm there's actually user and domain portions of acct string before assigning things from output of explode(); avoids notice message when invalid input passed to main/xrd
2010-03-22 11:27:39 -07:00
Craig Andrews
295e05ea39
Refactor common parts of LdapAuthorization and LdapAuthentication plugins into a separate class
...
LdapAuthorization should get a performance improvement as LDAP schema caching is now used
2010-03-22 14:17:58 -04:00
James Walker
a20880ee1e
Fixing HTTP Header LRDD parsing (sites in subdirectories need this)
2010-03-22 13:45:13 -04:00
Sean Carmody
c810f24851
Added plugin AutoSandbox for spam-management: new users sandboxed by default
2010-03-22 17:18:43 +00:00
Evan Prodromou
edee1fc09e
ignore unrecognized object types
2010-03-22 08:17:14 -04:00
Craig Andrews
5cd8679961
Fix stupid typo in ldap authorization debug logging
2010-03-21 20:28:33 -04:00
Brion Vibber
be7efe7504
Merge branch 'testing' into 0.9.x
2010-03-21 16:28:56 -07:00
Brion Vibber
fcb614d0eb
Pull <atom:author> info as well as <activity:actor> when we have an old-style ActivityStreams feed. This fixes subscription setup for Cliqset feeds, which currently have a bogus activity:actor/atom:id but a good atom:author/atom:uri
2010-03-21 16:25:12 -07:00
Brion Vibber
b228da628d
Accept 'tag' and other non-http id URIs in Ostatus_profile::getActivityObjectProfileURI().
...
(If there's not a valid ID we fall back to the link, which we do still validate as http/s.)
2010-03-21 15:46:28 -07:00
Evan Prodromou
8f071b2818
scrub magic quotes from HTML in TinyMCE
2010-03-21 17:41:37 -05:00
Evan Prodromou
dfa785e9ae
save the data from TinyMCE
2010-03-21 17:41:37 -05:00
Evan Prodromou
7c7d42b5f1
enable tinymce editor
2010-03-21 17:41:37 -05:00
Brion Vibber
5d3bce49b8
OStatus profile setup cleanup
...
* drop OStatusPlugin::localProfileFromUrl(), we can just look up on user.uri
* clean up a few edge cases that returned null through Ostatus_profile::ensure* code paths, now throws clear exception when we can't find a feed from the given profile url
* add some doc comments on the ensure* methods
2010-03-21 15:18:37 -07:00
Evan Prodromou
0f1f7ab79b
only use Posterous author data if it matches the profile URL
2010-03-21 07:37:58 -05:00
Evan Prodromou
c2afdfbbf5
use Posterous element if available for RssChannel discovery
2010-03-20 17:18:55 -05:00
Evan Prodromou
e458e9fe63
Merge branch 'testing' into 0.9.x
...
Conflicts:
lib/activity.php
2010-03-20 16:11:42 -05:00
Evan Prodromou
fb2b45c68a
use feedEl for discovery
2010-03-20 09:46:22 -05:00
Evan Prodromou
515acb8513
fall back to summary or title if content not available
2010-03-20 09:30:57 -05:00
Evan Prodromou
25cb917523
Allow PuSH posts without author information
...
Superfeedr (sp.?) posts entries without author information. We can
assume that this is intended to be by the original author.
Re-structured the checks for entries that come in by PuSH so they can
either have no author or an empty author, but not a different author.
2010-03-20 08:25:56 -05:00
Evan Prodromou
f558508784
handle RSS as well as Atom in Ostatus push hits
2010-03-20 07:23:13 -05:00
Evan Prodromou
c0f6572001
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-20 06:44:55 -05:00
Evan Prodromou
51283a1b34
try to make a nickname from the user profile url before using the URI
2010-03-20 06:44:38 -05:00
Brion Vibber
db0cf50f65
Avoid notices for accessing undefined array indices in hcard processing
2010-03-19 15:54:54 -07:00
Brion Vibber
a02e5b302b
Avoid notices for accessing undefined array indices in hcard processing
2010-03-19 15:54:16 -07:00
Brion Vibber
7e2af3dcae
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
2010-03-19 15:51:22 -07:00
Brion Vibber
c84c4c6839
OStatus: be a little laxer about attempts to start/stop PuSH subscriptions that were left in an inconsistent state.
...
Instead of aborting, we'll try to reconfirm the sub/unsub, which once confirmed will replace whatever the previous state was on the server side.
2010-03-19 15:47:43 -07:00
Brion Vibber
79ec565104
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-19 15:29:00 -07:00
Evan Prodromou
db9e57f761
ensure from an RSS channel
2010-03-19 15:50:06 -05:00
Evan Prodromou
5092f98c0d
return empty hints if no hcard in the html
2010-03-19 15:28:06 -05:00
Evan Prodromou
1e03968d91
define a 'root' attribute for the channel or feed
2010-03-19 15:23:30 -05:00
Brion Vibber
b97400bd6f
clarify output on fixup-shadow.php
2010-03-19 11:17:56 -07:00
Zach Copley
f0c54243ba
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Validate OStatus avatar URL before fetching.
2010-03-19 10:38:54 -07:00
Brion Vibber
3d1c99c258
Merge branch 'ostatus-crop' of git@gitorious.org:~brion/statusnet/brion-fixes into 0.9.x
2010-03-19 10:27:03 -07:00
Brion Vibber
d2e6664132
Validate OStatus avatar URL before fetching.
2010-03-19 10:16:12 -07:00
Brion Vibber
9e3e1d3d56
Validate OStatus avatar URL before fetching.
2010-03-19 10:15:00 -07:00
Zach Copley
fb50a2d83c
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Parse RSS items as activities
Remove hkit and do our own hcard parsing
Work around weird bug with HTML normalization via PHP DOM module; if source had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved.
2010-03-19 10:08:47 -07:00
Evan Prodromou
ac609e8040
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
...
Conflicts:
plugins/OStatus/extlib/hkit/hkit.class.php
plugins/OStatus/lib/discoveryhints.php
2010-03-18 20:57:38 -05:00
Evan Prodromou
17c50f338c
Remove hkit and do our own hcard parsing
...
Parsing hcards for the data we need wasn't hard enough to justify using
hkit. It was dependent on a number of external systems (something to
run tidy), and only could handle XHTML.
We now parse HTML with the PHP dom libraries used elsewhere, and
scrape out our own hcards. Seems to work nicer and faster and most of
all works with Google Buzz profile URLs.
2010-03-18 20:52:00 -05:00
Brion Vibber
4a6c9e4451
Work around weird bug with HTML normalization via PHP DOM module; if source had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved.
2010-03-18 17:57:58 -07:00
Brion Vibber
08faff2278
Work around weird bug with HTML normalization via PHP DOM module; if source had xmlns and xml:lang I ended up with double output, breaking the subsequent parsing. Will have to track this down later and report upstream if not already resolved.
2010-03-18 17:55:21 -07:00
Brion Vibber
3e2e88b0df
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-18 17:19:28 -07:00
Zach Copley
a6c9445f0d
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
OStatus discover fixes:
Remove xpm support (no one really uses it, and IMAGETYPE_XPM is undefined, causing warnings)
Fix notice warning about unused var -- was renamed during refactoring.
2010-03-18 17:11:06 -07:00
Brion Vibber
1301877dfe
OStatus discover fixes:
...
* Subscription::start was sometimes passing users instead of profiles to hooks, which broke OStatus subscription notifications; now normalizing to profiles for processing.
* H-card parsing would trigger a lot of PHP warnings and notices in hKit. Now suppressing warnings and notices for the duration of the call to keep them out of output when display_errors is on.
* H-card parsing would trigger a PHP fatal error if the source page was not well-formed XML and Tidy was not present on the system. Switched normalization to use the PHP DOM module which is always present, as we have no need for Tidy's extra features here.
* Trying to fetch avatars from Google profiles failed and triggered a PHP warning due to the relative URL not being resolved during h-card parsing. Now passing profile page URL into hKit by sneaking a <base> tag in while we normalize the HTML source.
* Profile pages without a "Link" header could trigger PHP notices due to a bad NULL -> array(NULL) conversion in LinkHeader::getLink(). Now checking that there was a return value before converting single return value into array.
2010-03-18 17:08:19 -07:00
Zach Copley
051bee988c
Minor syntax err in TwitterBridge README example
2010-03-18 17:00:37 -07:00
Brion Vibber
c8e3d08a8f
Fix notice warning about unused var -- was renamed during refactoring.
2010-03-18 15:11:25 -07:00
Brion Vibber
cac9d23498
Fix for xmpp/sms notification options appearing to be disabled on new subscriptions.
...
Base problem is that our caching-on-insert interferes with relying on column default values; the cached object is missing those fields, so they appear to be empty (null) when the object is retrieved from cache.
Now explicitly setting them when inserting subscriptions, and cleaned up some code that had alternate code paths.
May also have made auto-subscription work for remote OStatus subscribers, but can't test until magic sigs are working again.
2010-03-18 14:26:32 -07:00
Brion Vibber
f1b3d84b7d
Fix some remote subscription regressions from f21f78364a
...
Ostatus_profile::ensureProfile() has been renamed to Ostatus_profile::ensureProfileURL()
2010-03-18 13:13:57 -07:00
Brion Vibber
1de7badd78
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-18 10:55:20 -07:00
Sarven Capadisli
052466ceab
Using … (hellip) instead of "more" for link text
2010-03-18 14:26:30 +01:00
Evan Prodromou
a764603e73
reverse order from delete, insert to insert, delete on ostatus conversion
2010-03-18 08:04:22 -05:00
Evan Prodromou
f1af583e3e
catch exceptions in OStatus updates, log, and continue
2010-03-18 07:55:14 -05:00
Sarven Capadisli
d8a533274f
Updated 'more' anchor for attachments to do an XHR GET
2010-03-18 00:19:32 +01:00
Brion Vibber
dc71833ce6
Add doc comments on saveHTMLFile; drop the extra <div> wrapping the contents to make it easier to extract without getting extra markup.
2010-03-17 15:49:10 -07:00
Brion Vibber
a9c731798e
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.
2010-03-17 14:16:43 -07:00
Brion Vibber
3a72c70b7e
When too-long messages come in via OStatus, mark the attachment link up as a "more" link in the HTML output, marked with class="attachment more" so JS code can fold it out smartly. Text output will still include the raw link.
2010-03-17 12:34:35 -07:00
Brion Vibber
67f2f01c5e
Merge branch 'testing' into 0.9.x
2010-03-17 12:15:40 -07:00
Evan Prodromou
4761c07ad8
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-17 09:38:39 -05:00
Evan Prodromou
f21f78364a
Change the workflow to get better discovery
...
Tried to re-structure the workflow of discovery to get more and richer
data and hints.
2010-03-16 11:25:18 -05:00
Jeffery To
8a9b3a858b
Fixed "Warning: syslog() expects parameter 1 to be long, string given"
...
With the FirePHP plugin enabled, I get these warnings in the output
page. This is because the StartLog handler inadvertly modifies the
original (number) priority with the corresponding (string) FirePHP
priority.
2010-03-16 11:44:51 -04:00
Brion Vibber
2b684f6954
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-15 14:39:14 -07:00
Brion Vibber
dfac4bfd09
Fix feed discovery: html:link@rel can contain multiple values; saw rel="updates alternate" in the wild at http://tantek.com/ which broke old discovery code.
2010-03-15 20:26:42 +00:00
Brion Vibber
c9232d8f26
Ticket #2242 : fix reading of inline XHTML content in Atom feeds for OStatus input.
...
Lookup of the <div> needed to check for the XHTML namespace.
2010-03-15 20:21:55 +00:00
Brion Vibber
c89e1865f7
Merge branch 'testing' into 0.9.x
2010-03-15 12:45:38 -07:00
James Walker
7aa49b5e87
use canonical user url in xrd
2010-03-15 15:17:31 -04:00
Sarven Capadisli
6e5e75f341
Updated plugin to open external links on a new window that are not
...
attachments
2010-03-14 14:06:14 -04:00
James Walker
85cf90cf0f
Performing & allowing host-meta discovery by http url (in addition to webfinger acct)
2010-03-13 18:35:00 -05:00
James Walker
99ca84e68e
changing keypair to text to hold a full 1024bit keypair
2010-03-13 15:46:54 -05:00
Brion Vibber
56402597dd
Throw a quick button label into ostatus .po file for french to test with
2010-03-13 12:19:07 -08:00
James Walker
9111c5c6fe
allow profile_url to be used in ostatus:attention
2010-03-13 14:36:51 -05:00
James Walker
135c0c8a7f
cleaning up key generation
2010-03-12 21:44:18 -05:00
James Walker
4e44cf906b
converting key generation to new crypt library
2010-03-12 20:02:00 -05:00
James Walker
520faaf67d
updating phpseclib to latest cvs - fixes a bunch of key generation issues
2010-03-12 20:01:34 -05:00
James Walker
c5bb41176e
converted toString to new crypt library
2010-03-12 19:42:48 -05:00
James Walker
23d44c7d59
converted sign, verify and fromString to new crypt lib
2010-03-12 19:34:45 -05:00
James Walker
41d2ff662c
Adding Crypt library from http://phpseclib.sourceforge.net/
2010-03-12 19:34:24 -05:00
James Walker
114f046691
removing deprecated PEAR Crypt_RSA
2010-03-12 18:50:00 -05:00
Brion Vibber
9e9ab23e1f
Fixes for updating indices, charset/collation and engine type on plugin-created tables.
...
Under MySQL, new tables will be created as InnoDB with UTF-8 (utf8/utf8_bin) same as core tables.
Existing plugin tables will have table engine and default charset/collation updated, and string columns will have charset updated, at checkschema time.
Switched from 'DESCRIBE' to INFORMATION_SCHEMA for pulling column information in order to get charset. A second hit to INFORMATION_SCHEMA is also needed to get table properties.
Indices were only being created at table creation time, which ain't so hot. Now also adding/dropping indices when they change.
Fixed up some schema defs in OStatus plugin that were a bit flaky, causing extra alter tables to be run.
TODO: Generalize this infrastructure a bit more up to base schema & pg schema classes.
2010-03-12 13:16:32 -08:00
Brion Vibber
4d7479dcbc
OpenID fixes:
...
- avoid notice spew when checking sreg items that weren't provided
- fix keys spec for user_openid, clears up problems with removing openid associations
- fix keys spec for user_openid_trustroot
2010-03-12 10:07:32 -08:00
Sarven Capadisli
ea7c1bab2e
Plugin to open up rel="external" links on a new window or tab
2010-03-12 11:13:05 -05:00
Sarven Capadisli
4c320872d9
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-11 16:39:07 -05:00
James Walker
512e511053
fix invalid separator in magic-public-key XRD and matching parsing.
2010-03-11 14:49:12 -05:00
James Walker
06612e35e4
remove hard-coded me:env check in magicenvelope
2010-03-11 14:49:12 -05:00
James Walker
89582e7226
base64_encode/decode -> base64_url_encode/decode
2010-03-11 14:49:12 -05:00
Brion Vibber
c6f09306b1
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-10 17:04:51 -08:00
Brion Vibber
66518df435
OStatus: reject attempts to create a remote profile for a local user or group.
...
Some stray shadow entries were ending up getting created, which would steal group posts from remote users.
Run plugins/OStatus/scripts/fixup-shadow.php for each site to remove any existing ones.
2010-03-10 17:00:05 -08:00
Brion Vibber
9b75e162c7
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-10 10:07:52 -08:00
Brion Vibber
69b2f19b6f
RequireValidatedEmailPlugin fixes: require email on registration form, tidy up i18n infrastructure.
2010-03-10 10:06:46 -08:00
Craig Andrews
9653cb9f0a
Fix error logging
2010-03-09 21:26:48 -05:00
Brion Vibber
8bf1b54abd
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-09 13:07:52 -08:00
Brion Vibber
32532c7c42
Merge branch 'commands' into testing
2010-03-09 13:05:51 -08:00
Brion Vibber
80a17387bf
Command input processing now has centralized places for looking up notice, user/profile, and group arguments.
...
OStatus plugin overrides these to allow using webfinger (user@example.com ), profile URL (http://example.com/user ) and bare profile URL (example.com/user) as arguments.
2010-03-09 13:03:32 -08:00
Brion Vibber
6c4ade4251
Merge branch 'testing' into 0.9.x
2010-03-09 11:27:53 -08:00
Brion Vibber
58192ad687
OStatus: fix exception thrown on HTTP error during feed discovery
2010-03-09 10:56:33 -08:00
Zach Copley
311da86762
Use canonical URL for notification in RSSCloud plugin
2010-03-09 11:08:07 +00:00
Zach Copley
d644f4148b
Merge branch 'master' of git@gitorious.org:statusnet/mainline
2010-03-09 11:07:42 +00:00
Zach Copley
7afad469c2
Use canonical URL for notification in RSSCloud plugin
2010-03-09 11:07:24 +00:00
James Walker
7214db14fe
wrong param order to strpos()
2010-03-09 01:24:21 -05:00
Craig Andrews
9466546705
On the OpenID settings page, allow users to remove trustroots.
2010-03-08 21:43:34 -05:00
Zach Copley
691c88bce8
Only allow RSSCloud subs to canonical RSS2 profile feeds
2010-03-08 23:12:15 +00:00
Zach Copley
f8c5996758
Only allow RSSCloud subs to canonical RSS2 profile feeds
2010-03-08 23:11:52 +00:00
Craig Andrews
714d920fae
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
classes/statusnet.ini
db/statusnet.sql
lib/jabber.php
lib/xmppmanager.php
2010-03-08 17:22:23 -05:00
Craig Andrews
51a245f18c
Added Memcached plugin (using pecl/memcached versus pecl/memcache)
2010-03-08 17:17:37 -05:00
Brion Vibber
42463e160d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-08 13:37:45 -08:00
Jeffery To
3f696ff0ed
ldap_get_connection() to return null when passed a config with bad user/pw.
...
This mainly affects login; before if the user enters a valid username
but invalid password, ldap_get_connection() throws an
LDAP_INVALID_CREDENTIALS error. Now the user sees the regular
"Incorrect username of password" error message.
2010-03-08 13:14:41 -05:00
Brion Vibber
5355c3b7b5
OpenID fix:
...
- avoid notice on insert (missing sequenceKeys())
- avoid cache corruption on delete (user_id was missing from keys list, cache not cleared for user_id lookups)
2010-03-05 15:00:27 -08:00
Brion Vibber
89e313e45b
OStatus fix: send the feed's root element, not the DOM document, down to low-level feed processing as entry context on PuSH input.
2010-03-05 10:55:07 -08:00
root
982edc653f
Another typo
2010-03-04 23:30:36 -05:00
Zach Copley
b8001ea107
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-05 03:56:04 +00:00
Zach Copley
e3c4b0c85d
A better way to safely delete Foreign_links
2010-03-05 03:55:56 +00:00
Zach Copley
6aac7cc6cd
Fix for errant deletion of all Twitter foreign_links
2010-03-05 03:55:39 +00:00
Zach Copley
6a377a4ba4
A better way to safely delete Foreign_links
2010-03-05 03:14:40 +00:00
Zach Copley
029b8c9014
Fix for errant deletion of all Twitter foreign_links
2010-03-05 02:27:01 +00:00
Brion Vibber
2f41e93339
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-04 14:44:38 -08:00
Sarven Capadisli
a4ec64ff45
Slight right alignment for remote button in minilists
2010-03-04 13:43:28 -05:00
Brion Vibber
7bd0b8e17e
Pull latest .po files from 0.9.x to testing
2010-03-04 10:20:10 -08:00
Brion Vibber
f969d6349c
Merge branch 'testing' into 0.9.x
...
Conflicts:
db/08to09.sql
2010-03-04 10:16:59 -08:00
Brion Vibber
a6a056026d
Dropping the earlier PubSubHubbub plugin; OStatus plugin is taking that portion over (with both internal and external hub options for user and group feeds).
...
Todo: add support for other feeds to OStatus PuSH hub implementation.
2010-03-04 17:33:56 +00:00
Brion Vibber
8f1762cb95
OStatus: fix for remote group join via non-logged-in 'join' button.
...
Bad lookup was sending us to the first group instead of the selected group.
2010-03-04 09:24:47 -08:00
James Walker
45f11d9637
adding plugin version to OStatus
2010-03-04 12:02:44 -05:00
Brion Vibber
b218aee94e
Merge commit 'origin/testing' into 0.9.x
...
Conflicts:
lib/action.php
lib/adminpanelaction.php
2010-03-04 06:07:28 -08:00
James Walker
ddc4a7d2ff
Catch a previously uncaught exception and add some additional debug logs for signature verification
2010-03-04 01:46:34 -05:00
James Walker
9cbeac5695
Merge remote branch 'statusnet/testing' into testing
2010-03-04 01:31:19 -05:00
James Walker
849f5783c4
update xrd -> userxrd
2010-03-04 01:30:15 -05:00
Sarven Capadisli
b97ac60209
Changed text for authorizing/confirming remote profile
2010-03-03 23:47:27 -05:00
Sarven Capadisli
f54fa6b10b
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 23:36:05 -05:00
Sarven Capadisli
38503096d9
Puts All groups and Remote sub button in the mini list on the same line
2010-03-03 23:34:48 -05:00
James Walker
1c8399fde1
refactor xrd to allow for ownerxrd - xrd document for the site owner.
...
introduced $config['webfinger']['owner'] for a custom xrd subject
2010-03-03 23:20:30 -05:00
Sarven Capadisli
239750aa00
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 22:58:28 -05:00
Sarven Capadisli
de687d00c0
Updated OStatus subscription error messages to be more user friendly.
...
Hopefully.
2010-03-03 22:56:50 -05:00
Brion Vibber
24835c1164
OStatus: catchable exception instead of fatal when parsing valid XML that isn't a valid XRD doc
2010-03-03 18:31:35 -08:00
Brion Vibber
14065ca350
OStatus: code cleanup on webfinger fallback path
2010-03-03 18:28:39 -08:00
Brion Vibber
a4d9171306
Fix up catching of webfinger setup fails
2010-03-03 18:23:28 -08:00
Sarven Capadisli
6a5a629afa
Updated label and note text for user and group remote subscribe forms
2010-03-03 20:08:55 -05:00
Brion Vibber
9fadf8da11
Put all required field setup into AtomUserNoticeFeed and AtomGroupNoticeFeed, consolidating some code. (RSS feeds pulling title, logo etc from the Atom data structure so we don't dupe it.)
...
OStatus now calling the feed classes directly instead of faking a call into the API, should be less flakey.
2010-03-03 16:33:20 -08:00
Sarven Capadisli
b3969be85a
Updated remote subscribe button style in aside
2010-03-03 17:48:00 -05:00
Brion Vibber
628338265c
OStatus: fix up remote join button on group profiles
2010-03-03 14:06:05 -08:00
Brion Vibber
4bad176088
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 13:41:00 -08:00
Brion Vibber
a42d1116db
Separate the UI paths for ostatussub and ostatusgroup. They'll redirect to each other transparently if they find you've put a remote entity of the other type.
2010-03-03 13:40:26 -08:00
Sarven Capadisli
2a96d1d59d
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 16:27:19 -05:00
Sarven Capadisli
219e15ac64
Returning true instead for group remote subscription. If not logged
...
in, it gives the chance to use the logged in join/leave instead.
2010-03-03 16:26:02 -05:00
Zach Copley
339b0b0a4d
Don't expose global Twitter consumer key and secret, because that would be idiotic.
2010-03-03 13:05:11 -08:00
Sarven Capadisli
d3c1888256
Generalized style for remote subscription button
2010-03-03 15:31:16 -05:00
Sarven Capadisli
3c55edde39
Showing the remote subscribe button on the user groups page
2010-03-03 15:30:43 -05:00
Evan Prodromou
ccd0db1e0a
add remote subscribe button for not-logged-in users looking a profile list with local users in it
2010-03-03 14:32:03 -05:00
Sarven Capadisli
e6fd387c94
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 13:38:31 -05:00
Sarven Capadisli
023b9bb00f
Renamed subscribe button from New to Remote since it only does remote
...
subscriptions at the moment.
2010-03-03 13:30:14 -05:00
Zach Copley
a82cd89a97
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Using position relative only for the remote subscription in section
Added group subscription button to groups mini list
Added event hooks at the start and end of groups mini list
2010-03-03 10:28:45 -08:00
Zach Copley
61ada4558d
Fix for disappearing 'connect' menu if xmpp and sms are disabled.
...
All 'connect' menu panels used to be optional, so Action tried to
figure out what the first item on the 'connect' menu should be.
This is no longer necessary because we have the non-optional OAuth
client connections panel now, which is not optional and can't be
turned off.
2010-03-03 10:19:14 -08:00
Sarven Capadisli
7d7847295a
Using position relative only for the remote subscription in section
2010-03-03 13:17:00 -05:00
Sarven Capadisli
2c9887bce5
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 12:57:03 -05:00
Sarven Capadisli
c8bdf3cacb
Added group subscription button to groups mini list
2010-03-03 12:56:19 -05:00
Brion Vibber
f3cea24304
Fix for hcard parsing: typo caused notice spew accessing unset array index
2010-03-03 09:36:26 -08:00
Brion Vibber
9801c60bea
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-03 09:33:38 -08:00
Brion Vibber
1e63fda669
Clean up OStatus mentions finding; separate regexes keeps the code paths a bit clearer. Also switched to hitting HTTP profile first; as the common case it'll be faster.
2010-03-03 09:32:25 -08:00
Brion Vibber
ffa1931c9d
Avoid warning/notice spew in XRD parser. Not all DOM nodes are elements.
2010-03-03 09:31:14 -08:00
Sarven Capadisli
11750e832f
Added remote join action for group profile
2010-03-03 12:02:10 -05:00
Sarven Capadisli
ea10805e3f
Moved the remote subscription button to subscription mini list
2010-03-03 11:22:21 -05:00
Sarven Capadisli
1a4652b1ad
Changed label text for remote subscription to something similar. Given
...
that this button will be used within context of subscriptions, 'New'
works along with the '+' icon.
2010-03-03 10:32:54 -05:00
Craig Andrews
358556057a
Bump to phpCAS 1.1.0RC6
2010-03-02 23:25:34 -05:00
Zach Copley
f7ba5566bc
Make Facebook plugin look for API key and secret before doing anything
2010-03-02 18:27:37 -08:00
Zach Copley
32c08f53de
Show global key and secret, if defined, in Twitter bridge admin panel
2010-03-03 01:49:14 +00:00
Zach Copley
08422dfa17
Remove double word from Twitter bridge README
2010-03-02 16:53:53 -08:00
Zach Copley
9520c0996d
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: save file records for enclosures
Changed the geo location cookie Expire to Session.
2010-03-02 16:51:21 -08:00
Zach Copley
ca21f1da86
- Have Twitter bridge check for a global key and secret if it can't
...
find one in the local config
- Refuse to work at all if the consumer key and secret aren't set
2010-03-02 16:49:29 -08:00
Brion Vibber
79ffebb51b
OStatus: save file records for enclosures
...
Also stripping id from foreign HTML messages (could interfere with UI) and disabled failing attachment popup for a.attachment links that don't have a proper id, so you can click through instead of getting an error.
Issues:
* any other links aren't marked and saved
* inconsistent behavior between local and remote attachments (local displays in lightbox, remote doesn't)
* if the enclosure'd object isn't referenced in the content, you won't be offered a link to it in our UI
2010-03-02 16:36:08 -08:00
Brion Vibber
ddf3614c84
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into 0.9.x
2010-03-02 13:38:10 -08:00
Sarven Capadisli
e9c127ddd8
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 15:26:27 -05:00
Sarven Capadisli
1550d1004d
Don't need to float the anchor
2010-03-02 15:24:07 -05:00
Brion Vibber
72460091dd
Merge branch 'master' of git@gitorious.org:statusnet/mainline into testing
2010-03-02 12:21:48 -08:00
Craig Andrews
380439ba77
Redirect to main page when transparent SSO is in place for the CAS plugin (which is what the user expects)
2010-03-02 15:10:30 -05:00
Brion Vibber
b1ffbf17d3
Performance fix on Sphinx search results: use id instead of created timestamp for reverse date sorting; should give same result but doesn't trigger a filesort.
2010-03-02 12:06:40 -08:00
Sarven Capadisli
e3c2b8e0b5
Refactored remote subscribe action in OStatus
2010-03-02 12:41:18 -05:00
Sarven Capadisli
88c33bbb57
Showing remote subscription button on the personal timeline
2010-03-02 12:35:27 -05:00
Sarven Capadisli
5abff91041
Generalized style for entity remote subscription action
2010-03-02 12:34:35 -05:00
Sarven Capadisli
623faf9f2d
Just a label change. Since the user already went ahead with
...
subscribing, in this step we are just confirming the profile.
2010-03-02 09:57:28 -05:00
Zach Copley
9816b35063
Update Facebook plugin README with info about new admin panel
2010-03-02 00:38:00 -08:00
Zach Copley
40e1b249cf
Initial Facebook admin panel
2010-03-01 23:31:56 -08:00
Zach Copley
1df8c2a44d
Some wording / spelling fixes
2010-03-01 22:58:27 -08:00
Zach Copley
27a49361eb
- Make 'Sign in with Twitter' optional
...
- Updates to the Twitter bridge plugin README
2010-03-01 22:41:07 -08:00
Zach Copley
82c9714fca
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
High-priority OStatus fixes:
OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
2010-03-01 21:54:53 -08:00
Zach Copley
871b3aa6c0
Remove un-needed config variable for enabling/disabling Twitter integration
2010-03-01 21:52:31 -08:00
Zach Copley
6b2d67216e
Initial Twitter bridge admin panel
2010-03-01 21:35:24 -08:00
Brion Vibber
c38ed1bb19
High-priority OStatus fixes:
...
* PuSHing out to multiple client services could fail; only first callback got reached
* Correction for re-sub request to a known sub
2010-03-01 18:48:45 -08:00
Brion Vibber
680ace1966
High-priority OStatus fixes:
...
* PuSHing out to multiple client services could fail; only first callback got reached
* Correction for re-sub request to a known sub
2010-03-01 18:46:34 -08:00
Brion Vibber
e30af99873
Merge branch 'work' into testing
2010-03-01 16:57:58 -08:00
Brion Vibber
493b5479c1
OStatus: support @example.com/path/to/profile mentions as well as @profile@example.com (latter requires webfinger, former doesn't)
...
Plus misc warnings/notices cleanup in the submission path.
2010-03-01 16:43:36 -08:00
Brion Vibber
45e8819c1b
Fix a bunch of notice & warning-level messages that were breaking my inter-instance communications
2010-03-01 16:35:36 -08:00
Evan Prodromou
0512151eab
more output in updateostatus.php
2010-03-01 18:19:20 -05:00
Evan Prodromou
d77248343f
fix path for updateostatus.php
2010-03-01 18:03:17 -05:00
Evan Prodromou
3ff3abb247
Script to convert OMB subscriptions to OStatus subscriptions
2010-03-01 18:03:17 -05:00
Brion Vibber
3c4ead4996
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
...
Conflicts:
db/08to09.sql
locale/statusnet.po
scripts/update_po_templates.php
2010-03-01 14:59:26 -08:00
Brion Vibber
00f724d0e6
Localization tweak: include doc comments marked as 'TRANS' in .po file output; these should now get automatically pulled through to the TranslateWiki interface as translator help hints.
2010-03-01 14:10:13 -08:00
Craig Andrews
3bfe3345df
Use common_nicknamize() in better places.
2010-03-01 11:56:07 -05:00
Evan Prodromou
f00e8bbf47
Merge branch 'testing' into 0.9.x
2010-02-27 17:07:57 -05:00
Evan Prodromou
55f27feb78
Plugin to restrict too many registrations from one IP
...
We throttle registrations by IP. We record IP address of each
registration, and if too many registrations have been done by the same
IP address in the time interval, we reject the registration.
2010-02-27 15:05:08 -05:00
James Walker
831eb0d2b6
renaming sha256 to prevent conflict
2010-02-26 18:27:13 -05:00
James Walker
ee7603b09f
better return check in Magicsig::staticGet()
2010-02-26 17:53:27 -05:00
James Walker
1cf08c7ad7
MagicEnvelope::parse shouldn't be called statically
2010-02-26 17:09:50 -05:00
James Walker
6ee7660a58
should be sequenceKey (singular)
2010-02-26 16:51:50 -05:00
James Walker
0ecf435dc5
adding sequenceKeys() to magicsig
2010-02-26 16:50:00 -05:00
James Walker
c82cee1876
removing some extraneous debug logging
2010-02-26 16:26:04 -05:00
Craig Andrews
74bcc6929d
Show messaging on the login and registration forms informing users that they may use their LDAP credentials
2010-02-26 15:51:25 -05:00
James Walker
e4c462570f
move salmon posting to send application/magic-envelope+xml per http://salmon-protocol.googlecode.com/svn/trunk/draft-panzer-salmon-00.html#RPF
2010-02-26 15:39:58 -05:00
James Walker
f23a877cd8
Discovery::lookup now throws an exception
2010-02-26 15:39:58 -05:00
Brion Vibber
9b366547d7
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-26 12:33:50 -08:00
Brion Vibber
517fd54b65
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-26 12:33:36 -08:00
James Walker
223ebc765c
move signing to take a local actor profile and use local keys
2010-02-26 14:22:49 -05:00
James Walker
3a7eef1074
only put public keys in XRD
2010-02-26 14:22:49 -05:00
James Walker
bbb0a7d5bc
updating to use latest salmon NS definitions
2010-02-26 14:22:49 -05:00
Evan Prodromou
6781f95c73
Merge branch 'blacklistplus' into testing
...
Conflicts:
EVENTS.txt
2010-02-26 12:40:30 -05:00
Brion Vibber
8dfc8f1635
Merge branch 'testing' into 0.9.x
2010-02-26 09:35:28 -08:00
Evan Prodromou
c188ae15d9
Blacklist user nickname and password on delete
2010-02-26 12:29:28 -05:00
James Walker
ab8bb4d79e
more cleanup
2010-02-26 04:07:58 -05:00
James Walker
d1256b547f
bad merge.. cleaning up missing webfinger bits
2010-02-26 03:43:35 -05:00
James Walker
22062b665e
remove webfinger.php
2010-02-26 03:28:29 -05:00
James Walker
85b5b4b40a
Merge remote branch 'statusnet/testing' into testing
2010-02-26 03:27:40 -05:00
James Walker
84d0c865c4
salmon actually fetching remote keypairs
2010-02-26 03:25:51 -05:00
Zach Copley
e650794300
Remove unnecessary requires
2010-02-25 22:06:31 -08:00
James Walker
7c8031dc4b
Merge remote branch 'statusnet/testing' into testing
...
Conflicts:
plugins/OStatus/lib/webfinger.php
2010-02-25 23:49:45 -05:00
James Walker
855692141d
use a real keypair from discovery
2010-02-25 23:38:25 -05:00
James Walker
0afb09ad64
er. right.
2010-02-25 23:37:59 -05:00
Brion Vibber
02300ebfb0
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-25 19:52:19 -08:00
Brion Vibber
2528bb452b
OStatus: clean up known-URL hinting during profile setup, saves some extra HTTP hits we were getting when mentioning Buzz feeds.
2010-02-25 19:50:59 -08:00
Zach Copley
cf61f36e6b
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first)
info about discovery in Ostatus_profile::ensureWebfinger()
cache Web responses in Webfinger library
2010-02-25 18:57:12 -08:00
Zach Copley
d8d8d59a03
- Updates to use new activity object factories
...
- Prune obsolete feed creation method
2010-02-25 18:55:11 -08:00
Brion Vibber
2fa953da22
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-25 18:52:26 -08:00
Brion Vibber
2feb09f434
OStatus: pull best-sized avatar image (96x96 if found, otherwise largest, otherwise if none labeled takes the first)
2010-02-25 18:51:44 -08:00
Evan Prodromou
e197208a4a
info about discovery in Ostatus_profile::ensureWebfinger()
2010-02-25 21:07:52 -05:00
Evan Prodromou
a43598c31e
cache Web responses in Webfinger library
2010-02-25 21:07:24 -05:00
Evan Prodromou
c693365ae7
cache results of webfinger lookups
2010-02-25 20:29:52 -05:00
Evan Prodromou
1cae324555
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 19:59:01 -05:00
Evan Prodromou
894b221e8a
Parse an hcard for hints, if available
2010-02-25 19:58:51 -05:00
Evan Prodromou
cc0670791e
use new hcard method for webfinger
2010-02-25 19:58:18 -05:00
Evan Prodromou
36f02f459b
add hkit for hCard parsing
2010-02-25 19:11:39 -05:00
Zach Copley
82cac2be59
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
OStatus: if no <link> available and no profileurl hint passed in, use object id if it's an HTTP(S) URL. Fixes profile link for Google accounts.
Tweak common_url_to_nickname to take the last path component; fixes pulling nicks from Google profile pages (path is "/profile/<nickname>")
Fix bug on subscribe/unsubscribe in profile lists. Bogus call to nonexisting profile->getProfile() was masked by DB_DataObject
2010-02-25 16:07:32 -08:00
Zach Copley
7922edb5b6
Add lots of fun avatars to our Atom output
2010-02-25 16:06:49 -08:00
Brion Vibber
45435a7c03
OStatus: if no <link> available and no profileurl hint passed in, use object id if it's an HTTP(S) URL. Fixes profile link for Google accounts.
2010-02-26 00:01:22 +00:00
Evan Prodromou
4aa82f75ed
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-25 18:45:32 -05:00
Evan Prodromou
6578e0e1af
use new dedicated hcard method for Webfinger profile
2010-02-25 18:45:08 -05:00
James Walker
08413428a7
typo
2010-02-25 17:52:56 -05:00
James Walker
93f4f07c12
moving webfinger action to xrdaction
2010-02-25 17:52:18 -05:00
James Walker
5ae64a7adb
moving references to Webfinger to Discovery
2010-02-25 17:34:56 -05:00
James Walker
bd90ef9f66
replace webfinger usage in hostmeta.php
2010-02-25 17:26:10 -05:00
James Walker
b2dabe6a48
removing the webfinger lib
2010-02-25 17:12:46 -05:00
James Walker
3d0ba3efc8
adding a new, more generic "discovery" class that does LRDD disco
...
(rather than webfinger specific)
2010-02-25 17:09:54 -05:00
James Walker
5cb6e54bed
call-time pass by reference
2010-02-25 17:09:54 -05:00
James Walker
e62e49ed3b
adding some exception handling for magicenv parsing
2010-02-25 17:09:54 -05:00
Brion Vibber
b5b5184c88
OStatus: fix remote groups to work with new user_groups/local_groups split.
...
- fix <activity:subject> generation so we get the profile info (what's available so far)
- use id instead of nickname for group join/leave forms so we can join/leave remote groups
while the rest of the groups UI remains limited to local groups
(plugins are responsible for making sure remote notifications and permission checks are done)
- fix remote notification when joining group through OStatus's remote subscribe form
2010-02-25 13:02:08 -08:00
Craig Andrews
eb724bfdc8
Add TabFocus (for die-hard Twitter users) plugin
2010-02-25 15:34:01 -05:00
Brion Vibber
79c0d52daa
OStatus: save categories from the Atom entry as hashtags.
2010-02-25 11:26:33 -08:00
Brion Vibber
4a71753f20
Merge branch 'master' of gitorious.org:statusnet/mainline into testing
2010-02-25 09:28:19 -08:00
Brion Vibber
84fa3776e2
Merge commit 'refs/merge-requests/122' of git://gitorious.org/statusnet/mainline into integration
2010-02-25 09:14:42 -08:00
Sarven Capadisli
ffdcdbc198
Removed dangling icons in Realtime plugin
2010-02-25 13:55:06 +00:00
Sarven Capadisli
9ef7eb036c
Moved common icons from Realtime plugin to core icons file
2010-02-25 10:38:55 +00:00
Craig Andrews
489bd935eb
Make LDAP connection error fatal - there really is no way to recover from that.
2010-02-24 23:20:34 -05:00
Craig Andrews
bdf0dfc30d
Improve description of what the provide_name parameter means
2010-02-24 22:29:46 -05:00
Evan Prodromou
374c488cf1
return attachement from saveHTMLFile()
2010-02-24 22:26:40 -05:00
Evan Prodromou
b08a527139
content_* to common_*
2010-02-24 22:22:42 -05:00
Evan Prodromou
75cf4d4312
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 22:03:01 -05:00
Evan Prodromou
942521ef30
if OStatus post is too long, show the summary and save it as an HTML attachment
2010-02-24 22:02:43 -05:00
Brion Vibber
58e232a10a
OStatus: when finding webfinger @-replies, override a local profile match if found at the same location (eg @someguy vs @someguy@example.org)
...
Fixes inconsistent application of webfinger @-mentions in OStatus; once a local profile is set up the local name would often match first and ended up overriding in output.
2010-02-25 02:56:56 +00:00
Brion Vibber
b798faf9ea
OStatus: abort processing of this PuSH in item if we got an exception, rather than letting it be re-run.
2010-02-25 02:43:20 +00:00
Craig Andrews
c187bf5597
Merge branch '0.9.x' into 1.0.x
...
Conflicts:
EVENTS.txt
db/statusnet.sql
lib/queuemanager.php
2010-02-24 20:52:45 -05:00
Zach Copley
10884dcd49
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
...
* 'testing' of gitorious.org:statusnet/mainline:
Merge StatusNet core localization updates from 0.9.x branch
Fix update_po_templates.php to support the plural and context variants of _m() in plugins
Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
OStatus: handle update-profile Salmon pings
Revert "Updated jQuery Form Plugin from v2.17 to v2.36"
OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
2010-02-24 16:52:16 -08:00
Zach Copley
543ff40ef6
Populate more profile information when doing a remote subscribe
2010-02-24 16:51:24 -08:00
Brion Vibber
8914b69d50
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-24 16:35:57 -08:00
Brion Vibber
3b7084c6dd
Fix update_po_templates.php to support the plural and context variants of _m() in plugins
2010-02-24 16:34:45 -08:00
Brion Vibber
59be4b8cae
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-24 15:47:51 -08:00
Brion Vibber
e18e659ca3
Drop HTMLPurifier; we don't need its extra capabilities and we're already using htmLawed which is lighter-weight.
2010-02-24 23:39:40 +00:00
Brion Vibber
93507a1927
OStatus: handle update-profile Salmon pings
2010-02-24 23:28:01 +00:00
Brion Vibber
ec4899e617
OStatus: disable HTMLPurify cache unless we've configured a writable path for it.
...
Updated plugin README with available config options.
Cleanup for a bad element fallback lookup in Activity
2010-02-24 22:16:17 +00:00
Brion Vibber
0c7844734e
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 20:38:38 +00:00
Brion Vibber
c36bdc1ba5
- break OMB profile update pings to a background queue
...
- add event hooks to profile update pings
- send Salmon pings with custom update-profile event to OStatus subscribees and groups (subscribers will see it on your next post)
- fix OStatus queues with overlong transport names, should work on DB queues now
- Ostatus_profile::notifyActivity() and ::notifyDeferred() now can take XML, Notice, or Activity for convenience
2010-02-24 20:36:36 +00:00
Evan Prodromou
269d567d94
use Subscription::start() for remote subscribes
2010-02-24 15:20:06 -05:00
Evan Prodromou
daea988786
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-24 15:00:52 -05:00
Brion Vibber
07214f1370
OStatus: save updated profile bits when they come in over the wire; fix up nicknames
2010-02-24 19:06:10 +00:00
Sarven Capadisli
1f45273d53
Moved StatusNetInstance into SN in util.js
2010-02-24 16:35:20 +01:00
Sarven Capadisli
8e7606cc8d
Added processing indicator for .form_remote_authorize on ostatussub page
2010-02-24 15:20:44 +01:00
Zach Copley
618ce6a855
- Move ActivityParseTests to core
...
- Add test for Portable Contacts stuff
2010-02-23 23:58:21 -08:00
Brion Vibber
2e58802cc9
OStatus: fix group delivery, send reply/group Salmon pings from background.
2010-02-24 02:20:31 +00:00
Brion Vibber
584b87cfe5
OStatus: consolidate the low-level notice save code between Salmon and PuSH input paths. Validation etc remains at higher levels.
2010-02-24 01:09:52 +00:00
James Walker
391b45949f
adding xfn, foaf and hcard rel's to our webfinger output
2010-02-23 18:25:31 -05:00
Brion Vibber
d6ad733247
OStatus: fixes for link/id and text extraction gets import of Buzz feeds working.
2010-02-23 21:47:14 +00:00
Evan Prodromou
f5ec7c2707
some logging for OStatusPlugin::onStartFindMentions()
2010-02-23 16:13:24 -05:00
Brion Vibber
5f9a8ca64b
OStatus: accept webfinger addresses as well as profile URLs in the explicit remote subscribe form.
2010-02-23 21:11:44 +00:00
Evan Prodromou
b09304a6c4
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
...
Conflicts:
plugins/OStatus/OStatusPlugin.php
2010-02-23 16:02:27 -05:00
Evan Prodromou
a0c255e231
move mention detection before default in OStatusPlugin
2010-02-23 15:59:10 -05:00
Brion Vibber
90d34b26c6
OStatus: do PuSH subscription setup from subscribe/join event hooks, so resubscribing directly from a profile/group list works correctly if there aren't active subscriptions at the moment.
2010-02-23 20:44:27 +00:00
Brion Vibber
c79c70ea2c
OStatus subscription UI tweak: if we're already subscribed/joined, say so and don't offer a 'subscribe'/'join' button on the profile preview page.
2010-02-23 11:56:17 -08:00
Brion Vibber
e070fcaaae
OStatus: fix for avatars, submit button in updated remote profile preview
2010-02-23 11:37:49 -08:00
James Walker
1fe031844c
er typo
2010-02-22 23:44:33 -05:00
James Walker
9494b0e5d7
magicsig shuffling
2010-02-22 23:30:32 -05:00
James Walker
17b8020d25
clean up error logging
2010-02-22 23:30:31 -05:00
James Walker
cd561657c2
missing return value check
2010-02-22 23:30:31 -05:00
James Walker
f4b34d67c5
generate keypairs for users, and put them in the XRD for discovery
2010-02-22 23:30:31 -05:00
James Walker
74f5c1e169
db_objectified magic sig - for persistence of local keypairs
2010-02-22 23:30:31 -05:00
James Walker
cb32b676fa
moving magicsig.php to classes - to add storage
2010-02-22 23:30:31 -05:00
Sarven Capadisli
b67bb182b0
Refactored preview info and form for authorizing a remote subscription
2010-02-23 04:59:34 +01:00
Brion Vibber
193448d1be
OStatus: cleanup on ostatussub preparing for final UI work on the remote sub/join forms.
2010-02-23 01:58:05 +00:00
Zach Copley
cbf6ebae01
Merge branch 'rationalize-activity' into testing
...
* rationalize-activity:
Move ActivityObject and related stuff to core
Add PoCo bits, avatar link, geo point, etc. to person activity obj output
2010-02-22 17:12:33 -08:00
Zach Copley
6a711c6cdc
Move ActivityObject and related stuff to core
2010-02-22 17:10:50 -08:00
Brion Vibber
870e556faa
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-23 00:52:47 +00:00
Zach Copley
a3e800e67c
Add PoCo bits, avatar link, geo point, etc. to person activity obj output
2010-02-22 16:46:54 -08:00
Brion Vibber
d410df0406
OStatus group delivery initial implementation.
...
- added rel="ostatus:attention" links for group delivery
- added events for plugins to override group profile/permalink pages
- pulled Notice::saveGroups up to save-time so we can override;
it's relatively cheap and gives us a clean list of target
groups for distrib time even with customized delivery.
- fixed notice::getGroups to return group objects as expected
- added some doc on new parameters to Notice::saveNew
- 'groups' list of group IDs to push to in place of parsing
- messages that come in via PuSH and contain local group targets
are delivered to local group members
- messages that come in via PuSH and contain remote group targets
are delivered to local members of the remote group
Todo:
- handle group posts that only come through Salmon
- handle conflicts in case something comes in both through Salmon and PuSH
- better source verification
- need a cleaner interface to look up groups by URI
- need a way to handle remote groups with conflicting names
2010-02-23 00:44:45 +00:00
James Walker
caad5859b5
swapping pear error handling so Crypt_RSA can properly detect available
...
math libraries
2010-02-22 19:01:12 -05:00
Sarven Capadisli
3b823f8fbd
Leaves the original URL alone and adds ? or & when it does the XHR.
2010-02-23 00:27:41 +01:00
Sarven Capadisli
8aa8e124cb
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-22 22:24:45 +01:00
Sarven Capadisli
3c00472999
Removed unnecessary assignment to SN.C.I.OStatusProfile. It can be
...
brought back in the future if the value is to be set directly from the
HTML script output.
2010-02-22 22:23:37 +01:00
Brion Vibber
06f155c02d
OStatus: initial hookup of remote group membership (notice delivery not yet working quite right)
...
- added a temp config var to disable salmon magic signatures until they're working consistently
2010-02-22 12:13:57 -08:00
Sarven Capadisli
7e8c3ea418
Removed extra comma
2010-02-22 19:37:42 +01:00
Sarven Capadisli
a1549ebf87
Minor JSLinting
2010-02-22 19:36:03 +01:00
Sarven Capadisli
3ed3796135
Added licensing info and a note about migrating
2010-02-22 19:18:32 +01:00
Sarven Capadisli
85cb850cd5
Set and reuse a cookie with own profile value at a StatusNet instance
2010-02-22 19:13:30 +01:00
Brion Vibber
2b16532ffb
OStatus: use 'profile' consistently as param on ostatussub and ostatusinit to help us stay sane.
2010-02-22 10:03:34 -08:00
Christopher Vollick
a6afc1cfd6
Made Blogspam Plugin Respect textlimit Setting.
...
The Blogspam plugin was setting a max-size to 140.
It was therefore rejecting posts with more characters as spam.
This kind of defeated the purpose of setting a higher limit...
2010-02-22 11:20:44 -05:00
Christopher Vollick
1e8e1e836d
Rewrote How Blogspam Plugin Made HTTP Requests.
...
The old way didn't seem to work anymore.
It was just sending empty requests.
2010-02-22 11:19:16 -05:00
Sarven Capadisli
c88507fe11
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-22 17:08:54 +01:00
Sarven Capadisli
3569493ba7
Added link to Subscriptions page to XHR get the ostatus sub form
2010-02-22 17:07:48 +01:00
Sarven Capadisli
e6ce04cbce
Generalised Subscription XHR dialogbox
2010-02-22 17:05:43 +01:00
James Walker
2f65fa646a
wiring in magicsig
2010-02-22 09:05:52 -05:00
James Walker
e0388cc1d3
adding magic sig stuff
2010-02-22 09:05:32 -05:00
James Walker
8fe097d7d1
Merge remote branch 'statusnet/testing' into testing
2010-02-22 09:03:42 -05:00
Evan Prodromou
75fdef2092
handle poco nicknames in Ostatus_profile
2010-02-22 07:57:44 -05:00
Evan Prodromou
074e3fa895
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-22 07:09:08 -05:00
Evan Prodromou
e94800ced9
fix broken link in OpenID documentation
2010-02-22 07:08:57 -05:00
Sarven Capadisli
f54c9b70db
Fixed error/warning message location in OStatus autorize subscription page
2010-02-22 11:53:34 +01:00
James Walker
7b2ea7aa22
Merge remote branch 'statusnet/testing' into testing
2010-02-22 01:40:03 -05:00
James Walker
effa4f5d1e
adding extlib for Crypt_RSA
2010-02-22 01:39:00 -05:00
Brion Vibber
17ed30dffc
OStatus: fix remote subscription when putting webfinger address in the little box
2010-02-22 06:00:13 +00:00
Evan Prodromou
891e002883
don't calculate replies for remote notices
2010-02-21 23:56:48 -05:00
Evan Prodromou
a9599d53c5
some info code for usersalmon.php
2010-02-21 23:39:52 -05:00
Evan Prodromou
e4c4f90c8a
don't save Notices that already exist in Salmon
2010-02-21 23:32:20 -05:00
Evan Prodromou
48839a1fcf
change erroneous common_sql_time() to common_sql_date()
2010-02-21 23:19:29 -05:00
Evan Prodromou
e39e6cdcc5
was using HTMLPurifier::purify() as a static method, which it is not
2010-02-21 23:16:42 -05:00
Evan Prodromou
aab7ce70dc
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-21 23:08:01 -05:00
Evan Prodromou
17c329ba89
add HTMLPurifier config
2010-02-21 23:07:46 -05:00
Brion Vibber
bd3051b85c
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-21 19:55:53 -08:00
Brion Vibber
5207783765
OStatus: record source profile & saving method in ostatus_source table; this allows us to distinguish posts that have come through an unverified group feed
2010-02-21 19:52:53 -08:00
Evan Prodromou
cc18f757a8
hook in OStatusPlugin to return Ostatus_profile URIs where applicable
2010-02-21 22:52:52 -05:00
Evan Prodromou
232b5efa7e
Add error info for missing URI in attention
2010-02-21 22:44:58 -05:00
Evan Prodromou
13fb7bef78
reversed in_array() arguments in UsersalmonAction
2010-02-21 22:41:02 -05:00
Evan Prodromou
de522d7978
Wasn't putting in namespaces for reply salmons
2010-02-21 22:38:18 -05:00
Evan Prodromou
a0b64663be
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-21 22:35:04 -05:00
Evan Prodromou
bd21f48cee
Notice::getReplies() returns array of profile IDs
2010-02-21 22:34:40 -05:00
Brion Vibber
892cd801d1
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-21 19:02:23 -08:00
Brion Vibber
ad10e6e8da
OStatus: drop the remnants of feedsubsettings, replaced by ostatussub and no longer linked in UI
2010-02-21 19:01:32 -08:00
Evan Prodromou
79c76f1a87
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-21 21:57:32 -05:00
Evan Prodromou
be70dd3677
work harder to preserve info when creating new Ostatus_profile
2010-02-21 21:57:09 -05:00
Brion Vibber
d3996996e4
Merge branch 'testing' of gitorious.org:statusnet/mainline into testing
2010-02-21 18:54:06 -08:00
Brion Vibber
78ca45c7a0
OStatus PuSH fixes:
...
- hub now defers subscription state updates until after verification, per spec
- hub now supports synchronous verification when requested (if async is not requested after)
- client now requests synchronous verification (it's a bit safer)
- cleanup on subscription logging/error responses
2010-02-21 18:51:15 -08:00
Evan Prodromou
273c0e0363
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-21 21:39:50 -05:00
Evan Prodromou
912814fb7f
use some constants and do some extra output in webfinger output
2010-02-21 21:38:59 -05:00
Evan Prodromou
bd74f05a66
Do mention lookup for Webfinger accounts in OStatusPlugin
2010-02-21 21:38:16 -05:00
Evan Prodromou
bf23c35495
Add OStatus_profile::ensureWebfinger()
2010-02-21 21:37:12 -05:00
Evan Prodromou
fde64ddf26
make some of the Webfinger magic strings constants
2010-02-21 21:36:36 -05:00
Brion Vibber
aa0b2ce81a
OStatus PuSH fixlets:
...
- set minimal error page output on PuSH callback
- allow hub to retry ($config['ostatus']['hub_retries']), simplify internal iface a bit. Retries are pushed to end of queue but otherwise not delayed yet; makes delivery more robust to one-off transitory errors but not yet against downtime.
2010-02-21 14:28:06 -08:00
Evan Prodromou
37179a91d5
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-21 17:00:19 -05:00
Evan Prodromou
1c22bf20f1
fixup activity serialization so salmon notifications work
2010-02-21 17:00:05 -05:00
Brion Vibber
5349aa420e
OStatus feedsub fixlets:
...
- actually udpate feedsub.last_update when we get a new PuSH update in
- move incoming PuSH processing to a queue handler to minimize time spent before POST return, as recommended by PuSH spec. When queues are disabled this'll still be handled immediately.
2010-02-21 13:40:59 -08:00
Evan Prodromou
10f6c023f4
include namespaces in posted activities in notifyActivity()
2010-02-21 16:23:55 -05:00
Evan Prodromou
4209082677
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
2010-02-21 14:18:16 -05:00
Evan Prodromou
ad3406a919
use Ostatus_profile::ensureActivityObjectProfile() in SalmonAction::ensureProfile()
2010-02-21 14:17:37 -05:00
Evan Prodromou
16a43b1154
slightly more robust remote profile creation
2010-02-21 14:14:45 -05:00
Brion Vibber
85528ccb1f
Merge branch 'testing' of gitorious.org:statusnet/mainline into 0.9.x
2010-02-21 11:12:56 -08:00
Brion Vibber
588fe5d603
OStatus: debug aid - log the received Salmon post when it can't be parsed properly as an <atom:entry>
2010-02-21 10:48:48 -08:00
Evan Prodromou
de093537f6
correct actor for OStatusPlugin::onEndUnsubscribe()
2010-02-21 13:32:24 -05:00
Evan Prodromou
068d8f9220
correct call to time() in Ostatus_profile::notify()
2010-02-21 13:31:58 -05:00
Evan Prodromou
f83941a67b
correct name check in ActivityObject::fromProfile()
2010-02-21 13:31:31 -05:00
Evan Prodromou
5aeed9e041
add activity:subject to atom feeds
2010-02-21 13:11:00 -05:00
Evan Prodromou
1a86bf9c65
try different ways to get a profile from a feed
2010-02-21 12:56:46 -05:00
Evan Prodromou
d372a352ec
make avatar attribute explicit for ActivityObject
2010-02-21 12:55:40 -05:00
Evan Prodromou
09e2d181be
remove unused profile code from salmonaction
2010-02-21 12:54:52 -05:00
Evan Prodromou
727773cdfa
redirect ostatussub if not logged in
2010-02-21 11:24:04 -05:00
Evan Prodromou
df7c6b37c8
use notifyActivity() for notifications in OStatusPlugin
2010-02-21 10:53:32 -05:00
Evan Prodromou
4e90bd34e9
activity notification in Ostatus_profile
2010-02-21 10:53:11 -05:00
Evan Prodromou
ff2efd314f
let activities generate their own XML
2010-02-21 10:50:51 -05:00
Evan Prodromou
9898bbdeb2
Merge branch 'testing' of git@gitorious.org:statusnet/mainline into testing
...
Conflicts:
plugins/OStatus/lib/activity.php
2010-02-21 09:19:27 -05:00
Evan Prodromou
7f471bde23
more tests for Activity parsing
2010-02-21 09:17:52 -05:00