Commit Graph

6872 Commits

Author SHA1 Message Date
Morris Jobke 2b898bd82c Revert "cache the storage info for 5 min" 2017-02-16 11:58:45 -06:00
Lukas Reschke cf582a6d14 Merge pull request #3439 from nextcloud/oc-26963
Make sure invalid images don't flood the log file
2017-02-16 16:34:18 +01:00
Lukas Reschke 92c74d2f9a
Don't force displayname if backend already provides one
`\OC_User::loginWithApache` is used in combination with backend mechanisms like our SSO / SAML integration. Those can optionally already provide a displayname using other means. For example by mapping SAML attributes.

The current approach makes it however impossible for backends using `\OCP\Authentication\IApacheBackend` to set a displayname on their own. Because the display name will simply be overwritten with the loginname.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-02-16 13:55:48 +01:00
blizzz 19fc68cbdc Merge pull request #2606 from temparus/master
Add preLoginValidation hook
2017-02-15 21:47:47 +01:00
Roeland Jago Douma 79a16bc2d3 Merge pull request #3495 from nextcloud/dav-protected
Make it easier to subclass DAV storage
2017-02-15 20:49:06 +01:00
Roeland Jago Douma 17c07e5caf Merge pull request #3447 from nextcloud/getmetadata-permissions-mask
also apply permissions mask in getMetaData
2017-02-15 20:22:08 +01:00
Roeland Jago Douma f60d95840e Merge pull request #3262 from nextcloud/jail-scanner-storage-id
Make sure we use the correct storage id and parent id when scanning a jailed storage
2017-02-15 20:21:03 +01:00
Robin Appelman 25dc140511
Make it easier to subclass DAV storage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-15 14:00:00 +01:00
Morris Jobke b5b541d084 Merge pull request #3477 from nextcloud/fix-cloud-id-manager-injection
Fix DI of the cloud id manager into apps
2017-02-14 17:42:53 -06:00
Morris Jobke c5dffc465c Merge pull request #3472 from nextcloud/enable-avatars-always
Always enable avatars
2017-02-14 09:22:02 -06:00
Lukas Reschke 257e28f46d Merge pull request #3465 from nextcloud/storage-log-locks
Add option to enable locking debug logging
2017-02-14 15:08:21 +01:00
Joas Schilling 0be2921966
Fix DI of the cloud id manager into apps
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-14 12:47:46 +01:00
Morris Jobke 69c9ca4522 Merge pull request #3444 from nextcloud/recognize-bat-and-cmd
Recognize .bat and .cmd files
2017-02-13 18:09:12 -06:00
Morris Jobke 7f73ee0764
Add missing PHPDoc and properly throw exception
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-13 18:03:35 -06:00
Morris Jobke 200a28255e
Always enable avatars
* we introduced this setting in the begining because our
  avatar support caused some performance issues, but we
  fixed them and should only provide one way how Nextcloud
  looks

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-13 17:53:33 -06:00
Lukas Reschke 181b298d7c Merge pull request #3448 from kuimovvg/master
bug when connect to yandex webdav server
2017-02-13 23:00:44 +01:00
Lukas Reschke a422a59f99
Add storage to log item as well
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-02-13 22:49:44 +01:00
Robin Appelman 8c1ed7507a
Add option to enable locking debug logging
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-13 15:03:46 +01:00
Morris Jobke dfaaebd765 Merge pull request #3417 from nextcloud/push-notification
Push notification
2017-02-10 16:00:47 -06:00
Robin Appelman f27113a6ee
also apply permissions mask in getMetaData
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-10 22:36:12 +01:00
Morris Jobke abf0606054 Merge pull request #3430 from nextcloud/fix-ios-client-detection
Fix detection of the new iOS app
2017-02-10 14:24:45 -06:00
vkuimov 71a022640b bug when connect to yandex webdav server
server think that request like 
<?xml version="1.0" encoding="UTF-8"?> 
<d:propfind xmlns:d="DAV:">
<d:prop/> 
</d:propfind>

is 400: Bad Request
2017-02-10 16:31:49 +00:00
Victor Dubiniuk 2585f195da
Check if color exists in palette before using it
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
2017-02-10 16:27:51 +01:00
Joas Schilling ade91c8fe2
Recognize .bat and .cmd files
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 14:25:25 +01:00
Joas Schilling 69046c6662
Make sure invalid images don't flood the log file
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 13:44:16 +01:00
Björn Schießle b4ade76665 Merge pull request #3424 from nextcloud/fix-upgrade-path
Fix return value of getAllowedPreviousVersions()
2017-02-10 11:48:30 +01:00
Joas Schilling 33fb86f68b
Fix detection of the new iOS app
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-10 10:10:21 +01:00
Morris Jobke d548329543
Set vendor during install
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 23:37:00 -06:00
Morris Jobke b8c749b903
Fix return value of getAllowedPreviousVersions()
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
2017-02-09 23:24:24 -06:00
Joas Schilling efdc51c155
Make sure to use the right appdata directory
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 15:03:00 +01:00
Joas Schilling 7c47f822a1
Save the used token id in the session so it can be used later on
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-09 15:02:59 +01:00
Robin Appelman bf88060a98 Merge pull request #3297 from nextcloud/cloud-id-resolve
Add a single public api for resolving a cloud id to a user and remote and back
2017-02-09 14:54:32 +01:00
Robin Appelman 0d8d658b7e
fix copyright headers
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-09 13:32:36 +01:00
Robin Appelman f6cd5200a2
clean cloud ids
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-09 13:31:06 +01:00
Lukas Reschke 4a5a3681d9 Merge pull request #3184 from nextcloud/issue-3165
Prevent migration from ownCloud 11 to Nextcloud 12
2017-02-09 13:29:08 +01:00
Joas Schilling ed4633a552 Merge pull request #3408 from nextcloud/nullstorage-free-space
return unknown free space from nullstorage
2017-02-09 13:17:54 +01:00
Lukas Reschke 51f0555b5c Merge pull request #3396 from nextcloud/dont-log-password-on-failed-confirmation
Don't log the password on confirmPassword when LDAP throws an exception
2017-02-09 12:19:53 +01:00
Joas Schilling ac841ee002 Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name
oc_token should be nc_token
2017-02-09 10:07:59 +01:00
Robin Appelman ad5d04ccbe
return unknown free space from nullstorage
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 16:38:00 +01:00
Robin Appelman ae66cf8d37
add tests
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:03 +01:00
Robin Appelman fa49c4a13b
Add a single public api for resolving a cloud id to a user and remote and back
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-08 15:17:02 +01:00
Joas Schilling d0e6235b03
Don't log the password on confirmPassword when LDAP throws an exception
Signed-off-by: Joas Schilling <coding@schilljs.com>
2017-02-07 12:16:11 +01:00
Sandro Lutz 9b6f99ab08 Update license header
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-07 01:25:39 +01:00
Morris Jobke 5157f16d28 Merge pull request #3352 from nextcloud/public-page-guest-css-loader
Fix public page css fallback loading
2017-02-06 18:15:56 -06:00
Sandro Lutz fa1d607bfa Merge remote-tracking branch 'nextcloud/master'
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-07 00:15:30 +01:00
Robin Appelman 3d8a300b77
Lower log levels of resource locator
Signed-off-by: Robin Appelman <robin@icewind.nl>
2017-02-03 13:09:33 +01:00
Christoph Wurst 5e728d0eda oc_token should be nc_token
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2017-02-02 21:56:44 +01:00
Sandro Lutz 6feff0ceba Add check if UserManager is of type PublicEmitter before calling preLogin hook
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:50 +01:00
Sandro Lutz e30d28f7eb Change where preLogin hook gets called
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:42 +01:00
Sandro Lutz 6ab0a3215d Remove preLoginValidation hook
Signed-off-by: Sandro Lutz <sandro.lutz@temparus.ch>
2017-02-01 21:53:29 +01:00