9c1915965e
Merge pull request #22242 from owncloud/remove_old_ocs_share_api_code
...
Remove old ocs share api code
2016-03-13 19:17:07 +01:00
3f8c998afe
Do not recurse link share fetching
...
* Might fix an issue on oracle
2016-03-13 13:31:28 +01:00
6509220f82
Fix intergration tests
2016-03-13 13:31:28 +01:00
4b1fe0083a
Remove the old OCS Share API code
2016-03-13 13:31:28 +01:00
5862a067d9
[tx-robot] updated from transifex
2016-03-12 01:55:36 -05:00
8082105a19
Merge pull request #23137 from owncloud/bump_doctrine
...
[3rdparty] Bump doctrine/dbal
2016-03-11 17:15:57 +01:00
5c7b26e1ef
[3rdparty] Bump doctrine/dbal
2016-03-11 15:18:33 +01:00
c874ebf425
Merge pull request #23141 from owncloud/behat-code-style
...
Fix all the yellow, orange and red errors in integration tests
2016-03-11 14:56:44 +01:00
a8922e9d35
Merge pull request #23125 from owncloud/add-port-support-to-trusteddomain
...
Explicitly check for port
2016-03-11 14:55:27 +01:00
a7f6f10d4e
Merge pull request #22750 from owncloud/integration-tests-federated-resharing
...
Adding new tests for federation sharing
2016-03-11 14:51:06 +01:00
19695ff8da
Merge pull request #23133 from owncloud/more_generic_share_parameters
...
Use more generic node instead of File/Folder
2016-03-11 14:50:48 +01:00
6d80efc2a4
Fix WebDav
2016-03-11 13:59:20 +01:00
6ff3d23b24
Fix docs of Tags
2016-03-11 13:59:19 +01:00
957a13d879
Remove unnecessary imports
2016-03-11 13:59:19 +01:00
d78357c210
Fix comments
2016-03-11 13:59:19 +01:00
c604046e3e
Fix checksumsContext
2016-03-11 13:59:19 +01:00
2faf520504
Fix issues in CardDav
2016-03-11 13:59:19 +01:00
b4affa4d27
Add docs for CalDavContext
2016-03-11 13:59:19 +01:00
0f214017d2
Docs for BasicStructure
2016-03-11 13:59:19 +01:00
6381c22a7d
Remove trailing spaces
2016-03-11 13:59:19 +01:00
cdc5470f7e
Fix the use of traits
2016-03-11 13:59:19 +01:00
26e974d859
Fix inheritance of members
2016-03-11 13:59:19 +01:00
62b77d8ed0
API version needs to be on basic because we use it there
2016-03-11 13:59:19 +01:00
5f7502de6c
Fix type in class name
2016-03-11 13:59:19 +01:00
95a7518653
Remove hardcoded api versions
2016-03-11 13:59:19 +01:00
985b11876f
asCreatingAShareWith has no return
2016-03-11 13:59:18 +01:00
9be7f4d19d
Fix docs
2016-03-11 13:59:18 +01:00
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
c153a27ce5
Change resharing to local instead of remote because of a deadlock
2016-03-11 08:49:26 +00:00
44da5fe1ab
Adding new tests for federation sharing
2016-03-11 08:49:26 +00:00
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
1ed831564e
[tx-robot] updated from transifex
2016-03-11 01:55:49 -05:00
866de3c174
Merge pull request #23086 from owncloud/ldap-sort-deprecated
...
remove deprecated ldap_sort
2016-03-11 00:23:13 +01:00
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
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
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
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
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
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
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
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
e6712c47a6
Fix some scrutinizer warning in the sharing code
...
* Better phpdoc
* Promper use statements
* Unused parameter
2016-03-10 21:35:22 +01:00
8e51634e6d
Merge pull request #23056 from owncloud/fix_23044
...
Add mimetype to OCS Share API output
2016-03-10 21:18:19 +01:00
cac92730ac
Scrutinizer should not check generated composer files
2016-03-10 21:17:34 +01:00
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
b7adf371c6
getOwner is not available on FileHome - fixes #23116
2016-03-10 20:53:56 +01:00
7430db79c5
[3rdparty] Bump symfony/console to 2.8.3
2016-03-10 20:14:39 +01:00
ca2a24d286
Add intergration tests
2016-03-10 20:12:58 +01:00
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
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
Roeland Douma
Roeland Jago Douma
Jenkins for ownCloud
Thomas Müller
Joas Schilling
Sergio Bertolin
Stephan Köninger
Lukas Reschke