Luke Fitzgerald
ed1ea2f086
Merge branch 'idle-irc-plugin' into irc-plugin
...
Conflicts:
plugins/Irc/ircmanager.php
2010-08-12 12:01:11 -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
78eea352b4
Merge branch '0.9.x'
2010-08-11 18:55:12 -07:00
Brion Vibber
111fc33e1a
Output "web" instead of gettext translation file metadata when notice.source is empty
2010-08-11 18:53:34 -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
1551fec65a
Merge branch '0.9.x'
2010-08-11 12:51:27 -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
Brion Vibber
34baeb4d77
Merge branch '0.9.x' into tinymce
2010-08-11 10:50:53 -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
4b2abf0515
Disabled debugging output
2010-08-11 10:37:43 -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
Brion Vibber
d15a41c96e
0.9.4beta2 update some notes in README, note the fix from beta1
2010-08-11 10:32:52 -07:00
Siebrand Mazeland
bd72ec8abc
Localisation updates from http://translatewiki.net
2010-08-11 12:55:05 +02:00
Siebrand Mazeland
db46d73a5f
Add dummy support for Esperanto.
2010-08-11 12:46:54 +02:00
Siebrand Mazeland
f659a46083
Localisation updates from http://translstewiki.net
2010-08-11 12:34:22 +02: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
382756a6ad
Merge remote branch 'statusnet/1.0.x' into irc-plugin
2010-08-10 19:48:30 -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
19e6b84050
StatusNet_network staticGet lookup fix
2010-08-10 17:22:26 -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
5c210f724a
update version for 0.9.4beta1
2010-08-10 16:28:33 -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
