summaryrefslogtreecommitdiffstats
path: root/lib/private
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #5333 from owncloud/avater_with_encryptionBjörn Schießle2013-10-161-4/+0
|\ | | | | avatars should also work with encryption after pr #5332 was merged
| * Merge branch 'master' into avater_with_encryptionBjoern Schiessle2013-10-156-22/+78
| |\
| * | avatars should also work with encryption after pr #5332 was mergedBjoern Schiessle2013-10-141-4/+0
| | |
* | | Prevent renaming/deleting mount pointsVincent Petry2013-10-151-1/+2
| |/ |/| | | | | | | | | | | Fixed permissions returned for mount points to not include update and delete permissions. Fixes #5291
* | Merge pull request #5341 from owncloud/fix-logout-link-htmlVincent Petry2013-10-151-1/+1
|\ \ | | | | | | Fix logout link HTML.
| * | Fix logout link HTML.Andreas Fischer2013-10-141-1/+1
| | | | | | | | | | | | <a id="logout" href=/projects/owncloud/core/index.php?logout=true>
* | | streamCopy() should return proper structure.Thomas Müller2013-10-141-2/+2
|/ / | | | | | | Callers of streamCopy() expect an array to be returned containing count and result.
* | Merge pull request #4867 from owncloud/fixing-4546-masterThomas Müller2013-10-144-19/+75
|\ \ | |/ |/| Adding detection of aborted uploads for chunked uploads
| * Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-1416-343/+135
| |\ | | | | | | | | | | | | Conflicts: lib/private/connector/sabre/file.php
| * | moving createFileChunked() to OC_Connector_Sabre_FileThomas Müller2013-10-071-15/+34
| | |
| * | Merge branch 'master' into fixing-4546-masterThomas Müller2013-10-073-2/+41
| | | | | | | | | | | | | | | Conflicts: lib/private/connector/sabre/directory.php
* | | case insensitive sortFrank Karlitschek2013-10-141-1/+1
| | |
* | | fix styleFrank Karlitschek2013-10-141-5/+5
| | |
* | | finally fix the app sortingFrank Karlitschek2013-10-141-0/+33
| |/ |/|
* | Merge branch 'master' of github.com:owncloud/core into ↵Tom Needham2013-10-123-1/+59
|\ \ | | | | | | | | | fix-unlogged-session-error
| * \ Merge pull request #5207 from owncloud/fixing-4011-part2-masterThomas Müller2013-10-113-1/+59
| |\ \ | | | | | | | | [OC6] file upload exception handling
| | * | fixing status code and formattingThomas Müller2013-10-082-18/+17
| | | |
| | * | catch specific file exceptions and convert them to proper http status code ↵Thomas Müller2013-10-081-5/+12
| | | | | | | | | | | | | | | | via webdav
| | * | adding additional exceptions for special cases where creating a file might ↵Thomas Müller2013-10-073-0/+52
| | | | | | | | | | | | | | | | not be allowed
* | | | Handle ownCloud logging when data dir not createdTom Needham2013-10-111-1/+5
|/ / /
* | | Merge pull request #5263 from owncloud/fixing-5255-masterVicDeo2013-10-101-1/+3
|\ \ \ | | | | | | | | Proper behavior of resolvePath()
| * | | the path need to be normalized before putting it into resolvePath()Thomas Müller2013-10-101-1/+3
| | | | | | | | | | | | | | | | otherwise the returned internalPath will not match followup calls to e.g. Cache::getID()
* | | | merge master into hooks-view-same-startRobin Appelman2013-10-106-320/+10
|\| | |
| * | | Merge pull request #5221 from owncloud/fixing-5217-masterVicDeo2013-10-103-312/+7
| |\ \ \ | | | | | | | | | | fixing php 5.3 compatibility
| | * | | php 5.3 compatibility for \OC\AppFramework\DependencyInjection\DIContainerThomas Müller2013-10-081-2/+3
| | | | |
| | * | | php 5.3 compatibility for \OC\Files\StorageThomas Müller2013-10-081-279/+0
| | | | |
| | * | | fixing php 5.3 compatibilityThomas Müller2013-10-081-31/+4
| | | | | | | | | | | | | | | | | | | | PHP Fatal error: Can't inherit abstract function OCP\ISession::set() (previously declared abstract in OC\Session\Session)
| * | | | Merge pull request #5210 from owncloud/sharing_search_users_fixBjörn Schießle2013-10-101-1/+1
| |\ \ \ \ | | | | | | | | | | | | find users which are in the same group
| | * | | | find users which are in the same groupBjoern Schiessle2013-10-081-1/+1
| | | | | |
| * | | | | Merge pull request #5232 from owncloud/fixing-webdav-touch-masterFrank Karlitschek2013-10-101-6/+0
| |\ \ \ \ \ | | | | | | | | | | | | | | due to internal implementations touch will always be successful - $mtime...
| | * | | | | due to internal implementations touch will always be successful - $mtime ↵Thomas Müller2013-10-091-6/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | will be stored in the cache from desktop client perspective it is necessary to set the mtime under every condition
| * | | | | | don't trigger the create hooks when if the file already exists for ↵Robin Appelman2013-10-091-1/+2
| |/ / / / / | | | | | | | | | | | | | | | | | | file_put_contents
* / / / / / ensure the view's root is a subfolder of the the default root, not only ↵Robin Appelman2013-10-091-1/+4
|/ / / / / | | | | | | | | | | | | | | | starting the same
* | | | | Merge pull request #5219 from owncloud/catch_wrong_timezoneBjörn Schießle2013-10-091-2/+6
|\ \ \ \ \ | | | | | | | | | | | | catch unknown timezone and fall-back to UTC
| * | | | | changed default time format to ISO8601Bjoern Schiessle2013-10-091-1/+1
| | | | | |
| * | | | | catch unknown timezone and fall-back to UTCBjoern Schiessle2013-10-081-1/+5
| | |/ / / | |/| | |
* | | | | Merge pull request #5032 from owncloud/fixing-5006-masterAndreas Fischer2013-10-081-2/+2
|\ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Test OC_User_Database in Test_User_Database instead of OC_User_Dummy. * owncloud/fixing-5006-master: Use strict comparison === instead of ==. Adjust return value tests for checkPassword() to what OC_User_Example says. Make OC_User_Dummy::checkPassword() compatible with OC_User_Example. Use parent:: in Test_User_Database::getUser(). Test_User_Backend::getUser() does not return an array, it returns a string. Test OC_User_Database in Test_User_Database instead of OC_User_Dummy.
| * | | | | Use strict comparison === instead of ==.Andreas Fischer2013-10-081-1/+1
| | | | | |
| * | | | | Make OC_User_Dummy::checkPassword() compatible with OC_User_Example.Andreas Fischer2013-10-081-2/+2
| |/ / / / | | | | | | | | | | | | | | | The user id has to be returned.
* | | | | Merge pull request #5188 from owncloud/master-delete-userThomas Müller2013-10-081-0/+4
|\ \ \ \ \ | |/ / / / |/| | | | User::delete should return bool
| * | | | User::delete should return boolVictor Dubiniuk2013-10-071-0/+4
| | | | |
* | | | | Merge pull request #5173 from owncloud/set_timezone_for_logBjörn Schießle2013-10-081-3/+5
|\ \ \ \ \ | | | | | | | | | | | | let admin specify timezone for log file entries
| * | | | | let admin specify timezone for log file entriesBjoern Schiessle2013-10-071-3/+5
| | | | | |
* | | | | | Merge pull request #5146 from guruz/cache_enabled_apps_listFrank Karlitschek2013-10-081-3/+10
|\ \ \ \ \ \ | |_|_|/ / / |/| | | | | OC_App: Cache list of enabled apps
| * | | | | OC_App: Cache list of enabled appsMarkus Goetz2013-10-051-3/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In my test here 1 SELECT instead of 5 (when doing a DAV request, probably similar for other requests)
* | | | | | Merge pull request #5194 from owncloud/fixing-5172-masterThomas Müller2013-10-081-0/+3
|\ \ \ \ \ \ | | | | | | | | | | | | | | adding check isDeletable() on $sourcePath
| * | | | | | adding check isDeletable() on $sourcePathThomas Müller2013-10-081-0/+3
| | | | | | |
* | | | | | | part file needs to have .part extensionBjoern Schiessle2013-10-081-1/+1
| | | | | | |
* | | | | | | updating a existing large file creates new file chunks. Therefore ↵Bjoern Schiessle2013-10-081-2/+16
| | | | | | | | | | | | | | | | | | | | | | | | | | | | createFile() needs to check not only if we can write to the parent folder but also if we can update the existing file"
* | | | | | | If a existing file in Shared/ with update permissions gets updated we need ↵Bjoern Schiessle2013-10-081-0/+11
|/ / / / / / | | | | | | | | | | | | | | | | | | to write the .part file to a different place because we can't create new files in the Shared folder
generated by cgit v1.2.3 (git 2.39.1) at 2025-04-18 11:16:10 +0000