summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'subadmin'Georg Ehrke2012-07-2615-46/+461
|\
| * Merge branch 'master' into subadminGeorg Ehrke2012-07-26155-3628/+16861
| |\
| * \ Merge branch 'master' into subadminGeorg Ehrke2012-07-211-84/+129
| |\ \
| * | | add some hooks for subadminsGeorg Ehrke2012-07-211-1/+24
| | | |
| * | | Merge branch 'master' into subadminGeorg Ehrke2012-07-2178-613/+347
| |\ \ \
| * | | | some js improvements for subadminsGeorg Ehrke2012-07-211-0/+3
| | | | |
| * | | | Merge branch 'master' into subadminGeorg Ehrke2012-07-20206-147/+376
| |\ \ \ \
| * | | | | don't show label 'add group' for subadmins and remove some debug codeGeorg Ehrke2012-07-201-5/+7
| | | | | |
| * | | | | Merge branch 'master' into subadminGeorg Ehrke2012-07-2046-254/+601
| |\ \ \ \ \
| * | | | | | improve default qouta for subadminsGeorg Ehrke2012-07-202-3/+14
| | | | | | |
| * | | | | | fix tooglegroup for subadminsGeorg Ehrke2012-07-201-1/+7
| | | | | | |
| * | | | | | simplify code of createuser.phpGeorg Ehrke2012-07-201-7/+4
| | | | | | |
| * | | | | | simplify code of changepassword.phpGeorg Ehrke2012-07-191-12/+2
| | | | | | |
| * | | | | | add isGroupAccessible in OC_SubAdminGeorg Ehrke2012-07-191-0/+7
| | | | | | |
| * | | | | | fix copy&paste fail and deny subadmins to set the default qoutaGeorg Ehrke2012-07-193-4/+4
| | | | | | |
| * | | | | | add some doc for lib/subadmin.phpGeorg Ehrke2012-07-191-1/+14
| | | | | | |
| * | | | | | fix setqouta for subadminsGeorg Ehrke2012-07-191-1/+7
| | | | | | |
| * | | | | | simplify code of remoteuser.phpGeorg Ehrke2012-07-191-14/+4
| | | | | | |
| * | | | | | add isUserAccessible method to OC_SubAdmin classGeorg Ehrke2012-07-191-0/+13
| | | | | | |
| * | | | | | fix removeuser.php for subadminsGeorg Ehrke2012-07-181-1/+17
| | | | | | |
| * | | | | | add checkSubAdminUser method to OC_JSON classGeorg Ehrke2012-07-181-0/+12
| | | | | | |
| * | | | | | remove unused code from togglesubadmins.phpGeorg Ehrke2012-07-181-4/+0
| | | | | | |
| * | | | | | fix changepassword.php for subadminsGeorg Ehrke2012-07-181-1/+22
| | | | | | |
| * | | | | | Merge branch 'master' into subadminGeorg Ehrke2012-07-181-1/+1
| |\ \ \ \ \ \
| * \ \ \ \ \ \ Merge branch 'master' into subadminGeorg Ehrke2012-07-1848-162/+292
| |\ \ \ \ \ \ \
| * \ \ \ \ \ \ \ Merge branch 'master' into subadminGeorg Ehrke2012-07-1541-517/+737
| |\ \ \ \ \ \ \ \
| * | | | | | | | | add another file which was missing in the previous commitGeorg Ehrke2012-07-151-0/+23
| | | | | | | | | |
| * | | | | | | | | subadmins can now add usersGeorg Ehrke2012-07-157-59/+149
| | | | | | | | | |
| * | | | | | | | | fix merge conflictsGeorg Ehrke2012-07-11189-442/+2354
| |\ \ \ \ \ \ \ \ \
| * | | | | | | | | | some work on subadminsGeorg Ehrke2012-07-095-11/+178
| | | | | | | | | | |
| * | | | | | | | | | add group_admin tableGeorg Ehrke2012-07-071-0/+26
| | | | | | | | | | |
| * | | | | | | | | | Merge branch 'master' into subadminGeorg Ehrke2012-07-0591-1016/+1771
| |\ \ \ \ \ \ \ \ \ \
| * \ \ \ \ \ \ \ \ \ \ Merge branch 'master' into oc_errorGeorg Ehrke2012-06-2720-132/+316
| |\ \ \ \ \ \ \ \ \ \ \
* | | | | | | | | | | | | Fix used space calculation if shared folder does not exist, fixes bug oc-1331Michael Gapczynski2012-07-261-1/+6
| | | | | | | | | | | | |
* | | | | | | | | | | | | LDAP: use OC_Cache to cache results from LDAP. Default is set to 10 min. ↵Arthur Schiwon2012-07-265-34/+109
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Should improve performance especially when LDAP users use the sync client, because userExists checks with the LDAP server are reduced.
* | | | | | | | | | | | | LDAP: some cleanupArthur Schiwon2012-07-261-3/+0
| | | | | | | | | | | | |
* | | | | | | | | | | | | code styleArthur Schiwon2012-07-261-3/+3
| |_|_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | |
* | | | | | | | | | | | fix errors like Failed opening required ownCloudcalendar/appinfo/remote.phpGeorg Ehrke2012-07-261-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | declare OCP\App::register as deprecatedGeorg Ehrke2012-07-261-0/+15
| | | | | | | | | | | |
* | | | | | | | | | | | convert through caldav transmitted rgba calendarcolor to rgbGeorg Ehrke2012-07-261-1/+7
| | | | | | | | | | | |
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-07-2644-8/+10405
| | | | | | | | | | | |
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-07-2624-708/+959
| | | | | | | | | | | |
* | | | | | | | | | | | Updated styleLukas Reschke2012-07-261-1/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Remove unused filesLukas Reschke2012-07-262-84/+0
| | | | | | | | | | | |
* | | | | | | | | | | | Check for admin userLukas Reschke2012-07-261-0/+1
| | | | | | | | | | | |
* | | | | | | | | | | | Updated packagesLukas Reschke2012-07-262-4/+2
| | | | | | | | | | | |
* | | | | | | | | | | | Create uniqid ETag for directoriesBart Visscher2012-07-254-1/+40
| | | | | | | | | | | |
* | | | | | | | | | | | Rename functionsBart Visscher2012-07-254-6/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | getETagPropertyForFile -> getETagPropertyForPath removeETagPropertyForFile -> removeETagPropertyForPath
* | | | | | | | | | | | Fix filesystem hash, no longer using basicOperation()Michael Gapczynski2012-07-255-7/+26
| | | | | | | | | | | |
* | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2012-07-2512-689/+949
| | | | | | | | | | | |