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
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
