]> git.mxchange.org Git - quix0rs-gnu-social.git/log
quix0rs-gnu-social.git
14 years agoExchanging authorized request tokens for access tokens working
Zach Copley [Mon, 11 Jan 2010 09:11:50 +0000 (01:11 -0800)]
Exchanging authorized request tokens for access tokens working

14 years agoAssociate request tokens with OAuth apps and app users
Zach Copley [Mon, 11 Jan 2010 07:03:30 +0000 (23:03 -0800)]
Associate request tokens with OAuth apps and app users

14 years agoWorkflow for request tokens and authorizing request tokens
Zach Copley [Mon, 11 Jan 2010 05:35:46 +0000 (21:35 -0800)]
Workflow for request tokens and authorizing request tokens

14 years agoAction for issuing a request token
Zach Copley [Fri, 8 Jan 2010 02:33:17 +0000 (18:33 -0800)]
Action for issuing a request token

14 years agoStubs for API OAuth token exchange stuff
Zach Copley [Thu, 7 Jan 2010 21:19:21 +0000 (13:19 -0800)]
Stubs for API OAuth token exchange stuff

14 years agoAdd icons/icon upload to Oauth apps
Zach Copley [Thu, 7 Jan 2010 09:55:57 +0000 (01:55 -0800)]
Add icons/icon upload to Oauth apps

14 years agoAdded session token checking.
Zach Copley [Tue, 17 Nov 2009 02:12:39 +0000 (18:12 -0800)]
Added session token checking.

14 years agoWorkflow for registering new OAuth apps pretty much done.
Zach Copley [Tue, 17 Nov 2009 00:58:49 +0000 (16:58 -0800)]
Workflow for registering new OAuth apps pretty much done.

14 years agoIt might help if I checkd in statusnet.ini.
Zach Copley [Sat, 14 Nov 2009 03:10:38 +0000 (19:10 -0800)]
It might help if I checkd in statusnet.ini.

14 years agoReorganized the OAuth app URLs and more work on the register app workflow
Zach Copley [Sat, 14 Nov 2009 03:02:18 +0000 (19:02 -0800)]
Reorganized the OAuth app URLs and more work on the register app workflow

14 years agoStarted work on interface for displaying connected OAuth apps
Zach Copley [Fri, 13 Nov 2009 03:42:18 +0000 (19:42 -0800)]
Started work on interface for displaying connected OAuth apps

14 years agoChanged the OAuth app tables to refer to profiles instead of users.
Zach Copley [Fri, 13 Nov 2009 03:34:13 +0000 (19:34 -0800)]
Changed the OAuth app tables to refer to profiles instead of users.
Added an owner column to oauth_application.

14 years agoAdd new OAuth application tables and DataObjects. Also add a new
Zach Copley [Wed, 11 Nov 2009 01:10:56 +0000 (17:10 -0800)]
Add new OAuth application tables and DataObjects. Also add a new
column for consumer secret to consumer table.

14 years agoaccept file for initializeinbox.php
Evan Prodromou [Thu, 14 Jan 2010 02:28:08 +0000 (18:28 -0800)]
accept file for initializeinbox.php

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Thu, 14 Jan 2010 01:50:21 +0000 (01:50 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoUpdate geo location UI for notice form where the geo data info is only
Sarven Capadisli [Thu, 14 Jan 2010 01:48:57 +0000 (01:48 +0000)]
Update geo location UI for notice form where the geo data info is only
visible on @title of the enable/disable button.

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Thu, 14 Jan 2010 01:30:22 +0000 (17:30 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agorev version in lib/common.php
Evan Prodromou [Thu, 14 Jan 2010 01:29:58 +0000 (17:29 -0800)]
rev version in lib/common.php

14 years agoscript to upgrade from RC2 to RC3
Evan Prodromou [Thu, 14 Jan 2010 01:28:31 +0000 (17:28 -0800)]
script to upgrade from RC2 to RC3

14 years agoFix for dbqueuehandler: if a queue is unrecognized, discard entries rather than attem...
Brion Vibber [Thu, 14 Jan 2010 00:33:03 +0000 (16:33 -0800)]
Fix for dbqueuehandler: if a queue is unrecognized, discard entries rather than attempting to re-run them forever!

14 years agodon't write Inbox if on a read-only page, but encache
Evan Prodromou [Thu, 14 Jan 2010 00:26:46 +0000 (16:26 -0800)]
don't write Inbox if on a read-only page, but encache

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Thu, 14 Jan 2010 00:19:35 +0000 (16:19 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoremove session info in syslog
Evan Prodromou [Thu, 14 Jan 2010 00:19:20 +0000 (16:19 -0800)]
remove session info in syslog

14 years agoUpdate generation of YAML files
Siebrand Mazeland [Wed, 13 Jan 2010 22:33:05 +0000 (23:33 +0100)]
Update generation of YAML files
* need lower case in some places
* update target path

Not in production yet at translatewiki.net - need some Translate extension code changes to get YAML config support for Gettext first.

14 years agoMerge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x
Siebrand Mazeland [Wed, 13 Jan 2010 22:10:00 +0000 (23:10 +0100)]
Merge branch '0.9.x' of git://gitorious.org/statusnet/mainline into 0.9.x

14 years agoUpdate line endings
Siebrand Mazeland [Wed, 13 Jan 2010 22:09:49 +0000 (23:09 +0100)]
Update line endings

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Wed, 13 Jan 2010 22:09:23 +0000 (23:09 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Wed, 13 Jan 2010 21:13:21 +0000 (21:13 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoChanged to margin instead of list position in order to avoid text
Sarven Capadisli [Wed, 13 Jan 2010 21:07:01 +0000 (21:07 +0000)]
Changed to margin instead of list position in order to avoid text
wrapping from the bullet point

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Wed, 13 Jan 2010 20:37:10 +0000 (12:37 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agomake sure whoGets() doesn't write anything
Evan Prodromou [Wed, 13 Jan 2010 20:37:01 +0000 (12:37 -0800)]
make sure whoGets() doesn't write anything

14 years agoMade the IMAP plugin work in the style of the new queue/iomanagers
Craig Andrews [Wed, 13 Jan 2010 20:35:53 +0000 (15:35 -0500)]
Made the IMAP plugin work in the style of the new queue/iomanagers

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Wed, 13 Jan 2010 19:17:49 +0000 (19:17 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoWhen Twitter bridge encounters a 403 (rate limit) err, drop the notice
Zach Copley [Wed, 13 Jan 2010 19:15:54 +0000 (19:15 +0000)]
When Twitter bridge encounters a 403 (rate limit) err, drop the notice
instead of requeuing.

14 years agoFix regressions in XMPP output during inbox refactoring
Brion Vibber [Wed, 13 Jan 2010 18:17:36 +0000 (18:17 +0000)]
Fix regressions in XMPP output during inbox refactoring
- NOTICE_INBOX_SOURCE_* constants moved to common.php since Notice_inbox.php not always loaded
- fixed typo in User::staticGet() call which caused user #1 to receive messages once for each subscriber instead of for him/herself
- 'continue' -> 'continue 2' inside switch() statement to fix loop escape (PHP considers switch() a looping construct for break & continue)

14 years agoUnchecks location sharing for geo location if it timesout
Sarven Capadisli [Wed, 13 Jan 2010 15:51:32 +0000 (15:51 +0000)]
Unchecks location sharing for geo location if it timesout

14 years agoTimeout should be 10000, not 10
Sarven Capadisli [Wed, 13 Jan 2010 15:50:45 +0000 (15:50 +0000)]
Timeout should be 10000, not 10

Revert "Unchecks location sharing for geo location if it timesout"

This reverts commit 8887d7a314bdbf4e4fc6ca26addf5ce28284d697.

14 years agoUnchecks location sharing for geo location if it timesout
Sarven Capadisli [Wed, 13 Jan 2010 15:48:26 +0000 (15:48 +0000)]
Unchecks location sharing for geo location if it timesout

14 years agoAdded timeout error handling for geo location
Sarven Capadisli [Wed, 13 Jan 2010 15:36:42 +0000 (15:36 +0000)]
Added timeout error handling for geo location

14 years agoUsing a JSON object for NoticeDataGeo text instead
Sarven Capadisli [Wed, 13 Jan 2010 15:21:43 +0000 (15:21 +0000)]
Using a JSON object for NoticeDataGeo text instead

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Wed, 13 Jan 2010 13:37:04 +0000 (13:37 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch 'subthrottle' into 0.9.x
Evan Prodromou [Wed, 13 Jan 2010 11:11:44 +0000 (03:11 -0800)]
Merge branch 'subthrottle' into 0.9.x

14 years agothrottle subscriptions
Evan Prodromou [Wed, 13 Jan 2010 11:11:31 +0000 (03:11 -0800)]
throttle subscriptions

14 years agocorrect check for error in subscribe and unsubscribe actions
Evan Prodromou [Wed, 13 Jan 2010 11:01:22 +0000 (03:01 -0800)]
correct check for error in subscribe and unsubscribe actions

14 years agoadd events for subscribing to people and joining groups
Evan Prodromou [Wed, 13 Jan 2010 10:16:13 +0000 (02:16 -0800)]
add events for subscribing to people and joining groups

14 years agorefactor jabber broadcast for notice_inbox removal
Evan Prodromou [Wed, 13 Jan 2010 09:13:49 +0000 (01:13 -0800)]
refactor jabber broadcast for notice_inbox removal

14 years agoDon't save reply info for repeats
Evan Prodromou [Wed, 13 Jan 2010 09:13:06 +0000 (01:13 -0800)]
Don't save reply info for repeats

14 years agorepeats don't get posted to groups
Evan Prodromou [Wed, 13 Jan 2010 08:47:12 +0000 (00:47 -0800)]
repeats don't get posted to groups

14 years agoremove vestiges of Notice_inbox from cache clearing code in Notice
Evan Prodromou [Wed, 13 Jan 2010 08:45:12 +0000 (00:45 -0800)]
remove vestiges of Notice_inbox from cache clearing code in Notice

14 years agounimplement repeatedToMe() until we figure out how
Evan Prodromou [Wed, 13 Jan 2010 08:44:29 +0000 (00:44 -0800)]
unimplement repeatedToMe() until we figure out how

14 years agoadd a script for initializing inboxes
Evan Prodromou [Wed, 13 Jan 2010 08:25:43 +0000 (00:25 -0800)]
add a script for initializing inboxes

14 years agomemoize Notice::whoGets()
Evan Prodromou [Wed, 13 Jan 2010 08:16:54 +0000 (00:16 -0800)]
memoize Notice::whoGets()

14 years agoMerge branch '0.9.x' into inblob
Evan Prodromou [Wed, 13 Jan 2010 07:58:32 +0000 (23:58 -0800)]
Merge branch '0.9.x' into inblob

14 years agoremove some debugging statements from util.php
Evan Prodromou [Wed, 13 Jan 2010 07:58:25 +0000 (23:58 -0800)]
remove some debugging statements from util.php

14 years agows changes for phpcs
Evan Prodromou [Wed, 13 Jan 2010 07:56:21 +0000 (23:56 -0800)]
ws changes for phpcs

14 years agoMerge branch '0.9.x' into inblob
Evan Prodromou [Wed, 13 Jan 2010 07:53:52 +0000 (23:53 -0800)]
Merge branch '0.9.x' into inblob

14 years agoremove transaction for Notice save; causes deadlocks
Evan Prodromou [Wed, 13 Jan 2010 07:41:33 +0000 (23:41 -0800)]
remove transaction for Notice save; causes deadlocks

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Wed, 13 Jan 2010 07:25:25 +0000 (23:25 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMajor refactoring of queue handlers to support running multiple sites in one daemon.
Brion Vibber [Wed, 13 Jan 2010 03:57:15 +0000 (19:57 -0800)]
Major refactoring of queue handlers to support running multiple sites in one daemon.

Key changes:
* Initialization code moved from common.php to StatusNet class;
  can now switch configurations during runtime.
* As a consequence, configuration files must now be idempotent...
  Be careful with constant, function or class definitions.
* Control structure for daemons/QueueManager/QueueHandler has been refactored;
  the run loop is now managed by IoMaster run via scripts/queuedaemon.php
  IoManager subclasses are woken to handle socket input or polling, and may
  cover multiple sites.
* Plugins can implement notice queue handlers more easily by registering a
  QueueHandler class; no more need to add a daemon.

The new QueueDaemon runs from scripts/queuedaemon.php:

* This replaces most of the old *handler.php scripts; they've been refactored
  to the bare handler classes.
* Spawns multiple child processes to spread load; defaults to CPU count on
  Linux and Mac OS X systems, or override with --threads=N
* When multithreaded, child processes are automatically respawned on failure.
* Threads gracefully shut down and restart when passing a soft memory limit
  (defaults to 90% of memory_limit), limiting damage from memory leaks.
* Support for UDP-based monitoring: http://www.gitorious.org/snqmon

Rough control flow diagram:
QueueDaemon -> IoMaster -> IoManager
                           QueueManager [listen or poll] -> QueueHandler
                           XmppManager [ping & keepalive]
                           XmppConfirmManager [poll updates]

Todo:

* Respawning features not currently available running single-threaded.
* When running single-site, configuration changes aren't picked up.
* New sites or config changes affecting queue subscriptions are not yet
  handled without a daemon restart.
* SNMP monitoring output to integrate with general tools (nagios, ganglia)
* Convert XMPP confirmation message sends to use stomp queue instead of polling
* Convert xmppdaemon.php to IoManager?
* Convert Twitter status, friends import polling daemons to IoManager
* Clean up some error reporting and failure modes
* May need to adjust queue priorities for best perf in backlog/flood cases

Detailed code history available in my daemon-work branch:
http://www.gitorious.org/~brion/statusnet/brion-fixes/commits/daemon-work

14 years agoAvoid PHP notice when outputting API data for remote users; no $user means no $user...
Brion Vibber [Tue, 12 Jan 2010 20:26:08 +0000 (12:26 -0800)]
Avoid PHP notice when outputting API data for remote users; no $user means no $user->timezone :)

Trying to get property of non-object (/srv/com.leuksman.status/lib/api.php:171)

14 years agoAvoid spewing warnings about returning by reference on memcached cache misses by...
Brion Vibber [Tue, 12 Jan 2010 20:20:45 +0000 (12:20 -0800)]
Avoid spewing warnings about returning by reference on memcached cache misses by setting a var and returning it instead of trying to return false directly.
This hacky workaround is brought to you by DB_DataObject's PHP 4 roots.

14 years agoActually skip the pingback if XML-RPC extension is missing, instead of considering...
Brion Vibber [Tue, 12 Jan 2010 20:12:31 +0000 (12:12 -0800)]
Actually skip the pingback if XML-RPC extension is missing, instead of considering it then trying anyway and dying of a fatal error. :)

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Tue, 12 Jan 2010 20:11:37 +0000 (12:11 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Tue, 12 Jan 2010 18:47:12 +0000 (18:47 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoTicket 2152: avoid fatal when php.ini disables dl via disabled_functions (function_ex...
Brion Vibber [Tue, 12 Jan 2010 15:24:43 +0000 (07:24 -0800)]
Ticket 2152: avoid fatal when php.ini disables dl via disabled_functions (function_exists returns false even though it exists and cannot be redefined)

14 years agoFixed width for form_notice selected view in IE
Sarven Capadisli [Tue, 12 Jan 2010 03:06:31 +0000 (03:06 +0000)]
Fixed width for form_notice selected view in IE

14 years agoadd inbox to list of always-readwrite tables
Evan Prodromou [Tue, 12 Jan 2010 02:31:49 +0000 (18:31 -0800)]
add inbox to list of always-readwrite tables

14 years agoMerge branch '0.9.x' into inblob
Evan Prodromou [Tue, 12 Jan 2010 00:28:27 +0000 (16:28 -0800)]
Merge branch '0.9.x' into inblob

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Tue, 12 Jan 2010 00:23:48 +0000 (16:23 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agosafer storage for diskcacheplugin
Evan Prodromou [Tue, 12 Jan 2010 00:23:34 +0000 (16:23 -0800)]
safer storage for diskcacheplugin

14 years agodos -> unix line endings on CasAuthentication's CAS library
Brion Vibber [Mon, 11 Jan 2010 23:42:17 +0000 (15:42 -0800)]
dos -> unix line endings on CasAuthentication's CAS library

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Mon, 11 Jan 2010 23:36:24 +0000 (00:36 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoMerge branch 'diskcache' into 0.9.x
Evan Prodromou [Mon, 11 Jan 2010 23:34:27 +0000 (15:34 -0800)]
Merge branch 'diskcache' into 0.9.x

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Zach Copley [Mon, 11 Jan 2010 23:22:24 +0000 (23:22 +0000)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoFix format specifier on page title
Zach Copley [Mon, 11 Jan 2010 23:21:09 +0000 (23:21 +0000)]
Fix format specifier on page title

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Mon, 11 Jan 2010 23:12:13 +0000 (15:12 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch 'sessionidparam' into 0.9.x
Evan Prodromou [Mon, 11 Jan 2010 23:12:00 +0000 (15:12 -0800)]
Merge branch 'sessionidparam' into 0.9.x

14 years agostrip out session ID from root URL
Evan Prodromou [Mon, 11 Jan 2010 23:09:46 +0000 (15:09 -0800)]
strip out session ID from root URL

14 years agostrip out session ID from root URL
Evan Prodromou [Mon, 11 Jan 2010 23:09:46 +0000 (15:09 -0800)]
strip out session ID from root URL

14 years agoRegression fix: don't spew notices to log every time we get a non-cached user object
Brion Vibber [Mon, 11 Jan 2010 21:24:52 +0000 (13:24 -0800)]
Regression fix: don't spew notices to log every time we get a non-cached user object

14 years agofix long options on deleteuser.php
Brion Vibber [Mon, 11 Jan 2010 21:24:40 +0000 (13:24 -0800)]
fix long options on deleteuser.php

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Sarven Capadisli [Mon, 11 Jan 2010 15:48:02 +0000 (16:48 +0100)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoRemoved period
Sarven Capadisli [Mon, 11 Jan 2010 15:33:46 +0000 (16:33 +0100)]
Removed period

14 years agoExplicitly reseting notice_in-reply-to value
Sarven Capadisli [Mon, 11 Jan 2010 12:19:53 +0000 (12:19 +0000)]
Explicitly reseting notice_in-reply-to value

14 years agoApparently, I can't spell my family name.
Sarven Capadisli [Mon, 11 Jan 2010 12:02:04 +0000 (13:02 +0100)]
Apparently, I can't spell my family name.

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Mon, 11 Jan 2010 08:45:51 +0000 (00:45 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch 'sessionidparam' into 0.9.x
Evan Prodromou [Mon, 11 Jan 2010 08:45:26 +0000 (00:45 -0800)]
Merge branch 'sessionidparam' into 0.9.x

Conflicts:
lib/command.php

14 years agoinject session before redirect for openid finish login
Evan Prodromou [Mon, 11 Jan 2010 08:40:41 +0000 (08:40 +0000)]
inject session before redirect for openid finish login

14 years agoinject session before redirect for login
Evan Prodromou [Mon, 11 Jan 2010 08:40:22 +0000 (08:40 +0000)]
inject session before redirect for login

14 years agoaccept session from
Evan Prodromou [Mon, 11 Jan 2010 08:39:02 +0000 (08:39 +0000)]
accept session from

14 years agoMerge branch 'sessionidparam' of http://git.gitorious.org/~evan/statusnet/evans-mainl...
root [Mon, 11 Jan 2010 07:53:15 +0000 (07:53 +0000)]
Merge branch 'sessionidparam' of http://git.gitorious.org/~evan/statusnet/evans-mainline into sessionidparam

14 years agoadd session ID to local URL when server parts differ
Evan Prodromou [Mon, 11 Jan 2010 07:51:57 +0000 (23:51 -0800)]
add session ID to local URL when server parts differ

14 years agoSever -> server in error message
Evan Prodromou [Mon, 11 Jan 2010 06:59:32 +0000 (22:59 -0800)]
Sever -> server in error message

14 years agoSever -> server in error message
Evan Prodromou [Mon, 11 Jan 2010 06:59:32 +0000 (22:59 -0800)]
Sever -> server in error message

14 years agoremove redirect to OTP on login from login, register
Evan Prodromou [Mon, 11 Jan 2010 06:58:33 +0000 (22:58 -0800)]
remove redirect to OTP on login from login, register

14 years agoLocalisation updates for !StatusNet from !translatewiki.net !sntrans
Siebrand Mazeland [Mon, 11 Jan 2010 00:24:20 +0000 (01:24 +0100)]
Localisation updates for !StatusNet from !translatewiki.net !sntrans

14 years agoMerge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x
Evan Prodromou [Sun, 10 Jan 2010 22:18:54 +0000 (14:18 -0800)]
Merge branch '0.9.x' of git@gitorious.org:statusnet/mainline into 0.9.x

14 years agoMerge branch 'master' into 0.9.x
Evan Prodromou [Sun, 10 Jan 2010 22:18:19 +0000 (14:18 -0800)]
Merge branch 'master' into 0.9.x

Conflicts:
classes/Memcached_DataObject.php

14 years agodefaultDesign was undefined; fixed that
Evan Prodromou [Sun, 10 Jan 2010 22:10:31 +0000 (14:10 -0800)]
defaultDesign was undefined; fixed that

14 years agocatch exceptions from snapshot
Evan Prodromou [Sun, 10 Jan 2010 21:54:26 +0000 (13:54 -0800)]
catch exceptions from snapshot