aboutsummaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* scrutinizer fix: explicitly declare Google class property $clientAdam Williamson2014-11-061-0/+1
|
* scrutinizer fix: correct @return for getDriveFile()Adam Williamson2014-11-061-2/+3
|
* bump google lib to c6949531d2 (post 1.0.3-beta, including query separator fix)Adam Williamson2014-11-064-11/+38
| | | | | | | 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.
* google drive: set access type to 'offline' when requesting tokenAdam Williamson2014-11-061-0/+1
| | | | | | 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.
* fix a bug in google-api-php-client: generates an auth url that doesn't workAdam Williamson2014-11-061-1/+1
| | | | | | | | | | | | | 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.
* files_external/3rdparty: update google-api-php-client to 1.0.2-betaAdam Williamson2014-11-0653-6160/+10171
|
* Migrate Google Drive storage app to v1.0.0 of the client libraryAdam Williamson2014-11-062-25/+25
|
* Merge pull request #12003 from owncloud/password-migrationLukas Reschke2014-11-062-33/+9
|\ | | | | Use new hashing API for OC_User_Database
| * Load PHPAss via autoloaderLukas Reschke2014-11-061-1/+2
| |
| * Use new hashing API for OC_User_DatabaseLukas Reschke2014-11-061-32/+7
| | | | | | | | This will use the new Hashing API for OC_User_Database and migrate old passwords upon initial login of the user.
* | Merge pull request #12009 from owncloud/make-optionalMorris Jobke2014-11-061-2/+2
|\ \ | | | | | | Make second argument optional
| * | Make second argument optionalLukas Reschke2014-11-061-2/+2
| | | | | | | | | | | | Equivalent to addVendorScript und addScript from OC_Util
* | | Merge pull request #11945 from owncloud/share-setup-other-userRobin Appelman2014-11-067-14/+71
|\ \ \ | |/ / |/| | Setup shared mounts for the correct user when setting up the filesystem
| * | Fix sharing testsRobin Appelman2014-11-063-2/+15
| | |
| * | Support displaynames for dummy user backendRobin Appelman2014-11-061-3/+18
| | |
| * | Setup shared mounts for the correct user when setting up the filesystem for ↵Robin Appelman2014-11-063-6/+33
| | | | | | | | | | | | the non-logged in user
| * | Dont make real users in testsRobin Appelman2014-11-061-3/+5
| | |
* | | Merge pull request #12000 from owncloud/bower-strengthifyMorris Jobke2014-11-068-16/+212
|\ \ \ | | | | | | | | bower strengthify
| * | | bower strengthifyMorris Jobke2014-11-068-16/+212
|/ / /
* | | Merge pull request #11998 from owncloud/add-get-logger-to-interfaceLukas Reschke2014-11-061-0/+7
|\ \ \ | |_|/ |/| | Add getLogger() to IServerContainer
| * | Add getLogger() to IServerContainerLukas Reschke2014-11-061-0/+7
| | | | | | | | | | | | Makes my IDE complaining less ;-)
* | | Merge pull request #11947 from owncloud/public-hash-apiThomas Müller2014-11-067-0/+341
|\ \ \ | | | | | | | | Add OCP\Security\IHasher
| * | | Add OCP\Security\IHasherLukas Reschke2014-11-067-0/+341
|/ / / | | | | | | | | | | | | | | | | | | 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
* | | update to 3rdparty masterMorris Jobke2014-11-061-0/+0
| | |
* | | Merge pull request #11883 from owncloud/clear-session-for-setupLukas Reschke2014-11-061-1/+2
|\ \ \ | |_|/ |/| | Clear session before setup
| * | Clear session before setupLukas Reschke2014-10-311-1/+2
| | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/11861
* | | Merge pull request #11972 from owncloud/usermanager-remove-deleteLukas Reschke2014-11-064-29/+18
|\ \ \ | | | | | | | | Remove confusingly names \OC\User\Manager::delete and fix the automatic ...
| * | | Remove confusingly names \OC\User\Manager::delete and fix the automatic ↵Robin Appelman2014-11-054-29/+18
| | | | | | | | | | | | | | | | cache cleanup instead
* | | | Merge pull request #11993 from owncloud/enc_repeat_passwordLukas Reschke2014-11-061-1/+15
|\ \ \ \ | |_|_|/ |/| | | [encryption] check if the provided password is really the current log-in password
| * | | check if the provided password is really the current log-in passwordBjoern Schiessle2014-11-061-1/+15
| | | |
* | | | Merge pull request #11984 from owncloud/bower-md5Thomas Müller2014-11-065-1/+287
|\ \ \ \ | | | | | | | | | | bower md5
| * | | | md5 now handled via bowerMorris Jobke2014-11-065-1/+287
|/ / / /
* | | | Merge pull request #11985 from owncloud/bower-snapMorris Jobke2014-11-066-5/+805
|\ \ \ \ | | | | | | | | | | bower snapjs
| * | | | bower snapjsMorris Jobke2014-11-066-5/+805
|/ / / /
* | | | Merge pull request #11989 from owncloud/bower-zxcvbnThomas Müller2014-11-067-3/+72
|\ \ \ \ | | | | | | | | | | bower zxcvbn
| * | | | bower zxcvbnMorris Jobke2014-11-067-3/+72
|/ / / /
* | | | Merge pull request #11981 from owncloud/bower-jcropThomas Müller2014-11-068-2/+1893
|\ \ \ \ | |/ / / |/| | | bower jcrop
| * | | bower jcropMorris Jobke2014-11-068-2/+1893
|/ / /
* | | Merge pull request #11980 from owncloud/bower-select2Morris Jobke2014-11-0663-1301/+16
|\ \ \ | | | | | | | | bower select2
| * | | manage select2 via bowerMorris Jobke2014-11-0663-1301/+16
|/ / /
* | | Merge pull request #11982 from owncloud/bower-underscoreVincent Petry2014-11-067-8/+35
|\ \ \ | | | | | | | | bower underscore
| * | | bower underscoreMorris Jobke2014-11-057-8/+35
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-06100-308/+182
| | | |
* | | | Merge pull request #11983 from owncloud/drop-chosenMorris Jobke2014-11-062-2/+0
|\ \ \ \ | |/ / / |/| | | drop unused library chosen
| * | | drop unused library chosenMorris Jobke2014-11-052-2/+0
|/ / /
* | | Merge pull request #11970 from owncloud/bower-handlebarsThomas Müller2014-11-054-1/+6
|\ \ \ | | | | | | | | bower handlebars
| * | | bower handlebarsMorris Jobke2014-11-054-1/+6
|/ / /
* | | Merge pull request #11936 from owncloud/bower-jqueryLukas Reschke2014-11-0514-184/+192
|\ \ \ | | | | | | | | Bower jquery
| * | | ignore core/vendor in scrutinizerMorris Jobke2014-11-051-4/+1
| | | |
| * | | migrate jQuery to bowerMorris Jobke2014-11-0413-164/+175
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-15 18:02:26 +0000