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
d383c45c13
Merge pull request #12003 from owncloud/password-migration
...
Use new hashing API for OC_User_Database
2014-11-06 22:43:57 +01:00
e53354bfd7
Merge pull request #12009 from owncloud/make-optional
...
Make second argument optional
2014-11-06 19:43:11 +01:00
0c230fb57e
Merge pull request #11945 from owncloud/share-setup-other-user
...
Setup shared mounts for the correct user when setting up the filesystem
2014-11-06 19:24:24 +01:00
0f3fd89f7d
Fix sharing tests
2014-11-06 18:31:41 +01:00
c21d1da01a
Support displaynames for dummy user backend
2014-11-06 18:31:40 +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
20cd9a134f
Make second argument optional
...
Equivalent to addVendorScript und addScript from OC_Util
2014-11-06 18:17:21 +01:00
5b8a6b66b5
Load PHPAss via autoloader
2014-11-06 16:32:53 +01:00
efe209784e
Merge pull request #12000 from owncloud/bower-strengthify
...
bower strengthify
2014-11-06 16:30:44 +01:00
7353183d99
bower strengthify
2014-11-06 16:29:34 +01:00
8f1fa32e1f
Merge pull request #11998 from owncloud/add-get-logger-to-interface
...
Add getLogger() to IServerContainer
2014-11-06 16:04:54 +01:00
c4d7483a0a
Use new hashing API for OC_User_Database
...
This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.
2014-11-06 15:42:06 +01:00
2090e9b620
Merge pull request #11947 from owncloud/public-hash-api
...
Add OCP\Security\IHasher
2014-11-06 15:17:12 +01:00
24ca2d858f
Add OCP\Security\IHasher
...
Public interface for hashing which also works with legacy ownCloud hashes and supports updating the legacy hash via a passed reference.
Follow-up of https://github.com/owncloud/core/pull/10219#issuecomment-61624662
Requires https://github.com/owncloud/3rdparty/pull/136
2014-11-06 15:16:14 +01:00
1d6c7e28e9
update to 3rdparty master
2014-11-06 15:02:32 +01:00
5f2a083686
Merge pull request #11883 from owncloud/clear-session-for-setup
...
Clear session before setup
2014-11-06 14:39:51 +01:00
f73d653036
Merge pull request #11972 from owncloud/usermanager-remove-delete
...
Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
2014-11-06 13:52:25 +01:00
bb15028a00
Merge pull request #11993 from owncloud/enc_repeat_password
...
[encryption] check if the provided password is really the current log-in password
2014-11-06 13:42:00 +01:00
0e3e1e3563
Add getLogger() to IServerContainer
...
Makes my IDE complaining less ;-)
2014-11-06 13:36:36 +01:00
f2d17ea771
Merge pull request #11984 from owncloud/bower-md5
...
bower md5
2014-11-06 13:28:30 +01:00
73569b29bc
md5 now handled via bower
2014-11-06 13:22:16 +01:00
ae72f0c158
Merge pull request #11985 from owncloud/bower-snap
...
bower snapjs
2014-11-06 12:44:36 +01:00
e49b9022a1
bower snapjs
2014-11-06 12:03:57 +01:00
fd829cb0b5
Merge pull request #11989 from owncloud/bower-zxcvbn
...
bower zxcvbn
2014-11-06 11:57:33 +01:00
f816f3df03
bower zxcvbn
2014-11-06 11:55:57 +01:00
06b67f7e43
Merge pull request #11981 from owncloud/bower-jcrop
...
bower jcrop
2014-11-06 11:49:39 +01:00
8104a4e24e
check if the provided password is really the current log-in password
2014-11-06 11:12:20 +01:00
49fbd766c2
bower jcrop
2014-11-06 09:32:34 +01:00
3329492766
Merge pull request #11980 from owncloud/bower-select2
...
bower select2
2014-11-06 09:27:58 +01:00
226d43a1cf
manage select2 via bower
2014-11-06 09:27:12 +01:00
afa14d571c
Merge pull request #11982 from owncloud/bower-underscore
...
bower underscore
2014-11-06 08:42:29 +01:00
fa4018d36c
[tx-robot] updated from transifex
2014-11-06 01:55:04 -05:00
86d3476761
Merge pull request #11983 from owncloud/drop-chosen
...
drop unused library chosen
2014-11-06 00:47:25 +01:00
957dee5af1
bower underscore
2014-11-05 23:23:03 +01:00
0af5a8db74
drop unused library chosen
2014-11-05 22:41:33 +01:00
bf0ad7f219
Merge pull request #11970 from owncloud/bower-handlebars
...
bower handlebars
2014-11-05 16:50:58 +01:00
02c7fb8445
bower handlebars
2014-11-05 16:47:46 +01:00
4659b0e6a0
Merge pull request #11936 from owncloud/bower-jquery
...
Bower jquery
2014-11-05 16:43:24 +01:00
1eefc21329
Remove confusingly names \OC\User\Manager::delete and fix the automatic cache cleanup instead
2014-11-05 15:45:58 +01:00
9dc769c37a
Merge pull request #11968 from owncloud/drop-jquery-placeholder
...
drop unused jquery.placeholder
2014-11-05 15:04:23 +01:00
a0e9324e00
Merge pull request #11355 from owncloud/unbold
...
Unbold
2014-11-05 14:18:16 +01:00
a857559979
explicitly unbold text by default, otherwise might be bold
2014-11-05 14:14:16 +01:00
e869db47b0
unbold labels and folders
2014-11-05 14:13:09 +01:00
Adam Williamson
Lukas Reschke
Morris Jobke
Robin Appelman
Robin Appelman
Thomas Müller
Bjoern Schiessle
Vincent Petry
Jenkins for ownCloud
Jan-Christoph Borchardt