Lukas Reschke
284ba5b688
Merge pull request #12290 from owncloud/ext-preventbreakageduetobugs2
...
Show warning when invalid user was passed
2014-11-19 14:27:32 +01:00
Lukas Reschke
1c8f9564a4
Merge pull request #11696 from owncloud/addWarningToEncryptionLostPassword
...
Warn for password reset when files_encryption is enabled
2014-11-19 13:05:02 +01:00
Morris Jobke
dc9eaf59dc
Merge pull request #12276 from owncloud/undelete-only-if-files-trashin-is-enabled
...
Only show undelete capability if files_trashbin is enabled
2014-11-19 11:42:19 +01:00
Jenkins for ownCloud
705976ba0a
[tx-robot] updated from transifex
2014-11-19 01:54:59 -05:00
Lukas Reschke
61641293f4
Only show undelete capability if files_trashbin is enabled
...
Fixes the OCS capability API at /ocs/v1.php/cloud/capabilities
2014-11-18 23:06:39 +01:00
Lukas Reschke
a6ebb17610
Remove unused variable and make Scrutinizer happy.
2014-11-18 18:52:00 +01:00
Lukas Reschke
f3ab4f3faf
Don't disclose relative directory path for single shared files of user
...
The "dir" key is used within the public sharing template to indicate in 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.
2014-11-18 18:51:57 +01:00
Lukas Reschke
5f07fb15dc
Fix case-sensitivity
2014-11-18 18:50:47 +01:00
Lukas Reschke
1b85f40cbe
$file only contains the filename and not the absolute path, that means that files in a subdirectory will not get properly resolved and an empty filesize is returned.
...
This feature only exists on master.
2014-11-18 17:14:26 +01:00
Morris Jobke
230e517f35
Merge pull request #12220 from owncloud/remove-unused-code
...
Remove unused code
2014-11-18 10:36:32 +01:00
Jenkins for ownCloud
91f7c0af6e
[tx-robot] updated from transifex
2014-11-18 01:54:31 -05:00
Bjoern Schiessle
f6efbfcf0b
listen to the post_passwordReset hook, backup the old keys and create a new key pair for the user
2014-11-17 17:50:20 +01:00
Morris Jobke
146cb920c9
Merge pull request #12218 from owncloud/issue/10991-fixes
...
Issue/10991 Make unit tests pass on windows
2014-11-17 16:44:45 +01:00
Lukas Reschke
8dbedbb849
Remove unused code
...
We don't support direct updates from older ownCloud versions except the previous one therefore this code is unused and can be removed.
2014-11-17 14:01:39 +01:00
Lukas Reschke
8595b76df2
Remove phpass and migrate to new Hasher interface
...
This PR removes phpass and migrates to the new Hasher interface.
Please notice that due to https://github.com/owncloud/core/issues/10671 old hashes are not updated but the hashes are backwards compatible so this shouldn't hurt.
Once the sharing classes have a possibility to update the passwords of single shares those methods should be used within the newHash if block.
2014-11-17 13:39:13 +01:00
Joas Schilling
6625d5c88f
Correctly restore previous root mount point after testing
2014-11-17 10:48:19 +01:00
Joas Schilling
b228226700
Fix single run of encryption tests and usages of uniqid() and fopen()
2014-11-17 10:48:13 +01:00
Joas Schilling
a3a064fe96
Skip some more tests on Windows which just can not work at all
2014-11-17 10:48:06 +01:00
Jenkins for ownCloud
9df50c7be6
[tx-robot] updated from transifex
2014-11-17 01:54:33 -05:00
Jenkins for ownCloud
55889d7eb4
[tx-robot] updated from transifex
2014-11-16 01:55:00 -05:00
Jenkins for ownCloud
580d27eed2
[tx-robot] updated from transifex
2014-11-15 01:54:28 -05:00
Vincent Petry
c941c3fa51
Show warning when invalid user was passed
...
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.
2014-11-14 16:43:23 +01:00
Vincent Cloutier
fad621140b
Added download size on public sharing
2014-11-14 16:26:59 +01:00
Lukas Reschke
988c85d292
Refactor file sharing public link handling
...
fixes download issue introduced by #10755
Conflicts:
apps/files_sharing/public.php
2014-11-14 16:26:59 +01:00
Jörn Friedrich Dreyer
df18bd3e0d
Merge pull request #12162 from owncloud/ext-s3-missingfolderwithsamename
...
Do not remove dir entry if it has the same name as the parent
2014-11-14 10:37:10 +01:00
Jenkins for ownCloud
0811b39e5f
[tx-robot] updated from transifex
2014-11-14 01:54:47 -05:00
Vincent Petry
914f4cb6f2
Do not remove dir entry if it has the same name as the parent
...
This fixes an issue when a subdir has the same name as its parent, it
would get exluded from the list.
2014-11-13 17:37:56 +01:00
blizzz
559b34e53d
Merge pull request #12005 from owncloud/bower-multiselect
...
Move multiselect to user_ldap
2014-11-13 14:43:06 +01:00
Vincent Petry
5ca869c324
Merge pull request #9177 from owncloud/jsdocexperiment
...
Improved JS Docs + added build script for JS Docs
2014-11-13 11:16:08 +01:00
Jenkins for ownCloud
a069171cda
[tx-robot] updated from transifex
2014-11-13 01:54:36 -05:00
Morris Jobke
f39cb3fbc9
Migrate multiselect to user_ldap
2014-11-13 00:47:14 +01:00
Vincent Petry
e0b797c43c
Merge pull request #12087 from AdamWill/google-touch
...
google: fix touch() when $mtime is set (Google wants RFC3339) #11267
2014-11-12 18:24:57 +01:00
Jenkins for ownCloud
1846fb0285
[tx-robot] updated from transifex
2014-11-12 01:55:24 -05:00
Morris Jobke
081787d6ae
Fix infinite loop if count and limit is 0
...
* otherwise it will always think it hits the limit and need another round to fetch additional results
2014-11-11 12:15:30 +01:00
Morris Jobke
9368de5a8b
Merge pull request #11789 from owncloud/fix-11762
...
[LDAP] Login: dont fail with 500 if configured display name attribute is not set
2014-11-11 11:16:41 +01:00
Jenkins for ownCloud
664cc4ac0e
[tx-robot] updated from transifex
2014-11-11 01:55:23 -05:00
Adam Williamson
f76419d190
fix touch() when $mtime is set (Google wants RFC3339) #11267
...
ownCloud passes us a Unix time integer, but the GDrive API wants
an RFC3339-formatted date. Actually it wants a single particular
RFC3339 format, not just anything that complies will do - it
requires the fractions to be specified, though RFC3339 doesn't.
This resolves issue #11267 (and was also noted by PVince81 in
reviewing PR #6989 ).
2014-11-10 11:56:01 -08:00
Morris Jobke
2023878d53
Merge pull request #10966 from owncloud/storage-root-share-permissions
...
Dont' use mountpoint permissions as share permissions for external storages
2014-11-10 13:11:22 +01:00
Morris Jobke
8afb623f08
Merge pull request #12070 from owncloud/accessibility-fixes
...
Accessibility fixes
2014-11-10 13:06:46 +01:00
Vincent Petry
676b911b22
Merge pull request #12027 from owncloud/cleanup_exceptions
...
[encryption] clean up encryption exceptions
2014-11-10 12:46:53 +01:00
Jenkins for ownCloud
c3e3432662
[tx-robot] updated from transifex
2014-11-10 01:54:30 -05:00
Jenkins for ownCloud
46010655d2
[tx-robot] updated from transifex
2014-11-09 01:54:30 -05:00
Jenkins for ownCloud
da14a605d5
[tx-robot] updated from transifex
2014-11-08 01:54:35 -05:00
Adam Williamson
c237acb395
google: disable compression when curl is not available
...
This is a slightly hacky workaround for
https://github.com/google/google-api-php-client/issues/59 .
There's a bug in the Google library which makes it go nuts on
file uploads and transfer *way* too much data if compression is
enabled and it's using its own IO handler (not curl). Upstream
'fixed' this (by disabling compression) for one upload
mechanism, but not for the one we use. The bug doesn't seem to
happen if the google lib detects that curl is available and
decides to use it instead of its own handler. So, let's disable
compression, but only if it looks like the Google lib's check
for curl is going to fail.
2014-11-07 22:52:07 -08:00
Adam Williamson
b3bccce267
update google-api-php-client to 1.0.6-beta
...
Latest version with various bugfixes, also implements support
for using curl instead of its own io class when available; this
avoids the bug that causes severe excess bandwidth use due to
some kind of zlib issue.
2014-11-07 22:33:40 -08:00
Bjoern Schiessle
2af7256267
only set the values we need and make sure that we write the file info for both
...
the real file and the part file, because some information from the part file
might be needed later
2014-11-07 15:20:52 +01:00
Bjoern Schiessle
3d19bb2e51
also try to get file info from part file
2014-11-07 15:17:24 +01:00
Bjoern Schiessle
a10ae2816e
clean up encryption exceptions
2014-11-07 13:48:31 +01:00
Lukas Reschke
e345697cab
Merge pull request #11954 from owncloud/enc_stop_uploading_if_private_key_is_missing
...
Enc stop uploading if private key is missing
2014-11-07 11:19:04 +01:00
Jenkins for ownCloud
7d47d50724
[tx-robot] updated from transifex
2014-11-07 01:55:10 -05:00
Adam Williamson
04369fb9cc
scrutinizer fix: explicitly declare Google class property $client
2014-11-06 21:28:05 -08:00
Adam Williamson
f9bd43ff03
scrutinizer fix: correct @return for getDriveFile()
2014-11-06 21:27:12 -08:00
Adam Williamson
5935758b3a
bump google lib to c6949531d2 (post 1.0.3-beta, including query separator fix)
...
This is the upstream commit that merged my query separator fix. It's slightly
after the 1.0.3-beta tag. I eyeballed the other post 1.0.3-beta changes and
none of them looks like any kind of problem, so we may as well just use this
upstream state.
2014-11-06 18:47:11 -08:00
Adam Williamson
61d70b17ee
google drive: set access type to 'offline' when requesting token
...
We need to do this in order to be able to refresh the access token without
prompting the user for their credentials every hour. This was the default
in 0.6 of the Google library, but needs to be explicitly specified in 1.0.
2014-11-06 18:47:11 -08:00
Adam Williamson
18707f5aba
fix a bug in google-api-php-client: generates an auth url that doesn't work
...
Submitted upstream as https://github.com/google/google-api-php-client/issues/76
Google's php lib has a function to generate a URL for OAuth2 authentication.
It uses http_build_query() to generate the query part of the URL, and in PHP
5.3 or later, this uses an encoded ampersand - & - as the query separator,
not a raw one. However, Google's OAuth server apparently can't handle encoded
ampersands as separators and so it fails.
This patch explicitly sets a raw ampersand as the separator. If Google decides
to fix their OAuth server instead of merging this patch into google-api-php-
client, we can drop this patch as soon as that happens.
2014-11-06 18:47:11 -08:00
Adam Williamson
d96c06f1a3
files_external/3rdparty: update google-api-php-client to 1.0.2-beta
2014-11-06 18:47:11 -08:00
Adam Williamson
62b859d66f
Migrate Google Drive storage app to v1.0.0 of the client library
2014-11-06 18:47:11 -08:00
Robin Appelman
0f3fd89f7d
Fix sharing tests
2014-11-06 18:31:41 +01:00
Robin Appelman
7ecd220715
Setup shared mounts for the correct user when setting up the filesystem for the non-logged in user
2014-11-06 18:31:40 +01:00
Robin Appelman
9c79c2fa17
Dont make real users in tests
2014-11-06 18:31:40 +01:00
Jan-Christoph Borchardt
a410055291
add relevant focus styles to the existing hover styles
2014-11-06 16:22:57 +01:00
Jan-Christoph Borchardt
af743efff0
add alt text for file actions, but leave empty since text is directly next to it
2014-11-06 15:33:38 +01:00
Bjoern Schiessle
8104a4e24e
check if the provided password is really the current log-in password
2014-11-06 11:12:20 +01:00
Morris Jobke
226d43a1cf
manage select2 via bower
2014-11-06 09:27:12 +01:00
Jenkins for ownCloud
fa4018d36c
[tx-robot] updated from transifex
2014-11-06 01:55:04 -05:00
Jan-Christoph Borchardt
e869db47b0
unbold labels and folders
2014-11-05 14:13:09 +01:00
Thomas Müller
7f41048a33
Merge pull request #11962 from owncloud/fix-server-sharing-strings
...
adjust strings - fixed #11930
2014-11-05 13:43:23 +01:00
Bjoern Schiessle
c2a45c1238
throw exception if private key is missing
2014-11-05 13:05:46 +01:00
Vincent Petry
97cbec8b8d
Merge pull request #11853 from owncloud/close-session-for-trashbin
...
Close session for files_trashbin
2014-11-05 12:44:10 +01:00
Thomas Müller
8116d903dd
adjust strings - fixed #11930
2014-11-05 11:08:17 +01:00
Jenkins for ownCloud
c8f55e7f87
[tx-robot] updated from transifex
2014-11-05 01:54:36 -05:00
Vincent Petry
ee6d8c9d58
Store curl error message directly
2014-11-04 17:37:15 +01:00
Bjoern Schiessle
0580c232d7
still try to encrypt files, even if the session is not initialized. The stream wrapper will throw an error which is better than silently continue.
2014-11-04 17:16:36 +01:00
Vincent Petry
768f3979e0
Check for cert bundle existence before using it
2014-11-04 16:44:42 +01:00
Vincent Petry
79a7297880
Merge pull request #11934 from owncloud/trash-restorefixonlyrescantrashfolder
...
Only rescan trash folder when checking deleted versions
2014-11-04 14:16:58 +01:00
blizzz
b26f11c16f
Merge pull request #11362 from mark0n/rm_ldap_conf_cli
...
Add a CLI command that deletes an LDAP config
2014-11-04 13:19:45 +01:00
Vincent Petry
97a51c46ed
Only rescan trash folder when checking deleted versions
...
This fix prevents the file scanner to rescan the WHOLE storage and reset
the etags by mistake.
2014-11-04 12:29:42 +01:00
Morris Jobke
1979ec70a5
JS unit tests fix - use toBeUndefined() instead of toEqual(null)
2014-11-04 10:37:16 +01:00
Jenkins for ownCloud
287faf9923
[tx-robot] updated from transifex
2014-11-04 01:55:05 -05:00
blizzz
dc9ea893fd
Merge pull request #11172 from owncloud/user-ldap-no-bcmath
...
Fix ldap convertSID2Str() / Remove BCMath dependency
2014-11-03 14:03:26 +01:00
Björn Schießle
79b650a023
Merge pull request #11825 from owncloud/fix_rename_files_in_shared_folder
...
move versions if a file was renamed in a shared folder
2014-11-03 12:53:14 +01:00
Andreas Fischer
d1410b46a9
user_ldap: Reimplement convertSID2Str() without BCMath dependency.
...
Also explicitly format sub-id integers as unsigned, which is required for
32-bit systems.
2014-11-03 12:07:53 +01:00
Jenkins for ownCloud
fd480d6c40
[tx-robot] updated from transifex
2014-11-02 01:54:24 -05:00
Jenkins for ownCloud
469b2655d5
[tx-robot] updated from transifex
2014-11-02 01:54:29 -04:00
Jenkins for ownCloud
d8f7780f4f
[tx-robot] updated from transifex
2014-11-01 01:54:37 -04:00
Bjoern Schiessle
ebe1d3df0a
don't move versions if only the mount point was renamed
2014-10-31 16:42:54 +01:00
Robin Appelman
83126ab675
Add unit tests
2014-10-31 15:22:08 +01:00
Robin Appelman
307071cfec
Keep the share permissions from mountpoints
2014-10-31 14:43:32 +01:00
Robin Appelman
2705588073
Dont' use mountpoint permissions as share permissions for external storages
2014-10-31 14:43:32 +01:00
Jörn Friedrich Dreyer
fe9e6be35c
test files external amazon s3 storage id migration
2014-10-31 14:26:09 +01:00
Jörn Friedrich Dreyer
69a3d8eb1a
fix files_external storage id migration
2014-10-31 14:25:55 +01:00
Vincent Petry
0f3e6cb50a
Improved Javascript docs for JSDoc
...
Added namespaces so that JSDoc can find them.
Fixed a few warnings.
Improved some comments.
2014-10-31 13:43:30 +01:00
Lukas Reschke
e0528c7598
Merge pull request #11876 from owncloud/remove-pointless-requires
...
remove unnecessary require calls - the ownCloud class loader is supposed...
2014-10-31 13:10:59 +01:00
Vincent Petry
a9b41cbf54
Merge pull request #11850 from owncloud/fix-11848
...
on xp'ed mode and switching configurations: save raw mode instead of tog...
2014-10-31 08:38:05 +01:00
Jenkins for ownCloud
e00f25e5b0
[tx-robot] updated from transifex
2014-10-31 01:55:39 -04:00
Vincent Petry
146c46b73a
Merge pull request #11659 from jknockaert/master
...
rework getFileSize
2014-10-30 18:06:25 +01:00
Thomas Müller
f776bcd4a0
remove unnecessary require calls - the ownCloud class loader is supposed to take care of this
2014-10-30 17:20:40 +01:00
Jan-Christoph Borchardt
108cdeb892
Merge pull request #11867 from owncloud/settings-sidebar-admin
...
introduce sidebar for admin page
2014-10-30 17:03:03 +01:00
Jan-Christoph Borchardt
1dfabfb491
admin settings: fix LDAP settings header layout
2014-10-30 16:04:26 +01:00
Thomas Müller
24feb74638
fixing ldap listing in admin sidebar - needs styling review
2014-10-30 13:55:33 +01:00