summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Don't show favicon to prevent iteration through subfoldersLukas Reschke2014-11-261-1/+1
| | | | The codepath for generating the favicons iterates through subnodes and if one of those nodes is unavailable is throwing a 503 exception. Since these favicons don't have any use except of "making a tool for developers looking nicer" I consider it feasible to remove them.
* Consolidate if statement, and update unit testMiguel Prokop2014-11-262-8/+4
|
* fix calculation of expiration date if there is a default expiration date set ↵Miguel Prokop2014-11-261-3/+8
| | | | (but not forced) and the user does not want the link to expire.
* Merge pull request #12397 from owncloud/fix-undefined-appitemMorris Jobke2014-11-261-1/+1
|\ | | | | [stable7] fixes undefined appitem - fixes #12396
| * fixes undefined appitem - fixes #12396Morris Jobke2014-11-251-1/+1
| |
* | Merge pull request #12415 from owncloud/port-12262Morris Jobke2014-11-251-1/+1
|\ \ | | | | | | Backport #12262
| * | The "dir" key is used within the public sharing template to indicate in ↵Lukas Reschke2014-11-251-1/+1
| |/ | | | | | | | | | | | | | | | | | | | | which directory the user currently is when sharing a directory with subdirectories. This is needed by the JS scripts. However, when not accessing a directory then "dir" was set to the relative path of the file (from the user's home directory), meaning that for every public shared file the sharee can see the path. (For example if you share the file "foo.txt" from "finances/topsecret/" the sharee would still see the path "finances/topsecret/" from the shared HTML template) This is not the excpected behaviour and can be considered a privacy problem, this patch addresses this by setting "dir" to an empty key. Port of https://github.com/owncloud/core/pull/12262, approved with https://github.com/owncloud/core/pull/12262#issuecomment-64394040
* | Try to read the file only instead of trying to touchLukas Reschke2014-11-251-3/+3
| | | | | | | | | | | | | | | | | | The permissions are already catched properly on the installation so we just have to check whether the file is readable to prevent fatal errors from happening. Fixes https://github.com/owncloud/core/issues/12135 Conflicts: lib/private/config.php
* | use login name to verify passwordBjoern Schiessle2014-11-251-1/+2
|/
* Merge pull request #12373 from owncloud/backport_preview_fixes_stable7Morris Jobke2014-11-241-20/+105
|\ | | | | Backport preview fixes stable7
| * delete all children's previews when deleting a folderGeorg Ehrke2014-11-231-14/+93
| | | | | | | | | | | | | | add phpdoc Conflicts: lib/private/preview.php
| * add y to with-aspect naming schemaGeorg Ehrke2014-11-231-7/+13
| |
* | Use `/` as redirect location if webroot is set to an empty valueLukas Reschke2014-11-241-1/+5
|/ | | | | | | | | | | | If the webroot has been set to an empty value or ownCloud has been installed at the root location (`/``) there is a fair chance that the redirect for password resets does not work at all. This means that while the password is getting resetted the user is not redirected to the login page. I'm aware that it might be better to just set the webroot to `/` in those cases but this patch is better in the regard that it cannot break stuff. Thanks to @PVince81 for helping me debugging this. (I'm a moron and assumed it couldn't be THAT easy) Reported by @cdamken
* Merge pull request #12131 from owncloud/stable7-enc-recoverykeywithextstoragefixVincent Petry2014-11-202-9/+58
|\ | | | | [stable7] Fix file upload to ext storage when recovery key is enabled
| * Fix file upload to ext storage when recovery key is enabledVincent Petry2014-11-172-9/+58
| | | | | | | | | | | | | | | | Fixes an issue when uploading files to external storage when recovery keys are enabled The Util class only works with real users, so instantiating it with the virtual recovery key user or public key user can cause issues.
* | Show warning when invalid user was passedVincent Petry2014-11-201-0/+8
| | | | | | | | | | | | | | | | Sometimes there are bugs that cause setupFS() to be called for non-existing users. Instead of failing hard and breaking the instance, this fix simply logs a warning. Backport c941c3fa5139ba4f122d4f40d9c9db5e50f8bcb7 from master
* | adjust autocomplete behavior for sharing menuCraig Morrissey2014-11-191-1/+1
| |
* | Merge pull request #12288 from owncloud/backport-mapper-fixesJoas Schilling2014-11-191-26/+49
|\ \ | | | | | | Backport mapper fixes
| * | Fix mapping of relative pathsLukas Reschke2014-11-191-14/+30
| | |
| * | Use md5() of the original name instead of uniqid() for slugifyingJoas Schilling2014-11-191-1/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Previously we used uniqid() here. However this means that the behaviour is not reproducable, so when uploading files into a "empty" folder, the folders name is different. If there would be a md5() hash collition, the deduplicate check will spot this and append an index later, so this should not be a problem. Fix #6722
| * | Fix code layout before fixing the functionJoas Schilling2014-11-191-13/+9
| | |
* | | Merge pull request #12291 from owncloud/issue/10991-stable7-backportJoas Schilling2014-11-1947-425/+805
|\ \ \ | |/ / |/| | Issue/10991 stable7 backport
| * | fixing cache routesClark Tomlinson2014-11-192-6/+6
| | | | | | | | | | | | | | | | | | Conflicts: tests/lib/cache/file.php tests/lib/cache/usercache.php
| * | use the new base class for share/share.php testsBjoern Schiessle2014-11-191-10/+12
| | |
| * | Simple fix for the wrong Mapper resetJoas Schilling2014-11-192-3/+6
| | |
| * | Back to OC_Util::generateRandomBytes()Joas Schilling2014-11-191-4/+1
| | |
| * | Correctly restore previous root mount point after testingJoas Schilling2014-11-1915-55/+202
| | | | | | | | | | | | | | | | | | Conflicts: tests/lib/cache/file.php tests/lib/cache/usercache.php
| * | Correctly refresh the apps list after removing the mockJoas Schilling2014-11-191-0/+3
| | |
| * | Fix Files\Storage\Home::testRoot()Joas Schilling2014-11-191-1/+6
| | |
| * | Make it possible to cleanPath() absolute Windows pathsJoas Schilling2014-11-191-2/+11
| | |
| * | Fix single run of encryption tests and usages of uniqid() and fopen()Joas Schilling2014-11-1912-252/+375
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Conflicts: apps/files_encryption/tests/crypt.php apps/files_encryption/tests/helper.php apps/files_encryption/tests/hooks.php apps/files_encryption/tests/keymanager.php apps/files_encryption/tests/proxy.php apps/files_encryption/tests/share.php apps/files_encryption/tests/stream.php apps/files_encryption/tests/trashbin.php apps/files_encryption/tests/webdav.php
| * | Skip some more tests on Windows which just can not work at allJoas Schilling2014-11-196-11/+51
| | | | | | | | | | | | | | | | | | | | | Conflicts: tests/lib/archive/tar.php tests/lib/files/storage/local.php tests/lib/files/view.php
| * | Windows does not support CHMOD, therefor we can not test not writable foldersJoas Schilling2014-11-191-0/+4
| | | | | | | | | | | | | | | Conflicts: tests/lib/tempmanager.php
| * | Test LargeFileHelperGetFileSize also with ascii only charactersJoas Schilling2014-11-191-18/+37
| | | | | | | | | | | | And skip the UTF8 names on Windows as they are not supported
| * | Do not use uniqid in Group and User tests as it is not unique on windowsJoas Schilling2014-11-197-67/+62
| | |
| * | Testcase base classJoas Schilling2014-11-191-0/+33
|/ /
* | only users can have a display name different from the idBjoern Schiessle2014-11-181-1/+4
| |
* | make sure that we only find the shares from the correct share type if users ↵Bjoern Schiessle2014-11-181-2/+8
| | | | | | | | and groups with the same ID exists
* | make sure that we don't find the wrong shares if a user and a group have the ↵Bjoern Schiessle2014-11-182-6/+51
| | | | | | | | same ID
* | Merge pull request #12154 from owncloud/ignore-port-for-trusted-domainMorris Jobke2014-11-186-13/+79
|\ \ | | | | | | Ignore port for trusted domains
| * | add newlineMorris Jobke2014-11-181-1/+1
| | |
| * | Add repair steps for legacy config filesLukas Reschke2014-11-132-1/+56
| | | | | | | | | | | | Remove all ports from the trusted domains
| * | Ignore port for trusted domainsLukas Reschke2014-11-134-12/+23
| | | | | | | | | | | | | | | | | | This lead to a lot of confusion in the past and did not really offer any value. Let's remove the port check therefore. (it's anyways not really a part of the domain) Fixes https://github.com/owncloud/core/issues/12150 and https://github.com/owncloud/core/issues/12123 and also a problem reported by @DeepDiver1975.
* | | Merge pull request #12223 from owncloud/fix-unit-tests-s7Lukas Reschke2014-11-171-1/+6
|\ \ \ | | | | | | | | Backport #12181
| * | | Backport #12181Lukas Reschke2014-11-171-1/+6
| | | | | | | | | | | | This should fix the stable7 unit tests again since the last CI update.
* | | | file size on non-(Linux/BSD/Windows)-installationsMichael Roitzsch2014-11-171-1/+1
|/ / / | | | | | | | | | Determining the file size using the exec() method is implemented for Linux, BSD, and Windows. However, on systems matching neither platform name (like SunOS), the fall-through path will return a file size result constituting a zero size instead of an invalid null return value.
* | | Check if app is enabled for userLukas Reschke2014-11-152-2/+13
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
* | | Hiding add to your own cloud if server2server sharing is not enabledClark Tomlinson2014-11-132-1/+9
| | |
* | | cleanup group admin(s) on deleteGroupmichag862014-11-131-0/+4
| | |
* | | removal of wrong/double implemented checkmichag862014-11-131-1/+1
| | | | | | | | | | | | Check already implemented in core/settings/ajax/changedisplayname.php
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-13 08:44:53 +0000