summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 7.0.4 RC2v7.0.4RC2Frank Karlitschek2014-12-051-2/+2
|
* Merge pull request #12623 from owncloud/fix-s2s-oc7Björn Schießle2014-12-041-1/+1
|\ | | | | password column needs to allow null (oc7 backport)
| * password column needs to allow null otherwise Oracle will break for empty ↵Bjoern Schiessle2014-12-041-1/+1
| | | | | | | | passwords
* | Merge pull request #12309 from owncloud/ldap-cache-user-countblizzz2014-12-041-0/+5
|\ \ | | | | | | LDAP: cache total user count
| * | cache total user countArthur Schiwon2014-11-191-0/+5
| | |
* | | Merge pull request #12493 from owncloud/ldap_search_perfblizzz2014-12-044-2/+153
|\ \ \ | |_|/ |/| | LDAP search behaviour modifications
| * | trim search string before passing it onArthur Schiwon2014-12-041-1/+1
| | |
| * | LDAP search filter creation changes:Arthur Schiwon2014-11-281-1/+40
| | | | | | | | | | | | | | | | | | | | | | | | | | | 1. do not prepend * wildcard to search terms. Will result in faster search, but you don't find "foobar" when looking for "bar" 2. advanced behaviour when search string contains a space and multiple search attributes are present. The search string is split into single words. The resulting filter requires that each word at least appears once in any search attribute. This is supposed to return better results in big LDAPs.
| * | add ldap-search command to occArthur Schiwon2014-11-283-0/+112
| | |
* | | Merge pull request #12528 from owncloud/backport-12419Thomas Müller2014-12-035-6/+39
|\ \ \ | | | | | | | | Allow read-only configuration
| * | | Allow read-only configurationLukas Reschke2014-12-015-6/+39
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Workaround required for IIS setups running ownCloud to prevent dataloss. Long-term solution would be to move some configuration settings to the database Conflicts: lib/base.php settings/admin.php
* | | | add proper description what database is supported by CE and EEMorris Jobke2014-12-031-7/+13
| | | |
* | | | 7.0.4 RC1v7.0.4RC1Frank Karlitschek2014-12-011-2/+2
|/ / /
* | | Merge pull request #11747 from owncloud/storeCredentialsOnlyInSessionIfRequiredVincent Petry2014-12-0112-4/+416
|\ \ \ | | | | | | | | Store credentials only in session if required
| * | | Only store user credentials when SMB_OC storage is enabledLukas Reschke2014-11-201-3/+27
| | | |
| * | | Backport \OC\Security\Crypto to ownCloud 7Lukas Reschke2014-11-2011-1/+389
| | | | | | | | | | | | | | | | | | | | Conflicts: lib/repair/repairconfig.php
* | | | Merge pull request #12496 from owncloud/check-xml-writer-for-7Thomas Müller2014-12-011-0/+7
|\ \ \ \ | | | | | | | | | | Check for XMLWriter class
| * | | | Check for XMLWriter classLukas Reschke2014-11-281-0/+7
| | | | | | | | | | | | | | | | | | | | Backport of https://github.com/owncloud/core/pull/12321
* | | | | Adjust sample configLukas Reschke2014-11-281-1/+1
| | | | |
* | | | | Disable MSSQL for new CE installationsLukas Reschke2014-11-281-1/+3
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | Since automatic schema migrations are not yet possible let's disable this for now. Conflicts: lib/private/setup.php
* | | | Markup correctionsCarla Schroder2014-11-281-3/+2
| | | |
* | | | Add notes that SQLite is CE onlyCarla Schroder2014-11-281-2/+5
| |/ / |/| |
* | | delete old previewsGeorg Ehrke2014-11-271-1/+1
| | |
* | | added comment that App Store is disabled for EECarla Schroder2014-11-261-0/+1
| | |
* | | 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
| | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-05 07:59:47 +0000