Michael Gapczynski 11d1627513 Merge branch 'master' into sharing. Integrate with changes in master, rename classes ... Conflicts: lib/base.php		2011-07-30 19:40:19 -04:00
..
ajax	Merge branch 'master' into sharing. Integrate with changes in master, rename classes	2011-07-30 19:40:19 -04:00
appinfo	Merge branch 'master' into sharing. Integrate with changes in master, rename classes	2011-07-30 19:40:19 -04:00
js	Revise permissions system to support read, write, and delete	2011-07-30 16:03:32 -04:00
templates	Remove shared items check, it prevents sharing items if there aren't already any.	2011-07-21 14:53:51 -04:00
lib_share.php	Merge branch 'master' into sharing. Integrate with changes in master, rename classes	2011-07-30 19:40:19 -04:00
list.php	Merge branch 'master' into sharing. Integrate with changes in master, rename classes	2011-07-30 19:40:19 -04:00
sharedstorage.php	Merge branch 'master' into sharing. Integrate with changes in master, rename classes	2011-07-30 19:40:19 -04:00