luyijun 73e57422c7 Merge remote-tracking branch 'upstream/master'		2014-10-22 00:37:49 +08:00
..
commands	Fixed arg_regex inheritance across child commands. Resolves #601.	2014-10-17 18:28:53 +02:00
comms	Changed to Django1.7. Django 1.6 no longer supported. To change, upgrade django to 1.7+ and then run manage.py migrate, possibly followed by manage.py migrate --fake for objects and players.	2014-09-17 10:49:42 +02:00
help	Changed to Django1.7. Django 1.6 no longer supported. To change, upgrade django to 1.7+ and then run manage.py migrate, possibly followed by manage.py migrate --fake for objects and players.	2014-09-17 10:49:42 +02:00
locks	Readding some functionality.	2014-10-08 09:16:01 +02:00
objects	Added auto-conversion of typeclass to dbobj in ObjectDB.contents_get()	2014-09-30 12:31:44 +02:00
players	Changed at_cmdset_get() hook to at_cmdset_get(**kwargs). This allows for the possibility to control dynamic generation of cmdsets, for example to force Exit cmdsets to be rebuilt. The aliasing command now uses this. Resolves #563.	2014-09-20 10:26:59 +02:00
scripts	Made new tickerhandler store_key more ubiquitous, in case of not stopping server before pulling latest.	2014-10-20 06:07:15 +02:00
server	Added TCP keepalive to telnet and webclient, to make sure to (eventually) catch dead connections. Should help #498, but should test on demo before closing.	2014-10-20 23:40:01 +02:00
tests	Changed at_cmdset_get() hook to at_cmdset_get(**kwargs). This allows for the possibility to control dynamic generation of cmdsets, for example to force Exit cmdsets to be rebuilt. The aliasing command now uses this. Resolves #563.	2014-09-20 10:26:59 +02:00
typeclasses	Made property assignment go to Typeclass if that property were already defined on typeclass; otherwise relegate to dbobj as before. This fixes issues with property assignments on the Typeclass level. There are no obvious regressions in testing this but it's something to keep an eye out for in case there are any unexpected side effects.	2014-09-30 14:12:58 +02:00
utils	Merge remote-tracking branch 'upstream/master'	2014-10-22 00:37:49 +08:00
web	Fixed issue in template where it was pointing to the old logo name.	2014-09-28 13:02:27 -05:00
__init__.py	Changed contrib/procpool's PROC_MODIFIED_OBJS list to sit in src.utils.idmapper.base as well as be a WeakValueDictionary instead of a normal list. This removes unnecessary reference counts to objects.	2014-05-14 20:07:59 +02:00
settings_default.py	Fixed an AttributeError on website and a deprecationwarning for middleware relocation.	2014-09-17 14:47:07 +02:00