f9bd43ff03
scrutinizer fix: correct @return for getDriveFile()
2014-11-06 21:27:12 -08:00
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
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
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
d96c06f1a3
files_external/3rdparty: update google-api-php-client to 1.0.2-beta
2014-11-06 18:47:11 -08:00
62b859d66f
Migrate Google Drive storage app to v1.0.0 of the client library
2014-11-06 18:47:11 -08:00
0f3fd89f7d
Fix sharing tests
2014-11-06 18:31:41 +01:00
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
9c79c2fa17
Dont make real users in tests
2014-11-06 18:31:40 +01:00
8104a4e24e
check if the provided password is really the current log-in password
2014-11-06 11:12:20 +01:00
226d43a1cf
manage select2 via bower
2014-11-06 09:27:12 +01:00
fa4018d36c
[tx-robot] updated from transifex
2014-11-06 01:55:04 -05:00
e869db47b0
unbold labels and folders
2014-11-05 14:13:09 +01:00
7f41048a33
Merge pull request #11962 from owncloud/fix-server-sharing-strings
...
adjust strings - fixed #11930
2014-11-05 13:43:23 +01:00
97cbec8b8d
Merge pull request #11853 from owncloud/close-session-for-trashbin
...
Close session for files_trashbin
2014-11-05 12:44:10 +01:00
8116d903dd
adjust strings - fixed #11930
2014-11-05 11:08:17 +01:00
c8f55e7f87
[tx-robot] updated from transifex
2014-11-05 01:54:36 -05:00
ee6d8c9d58
Store curl error message directly
2014-11-04 17:37:15 +01:00
768f3979e0
Check for cert bundle existence before using it
2014-11-04 16:44:42 +01:00
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
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
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
1979ec70a5
JS unit tests fix - use toBeUndefined() instead of toEqual(null)
2014-11-04 10:37:16 +01:00
287faf9923
[tx-robot] updated from transifex
2014-11-04 01:55:05 -05:00
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
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
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
fd480d6c40
[tx-robot] updated from transifex
2014-11-02 01:54:24 -05:00
469b2655d5
[tx-robot] updated from transifex
2014-11-02 01:54:29 -04:00
d8f7780f4f
[tx-robot] updated from transifex
2014-11-01 01:54:37 -04:00
ebe1d3df0a
don't move versions if only the mount point was renamed
2014-10-31 16:42:54 +01:00
fe9e6be35c
test files external amazon s3 storage id migration
2014-10-31 14:26:09 +01:00
69a3d8eb1a
fix files_external storage id migration
2014-10-31 14:25:55 +01:00
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
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
e00f25e5b0
[tx-robot] updated from transifex
2014-10-31 01:55:39 -04:00
146c46b73a
Merge pull request #11659 from jknockaert/master
...
rework getFileSize
2014-10-30 18:06:25 +01:00
f776bcd4a0
remove unnecessary require calls - the ownCloud class loader is supposed to take care of this
2014-10-30 17:20:40 +01:00
108cdeb892
Merge pull request #11867 from owncloud/settings-sidebar-admin
...
introduce sidebar for admin page
2014-10-30 17:03:03 +01:00
1dfabfb491
admin settings: fix LDAP settings header layout
2014-10-30 16:04:26 +01:00
24feb74638
fixing ldap listing in admin sidebar - needs styling review
2014-10-30 13:55:33 +01:00
5536f6edd0
Properly register sharing hooks and proxies
...
This will fix failing tests when shares weren't cleant up on delete due
to missing hooks.
Added login for user1 in setUp().
2014-10-30 12:05:15 +01:00
ea55848fa1
[tx-robot] updated from transifex
2014-10-30 01:55:14 -04:00
2cd35e94b4
Close session for files_trashbin
...
When restoring huge folders the interface will be unresponsive otherwise
2014-10-29 22:53:59 +01:00
8a48b088ed
on xp'ed mode and switching configurations: save raw mode instead of toggling filter mode in tabs since their status is unknown and dealt with by the Wizard. Fixes #11848
2014-10-29 18:53:07 +01:00
106b9eb55c
Merge pull request #11409 from owncloud/watcher-reuse
...
Pass the cached data to the filesystem watcher
2014-10-29 16:38:16 +01:00
7d10ec41e6
Merge pull request #11835 from owncloud/enc-fixmovingsharekeystofolder
...
Fix moving share keys as non-owner to subdir
2014-10-29 15:59:42 +01:00
e8f9b929bd
Added encryption test when moving file as non-owner
2014-10-29 12:57:12 +01:00
f44e617dfd
Fix warning with unset extension check
2014-10-29 12:56:49 +01:00
b920f888ae
Fix moving share keys as non-owner to subdir
...
This fix gathers the share keys BEFORE a file is moved to make sure that
findShareKeys() is able to find all relevant keys when the file still
exists.
After the move/copy operation the keys are moved/copied to the target
dir.
Also: refactored preRename and preCopy into a single function to avoid
duplicate code.
2014-10-29 12:22:50 +01:00
Adam Williamson
Robin Appelman
Bjoern Schiessle
Morris Jobke
Jenkins for ownCloud
Jan-Christoph Borchardt
Thomas Müller
Vincent Petry
blizzz
Björn Schießle
Andreas Fischer
Jörn Friedrich Dreyer
Lukas Reschke