Commit Graph

10267 Commits

Author SHA1 Message Date
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
Siebrand Mazeland f60ee85f68 Update extension configuration file creation (doesn't work yet in translatewiki.net). 2010-08-13 22:21:33 +02: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
Evan Prodromou ed8d8eb5ee hooks to allow changing RSS content 2010-08-13 11:44:26 -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
Evan Prodromou 7dd46222a8 add StartNoticeSaveWeb and EndNoticeSaveWeb to hook web-based UI for notices 2010-08-13 11:21:07 -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
Evan Prodromou d06bdfa54b add note about software subscription 2010-08-12 18:42:09 -07:00
Brion Vibber f7d599f8ea Fix for ticket 2513: "Can't linkify" error when some links are shortened
When bogus SSL sites etc were hit through a shortening redirect, sometimes link resolution kinda blew up and the user would get a "Can't linkify" error, aborting their post.
Now catching this case and just passing through the URL without attempting to resolve it. Could benefit from an overall scrubbing of the freaky link/attachment code though...! :)

http://status.net/open-source/issues/2513
2010-08-12 15:25:32 -07:00
Brion Vibber 6787b377c0 Fix for ticket 2513: "Can't linkify" error when some links are shortened
When bogus SSL sites etc were hit through a shortening redirect, sometimes link resolution kinda blew up and the user would get a "Can't linkify" error, aborting their post.
Now catching this case and just passing through the URL without attempting to resolve it. Could benefit from an overall scrubbing of the freaky link/attachment code though...! :)

http://status.net/open-source/issues/2513
2010-08-12 15:19:47 -07:00
Brion Vibber dcfc13cc08 Fix PHP notice spew when Notice::saveNew() called without passing any options; default empty vars weren't being set. 2010-08-12 15:18:50 -07:00
Brion Vibber d9942a558a Fix regression in replies made from web (was saving reply_to value in wrong array key) 2010-08-12 15:18:16 -07:00
Brion Vibber c3475e6ebe Merge branch 'master' into 0.9.x 2010-08-12 12:55:36 -07:00
Brion Vibber 4cf58c4bc7 Merge branch 'tinymce' into 0.9.x 2010-08-12 12:54:20 -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 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
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