summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* dont strip the s from the resourceBernhard Posselt2014-06-262-6/+6
* Merge pull request #9193 from owncloud/sharing_etag_propagationBjörn Schießle2014-06-266-22/+261
|\
| * make sure that hooks are registered for the testsBjoern Schiessle2014-06-253-14/+23
| * make sure that during share and unshare the etags get propagated correctlyBjoern Schiessle2014-06-255-12/+242
* | [tx-robot] updated from transifexJenkins for ownCloud2014-06-2630-239/+267
* | 7.0 beta 1v7.0.0beta1Frank Karlitschek2014-06-251-2/+2
* | Merge pull request #9205 from owncloud/remoteshare-fixurlpathVincent Petry2014-06-252-2/+93
|\ \
| * | Fix parsing of remote URL when mounting remote sharesVincent Petry2014-06-252-2/+93
* | | Merge pull request #9194 from owncloud/revertloadappsVicDeo2014-06-251-0/+1
|\ \ \
| * | | Bring back loadApps() in base.phpVincent Petry2014-06-241-0/+1
* | | | Merge pull request #9202 from owncloud/urlhashfixMorris Jobke2014-06-252-23/+27
|\ \ \ \
| * | | | Fix parsing URL hash when no "?" was specifiedVincent Petry2014-06-251-0/+4
| * | | | Do not clear URL hash when no external mount params givenVincent Petry2014-06-251-23/+23
| | |/ / | |/| |
* | | | Merge pull request #9123 from owncloud/webdav-move-permissionsicewind19912014-06-252-4/+5
|\ \ \ \
| * | | | Fix unit testsRobin Appelman2014-06-201-0/+4
| * | | | Fix permissions check when moving a file to a different directory over webdavRobin Appelman2014-06-201-4/+1
* | | | | Merge pull request #9189 from owncloud/sharing_fix_permissionsicewind19912014-06-254-7/+37
|\ \ \ \ \
| * | | | | really always take root of the substorageRobin Appelman2014-06-251-1/+1
| * | | | | always take root of the substorageBjoern Schiessle2014-06-241-1/+1
| * | | | | add/update unit testsBjoern Schiessle2014-06-242-3/+33
| * | | | | only the mount point has delete and update permissions to enable rename opera...Bjoern Schiessle2014-06-241-1/+1
| * | | | | make sure that we always return the correct permissionsBjoern Schiessle2014-06-242-5/+5
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-2543-327/+388
| |_|_|_|/ |/| | | |
* | | | | adjust access constructor to masterArthur Schiwon2014-06-252-2/+10
* | | | | Port of LDAP Wizard: get correct total no of users, groups and complete list...Arthur Schiwon2014-06-254-70/+130
| |_|/ / |/| | |
* | | | Merge pull request #9145 from owncloud/everyonecountblizzz2014-06-242-1/+4
|\ \ \ \
| * | | | Better Logic to display user count for everyone.raghunayyar2014-06-242-1/+4
* | | | | Merge pull request #9168 from owncloud/files-phpwarningondeleteVincent Petry2014-06-241-5/+2
|\ \ \ \ \
| * | | | | Merge if statementsJoas Schilling2014-06-231-6/+2
| * | | | | Remove warning when deleting all entriesVincent Petry2014-06-231-1/+2
* | | | | | Merge pull request #9180 from owncloud/fix-error-on.update-pageVincent Petry2014-06-241-0/+6
|\ \ \ \ \ \ | |_|_|_|_|/ |/| | | | |
| * | | | | fixes the layout for error messages on the update pageMorris Jobke2014-06-241-0/+6
| | |_|/ / | |/| | |
* | | | | Merge pull request #9181 from owncloud/enc_recursive_mkdirMorris Jobke2014-06-242-3/+31
|\ \ \ \ \ | |/ / / / |/| | | |
| * | | | add unit testsBjoern Schiessle2014-06-242-2/+30
| * | | | always use '/' as directory seperatorBjoern Schiessle2014-06-241-1/+1
|/ / / /
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-06-2434-325/+382
* | | | Merge pull request #9074 from geez0x1/masterMorris Jobke2014-06-231-1/+1
|\ \ \ \
| * | | | Update the modified date in UI on file reversiongeez0x12014-06-171-1/+1
* | | | | Merge pull request #9158 from owncloud/no-recursion-on-rmdirr-masterThomas Müller2014-06-232-6/+35
|\ \ \ \ \
| * | | | | update PHPDoc $fileInfo is a SplFileInfoThomas Müller2014-06-231-1/+1
| * | | | | Added unit test for the helper's rmdirrVincent Petry2014-06-231-0/+24
| * | | | | dir itself has to be removed as wellThomas Müller2014-06-231-0/+1
| * | | | | fix recursion on rmdirrThomas Müller2014-06-231-7/+11
* | | | | | Merge pull request #9170 from owncloud/files-renamevalidationblurLukas Reschke2014-06-232-4/+53
|\ \ \ \ \ \
| * | | | | | Fix blurring of invalid file name on renameVincent Petry2014-06-232-4/+53
| | |_|/ / / | |/| | | |
* | | | | | Merge pull request #9159 from owncloud/enabledapp-cache-loggedinJoas Schilling2014-06-231-2/+7
|\ \ \ \ \ \
| * | | | | | Add commentRobin Appelman2014-06-231-0/+3
| * | | | | | Only cache enabled apps when logged inRobin Appelman2014-06-231-2/+4
* | | | | | | Merge pull request #9124 from owncloud/move-permissionsVincent Petry2014-06-231-0/+6
|\ \ \ \ \ \ \
| * | | | | | | Dont allow opening writable streams on a read only dav mountRobin Appelman2014-06-231-0/+6
| |/ / / / / /