summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
* | 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-181-6/+10
| | | | | | | | same ID
* | Merge pull request #12154 from owncloud/ignore-port-for-trusted-domainMorris Jobke2014-11-184-10/+72
|\ \ | | | | | | 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-132-9/+16
| | | | | | | | | | | | | | | | | | 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.
* | | 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-151-0/+11
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12188 for AppFramework apps
* | | 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
* | | fix for issue #10880michag862014-11-131-1/+1
| | |
* | | Merge pull request #12109 from owncloud/add-preupdate-before-upgradeLukas Reschke2014-11-132-5/+17
|\ \ \ | |_|/ |/| | Run preupdate before an update
| * | Run preupdate before an updateLukas Reschke2014-11-112-5/+17
| |/ | | | | | | | | | | | | | | The update routine tries to test the database migration before actually performing the update. However, this will fail hard if the schema has changed (for example an unique key has been added). App developers can convert the DB in preupdate.php, however it is not called before and therefore the update fails. This actually breaks ownCloud updates from ownCloud 6 to ownCloud 7 when the files_antivirus app is enabled.
* / Fix root path handling for WebDAV ext storageVincent Petry2014-11-121-0/+2
|/ | | | | | Added missing cleanPath() call that converts "/" to "" when calling SabreDAV. This is needed because SabreDAV will discard its base URL when passing "/".
* Ensure there is a connection object within \OC_DB::enableCaching()Thomas Müller2014-11-101-2/+3
|
* logging changesCraig Morrissey2014-11-071-0/+3
|
* Convert StorageNotAvailableException to SabreDAV exceptionVincent Petry2014-11-064-114/+158
| | | | | | | | | | | | | Convert \OCP\Files\StorageNotAvailableException to \Sabre\DAV\Exception\ServiceUnavailable for every file/directory operation happening inside of SabreDAV. This is necessary to avoid having the exception bubble up to remote.php which would return an exception page instead of an appropriate response. Conflicts: lib/private/connector/sabre/directory.php lib/private/connector/sabre/file.php
* fix typo in content typeBernhard Posselt2014-11-051-1/+1
|
* Support HTML in logo claimLukas Reschke2014-11-052-0/+20
|
* allow passing driver options, fixes #11718Jörn Friedrich Dreyer2014-11-031-0/+6
|
* Fix stupid copy paste failLukas Reschke2014-10-301-1/+1
| | | | ...
* Show login again instead of JSON if CSRF check failsLukas Reschke2014-10-291-1/+3
| | | | | | | | Previously a JSON error page was shown to the user in-case the CSRF token was not valid. This was confusing and prevented people from login. With this at least the login page is shown again and not a JSON error message. I consider this as sufficient since adding a new error page just for this sake would uneededly make lib/base.php even more cluttered and this is a edge-case which optimally should anyways not happen that often. This can be tested by opening the login page, then clearing the cookies, and trying to login.
* Merge pull request #11802 from owncloud/backport-10958Lukas Reschke2014-10-287-19/+73
|\ | | | | Backport #10958
| * Introduce cross-db ILIKERobin Appelman2014-10-277-19/+73
| | | | | | | | | | | | | | | | | | | | | | | | | | | | adding ILIKE to AdapterSQLSrv add test case for ILIKE with wildcard Make sqlite LIKE case sensitive on default Implement ILIKE for sqlite Use ILIKE in cache search Fix ILIKE without wildcards for oracle
* | Merge pull request #11800 from owncloud/backport-MakeSupportedDBsConfigurableThomas Müller2014-10-283-7/+106
|\ \ | | | | | | Make supported DBs configurable within config.php
| * | Make supported DBs configurable within config.phpLukas Reschke2014-10-273-7/+106
| |/ | | | | | | | | | | | | | | | | This commit will make the supported DBs for installation configurable within config.php. By default the following databases are tested: "sqlite", "mysql", "pgsql". The reason behind this is that there might be instances where we want to prevent SQLite to be used by mistake. To test this play around with the new configuration parameter "supportedDatabases". Conflicts: lib/private/util.php
* / Properly catch 503 storage not available in getQuotaInfoVincent Petry2014-10-281-7/+11
|/ | | | | | | | | When doing a PROPFIND on the root and one of the mount points is not available, the returned quota attributes will now be zero. This fix prevents the expected exception to make the whole call fail. Backport of 21d825ed6c11425d36a143f8ed63f1e3852d0aeb from master
* Make files non executableLukas Reschke2014-10-245-0/+0
| | | | There is not much sense in having these files marked executable, we should avoid that.
* Backport of #11702Arthur Schiwon2014-10-221-4/+5
| | | | | | set up FS by username, not login name\! better variable name
* always use the correct share typeBjoern Schiessle2014-10-211-3/+3
|
* Refer to relative path instead of absolute pathLukas Reschke2014-10-201-9/+21
| | | | | | | | | | There is no need to refer to the absolute path here if we can use the relative one. Conflicts: lib/private/templatelayout.php Conflicts: lib/private/templatelayout.php
* Add unit tests for convertToRelativePathLukas Reschke2014-10-201-1/+1
|
* backport of #11494Arthur Schiwon2014-10-181-4/+3
| | | | | | | | | | | | | | fix retrievel of group members and cache group members fix changed variable name with several backends, more than limit can be returned make performance less bad. Still far from good, but at least it works add one simple cache test adjust group manager tests
* backport of #9104macjohnny2014-10-171-5/+12
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Update manager.php add caching to getUserGroupIds Update manager.php added description and blank lines in getUserGroupIds Update manager.php defined $uid in getUserGroupIds Update manager.php Update manager.php Update manager.php clean up function getUserGroupIds clean up of function getUserGroupIds and improved caching mechanism of cachedUserGroupIds modified caching mechanism in getUserGroupIds removed cachedUserGroupIds, instead changed indexing in getUserGroups to groupId adapted tests for a groupId indexed group array
* Encapsulate require_once to avoid name space bleedindVincent Petry2014-10-171-1/+11
| | | | | | | | The script required by require_once might use variable names like $app which will conflict with the code that follows. This fix encapsulates require_once into its own function to avoid such issues.
* Merge pull request #11610 from owncloud/fix-svg-s7Thomas Müller2014-10-171-2/+12
|\ | | | | Fix SVG icons
| * Remove insane commentLukas Reschke2014-10-161-1/+0
| |
| * Fix SVG iconsLukas Reschke2014-10-161-2/+13
| | | | | | | | | | | | | | | | | | | | | | | | FIXME: Ugly hack to prevent SVG of being returned if the SVG provider is not enabled. This is required because the preview system is designed in a bad way and relies on opt-in with asterisks (i.e. image/*) which will lead to the fact that a SVG will also match the image provider. Conflicts: lib/private/preview.php
* | Add a try catch blockLukas Reschke2014-10-161-6/+10
| | | | | | | | This function might also be called before ownCloud is setup which results in a PHP fatal error. We therefore should gracefully catch errors in there.
* | Merge pull request #10732 from ↵Jörn Friedrich Dreyer2014-10-164-33/+48
|\ \ | | | | | | | | | | | | owncloud/make_skeleton_compatible_with_objectstore_minimal_stable7 make skeleton compatible with objectstore
| * | throw exception in writeBack, the returned boolean is checked nowhereJörn Friedrich Dreyer2014-10-161-3/+2
| | |
| * | make skeleton compatible with objectstoreJörn Friedrich Dreyer2014-10-163-30/+46
| | | | | | | | | | | | suspend encryption proxy when copying skeleton
* | | include the apps' versions hash to invalidate the cached assetsThomas Müller2014-10-161-0/+2
| | |
* | | Add app version to JS and CSSLukas Reschke2014-10-161-9/+10
| | | | | | | | | | | | | | | | | | This leads to the regeneration of the hash in case a single application is updated. Fixes https://github.com/owncloud/core/issues/11374
* | | strip whitespace from the beginning and end of the display name to avoid ↵Bjoern Schiessle2014-10-161-2/+12
| |/ |/| | | | | empty display names
* | Add darwin to if blockLukas Reschke2014-10-151-1/+1
| | | | | | | | Otherwise it would fall into the 'win' else block because strpos($os, 'win') does also match 'darwin' what is the `php_uname` for OS X.
* | Merge pull request #11520 from owncloud/make-trash-objectstore-compatibleLukas Reschke2014-10-151-0/+10
|\ \ | | | | | | make trashbin compatible with objectstore
| * | make trashbin compatible with objectstore, replace glob with search in ↵Jörn Friedrich Dreyer2014-10-101-0/+10
| | | | | | | | | | | | cache, make unknown free space work like unlimited free space
* | | Use `rawurlencode` since this seems to be expected by cURLLukas Reschke2014-10-151-1/+1
| | | | | | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/pull/11501#issuecomment-58794405 Conflicts: tests/lib/largefilehelpergetfilesize.php
* | | Merge pull request #11567 from owncloud/cache-updater-refactor-stable7Robin Appelman2014-10-154-176/+106
|\ \ \ | | | | | | | | [stable7] Refactor cache updater to work outside of the users home