Commit Graph

31116 Commits

Author SHA1 Message Date
Joas Schilling 6381c22a7d Remove trailing spaces 2016-03-11 13:59:19 +01:00
Joas Schilling cdc5470f7e Fix the use of traits 2016-03-11 13:59:19 +01:00
Joas Schilling 26e974d859 Fix inheritance of members 2016-03-11 13:59:19 +01:00
Joas Schilling 62b77d8ed0 API version needs to be on basic because we use it there 2016-03-11 13:59:19 +01:00
Joas Schilling 5f7502de6c Fix type in class name 2016-03-11 13:59:19 +01:00
Joas Schilling 95a7518653 Remove hardcoded api versions 2016-03-11 13:59:19 +01:00
Joas Schilling 985b11876f asCreatingAShareWith has no return 2016-03-11 13:59:18 +01:00
Joas Schilling 9be7f4d19d Fix docs 2016-03-11 13:59:18 +01:00
Robin Appelman a8db587b1f move failedstorage to core 2016-03-11 13:15:45 +01:00
Robin Appelman 3bd6fc797d dont break when there is an invalid share 2016-03-11 13:15:45 +01:00
Thomas Müller 750ec93394 Merge pull request #23080 from owncloud/use-non-localized-birthday-title
Use a birthday title which does not require translation because we ha…
2016-03-11 11:49:13 +01:00
Sergio Bertolin c153a27ce5 Change resharing to local instead of remote because of a deadlock 2016-03-11 08:49:26 +00:00
Sergio Bertolín 44da5fe1ab Adding new tests for federation sharing 2016-03-11 08:49:26 +00:00
Roeland Jago Douma b8ce9c5554 Use more generic node instead of File/Folder
The phpdoc for the sharing functions was very restrictive. As a
consequence passing node object (for example from the OCS Share API
where we don't really care if it is a file or folder), would actually
be invalid.

With this loser restriction the interfaces become more generic.
2016-03-11 08:51:07 +01:00
Jenkins for ownCloud 1ed831564e [tx-robot] updated from transifex 2016-03-11 01:55:49 -05:00
Thomas Müller 866de3c174 Merge pull request #23086 from owncloud/ldap-sort-deprecated
remove deprecated ldap_sort
2016-03-11 00:23:13 +01:00
Thomas Müller 7587fe8ad5 Merge pull request #23129 from SteKoe/add-jpg-to-htaccess
Allow jpg files to be statically served
2016-03-10 23:15:23 +01:00
Thomas Müller 07a1313114 Merge pull request #23119 from owncloud/fix-getOwner-on-fileshome-master
getOwner is not available on FileHome
2016-03-10 23:12:51 +01:00
Stephan Köninger 73a7c45dd4 Allow jpg files to be statically served
When using an background image in themes of type JPG, the current setting of owncloud's htaccess file does not allow to deliver these kinds of images as static content. Adding the file extensions as done in this commit, it works flawlessly.
2016-03-10 23:08:56 +01:00
Thomas Müller e0210058ef Merge pull request #23094 from owncloud/fake-lock-for-windows-7-8-10
Fake LOCK statement for Windows 7, 8 and 10 network mounts
2016-03-10 23:07:45 +01:00
Lukas Reschke dc6789fd5b Explicitly check for port
The setup uses `\OCP\IRequest::getInsecureServerHost` which in some cases can also include a port. This makes the trusted domain check fail thus.

I've decided to add this here that way because adjusting the setup would require parsing the host properly. This is not something that can be done very good in PHP. Check the following example for why `parse_url` is not our friend: https://3v4l.org/k501Z
2016-03-10 22:32:29 +01:00
Thomas Müller d8ba3a8944 Merge pull request #23027 from owncloud/bump_symfony_console
[3rdparty] Bump symfony/console to 2.8.3
2016-03-10 22:29:34 +01:00
Lukas Reschke 3e8decf5e9 Improved rewrite rule
As per https://github.com/owncloud/core/issues/23098 and https://github.com/owncloud/core/issues/23117
2016-03-10 22:20:02 +01:00
Thomas Müller b502667f3a Merge pull request #23121 from owncloud/scrutinizer_share_fixes
Fix some scrutinizer warning in the sharing code
2016-03-10 22:17:06 +01:00
Thomas Müller a146499902 Merge pull request #23120 from owncloud/do_not_analyze_composer
Scrutinizer should not check generated composer files
2016-03-10 21:40:14 +01:00
Roeland Jago Douma e6712c47a6 Fix some scrutinizer warning in the sharing code
* Better phpdoc
* Promper use statements
* Unused parameter
2016-03-10 21:35:22 +01:00
Thomas Müller 8e51634e6d Merge pull request #23056 from owncloud/fix_23044
Add mimetype to OCS Share API output
2016-03-10 21:18:19 +01:00
Roeland Jago Douma cac92730ac Scrutinizer should not check generated composer files 2016-03-10 21:17:34 +01:00
Thomas Müller 3cec5f7f6c Merge pull request #23100 from owncloud/DeepDiver1975-patch-1
Execute travis test on stable branches as well
2016-03-10 21:16:06 +01:00
Georg Ehrke 856ca641d1 add title and color to birthday calendar 2016-03-10 21:02:54 +01:00
Thomas Müller b7adf371c6 getOwner is not available on FileHome - fixes #23116 2016-03-10 20:53:56 +01:00
Roeland Jago Douma 7430db79c5 [3rdparty] Bump symfony/console to 2.8.3 2016-03-10 20:14:39 +01:00
Roeland Jago Douma ca2a24d286 Add intergration tests 2016-03-10 20:12:58 +01:00
Thomas Müller 7f16aaefc8 Merge pull request #23048 from owncloud/no-fatal-error-if-DSTART-is-not-set
No fatal error if dstart is not set
2016-03-10 17:58:01 +01:00
Thomas Müller ad61c552ea Merge pull request #23087 from owncloud/allow-migrating-all-calendars
Allow to migrate calendars of all users
2016-03-10 17:44:23 +01:00
Thomas Müller c8c9cd36dd Merge pull request #23079 from owncloud/readonly-birthday-cal
The birthday_calendar is read-only
2016-03-10 16:04:10 +01:00
Thomas Müller 207f6f8203 Execute travis test on stable branches as well 2016-03-10 15:53:26 +01:00
Roeland Jago Douma 517ef52560 Add mimetype to OCS Share API output
Fixes #23044
2016-03-10 15:41:17 +01:00
Thomas Müller b3c1379b8c Merge pull request #23084 from owncloud/fix_23067
Fix MKCOL for IE11 as well
2016-03-10 15:32:27 +01:00
Morris Jobke 48e03e0c49 Fake LOCK statement for Windows 7, 8 and 10 network mounts
* fixes #22596
2016-03-10 15:02:37 +01:00
Joas Schilling 94915e39db Allow to migrate calendars of all users 2016-03-10 13:42:09 +01:00
Roeland Jago Douma 19347187d8 Fix MKCOL for IE11 as well
Using https://github.com/owncloud/core/pull/22274 we have to patch the
iedavclient.js as well.
2016-03-10 13:36:26 +01:00
Arthur Schiwon fe2a506e56 remove deprecated ldap_sort 2016-03-10 13:13:38 +01:00
Thomas Müller 85521879cd The birthday_calendar is read-only 2016-03-10 12:50:07 +01:00
Thomas Müller fe7103506b Use a birthday title which does not require translation because we have no idea about the target device language and forcing English upon all users is kind of bad 2016-03-10 12:41:37 +01:00
Thomas Müller 51072f742e Merge pull request #21582 from owncloud/core_composer
Composers PSR-4 autoloader in core
2016-03-10 12:06:44 +01:00
Thomas Müller 262ec35d50 Merge pull request #23017 from owncloud/first-stop-the-dockers
docker containers should be stopped before being removed - refs https…
2016-03-10 10:58:20 +01:00
Thomas Müller 41aae971a9 Merge pull request #23050 from owncloud/href-target-blank
make sure links open in new tabs
2016-03-10 10:54:53 +01:00
Joas Schilling 6b4117df34 Correctly escape join statements and use selectAlias 2016-03-10 10:24:08 +01:00
Thomas Müller 6133253a2c fixes #23004 2016-03-10 09:20:53 +01:00