Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-28 | 8 | -6/+20 |
| | |||||
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-27 | 6 | -0/+6 |
| | |||||
* | Merge pull request #12448 from owncloud/no503forRoot | Morris Jobke | 2014-11-26 | 1 | -1/+1 |
|\ | | | | | Don't show favicon to prevent iteration through subfolders | ||||
| * | Don't show favicon to prevent iteration through subfolders | Lukas Reschke | 2014-11-26 | 1 | -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 #6989 from AdamWill/google-1 | Robin Appelman | 2014-11-26 | 57 | -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 available | Adam Williamson | 2014-11-07 | 1 | -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-beta | Adam Williamson | 2014-11-07 | 21 | -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 $client | Adam Williamson | 2014-11-06 | 1 | -0/+1 |
| | | |||||
| * | scrutinizer fix: correct @return for getDriveFile() | Adam Williamson | 2014-11-06 | 1 | -2/+3 |
| | | |||||
| * | bump google lib to c6949531d2 (post 1.0.3-beta, including query separator fix) | Adam Williamson | 2014-11-06 | 4 | -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 token | Adam Williamson | 2014-11-06 | 1 | -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 work | Adam Williamson | 2014-11-06 | 1 | -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-beta | Adam Williamson | 2014-11-06 | 53 | -6160/+10171 |
| | | |||||
| * | Migrate Google Drive storage app to v1.0.0 of the client library | Adam Williamson | 2014-11-06 | 2 | -25/+25 |
| | | |||||
* | | Merge pull request #12411 from owncloud/unknown-command-windows | Lukas Reschke | 2014-11-26 | 1 | -7/+2 |
|\ \ | | | | | | | Replace some more "command -v" calls with the Helper method | ||||
| * | | Replace some more "command -v" calls with the Helper method | Joas Schilling | 2014-11-25 | 1 | -7/+2 |
| | | | |||||
* | | | Merge pull request #12421 from ↵ | Morris Jobke | 2014-11-26 | 16 | -54/+54 |
|\ \ \ | | | | | | | | | | | | | | | | | owncloud/issue/6101-remove-namespace-permission-constants Issue/6101 remove namespace permission constants | ||||
| * | | | Replace deprecated constant with new class constant | Joas Schilling | 2014-11-25 | 16 | -54/+54 |
| |/ / | |||||
* | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-26 | 8 | -0/+8 |
| | | | |||||
* | | | Merge pull request #12410 from owncloud/no_session_for_public_share_key | Thomas Müller | 2014-11-25 | 4 | -34/+15 |
|\ \ \ | |/ / |/| | | don't store private public-share-key in session | ||||
| * | | replace \OC:: with \OC::->getSession() | Bjoern Schiessle | 2014-11-25 | 1 | -2/+2 |
| | | | |||||
| * | | we no longer need to keep the session open for encryption | Bjoern Schiessle | 2014-11-25 | 2 | -14/+3 |
| | | | |||||
| * | | don't store private public-share-key in session | Bjoern Schiessle | 2014-11-25 | 1 | -17/+10 |
| | | | |||||
| * | | remove unused variable | Bjoern Schiessle | 2014-11-25 | 1 | -1/+0 |
| | | | |||||
* | | | Merge pull request #12262 from owncloud/removeAbsoluteDirectoryPathFromTemplate | Morris Jobke | 2014-11-25 | 3 | -5/+3 |
|\ \ \ | |/ / |/| | | Don't disclose relative directory path for single shared files of user | ||||
| * | | Remove unused variable and make Scrutinizer happy. | Lukas Reschke | 2014-11-18 | 1 | -2/+0 |
| | | | |||||
| * | | Don't disclose relative directory path for single shared files of user | Lukas Reschke | 2014-11-18 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
| * | | Fix case-sensitivity | Lukas Reschke | 2014-11-18 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #12390 from owncloud/use-session-in-case | Morris Jobke | 2014-11-25 | 1 | -2/+8 |
|\ \ \ | | | | | | | | | Close session only if encryption app is not enabled | ||||
| * | | | Close session only if encryption app is not enabled | Lukas Reschke | 2014-11-24 | 1 | -2/+8 |
| | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/12389 | ||||
* | | | | Merge pull request #11837 from owncloud/fix-11328 | Morris Jobke | 2014-11-24 | 7 | -89/+217 |
|\ \ \ \ | | | | | | | | | | | unify count filters and introduce display name attribute detection | ||||
| * | | | | make scrutinizer happier and always count users on assisted mode, even with ↵ | Arthur Schiwon | 2014-11-22 | 2 | -6/+6 |
| | | | | | | | | | | | | | | | | | | | | xp'ed mode (would be a regression otherwise) | ||||
| * | | | | make updateCount work properly with new xp'd mode as well as without | Arthur Schiwon | 2014-11-21 | 2 | -7/+25 |
| | | | | | |||||
| * | | | | fix counting when ldapPagingSize is 0 | Arthur Schiwon | 2014-11-21 | 1 | -6/+5 |
| | | | | | |||||
| * | | | | trigger count on the correct filter | Arthur Schiwon | 2014-11-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | phpdoc and mixed up letters | Arthur Schiwon | 2014-11-20 | 2 | -1/+3 |
| | | | | | |||||
| * | | | | better readbility, no effective changes | Arthur Schiwon | 2014-11-20 | 1 | -5/+5 |
| | | | | | |||||
| * | | | | use underscore.js for undefined checks | Arthur Schiwon | 2014-11-20 | 1 | -4/+4 |
| | | | | | |||||
| * | | | | this happens already before counting, no need anymore | Arthur Schiwon | 2014-11-20 | 1 | -2/+0 |
| | | | | | |||||
| * | | | | JS doc | Arthur Schiwon | 2014-11-20 | 2 | -0/+27 |
| | | | | | |||||
| * | | | | a corrected email attribute needs to be saved, not only returned | Arthur Schiwon | 2014-11-20 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | to reassure that selected attributes still work, do not count all matching ↵ | Arthur Schiwon | 2014-11-20 | 2 | -11/+16 |
| | | | | | | | | | | | | | | | | | | | | entries but limit it to 1 in order to make it faster | ||||
| * | | | | detectors (email, displayname..) are now started in one place, triggered ↵ | Arthur Schiwon | 2014-11-20 | 3 | -34/+81 |
| | | | | | | | | | | | | | | | | | | | | from only 2 places. more reliable structure and flow, saves requests | ||||
| * | | | | consolidate user count filter in wizard and user back end | Arthur Schiwon | 2014-11-20 | 4 | -36/+16 |
| | | | | | |||||
| * | | | | detect user display name attribute and return user count depending on its ↵ | Arthur Schiwon | 2014-11-20 | 3 | -7/+59 |
| | | | | | | | | | | | | | | | | | | | | presence | ||||
* | | | | | use login name to verify password | Bjoern Schiessle | 2014-11-24 | 1 | -1/+2 |
| |/ / / |/| | | | |||||
* | | | | Merge pull request #12084 from owncloud/sharing_fix_shared_with_info | Morris Jobke | 2014-11-24 | 1 | -2/+3 |
|\ \ \ \ | | | | | | | | | | | sharing: make sure that we only find the shares from a given owner | ||||
| * | | | | also check for the correct owner if it was submitted | Bjoern Schiessle | 2014-11-21 | 1 | -2/+3 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-24 | 2 | -2/+8 |
| | | | | | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2014-11-22 | 8 | -4/+10 |
|/ / / / |