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

2625 Commits

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