summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #24899 from owncloud/local-storage-symlinksVincent Petry2016-06-083-3/+38
|\ | | | | dissalow symlinks in local storages that point outside the datadir
| * Ignore forbidden files while scanningRobin Appelman2016-06-071-1/+6
| |
| * dissalow symlinks in local storages that point outside the datadirRobin Appelman2016-06-072-2/+32
| |
* | Merge pull request #24983 from ↵Vincent Petry2016-06-084-5/+11
|\ \ | | | | | | | | | | | | owncloud/issue-23776-do-not-allow-boolean-user-config Do not allow to store boolean configs, they behave unexpected on postgres
| * | Do not allow to store boolean configs, they behave unexpected on postgresJoas Schilling2016-06-064-5/+11
| | |
* | | Merge pull request #24991 from owncloud/2fa-do-not-generate-tokenVincent Petry2016-06-081-0/+1
|\ \ \ | | | | | | | | do not generate device token if 2FA is enable for user
| * | | do not generate device token if 2FA is enable for userChristoph Wurst2016-06-071-0/+1
| | | |
* | | | Merge pull request #24998 from owncloud/issue-24994-allow-decrypting-user-0-onlyVincent Petry2016-06-081-2/+2
|\ \ \ \ | | | | | | | | | | Allow to decrypt user '0' files only
| * | | | Allow to decrypt user '0' files onlyJoas Schilling2016-06-071-2/+2
| |/ / /
* | | | Merge pull request #25005 from owncloud/parent-storage-time-castVincent Petry2016-06-082-1/+7
|\ \ \ \ | | | | | | | | | | don't update storage mtime if we can't get the modified date
| * | | | make sure $data['mtime'] is always a timestampRobin Appelman2016-06-071-0/+3
| | | | |
| * | | | don't update storage mtime if we can't get the modified dateRobin Appelman2016-06-071-1/+4
| | |_|/ | |/| |
* / | | [tx-robot] updated from transifexJenkins for ownCloud2016-06-084-0/+88
|/ / /
* | | Merge pull request #24813 from owncloud/delete-ghost-filesVincent Petry2016-06-072-18/+33
|\ \ \ | |/ / |/| | allow deleting "ghost files" trough the View and Node api
| * | Fix warnings when trying to get mtime of non existing filesRobin Appelman2016-06-031-3/+3
| | |
| * | return success when deleting ghost filesRobin Appelman2016-06-031-1/+3
| | |
| * | allow deleting "ghost files" trough the View and Node apiRobin Appelman2016-06-031-15/+28
| | |
* | | Fix second check for quota size (#24989)Joas Schilling2016-06-061-1/+1
| |/ |/|
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-042-2/+38
|/
* Merge pull request #24564 from owncloud/fix_21173_take_2Vincent Petry2016-06-031-0/+1
|\ | | | | normalize path in getInternalPath
| * normalize path in getInternalPathGeorg Ehrke2016-06-021-0/+1
| |
* | [tx-robot] updated from transifexJenkins for ownCloud2016-06-0328-104/+50
|/
* Merge pull request #24940 from owncloud/fix-normalizedcachekey-keepunicodeVincent Petry2016-06-021-1/+1
|\ | | | | Add keepUnicode value in the cache key of normalizedPathCache
| * Add keepUnicode value in the cache key of normalizedPathCacheVincent Petry2016-06-011-1/+1
| |
* | Merge pull request #24936 from owncloud/2fa-block-ocsVincent Petry2016-06-021-0/+4
|\ \ | | | | | | block OCS if 2FA challenge needs to be solved first
| * | block OCS if 2FA challenge needs to be solved firstChristoph Wurst2016-06-011-0/+4
| |/
* | Merge pull request #24946 from ↵Vincent Petry2016-06-021-0/+5
|\ \ | | | | | | | | | | | | owncloud/issue-24943-duplicate-downgrade-unsupported-message Do not show the hint when it's the same as the message
| * | Do not show the hint when it's the same as the messageJoas Schilling2016-06-011-0/+5
| |/
* | Merge pull request #24947 from owncloud/2fa-remember-redirect-urlVincent Petry2016-06-021-1/+2
|\ \ | | | | | | remember redirect_url when solving the 2FA challenge
| * | remember redirect_url when solving the 2FA challengeChristoph Wurst2016-06-011-1/+2
| |/
* | Merge pull request #24953 from owncloud/fix-client-download-urlVincent Petry2016-06-021-1/+1
|\ \ | | | | | | Fix URL for client downloads
| * | Fix URL for client downloadsJoas Schilling2016-06-011-1/+1
| |/
* / [tx-robot] updated from transifexJenkins for ownCloud2016-06-026-10/+74
|/
* Merge pull request #24912 from owncloud/session-tokens-apache-authVincent Petry2016-06-016-9/+59
|\ | | | | Create session tokens for apache auth users
| * Create session tokens for apache auth usersChristoph Wurst2016-05-316-9/+59
| |
* | Merge pull request #24851 from owncloud/ldap-static-method-logVincent Petry2016-05-311-3/+2
|\ \ | | | | | | Hack to prevent infinite loop with LDAP + logging
| * | Hack to prevent infinite loop with LDAP + loggingVincent Petry2016-05-311-3/+2
| |/ | | | | | | Forward port of a50619200c6a08929dbe802118a6afadb376b866 to 9.1/master
* | Merge pull request #24907 from owncloud/properly-check-for-mbstringVincent Petry2016-05-311-1/+1
|\ \ | |/ |/| Properly check for mbstring extension
| * Properly check for mbstring extensionLukas Reschke2016-05-311-1/+1
| | | | | | | | mb_detect_encoding is in the fallback we ship in the polyfill library, mb_strcut is not. Thus this lead to a false positive and ownCloud would just break.
* | Merge pull request #24769 from ↵Vincent Petry2016-05-311-1/+1
|\ \ | | | | | | | | | | | | owncloud/issue-24752-no-ui-message-when-integrity-disabled Only show message in the UI when the checker is enabled
| * | Only show message in the UI when the checker is enabledJoas Schilling2016-05-231-1/+1
| | |
* | | Merge pull request #24628 from owncloud/decryptall-checkifneedsprocessingVincent Petry2016-05-311-3/+9
|\ \ \ | | | | | | | | [decrypt_all] Check if file needs to decrypted or not for speed up large oc setups.
| * | | Use isEncrpyted() insteadVincent Petry2016-05-301-1/+1
| | | |
| * | | Respect oc coding style guide.Christian Jürges2016-05-301-1/+1
| | | |
| * | | Check if file needs to decrypted or not for speed up large oc setups.Christian Jürges2016-05-301-3/+9
| | | |
* | | | Merge pull request #16688 from owncloud/tests-dockerapachewebdavVincent Petry2016-05-311-7/+33
|\ \ \ \ | |_|_|/ |/| | | Add morrisjobke/webdav docker container for external storage tests
| * | | Check whether remote DAV server accepted the mtime on touchVincent Petry2016-05-301-1/+10
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ownCloud as remote DAV always accepts the mtime on touch, but other servers like Apache's DAV server doesn't. The latter doesn't give any visible hint in its response to detect this case, so this fix does a subsequent PROPFIND to check whether the mtime was actually set. Since a touch() operation seldom happens (only on uploads), the minor performance loss should hopefully be acceptable.
| * | | Fix webdav destination header when overwriting foldersVincent Petry2016-05-301-6/+23
| |/ / | | | | | | | | | The trailing slash is needed when talking to Apache's mod_dav server
* | | [tx-robot] updated from transifexJenkins for ownCloud2016-05-312-0/+6
| | |
* | | Fix for #23066 (#24689)Torben Dannhauer2016-05-311-1/+1
|/ /