Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-12 | 10 | -6/+38 |
| | |||||
* | Merge pull request #23080 from owncloud/use-non-localized-birthday-title | Thomas Müller | 2016-03-11 | 2 | -3/+3 |
|\ | | | | | Use a birthday title which does not require translation because we ha… | ||||
| * | Use a birthday title which does not require translation because we have no ↵ | Thomas Müller | 2016-03-10 | 2 | -3/+3 |
| | | | | | | | | idea about the target device language and forcing English upon all users is kind of bad | ||||
* | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-11 | 26 | -80/+218 |
| | | |||||
* | | Merge pull request #23086 from owncloud/ldap-sort-deprecated | Thomas Müller | 2016-03-11 | 3 | -30/+1 |
|\ \ | | | | | | | remove deprecated ldap_sort | ||||
| * | | remove deprecated ldap_sort | Arthur Schiwon | 2016-03-10 | 3 | -30/+1 |
| |/ | |||||
* | | Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-master | Thomas Müller | 2016-03-10 | 3 | -12/+65 |
|\ \ | | | | | | | getOwner is not available on FileHome | ||||
| * | | getOwner is not available on FileHome - fixes #23116 | Thomas Müller | 2016-03-10 | 3 | -12/+65 |
| |/ | |||||
* | | Merge pull request #23094 from owncloud/fake-lock-for-windows-7-8-10 | Thomas Müller | 2016-03-10 | 1 | -0/+1 |
|\ \ | | | | | | | Fake LOCK statement for Windows 7, 8 and 10 network mounts | ||||
| * | | Fake LOCK statement for Windows 7, 8 and 10 network mounts | Morris Jobke | 2016-03-10 | 1 | -0/+1 |
| |/ | | | | | | | * fixes #22596 | ||||
* | | Merge pull request #23121 from owncloud/scrutinizer_share_fixes | Thomas Müller | 2016-03-10 | 2 | -2/+2 |
|\ \ | | | | | | | Fix some scrutinizer warning in the sharing code | ||||
| * | | Fix some scrutinizer warning in the sharing code | Roeland Jago Douma | 2016-03-10 | 2 | -2/+2 |
| | | | | | | | | | | | | | | | | | | * Better phpdoc * Promper use statements * Unused parameter | ||||
* | | | Merge pull request #23056 from owncloud/fix_23044 | Thomas Müller | 2016-03-10 | 2 | -4/+19 |
|\ \ \ | |/ / |/| | | Add mimetype to OCS Share API output | ||||
| * | | Add mimetype to OCS Share API output | Roeland Jago Douma | 2016-03-10 | 2 | -4/+19 |
| |/ | | | | | | | Fixes #23044 | ||||
* | | Merge pull request #23048 from owncloud/no-fatal-error-if-DSTART-is-not-set | Thomas Müller | 2016-03-10 | 2 | -4/+19 |
|\ \ | | | | | | | No fatal error if dstart is not set | ||||
| * | | fixes #23004 | Thomas Müller | 2016-03-10 | 2 | -3/+18 |
| | | | |||||
| * | | fixes #23020 | Thomas Müller | 2016-03-09 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #23087 from owncloud/allow-migrating-all-calendars | Thomas Müller | 2016-03-10 | 2 | -4/+4 |
|\ \ \ | | | | | | | | | Allow to migrate calendars of all users | ||||
| * | | | Allow to migrate calendars of all users | Joas Schilling | 2016-03-10 | 2 | -4/+4 |
| | | | | |||||
* | | | | The birthday_calendar is read-only | Thomas Müller | 2016-03-10 | 2 | -7/+13 |
| |_|/ |/| | | |||||
* | | | Merge pull request #23017 from owncloud/first-stop-the-dockers | Thomas Müller | 2016-03-10 | 6 | -0/+6 |
|\ \ \ | |/ / |/| | | docker containers should be stopped before being removed - refs https… | ||||
| * | | docker containers should be stopped before being removed - refs ↵ | Thomas Müller | 2016-03-09 | 6 | -0/+6 |
| | | | | | | | | | | | | https://github.com/docker/docker/issues/18758 | ||||
* | | | Merge pull request #23050 from owncloud/href-target-blank | Thomas Müller | 2016-03-10 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | make sure links open in new tabs | ||||
| * | | | make sure links open in new tabs | Jan-Christoph Borchardt | 2016-03-09 | 1 | -1/+1 |
| | |/ | |/| | |||||
* | | | Merge pull request #23064 from owncloud/typo-comments-app-desc | Thomas Müller | 2016-03-10 | 1 | -1/+1 |
|\ \ \ | | | | | | | | | fix typo in comments app meta data | ||||
| * | | | fix typo | Arthur Schiwon | 2016-03-09 | 1 | -1/+1 |
| |/ / | |||||
* / / | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-10 | 8 | -12/+18 |
|/ / | |||||
* | | Merge pull request #23035 from owncloud/fix-syncing-of-all-birthday-calendars | Thomas Müller | 2016-03-09 | 1 | -1/+1 |
|\ \ | | | | | | | Fix syncing of all birthday calendars in one go | ||||
| * | | Fix syncing of all birthday calendars in one go | Joas Schilling | 2016-03-09 | 1 | -1/+1 |
| | | | |||||
* | | | Merge pull request #23026 from stweil/master | Thomas Müller | 2016-03-09 | 5 | -6/+6 |
|\ \ \ | |/ / |/| | | apps/files: Fix typos in comments (found and fixed by codespell) | ||||
| * | | apps/files: Fix typos in comments (found and fixed by codespell) | Stefan Weil | 2016-03-09 | 5 | -6/+6 |
| |/ | | | | | | | | | | | This contribution is AGPL and MIT licensed. Signed-off-by: Stefan Weil <sw@weilnetz.de> | ||||
* | | Merge pull request #22986 from owncloud/remove-disabled-autocorrect-new-file | Thomas Müller | 2016-03-09 | 1 | -1/+1 |
|\ \ | |/ |/| | Remove disabled autocorrect for new file names | ||||
| * | Remove disabled autocorrect for new file names | Morris Jobke | 2016-03-09 | 1 | -1/+1 |
| | | | | | | | | * ref #22784 | ||||
* | | Merge pull request #22930 from ↵ | Thomas Müller | 2016-03-09 | 2 | -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 0 | prastut | 2016-03-08 | 2 | -2/+12 |
| | | | |||||
* | | | Merge pull request #22961 from owncloud/fix-gdrive-on-php54 | Thomas Müller | 2016-03-09 | 1 | -1/+2 |
|\ \ \ | | | | | | | | | Fix compatibility with PHP 5.4 | ||||
| * | | | Fix compatibility with PHP 5.4 | Lukas Reschke | 2016-03-08 | 1 | -1/+2 |
| | | | | | | | | | | | | | | | | Fixes https://github.com/owncloud/core/issues/22960 | ||||
* | | | | Merge pull request #22972 from ↵ | Thomas Müller | 2016-03-09 | 1 | -27/+23 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | owncloud/use-httpclient-instead-of-file-get-contents Use HTTPClient instead of file_get_contents | ||||
| * | | | | Use HTTPClient instead of file_get_contents | Lukas Reschke | 2016-03-08 | 1 | -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-fun | Thomas Müller | 2016-03-09 | 1 | -2/+2 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Use "hasKey" instead of checking the value | ||||
| * | | | | Use "hasKey" instead of checking the value | Lukas Reschke | 2016-03-08 | 1 | -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 transifex | Jenkins for ownCloud | 2016-03-09 | 20 | -6/+112 |
|/ / / | |||||
* / / | Fix share mounting recursion | Vincent Petry | 2016-03-08 | 1 | -0/+2 |
|/ / | |||||
* | | Fix group sharing and sharing permissions - fixes #22932 | Thomas Müller | 2016-03-08 | 5 | -18/+31 |
| | | |||||
* | | Merge pull request #22885 from owncloud/master-show-version-to-update-to | Thomas Müller | 2016-03-08 | 2 | -3/+6 |
|\ \ | | | | | | | Show version to update to properly | ||||
| * | | Show version to update to properly | Lukas Reschke | 2016-03-05 | 2 | -3/+6 |
| | | | | | | | | | | | | Properly shows the version that will be updated to. | ||||
* | | | Merge pull request #22915 from owncloud/cleanup_ocs_share_api | Thomas Müller | 2016-03-08 | 1 | -57/+37 |
|\ \ \ | | | | | | | | | Cleanup OCS Share Api | ||||
| * | | | Can't convert node to string | Roeland Jago Douma | 2016-03-07 | 1 | -1/+6 |
| | | | | |||||
| * | | | Move common code to function | Roeland Jago Douma | 2016-03-07 | 1 | -56/+31 |
| | | | | | | | | | | | | | | | | | | | | The code to get a share by id is somewhat messy. And was duplicated. Now this is done is a separate function | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2016-03-08 | 18 | -12/+64 |
| |_|/ |/| | |