summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-0580-84/+30
|
* cache total user countArthur Schiwon2014-12-041-0/+5
| | | | | Conflicts: apps/user_ldap/user_ldap.php
* Forward port of #12493Arthur Schiwon2014-12-043-1/+152
| | | | | | | | | | | | | | | | | | add ldap-search command to occ Conflicts: apps/user_ldap/appinfo/register_command.php LDAP search filter creation changes: 1. do not prepend * wildcard to search terms. Will result in faster search, but you don't find "foobar" when looking for "bar" 2. advanced behaviour when search string contains a space and multiple search attributes are present. The search string is split into single words. The resulting filter requires that each word at least appears once in any search attribute. This is supposed to return better results in big LDAPs. trim search string before passing it on
* Merge pull request #12596 from owncloud/remove-travis-tracesMorris Jobke2014-12-041-40/+0
|\ | | | | Remove last traces of travis integration
| * Remove last traces of travis integrationMorris Jobke2014-12-041-40/+0
| |
* | update error messageBjoern Schiessle2014-12-041-1/+1
| |
* | OC8 and later requires PHP >= 5.4, so we can remove the check from the ↵Bjoern Schiessle2014-12-041-5/+1
|/ | | | encryption app
* [tx-robot] updated from transifexJenkins for ownCloud2014-12-044-2/+12
|
* fix typoBjoern Schiessle2014-12-031-1/+1
|
* Merge pull request #12382 from owncloud/enc_reorganize_folders2Morris Jobke2014-12-0325-1674/+1172
|\ | | | | [encryption] reorganize folder structure (second try to make Jenkins happy)
| * small fixesBjoern Schiessle2014-12-021-2/+2
| |
| * delete old keys if file was moved to a different mount pointBjoern Schiessle2014-12-021-4/+10
| |
| * upgrade to new folder structureBjoern Schiessle2014-12-0218-341/+483
| |
| * change private/public key names for consistency reasonsBjoern Schiessle2014-11-2611-226/+202
| |
| * harmonize copyright noticeBjoern Schiessle2014-11-267-18/+28
| |
| * new folder structure for keysBjoern Schiessle2014-11-2615-1162/+526
| | | | | | | | | | | | all keys are now in files_encryption/key/path_to_file/filename/ share keys are named: user.shareKey file key is named: fileKey
* | Merge pull request #12556 from owncloud/add-route-for-versionsThomas Müller2014-12-032-1/+3
|\ \ | | | | | | Add route for download of versions
| * | Add route for download of versionsLukas Reschke2014-12-022-1/+3
| | | | | | | | | | | | | | | | | | Otherwise on master it was not possible anymore to download older versions. Fixes itself.
* | | Merge pull request #12554 from owncloud/versions-app-autoloadLukas Reschke2014-12-035-8/+0
|\ \ \ | | | | | | | | Autoload lib files of versions app
| * | | Autoload exception from files_trashbinJoas Schilling2014-12-022-2/+0
| | | |
| * | | Autoload lib files of versions appJoas Schilling2014-12-023-6/+0
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-032-2/+2
| | |
* | | Merge pull request #12333 from owncloud/delete-selected-filesMorris Jobke2014-12-023-10/+42
|\ \ \ | |/ / |/| | Fix deleting non deletable files by selecting them
| * | Add js unit testRobin Appelman2014-11-261-7/+27
| | |
| * | Dont show the delete button for selected files if one of the selected files ↵Robin Appelman2014-11-261-2/+12
| | | | | | | | | | | | is not deletable
| * | Check if files are deletable before trying to delete themRobin Appelman2014-11-261-1/+3
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-304-0/+4
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-294-6/+8
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-288-6/+20
| | |
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-276-0/+6
| | |
* | | 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 #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 #12411 from owncloud/unknown-command-windowsLukas Reschke2014-11-261-7/+2
|\ \ \ | |_|/ |/| | Replace some more "command -v" calls with the Helper method
| * | Replace some more "command -v" calls with the Helper methodJoas Schilling2014-11-251-7/+2
| | |
* | | Merge pull request #12421 from ↵Morris Jobke2014-11-2616-54/+54
|\ \ \ | | | | | | | | | | | | | | | | owncloud/issue/6101-remove-namespace-permission-constants Issue/6101 remove namespace permission constants
| * | | Replace deprecated constant with new class constantJoas Schilling2014-11-2516-54/+54
| |/ /
* | | [tx-robot] updated from transifexJenkins for ownCloud2014-11-268-0/+8
| | |
* | | Merge pull request #12410 from owncloud/no_session_for_public_share_keyThomas Müller2014-11-254-34/+15
|\ \ \ | |/ / |/| | don't store private public-share-key in session
| * | replace \OC:: with \OC::->getSession()Bjoern Schiessle2014-11-251-2/+2
| | |
| * | we no longer need to keep the session open for encryptionBjoern Schiessle2014-11-252-14/+3
| | |