Commit Graph

1662 Commits

Author SHA1 Message Date
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
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
Siebrand Mazeland 1bfbe9badf * i18n/L10n updates and FIXMEs added
* whitespace fixes
2010-09-03 01:35:04 +02: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
Evan Prodromou a507f04bc4 fix incorrect function name in updateostatus.php script 2010-08-25 12:32:10 -04: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 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 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 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
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
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
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
James Walker c8a706081e strip whitespace from me:data and me:sig (per spec) 2010-08-07 09:48:21 -04:00
Eric Helgeson fd2919be18 Fixed PHP 5.3 by & value
Cleaned up {}'s
2010-08-06 22:51:45 -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
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
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
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
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