summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2012-07-28129-366/+9448
* bookmarks.pot and lib.pot added to transifexThomas Mueller2012-07-281-0/+12
* Set filter to empty if not set by Ampache clientMichael Gapczynski2012-07-271-3/+2
* Set the user id when authenticating user for Ampache, fixes bug oc-219Michael Gapczynski2012-07-271-0/+2
* Fix group detection for sharing in case username contains '@', fix for oc-1270Michael Gapczynski2012-07-272-2/+7
* Only call mkdir() if the root folder does not exist for FTP external storageMichael Gapczynski2012-07-271-2/+3
* Fix incorrect copy/paste for file_put_contents()Michael Gapczynski2012-07-271-1/+1
* fix for bug #1295, don't escape password reset linkBjoern Schiessle2012-07-271-1/+1
* Merge commit 'refs/merge-requests/76' of git://gitorious.org/owncloud/ownclou...Georg Ehrke2012-07-272-1/+5
|\
| * Server verhindert beim OSX Client einen DeleteSteven2012-02-132-1/+5
* | Cast groups as string, fixes bug oc-1309. Thanks to nderambure.Michael Gapczynski2012-07-261-1/+1
* | Forgot data parameter for file_put_contents() streams pre proxiesMichael Gapczynski2012-07-261-1/+1
* | Run pre and post proxies for file_put_contents() streamsMichael Gapczynski2012-07-261-31/+36
* | Check if size isset, try to fix used space calculation again, fixs bug oc-1331Michael Gapczynski2012-07-261-1/+1
* | [tx-robot] updated from transifexJenkins for ownCloud2012-07-27138-3907/+8619
* | fix spelling failGeorg Ehrke2012-07-261-1/+1
* | LDAP: add Test Configuration functionality in the settingsArthur Schiwon2012-07-264-1/+71
* | Smarter remove of etag properties for pathBart Visscher2012-07-262-3/+18
* | Fix oc-1362: post_rename has no path param but newpath and oldpathBart Visscher2012-07-261-1/+5
* | 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