summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2016-03-1210-6/+38
|
* Merge pull request #23080 from owncloud/use-non-localized-birthday-titleThomas Müller2016-03-112-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üller2016-03-102-3/+3
| | | | | | | | idea about the target device language and forcing English upon all users is kind of bad
* | [tx-robot] updated from transifexJenkins for ownCloud2016-03-1126-80/+218
| |
* | Merge pull request #23086 from owncloud/ldap-sort-deprecatedThomas Müller2016-03-113-30/+1
|\ \ | | | | | | remove deprecated ldap_sort
| * | remove deprecated ldap_sortArthur Schiwon2016-03-103-30/+1
| |/
* | Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-masterThomas Müller2016-03-103-12/+65
|\ \ | | | | | | getOwner is not available on FileHome
| * | getOwner is not available on FileHome - fixes #23116Thomas Müller2016-03-103-12/+65
| |/
* | Merge pull request #23094 from owncloud/fake-lock-for-windows-7-8-10Thomas Müller2016-03-101-0/+1
|\ \ | | | | | | Fake LOCK statement for Windows 7, 8 and 10 network mounts
| * | Fake LOCK statement for Windows 7, 8 and 10 network mountsMorris Jobke2016-03-101-0/+1
| |/ | | | | | | * fixes #22596
* | Merge pull request #23121 from owncloud/scrutinizer_share_fixesThomas Müller2016-03-102-2/+2
|\ \ | | | | | | Fix some scrutinizer warning in the sharing code
| * | Fix some scrutinizer warning in the sharing codeRoeland Jago Douma2016-03-102-2/+2
| | | | | | | | | | | | | | | | | | * Better phpdoc * Promper use statements * Unused parameter
* | | Merge pull request #23056 from owncloud/fix_23044Thomas Müller2016-03-102-4/+19
|\ \ \ | |/ / |/| | Add mimetype to OCS Share API output
| * | Add mimetype to OCS Share API outputRoeland Jago Douma2016-03-102-4/+19
| |/ | | | | | | Fixes #23044
* | Merge pull request #23048 from owncloud/no-fatal-error-if-DSTART-is-not-setThomas Müller2016-03-102-4/+19
|\ \ | | | | | | No fatal error if dstart is not set
| * | fixes #23004Thomas Müller2016-03-102-3/+18
| | |
| * | fixes #23020Thomas Müller2016-03-091-1/+1
| | |
* | | Merge pull request #23087 from owncloud/allow-migrating-all-calendarsThomas Müller2016-03-102-4/+4
|\ \ \ | | | | | | | | Allow to migrate calendars of all users
| * | | Allow to migrate calendars of all usersJoas Schilling2016-03-102-4/+4
| | | |
* | | | The birthday_calendar is read-onlyThomas Müller2016-03-102-7/+13
| |_|/ |/| |
* | | Merge pull request #23017 from owncloud/first-stop-the-dockersThomas Müller2016-03-106-0/+6
|\ \ \ | |/ / |/| | docker containers should be stopped before being removed - refs https…
| * | docker containers should be stopped before being removed - refs ↵Thomas Müller2016-03-096-0/+6
| | | | | | | | | | | | https://github.com/docker/docker/issues/18758
* | | Merge pull request #23050 from owncloud/href-target-blankThomas Müller2016-03-101-1/+1
|\ \ \ | | | | | | | | make sure links open in new tabs
| * | | make sure links open in new tabsJan-Christoph Borchardt2016-03-091-1/+1
| | |/ | |/|
* | | Merge pull request #23064 from owncloud/typo-comments-app-descThomas Müller2016-03-101-1/+1
|\ \ \ | | | | | | | | fix typo in comments app meta data
| * | | fix typoArthur Schiwon2016-03-091-1/+1
| |/ /
* / / [tx-robot] updated from transifexJenkins for ownCloud2016-03-108-12/+18
|/ /
* | Merge pull request #23035 from owncloud/fix-syncing-of-all-birthday-calendarsThomas Müller2016-03-091-1/+1
|\ \ | | | | | | Fix syncing of all birthday calendars in one go
| * | Fix syncing of all birthday calendars in one goJoas Schilling2016-03-091-1/+1
| | |
* | | Merge pull request #23026 from stweil/masterThomas Müller2016-03-095-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 Weil2016-03-095-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-fileThomas Müller2016-03-091-1/+1
|\ \ | |/ |/| Remove disabled autocorrect for new file names
| * Remove disabled autocorrect for new file namesMorris Jobke2016-03-091-1/+1
| | | | | | | | * ref #22784
* | 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 #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-0920-6/+112
|/ / /
* / / Fix share mounting recursionVincent Petry2016-03-081-0/+2
|/ /
* | Fix group sharing and sharing permissions - fixes #22932Thomas Müller2016-03-085-18/+31
| |
* | 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
* | | | [tx-robot] updated from transifexJenkins for ownCloud2016-03-0818-12/+64
| |_|/ |/| |