summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-11-2816-22/+98
|
* Merge pull request #12426 from owncloud/jail-mask-wrappersRobin Appelman2014-11-2711-5/+1384
|\ | | | | Add Jail and PermissionsMask storage wrappers
| * Add storage and cache wrappers to apply a permissions mask to a storageRobin Appelman2014-11-274-12/+252
| |
| * Add storage and cache wrappers to jail a storage to a subfolderRobin Appelman2014-11-278-5/+1144
| |
* | Merge pull request #12470 from owncloud/jenkins-12447Lukas Reschke2014-11-278-33/+80
|\ \ | | | | | | Jenkins 12447
| * | Move OC_USER_BACKEND_* constants to OC_User_Backend classJoas Schilling2014-11-274-22/+47
| | |
| * | Move OC_GROUP_BACKEND_* constants to OC_Group_Backend classJoas Schilling2014-11-274-11/+33
| | |
* | | Merge pull request #12462 from owncloud/issue/12460-localstorage-buildpathVincent Petry2014-11-272-63/+79
|\ \ \ | |_|/ |/| | Introduce buildPath() in Storage\Local to reduce the difference to MappedLocal
| * | Remove unused 2nd parameter of buildPath() and rename to getSourcePath()Joas Schilling2014-11-271-32/+33
| | |
| * | Introduce getSourcePath() in Storage\Local to reduce the difference to ↵Joas Schilling2014-11-271-31/+46
| | | | | | | | | | | | MappedLocal
* | | Merge pull request #12449 from owncloud/issue/12444-namespace-exceptionsJoas Schilling2014-11-2712-46/+61
|\ \ \ | | | | | | | | Issue/12444 namespace exceptions
| * | | Replace exception with standard exceptionJoas Schilling2014-11-271-4/+1
| | | |
| * | | Correctly namespace and autoload DatabaseExceptionJoas Schilling2014-11-275-29/+38
| | | |
| * | | Correctly namespace DatabaseSetupExceptionJoas Schilling2014-11-266-13/+22
| |/ /
* | | Merge pull request #12418 from owncloud/delete_previewsMorris Jobke2014-11-271-1/+1
|\ \ \ | |_|/ |/| | delete old previews
| * | delete old previewsGeorg Ehrke2014-11-251-1/+1
| | |
* | | Merge pull request #12464 from owncloud/cache-available-languagesVincent Petry2014-11-271-0/+6
|\ \ \ | | | | | | | | Cache results of available languages
| * | | Cache results of available languagesLukas Reschke2014-11-271-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | This function is about 8 times calles for every single page call, when caching this variable I was able to gain a small performance improvement from 20,512 µs to 630 µs profiled with xhprof Surely, this is no gigantic gain but if we would do that for every function out there...
* | | | Merge pull request #12451 from owncloud/issue/6101-remove-gettype-classVincent Petry2014-11-271-12/+9
|\ \ \ \ | | | | | | | | | | Move constants from GET_TYPE to OC\Files so they can be autoloaded
| * | | | Move constants from GET_TYPE to OC\Files so they can be autoloadedJoas Schilling2014-11-261-12/+9
| | |_|/ | |/| |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-278-0/+8
| | | |
* | | | Merge pull request #12433 from owncloud/appstoreVincent Petry2014-11-261-0/+1
|\ \ \ \ | | | | | | | | | | added comment that App Store is disabled for EE
| * | | | added comment that App Store is disabled for EECarla Schroder2014-11-251-0/+1
| | | | |
* | | | | Merge pull request #12304 from oparoz/patch-1Vincent Petry2014-11-261-1/+1
|\ \ \ \ \ | | | | | | | | | | | | Use a more universal shebang
| * | | | | Use a more universal shebangOlivier Paroz2014-11-191-1/+1
| | | | | | | | | | | | | | | | | | On FreeBSD, php is usually in /usr/local and I'm sure there are many more exceptions.
* | | | | | Merge pull request #12448 from owncloud/no503forRootMorris Jobke2014-11-261-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | Don't show favicon to prevent iteration through subfolders
| * | | | | | Don't show favicon to prevent iteration through subfoldersLukas Reschke2014-11-261-1/+1
| | |_|_|/ / | |/| | | | | | | | | | | | | | | | The codepath for generating the favicons iterates through subnodes and if one of those nodes is unavailable is throwing a 503 exception. Since these favicons don't have any use except of "making a tool for developers looking nicer" I consider it feasible to remove them.
* | | | | | Merge pull request #12453 from owncloud/kill-session-globalThomas Müller2014-11-262-27/+2
|\ \ \ \ \ \ | |_|_|_|/ / |/| | | | | remove deprecated \OC:$session
| * | | | | remove deprecated \OC:$sessionThomas Müller2014-11-262-27/+2
|/ / / / /
* | | | | Merge pull request #6989 from AdamWill/google-1Robin Appelman2014-11-2657-6250/+11212
|\ \ \ \ \ | | | | | | | | | | | | Migrate Google Drive external storage app to v1.0.6-beta of the google-api-php-client library
| * | | | | google: disable compression when curl is not availableAdam Williamson2014-11-071-0/+6
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | update google-api-php-client to 1.0.6-betaAdam Williamson2014-11-0721-264/+1179
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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.
| * | | | | 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 #12414 from owncloud/delay-autoconfig-kill-2Morris Jobke2014-11-261-7/+14
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | autoconfig.php only to be deleted on successful installation
| * | | | | autoconfig.php only to be deleted on successful installationThomas Müller2014-11-251-7/+14
| | | | | |
* | | | | | Merge pull request #12411 from owncloud/unknown-command-windowsLukas Reschke2014-11-262-9/+4
|\ \ \ \ \ \ | | | | | | | | | | | | | | Replace some more "command -v" calls with the Helper method
| * | | | | | Replace some more "command -v" calls with the Helper methodJoas Schilling2014-11-252-9/+4
| |/ / / / /
* | | | | | Merge pull request #12438 from owncloud/jenkins-no-new-session-ocs-apiMorris Jobke2014-11-261-16/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | because OC_User::login will create a new session we shall only try to lo...
| * | | | | | because OC_User::login will create a new session we shall only try to login ↵Thomas Müller2014-11-261-16/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | if user and pass are set ensure to never destroy an existing session
* | | | | | | Merge pull request #12350 from mprokop/link_expirationMorris Jobke2014-11-262-7/+8
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | fix calculation of expiration date if there is a default expiration date...
| * | | | | | Consolidate if statement, and update unit testMiguel Prokop2014-11-212-8/+4
| | | | | | |
| * | | | | | fix calculation of expiration date if there is a default expiration date set ↵Miguel Prokop2014-11-211-3/+8
| | | | | | | | | | | | | | | | | | | | | | | | | | | | (but not forced) and the user does not want the link to expire.
* | | | | | | Merge pull request #12421 from ↵Morris Jobke2014-11-2642-240/+262
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/issue/6101-remove-namespace-permission-constants Issue/6101 remove namespace permission constants
| * | | | | | | Replace deprecated constant with new class constantJoas Schilling2014-11-2541-237/+237
| | | | | | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-07 20:36:31 +0000