summaryrefslogtreecommitdiffstats
Commit message (Collapse)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 the etags get propagated correctly
| * 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 shares
| * | Fix parsing of remote URL when mounting remote sharesVincent Petry2014-06-252-2/+93
| | | | | | | | | | | | | | | | | | | | | | | | This fix allows for having the remote ownCloud instance live in a subpath like "http://example.com/basedir/subdir/owncloud". Such URLs are now parsed correctly. Added unit test for URL parsing.
* | | Merge pull request #9194 from owncloud/revertloadappsVicDeo2014-06-251-0/+1
|\ \ \ | | | | | | | | Bring back loadApps() in base.php
| * | | Bring back loadApps() in base.phpVincent Petry2014-06-241-0/+1
| | | | | | | | | | | | | | | | | | | | loadApps() had been deleted by mistake in 799205488cf82312586f99185e13df6015caa2ff
* | | | Merge pull request #9202 from owncloud/urlhashfixMorris Jobke2014-06-252-23/+27
|\ \ \ \ | | | | | | | | | | Do not clear URL hash when no external mount params given
| * | | | 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
| | |/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Whenever external share parameters were passed through the URL hash, the URL hash will now be cleared. In other cases, the hash needs to be left alone because it is used as workaround for the lack of history API in IE8 / IE9 Removed getParamterByName() and use OC.Util.History.parseUrlQuery() that does the same, including replacing the "+" with spaces.
* | | | Merge pull request #9123 from owncloud/webdav-move-permissionsicewind19912014-06-252-4/+5
|\ \ \ \ | | | | | | | | | | Fix permissions check when moving a file to a different directory over webdav
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Sharing fix permissions
| * | | | | 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 ↵Bjoern Schiessle2014-06-241-1/+1
| | | | | | | | | | | | | | | | | | | | | | | | operation
| * | | | | 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 ↵Arthur Schiwon2014-06-254-70/+130
| |_|/ / |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | list of groups on big setups #9002 fix PHPdoc Conflicts: apps/user_ldap/lib/connection.php add method to count groups on LDAP Conflicts: apps/user_ldap/lib/access.php LDAP Wizard: count users and groups with the power of paged search Conflicts: apps/user_ldap/lib/wizard.php consolidate requirement check fix PHPdoc Conflicts: apps/user_ldap/lib/access.php Wizard: get really all groups from LDAP by power of Paged Search Conflicts: apps/user_ldap/lib/wizard.php make all this work in an early configuration state in the wizard by marking the config active and ignoring the validation state. Conflicts: apps/user_ldap/lib/connection.php simplify two methods a bit, because they are not used for group search anymore Conflicts: apps/user_ldap/lib/wizard.php remove unused vars; increase scrutinizer happiness
* | | | Merge pull request #9145 from owncloud/everyonecountblizzz2014-06-242-1/+4
|\ \ \ \ | | | | | | | | | | Enhancement: Displays users and admin count in the Users Management.
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | Remove warning when deleting all entries
| * | | | | Merge if statementsJoas Schilling2014-06-231-6/+2
| | | | | |
| * | | | | Remove warning when deleting all entriesVincent Petry2014-06-231-1/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When deleting all entries, only "allfiles" is defined but not "file" or "files", which caused a PHP warning to be logged.
* | | | | | 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 page
| * | | | | 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
|\ \ \ \ \ | |/ / / / |/| | | | always use '/' as directory seperator
| * | | | 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 reversion
| * | | | 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
|\ \ \ \ \ | | | | | | | | | | | | fix recursion on rmdirr
| * | | | | 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 rename
| * | | | | | Fix blurring of invalid file name on renameVincent Petry2014-06-232-4/+53
| | |_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When renaming to an existing file name, blurring the field should not remove it. This fix keeps the field until escape is pressed instead of replacing it with a broken empty space.
* | | | | | Merge pull request #9159 from owncloud/enabledapp-cache-loggedinJoas Schilling2014-06-231-2/+7
|\ \ \ \ \ \ | | | | | | | | | | | | | | Only cache enabled apps when logged in
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Fix moving files into read only public shares
| * | | | | | | Dont allow opening writable streams on a read only dav mountRobin Appelman2014-06-231-0/+6
| |/ / / / / /
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-08 19:12:54 +0000