summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* docker containers should be stopped before being removed - refs ↵Thomas Müller2016-03-098-0/+9
| | | | https://github.com/docker/docker/issues/18758
* Merge pull request #23008 from owncloud/only_query_file_folder_sharesThomas Müller2016-03-091-10/+51
|\ | | | | Select queries in the default share provider should query for file/folder
| * Select queries in the default share provider should query for file/folderRoeland Jago Douma2016-03-091-10/+51
| | | | | | | | | | There can be leftover calendar and contacts shares in the oc_share table. We need to filter those out properly.
* | Merge pull request #22930 from ↵Thomas Müller2016-03-092-2/+12
|\ \ | | | | | | | | | | | | owncloud/bugfix-submit-disable-password-length-zero Public link share disabled if password length is equal to 0
| * | Public link share disabled if password length is equal to 0prastut2016-03-082-2/+12
| | |
* | | Merge pull request #22951 from owncloud/fix_intThomas Müller2016-03-091-2/+2
|\ \ \ | | | | | | | | Fix capabilities intergration tests
| * | | Fix capabilities intergration testsRoeland Jago Douma2016-03-081-2/+2
| | | | | | | | | | | | | | | | Split the array element selection and the member selection.
* | | | Merge pull request #22961 from owncloud/fix-gdrive-on-php54Thomas Müller2016-03-091-1/+2
|\ \ \ \ | | | | | | | | | | Fix compatibility with PHP 5.4
| * | | | Fix compatibility with PHP 5.4Lukas Reschke2016-03-081-1/+2
| |/ / / | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22960
* | | | Merge pull request #22972 from ↵Thomas Müller2016-03-091-27/+23
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | owncloud/use-httpclient-instead-of-file-get-contents Use HTTPClient instead of file_get_contents
| * | | | Use HTTPClient instead of file_get_contentsLukas Reschke2016-03-081-27/+23
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Allows us to catch exceptions like 404's and thus prevents stuff like: ``` {"reqId":"fnmS0hc+fL4+WXKAruo5","remoteAddr":"192.168.39.100","app":"PHP","message":"file_get_contents(http:\/\/ckamm.blaucloud.de\/\/status.php): failed to open stream: HTTP request failed! HTTP\/1.1 404 Not Found\r\n at \/var\/www\/owncloud\/apps\/files_sharing\/lib\/external\/storage.php#260","level":3,"time":"2016-03-08T21:00:33+00:00","method":"PROPFIND","url":"\/remote.php\/webdav\/"} ```
* | | | | Merge pull request #22974 from owncloud/php-automagics-type-conversion-is-funThomas Müller2016-03-091-2/+2
|\ \ \ \ \ | |_|_|_|/ |/| | | | Use "hasKey" instead of checking the value
| * | | | Use "hasKey" instead of checking the valueLukas Reschke2016-03-081-2/+2
| |/ / / | | | | | | | | | | | | If the check is negative it would depending on the used cache store the value as an empty string. When reading the value this check would thus return "false" even if a value exists.
* / / / [tx-robot] updated from transifexJenkins for ownCloud2016-03-0928-8/+124
|/ / /
* | | Merge pull request #22950 from owncloud/fixsharemountrecursionRoeland Douma2016-03-083-3/+10
|\ \ \ | |/ / |/| | Fix share mounting recursion
| * | Fix share mounting recursionVincent Petry2016-03-083-3/+10
|/ /
* | Merge pull request #22936 from ↵Thomas Müller2016-03-085-18/+31
|\ \ | | | | | | | | | | | | owncloud/fix-group-share-migration-for-calendars-and-contacts Fix migration of group shared calendars and addressbooks
| * | Fix group sharing and sharing permissions - fixes #22932Thomas Müller2016-03-085-18/+31
| | |
* | | Merge pull request #22814 from owncloud/delete-empty-fileThomas Müller2016-03-081-0/+0
|\ \ \ | |/ / |/| | Delete empty file
| * | Delete empty fileLukas Reschke2016-03-031-0/+0
| | | | | | | | | Ref https://github.com/owncloud/core/issues/22803#issuecomment-191749499
* | | Merge pull request #22800 from owncloud/fix-20536Thomas Müller2016-03-081-0/+3
|\ \ \ | | | | | | | | don't hide server not available exception, fixes #20536
| * | | don't hide server not available exception, fixes #20536Arthur Schiwon2016-03-031-0/+3
| | | |
* | | | Merge pull request #22885 from owncloud/master-show-version-to-update-toThomas Müller2016-03-082-3/+6
|\ \ \ \ | | | | | | | | | | Show version to update to properly
| * | | | Show version to update to properlyLukas Reschke2016-03-052-3/+6
| | | | | | | | | | | | | | | | | | | | Properly shows the version that will be updated to.
* | | | | Merge pull request #22915 from owncloud/cleanup_ocs_share_apiThomas Müller2016-03-081-57/+37
|\ \ \ \ \ | | | | | | | | | | | | Cleanup OCS Share Api
| * | | | | Can't convert node to stringRoeland Jago Douma2016-03-071-1/+6
| | | | | |
| * | | | | Move common code to functionRoeland Jago Douma2016-03-071-56/+31
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | The code to get a share by id is somewhat messy. And was duplicated. Now this is done is a separate function
* | | | | | Merge pull request #22918 from owncloud/remove-double-encoding-in-nameThomas Müller2016-03-081-4/+0
|\ \ \ \ \ \ | | | | | | | | | | | | | | Remove double URL encoding
| * | | | | | Remove double URL encodingLukas Reschke2016-03-071-4/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | ZipStreamer as bundled with 9.0 will properly encode the filename already. Fixes https://github.com/owncloud/core/issues/22836#issuecomment-193336245
* | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0836-24/+130
| |_|_|_|_|/ |/| | | | |
* | | | | | Merge pull request #22921 from owncloud/add-before-commandThomas Müller2016-03-071-0/+3
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Initialize submodules for Scrutinizer as well
| * | | | | Initialize submodules for Scrutinizer as wellLukas Reschke2016-03-071-0/+3
|/ / / / / | | | | | | | | | | | | | | | | | | | | Scrutinizer otherwise complains about the fact that some classes are undefined etc. Let's see whether that works :smile:
* | | | | Merge pull request #22880 from owncloud/fix-21656Thomas Müller2016-03-072-1/+4
|\ \ \ \ \ | | | | | | | | | | | | improve log output when no LDAP user was found on login attempt
| * | | | | improve log output when no LDAP user was found on login attemptArthur Schiwon2016-03-052-1/+4
| | | | | |
* | | | | | Merge pull request #22911 from owncloud/fix-failing-migrationThomas Müller2016-03-076-28/+68
|\ \ \ \ \ \ | |_|/ / / / |/| | | | | Handle calendar migration issue by writing the faulty event to the lo…
| * | | | | Calendar and addressbook migration commands are always availableThomas Müller2016-03-071-10/+2
| | | | | |
| * | | | | Handle addressbook migration issue by writing the faulty event to the log ↵Thomas Müller2016-03-073-7/+32
| | | | | | | | | | | | | | | | | | | | | | | | and continue
| * | | | | Handle calendar migration issue by writing the faulty event to the log and ↵Thomas Müller2016-03-073-11/+34
| | | | | | | | | | | | | | | | | | | | | | | | continue
* | | | | | Merge pull request #22900 from owncloud/diskfreespace-filesworkaroundThomas Müller2016-03-071-1/+9
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix call to disk_free_space when a file is provided
| * | | | | Fix call to disk_free_space when a file is providedVincent Petry2016-03-071-1/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | In the case of shared files, we have to call free_space() on the file name. This has the side-effect that when uploading to a local storage without quota set, it will call disk_free_space with the file name, which fails. This fix uses the parent folder in case the given path is a file.
* | | | | | Merge pull request #22902 from owncloud/share-archivenamedownloadallThomas Müller2016-03-072-3/+5
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix archive file name when downloading public share
| * | | | | | Remove "files" arg from download URL in public link pageVincent Petry2016-03-071-2/+4
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When no files were specified for download, it means folder download. In this case, no need to pass an empty "files" argument.
| * | | | | | Fix archive file name when downloading public shareVincent Petry2016-03-071-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When download a public link share folder using the button on the top right, it doesn't provide a list of files. This fix makes sure to trigger the correct logic when no file list was given.
* | | | | | Merge pull request #22898 from ↵Thomas Müller2016-03-071-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | | | | | owncloud/quota-allowuploadwhenfreespaceisunlimited Fix uploading to fed share when free space is unlimited
| * | | | | | Fix uploading when free space is unlimitedVincent Petry2016-03-071-1/+1
| |/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | A federated share can report unlimited quota as -3, so the ajax/upload.php code needs to be adjusted to block uploads when the free space is unlimited.
* | | | | | Merge pull request #22872 from owncloud/password-change-tooltip-textThomas Müller2016-03-071-0/+2
|\ \ \ \ \ \ | | | | | | | | | | | | | | Update error text for link passwords
| * | | | | | Update error text for link passwordsMorris Jobke2016-03-041-0/+2
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | * this removes the old tooltip first before showing the new one to update the text - otherwise the old text will be shown
* | | | | | | Merge pull request #22815 from prastut/feature-enhance-loginflowThomas Müller2016-03-071-0/+11
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Trigger login if remember_login checked
| * | | | | | | trigger login if remember_login checkedprastut2016-03-041-0/+11
| | | | | | | |
* | | | | | | | Merge pull request #22812 from owncloud/node-lockThomas Müller2016-03-072-0/+75
|\ \ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | | Add locking to the node api
generated by cgit v1.2.3 (git 2.39.1) at 2025-02-02 12:25:04 +0000