Commit Graph

25 Commits

Author SHA1 Message Date
Sam Tuke 8b01286a5d Merged branch 'master' 2012-10-16 16:57:07 +01:00
Bart Visscher 4a5973662c Merge branch 'unstable'
Conflicts:
	apps/files_external/tests/config.php
	apps/files_versions/ajax/getVersions.php
	apps/files_versions/appinfo/app.php
	apps/files_versions/history.php
	apps/files_versions/js/versions.js
	apps/files_versions/templates/history.php
	apps/files_versions/versions.php
	lib/base.php
2012-06-04 23:02:05 +02:00
Frank Karlitschek ad6562d14f sort users and groups. fixes oc-779 2012-06-01 14:18:14 +02:00
Frank Karlitschek a945fa10a6 update copyright 2012-05-26 19:14:24 +02:00
Robin Appelman 2c99924f7d make sure the group exists in the backend before adding a user to it 2012-05-17 00:47:43 +02:00
Bart Visscher e77ba0280a Implement default functions in OC_Group backend
Simplifies calling these functions, and makes code simpler

functions:
inGroup
getUserGroups
getGroups
usersInGroup
2012-05-10 09:14:26 +02:00
Bart Visscher 68b1ae1a36 OC_Group_Backend.php misses function groupexists
Fix http://bugs.owncloud.org/thebuggenie/owncloud/issues/oc-182
2012-04-15 17:11:03 +02:00
Robin Appelman 1d8fdf52d5 allow multiply group backends 2012-04-13 01:59:05 +02:00
Michael Gapczynski 67156f87e3 Add missing parameter to usersInGroup() 2011-08-12 20:53:36 -04:00
Robin Appelman bfd72501a1 add OC_Group::usersInGroup() to get a list of all users in a group 2011-08-11 10:12:17 +02:00
Robin Appelman f03874ac49 work on user management 2011-08-10 22:38:28 +02:00
Jakob Sack bafd684eb6 Renaming classes :-) 2011-07-29 21:36:03 +02:00
Jakob Sack f5c0dbd947 Use autoload 2011-07-27 19:07:28 +02:00
Jakob Sack da30671ec4 More error checking in user management 2011-04-18 12:39:28 +02:00
Jakob Sack a1ff99126a prevent users from deleting admin group 2011-04-18 11:53:38 +02:00
Jakob Sack f22c05deab Check for existance of group- and usernames, don't mix OC_USER and OC_GROUP! 2011-04-18 11:48:52 +02:00
Jakob Sack b37fb9142f Added tons of Hooks to OC_USER and OC_GROUP 2011-04-18 11:39:29 +02:00
Jakob Sack a70330e9be Improved documentation for group management 2011-04-18 10:00:45 +02:00
Jakob Sack d314c33715 do not redeclare methods 2011-04-17 01:06:48 +02:00
Jakob Sack cb2d8db9ce Merge branch 'refactoring' of git://anongit.kde.org/owncloud into refactoring 2011-04-17 01:04:43 +02:00
Jakob Sack c4287162c4 Some work on the fancy user management 2011-04-17 01:04:23 +02:00
Robin Appelman 25d687f35a add OC_GROUP::createGroup(); 2011-04-17 00:28:44 +02:00
Robin Appelman 232654cb60 get rid of the oc_require and friends 2011-04-16 10:12:53 +02:00
Jakob Sack 3c01e30748 Try to make owncloud working again 2011-04-15 18:13:49 +02:00
Jakob Sack 149793f2e7 First version of the new user management 2011-04-15 17:14:02 +02:00