]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
14 years agoadd CC BY 3.0 license to CSS files
Evan Prodromou [Fri, 3 Sep 2010 03:16:29 +0000 (23:16 -0400)]
add CC BY 3.0 license to CSS files

14 years agoMerge branch 'master' into testing
Brion Vibber [Thu, 2 Sep 2010 21:58:11 +0000 (14:58 -0700)]
Merge branch 'master' into testing

14 years agoFixes for Mac metadata files mucking up theme zip files
Brion Vibber [Thu, 2 Sep 2010 21:24:46 +0000 (14:24 -0700)]
Fixes for Mac metadata files mucking up theme zip files

14 years agoshow notice title on shownotice page
Evan Prodromou [Thu, 2 Sep 2010 21:16:10 +0000 (17:16 -0400)]
show notice title on shownotice page

14 years agoTicket #2638: allow themes to specify a base theme to load with 'include' setting...
Brion Vibber [Thu, 2 Sep 2010 21:11:52 +0000 (14:11 -0700)]
Ticket #2638: allow themes to specify a base theme to load with 'include' setting in a theme.ini file

14 years agohooks for showing <title> and <h1> elements
Evan Prodromou [Thu, 2 Sep 2010 21:10:25 +0000 (17:10 -0400)]
hooks for showing <title> and <h1> elements

14 years agoMerge branch 'swat0' into 0.9.x
Evan Prodromou [Thu, 2 Sep 2010 20:58:55 +0000 (16:58 -0400)]
Merge branch 'swat0' into 0.9.x

14 years agoMerge branch 'testing' into 0.9.x
Evan Prodromou [Thu, 2 Sep 2010 20:56:52 +0000 (16:56 -0400)]
Merge branch 'testing' into 0.9.x

14 years agoFixes for custom theme upload:
Brion Vibber [Thu, 2 Sep 2010 19:11:45 +0000 (12:11 -0700)]
Fixes for custom theme upload:
* skip more files (.xcf image sources, .html docs)
* skip files before rejecting them for funky filenames!
* allow period in filenames (eg foo-1.4.ttf) but blacklist some unsafe extensions-within-extensions

14 years agoFix for #2635: use ssl-sometimes settings for Twitter settings & auth pages
Brion Vibber [Thu, 2 Sep 2010 17:40:41 +0000 (10:40 -0700)]
Fix for #2635: use ssl-sometimes settings for Twitter settings & auth pages

14 years agoRevert "debugging replyToID"
Evan Prodromou [Wed, 1 Sep 2010 22:22:54 +0000 (18:22 -0400)]
Revert "debugging replyToID"

This reverts commit bb9353f6e04f863c50bca12247d1a70cb12350d5.

14 years agodebugging replyToID
Evan Prodromou [Wed, 1 Sep 2010 21:59:49 +0000 (17:59 -0400)]
debugging replyToID

14 years agoCorrectly check for user's id in replies in user salmon post
Evan Prodromou [Wed, 1 Sep 2010 21:10:29 +0000 (17:10 -0400)]
Correctly check for user's id in replies in user salmon post

14 years agocorrectly return oprofile from Ostatus_profile::ensureProfileURI()
Evan Prodromou [Wed, 1 Sep 2010 21:05:11 +0000 (17:05 -0400)]
correctly return oprofile from Ostatus_profile::ensureProfileURI()

14 years agobug in Profile::fromURI() wasn't returning profile
Evan Prodromou [Wed, 1 Sep 2010 20:55:16 +0000 (16:55 -0400)]
bug in Profile::fromURI() wasn't returning profile

14 years agosave URIs of remote profiles marked for attention
Evan Prodromou [Wed, 1 Sep 2010 20:17:18 +0000 (16:17 -0400)]
save URIs of remote profiles marked for attention

14 years agoHandle profile-from-uri hook to return ostatus profile if there's a match
Evan Prodromou [Wed, 1 Sep 2010 20:16:38 +0000 (16:16 -0400)]
Handle profile-from-uri hook to return ostatus profile if there's a match

14 years agoNotice::saveReplies() uses Profile::fromURI() to handle remote profiles too
Evan Prodromou [Wed, 1 Sep 2010 20:15:51 +0000 (16:15 -0400)]
Notice::saveReplies() uses Profile::fromURI() to handle remote profiles too

14 years agoStatic method to get a profile based on an URI
Evan Prodromou [Wed, 1 Sep 2010 20:15:22 +0000 (16:15 -0400)]
Static method to get a profile based on an URI

14 years agosend a salmon slap to mentioned person when we reply to a notice
Evan Prodromou [Wed, 1 Sep 2010 18:35:43 +0000 (14:35 -0400)]
send a salmon slap to mentioned person when we reply to a notice

14 years agoMerge branch 'master' into 0.9.x
Evan Prodromou [Wed, 1 Sep 2010 18:21:36 +0000 (14:21 -0400)]
Merge branch 'master' into 0.9.x

14 years agoremove noop function from OStatusPlugin
Evan Prodromou [Wed, 1 Sep 2010 18:21:24 +0000 (14:21 -0400)]
remove noop function from OStatusPlugin

14 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Sat, 28 Aug 2010 15:34:02 +0000 (17:34 +0200)]
Localisation updates from http://translatewiki.net
* removed messages marked fuzzy from translations.

14 years ago* when using multiple parameters, number them
Siebrand Mazeland [Sat, 28 Aug 2010 14:51:49 +0000 (16:51 +0200)]
* when using multiple parameters, number them
* fix double space to single space
* use consistent punctuation in messages
* complete translation hints for all commands
* add an i18n fixme for missing plural support
* trailing whitespace removed

14 years agoDocument UI text and number parameters.
Siebrand Mazeland [Sat, 28 Aug 2010 14:28:23 +0000 (16:28 +0200)]
Document UI text and number parameters.

14 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Sat, 28 Aug 2010 13:11:23 +0000 (15:11 +0200)]
Localisation updates from http://translatewiki.net

14 years agoFix for failover error in status_network_tag caching; when no tags present in table...
Brion Vibber [Thu, 26 Aug 2010 20:52:03 +0000 (13:52 -0700)]
Fix for failover error in status_network_tag caching; when no tags present in table we would return an array with one empty element instead of no elements when getting the cached data.

14 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Wed, 25 Aug 2010 21:50:29 +0000 (23:50 +0200)]
Localisation updates from http://translatewiki.net

14 years agoUse Status_network's caching settings when loading Status_network_tag entries; cache...
Brion Vibber [Wed, 25 Aug 2010 18:59:39 +0000 (11:59 -0700)]
Use Status_network's caching settings when loading Status_network_tag entries; cache entries are batched per site and will be cleared when tags are inserted/deleted using the main interface.
(with fixes from tagcache branch)

14 years agofix incorrect function name in updateostatus.php script
Evan Prodromou [Wed, 25 Aug 2010 16:32:10 +0000 (12:32 -0400)]
fix incorrect function name in updateostatus.php script

14 years agoLocalisation updates from http://translatewiki.net
Siebrand Mazeland [Tue, 24 Aug 2010 06:21:13 +0000 (08:21 +0200)]
Localisation updates from http://translatewiki.net

14 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Mon, 16 Aug 2010 23:56:15 +0000 (16:56 -0700)]
Merge branch 'master' into 0.9.x

14 years agoLink fixes for footer in fr, pt-br (also saved changed at TranslateWiki.net)
Brion Vibber [Mon, 16 Aug 2010 19:03:30 +0000 (12:03 -0700)]
Link fixes for footer in fr, pt-br (also saved changed at TranslateWiki.net)

14 years agoStatusNet 0.9.4 "Orange Crush"
Brion Vibber [Mon, 16 Aug 2010 17:09:33 +0000 (10:09 -0700)]
StatusNet 0.9.4 "Orange Crush"

14 years agoMerge branch 'testing'
Brion Vibber [Mon, 16 Aug 2010 17:06:52 +0000 (10:06 -0700)]
Merge branch 'testing'

Conflicts:
plugins/OStatus/classes/Ostatus_profile.php

14 years agofixed a %d that should be a %s in an error message
Brenda Wallace [Mon, 16 Aug 2010 01:26:27 +0000 (13:26 +1200)]
fixed a %d that should be a %s in an error message

14 years agoremoved the notice.location column from postgres def -- snuck in on a git commit...
Brenda Wallace [Mon, 16 Aug 2010 02:47:18 +0000 (14:47 +1200)]
removed the notice.location column from postgres def -- snuck in on a git commit by Patrick G

14 years agofix use of activity rather than act in salmonaction subclasses, too
Evan Prodromou [Fri, 13 Aug 2010 21:18:54 +0000 (14:18 -0700)]
fix use of activity rather than act in salmonaction subclasses, too

14 years agotypo mixing up and in salmonaction
Evan Prodromou [Fri, 13 Aug 2010 20:07:25 +0000 (13:07 -0700)]
typo mixing up  and  in salmonaction

14 years agoMerge remote branch 'shiny/0.9.x' into 0.9.x
Brenda Wallace [Mon, 16 Aug 2010 02:51:31 +0000 (14:51 +1200)]
Merge remote branch 'shiny/0.9.x' into 0.9.x

14 years agoMerge commit 'origin/0.9.x' into 0.9.x
Brenda Wallace [Mon, 16 Aug 2010 02:52:23 +0000 (02:52 +0000)]
Merge commit 'origin/0.9.x' into 0.9.x

14 years agoremoved the notice.location column from postgres def -- snuck in on a git commit...
Brenda Wallace [Mon, 16 Aug 2010 02:47:18 +0000 (14:47 +1200)]
removed the notice.location column from postgres def -- snuck in on a git commit by Patrick G

14 years agofixed a %d that should be a %s in an error message
Brenda Wallace [Mon, 16 Aug 2010 01:26:27 +0000 (13:26 +1200)]
fixed a %d that should be a %s in an error message

14 years agoNotice title constructor doesn't check class of Notice
Evan Prodromou [Sun, 15 Aug 2010 01:02:08 +0000 (18:02 -0700)]
Notice title constructor doesn't check class of Notice

14 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Sat, 14 Aug 2010 19:08:15 +0000 (12:08 -0700)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch 'noticetitle' into 0.9.x
Evan Prodromou [Sat, 14 Aug 2010 19:03:25 +0000 (12:03 -0700)]
Merge branch 'noticetitle' into 0.9.x

14 years agohandle deletion of notice
Evan Prodromou [Sat, 14 Aug 2010 18:58:54 +0000 (11:58 -0700)]
handle deletion of notice

14 years agoon deleting a notice
Evan Prodromou [Sat, 14 Aug 2010 18:54:20 +0000 (11:54 -0700)]
on deleting a notice

14 years agoMerge branch 'master' into noticetitle
Evan Prodromou [Sat, 14 Aug 2010 18:46:12 +0000 (11:46 -0700)]
Merge branch 'master' into noticetitle

14 years ago- Remove extraneous style stuff from Echo plugin - that stuff should
Zach Copley [Sat, 14 Aug 2010 00:07:12 +0000 (00:07 +0000)]
- 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

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Fri, 13 Aug 2010 23:53:44 +0000 (23:53 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoA plugin to add Disqus commenting to notice pages
Zach Copley [Fri, 13 Aug 2010 23:53:05 +0000 (23:53 +0000)]
A plugin to add Disqus commenting to notice pages

14 years agoMerge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Fri, 13 Aug 2010 21:35:49 +0000 (14:35 -0700)]
Merge branch '0.9.x' of gitorious.org:statusnet/mainline into 0.9.x

Conflicts:
plugins/OStatus/classes/Ostatus_profile.php

14 years agofix use of activity rather than act in salmonaction subclasses, too
Evan Prodromou [Fri, 13 Aug 2010 21:18:54 +0000 (14:18 -0700)]
fix use of activity rather than act in salmonaction subclasses, too

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Fri, 13 Aug 2010 20:53:19 +0000 (20:53 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoA plugin for adding the Echo (formerly JS-Kit) commenting widget to
Zach Copley [Fri, 13 Aug 2010 20:52:05 +0000 (20:52 +0000)]
A plugin for adding the Echo (formerly JS-Kit) commenting widget to
notice pages

14 years agoUpdate extension configuration file creation (doesn't work yet in translatewiki.net).
Siebrand Mazeland [Fri, 13 Aug 2010 20:21:33 +0000 (22:21 +0200)]
Update extension configuration file creation (doesn't work yet in translatewiki.net).

14 years agoadd hooks to allow plugins to handle different kinds of activities
Evan Prodromou [Fri, 13 Aug 2010 20:14:47 +0000 (13:14 -0700)]
add hooks to allow plugins to handle different kinds of activities

14 years agotypo mixing up and in salmonaction
Evan Prodromou [Fri, 13 Aug 2010 20:07:25 +0000 (13:07 -0700)]
typo mixing up  and  in salmonaction

14 years agoFixes for RSS subscriptions: accept posts with no ActivityStreams object-type set...
Brion Vibber [Fri, 13 Aug 2010 18:41:44 +0000 (11:41 -0700)]
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).

14 years agoSubMirror: check feel-url discovery if profile-url discovery failed; should help...
Brion Vibber [Fri, 13 Aug 2010 18:02:21 +0000 (11:02 -0700)]
SubMirror: check feel-url discovery if profile-url discovery failed; should help when giving direct feeds to subscribe to

14 years agoSuppress whinging during HTML parsing in profile page discovery for things that turn...
Brion Vibber [Fri, 13 Aug 2010 17:51:00 +0000 (10:51 -0700)]
Suppress whinging during HTML parsing in profile page discovery for things that turn out to be XML feeds with funny namespaces.

14 years agohide the Whats Up Nickname if notice title enabled
Evan Prodromou [Fri, 13 Aug 2010 19:22:58 +0000 (12:22 -0700)]
hide the Whats Up Nickname if notice title enabled

14 years agomake notice title phpcs-clean
Evan Prodromou [Fri, 13 Aug 2010 19:04:30 +0000 (12:04 -0700)]
make notice title phpcs-clean

14 years agomake notice title phpcs-clean
Evan Prodromou [Fri, 13 Aug 2010 19:01:29 +0000 (12:01 -0700)]
make notice title phpcs-clean

14 years agoset notice titles in RSS and Atom output
Evan Prodromou [Fri, 13 Aug 2010 18:50:33 +0000 (11:50 -0700)]
set notice titles in RSS and Atom output

14 years agohooks to allow changing RSS content
Evan Prodromou [Fri, 13 Aug 2010 18:44:26 +0000 (11:44 -0700)]
hooks to allow changing RSS content

14 years agoFixes for RSS subscriptions: accept posts with no ActivityStreams object-type set...
Brion Vibber [Fri, 13 Aug 2010 18:41:44 +0000 (11:41 -0700)]
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).

14 years agoshow notice title for notices in a notice list
Evan Prodromou [Fri, 13 Aug 2010 18:35:36 +0000 (11:35 -0700)]
show notice title for notices in a notice list

14 years agohelper static method to get title text based on a notice
Evan Prodromou [Fri, 13 Aug 2010 18:35:16 +0000 (11:35 -0700)]
helper static method to get title text based on a notice

14 years agosave the notice title when the notice is saved
Evan Prodromou [Fri, 13 Aug 2010 18:29:18 +0000 (11:29 -0700)]
save the notice title when the notice is saved

14 years agoadd StartNoticeSaveWeb and EndNoticeSaveWeb to hook web-based UI for notices
Evan Prodromou [Fri, 13 Aug 2010 18:21:07 +0000 (11:21 -0700)]
add StartNoticeSaveWeb and EndNoticeSaveWeb to hook web-based UI for notices

14 years agoSubMirror: check feel-url discovery if profile-url discovery failed; should help...
Brion Vibber [Fri, 13 Aug 2010 18:02:21 +0000 (11:02 -0700)]
SubMirror: check feel-url discovery if profile-url discovery failed; should help when giving direct feeds to subscribe to

14 years agoSuppress whinging during HTML parsing in profile page discovery for things that turn...
Brion Vibber [Fri, 13 Aug 2010 17:51:00 +0000 (10:51 -0700)]
Suppress whinging during HTML parsing in profile page discovery for things that turn out to be XML feeds with funny namespaces.

14 years agoadd title element to notice form
Evan Prodromou [Fri, 13 Aug 2010 05:11:26 +0000 (22:11 -0700)]
add title element to notice form

14 years agoPlugin file and data file for notice title
Evan Prodromou [Fri, 13 Aug 2010 04:19:12 +0000 (21:19 -0700)]
Plugin file and data file for notice title

14 years agoadd note about software subscription
Evan Prodromou [Fri, 13 Aug 2010 01:42:09 +0000 (18:42 -0700)]
add note about software subscription

14 years agoFix for ticket 2513: "Can't linkify" error when some links are shortened
Brion Vibber [Thu, 12 Aug 2010 22:19:47 +0000 (15:19 -0700)]
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

14 years agoFix for ticket 2513: "Can't linkify" error when some links are shortened
Brion Vibber [Thu, 12 Aug 2010 22:19:47 +0000 (15:19 -0700)]
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

14 years agoFix PHP notice spew when Notice::saveNew() called without passing any options; defaul...
Brion Vibber [Thu, 12 Aug 2010 22:18:50 +0000 (15:18 -0700)]
Fix PHP notice spew when Notice::saveNew() called without passing any options; default empty vars weren't being set.

14 years agoFix regression in replies made from web (was saving reply_to value in wrong array...
Brion Vibber [Thu, 12 Aug 2010 22:18:16 +0000 (15:18 -0700)]
Fix regression in replies made from web (was saving reply_to value in wrong array key)

14 years agoMerge branch 'master' into 0.9.x
Brion Vibber [Thu, 12 Aug 2010 19:55:36 +0000 (12:55 -0700)]
Merge branch 'master' into 0.9.x

14 years agoMerge branch 'tinymce' into 0.9.x
Brion Vibber [Thu, 12 Aug 2010 19:54:20 +0000 (12:54 -0700)]
Merge branch 'tinymce' into 0.9.x

14 years agoTinyMCE: counter support (may not be 100% exact match to server-side count, but there...
Brion Vibber [Thu, 12 Aug 2010 19:47:07 +0000 (12:47 -0700)]
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.

14 years agoTinyMCE: fixes to attachment handling
Brion Vibber [Thu, 12 Aug 2010 18:39:42 +0000 (11:39 -0700)]
TinyMCE: fixes to attachment handling

14 years agoMerge branch '0.9.x'
Brion Vibber [Thu, 12 Aug 2010 01:55:12 +0000 (18:55 -0700)]
Merge branch '0.9.x'

14 years agoOutput "web" instead of gettext translation file metadata when notice.source is empty
Brion Vibber [Thu, 12 Aug 2010 01:53:34 +0000 (18:53 -0700)]
Output "web" instead of gettext translation file metadata when notice.source is empty

14 years agowork in progress: tinymce image attachments
Brion Vibber [Thu, 12 Aug 2010 00:01:38 +0000 (17:01 -0700)]
work in progress: tinymce image attachments

14 years agowork in progress: prettier attachment mode for tinymce?
Brion Vibber [Wed, 11 Aug 2010 22:56:40 +0000 (15:56 -0700)]
work in progress: prettier attachment mode for tinymce?

14 years agoTinyMCE: only apply HTML parsing if we actually got into JS and poked the editor...
Brion Vibber [Wed, 11 Aug 2010 21:50:59 +0000 (14:50 -0700)]
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.

14 years agoTinyMCE: core tweak; switching order of input processing so length limit is applied...
Brion Vibber [Wed, 11 Aug 2010 21:39:39 +0000 (14:39 -0700)]
TinyMCE: core tweak; switching order of input processing so length limit is applied to stripped version of the text

14 years agoTinyMCE: add Shane Tomlinson's linkautodetect plugin so typed URLs get linked for...
Brion Vibber [Wed, 11 Aug 2010 20:38:09 +0000 (13:38 -0700)]
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.)

14 years agoTinyMCE: enable tab focus behavior matching the default textarea
Brion Vibber [Wed, 11 Aug 2010 20:17:11 +0000 (13:17 -0700)]
TinyMCE: enable tab focus behavior matching the default textarea

14 years agoMerge branch '0.9.x'
Brion Vibber [Wed, 11 Aug 2010 19:51:27 +0000 (12:51 -0700)]
Merge branch '0.9.x'

14 years agoTinyMCE: use inlinepopups mode, so linking dialog appears as a lightbox instead of...
Brion Vibber [Wed, 11 Aug 2010 19:49:02 +0000 (12:49 -0700)]
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)

14 years agoTinyMCE: enable autoresize plugin, makes the text area bigger as you're typing a...
Brion Vibber [Wed, 11 Aug 2010 19:44:01 +0000 (12:44 -0700)]
TinyMCE: enable autoresize plugin, makes the text area bigger as you're typing a giant message

14 years agoTinyMCE: add fullscreen zoom plugin for editor (a bit awkward but better than trying...
Brion Vibber [Wed, 11 Aug 2010 19:14:05 +0000 (12:14 -0700)]
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)

14 years agoTinyMCE: Switch default 'simple' layout for customized advanced layout: bold/italic...
Brion Vibber [Wed, 11 Aug 2010 19:10:08 +0000 (12:10 -0700)]
TinyMCE: Switch default 'simple' layout for customized advanced layout: bold/italic/strikethrough undo/redo link/unlink/image

14 years agoMerge branch '0.9.x' into tinymce
Brion Vibber [Wed, 11 Aug 2010 17:50:53 +0000 (10:50 -0700)]
Merge branch '0.9.x' into tinymce

14 years ago0.9.4beta2 update some notes in README, note the fix from beta1
Brion Vibber [Wed, 11 Aug 2010 17:32:52 +0000 (10:32 -0700)]
0.9.4beta2 update some notes in README, note the fix from beta1