b88a0e7080
Merge pull request #17231 from owncloud/add-missing-version-field
...
Add missing version field
2015-06-29 16:41:47 +02:00
30f5fa42e5
Merge pull request #17229 from owncloud/maintenance-plugin-test
...
Unit tests added for MaintenancePlugin
2015-06-29 16:22:38 +02:00
372a9afabe
Fixing ctor calls and ctor itself to not break usage in calendar and contacts .....
2015-06-29 15:54:05 +02:00
ab4d5d20ea
Typehint $targetVersion
2015-06-29 15:10:40 +02:00
1db047a336
Add missing version field
2015-06-29 15:09:57 +02:00
b56af26199
Merge pull request #17222 from owncloud/issue-17101-send-oc-version-to-app-store
...
Send OC version to appstore so it can reply with the right links
2015-06-29 15:07:00 +02:00
f8127046ee
Unit tests added for MaintenancePlugin
2015-06-29 14:18:09 +02:00
70eb20e3a7
Merge pull request #17030 from owncloud/lock-posthooks
...
Keep shared lock for post-hooks
2015-06-29 14:17:03 +02:00
c57fb19b2f
Merge pull request #17226 from owncloud/webdav-add-message-on-maintenance
...
In case of maintenance we should add a message to the exception
2015-06-29 14:11:36 +02:00
5810e7ab87
Merge pull request #17050 from owncloud/request-status-from-ocs
...
Request approved state for disabled apps with ocsid
2015-06-29 13:41:11 +02:00
e236e564af
In case of maintenance we should add a message to the exception
2015-06-29 12:31:01 +02:00
ae3d402dbc
Send OC version to appstore so it can reply with the right links
2015-06-29 12:14:07 +02:00
30145c0b52
Also load enabled apps
2015-06-29 11:38:28 +02:00
aa595392f6
Merge pull request #17217 from owncloud/use-new-updater-url
...
Use new updater URL + add unit tests
2015-06-29 11:27:23 +02:00
b55f71ee03
Merge pull request #17083 from owncloud/share-etag-update-target
...
take share target into account when updating recipient etags
2015-06-29 09:10:37 +02:00
733d59ed44
[tx-robot] updated from transifex
2015-06-29 01:54:44 -04:00
774a38256d
Merge pull request #17219 from owncloud/LukasReschke-patch-1
...
Increase timeout again
2015-06-28 20:19:52 +02:00
a43ba1bf1d
Update comment
2015-06-28 17:06:49 +02:00
7b4e1f526b
Increase timeout again
...
Our test execution is terribly slow and now also exceeds more than one hour on our CI system. This means that Scrutinizer fails hard on a lot of PRs such as https://github.com/owncloud/core/pull/17217#issuecomment-116252420
2015-06-28 17:06:15 +02:00
03498c0b2c
Build base URL
2015-06-28 12:26:47 +02:00
04fe9e05f0
Use new updater URL + add unit tests
...
Uses the new updater url "https://updates.owncloud.com/server/ "
2015-06-28 11:25:28 +02:00
4d565a8447
[tx-robot] updated from transifex
2015-06-28 01:55:19 -04:00
717f91a4e8
Merge pull request #17214 from owncloud/fix-php-doc-user-interface
...
Fix PHPDoc + Indentation
2015-06-27 21:58:49 +02:00
dd0625faf3
Merge pull request #17212 from owncloud/ocs-spec
...
Add endpoint with list of OCS providers
2015-06-27 21:56:46 +02:00
a793b98fd0
Fix indentation
2015-06-27 20:37:07 +02:00
af01958f3e
Add missing annotations for parameters
2015-06-27 20:35:47 +02:00
d1f0ff372e
Merge pull request #17163 from owncloud/update-licenses
...
Update license headers
2015-06-27 20:22:23 +02:00
76878e9943
Add endpoint with list of OCS providers
...
This adds a OCS provider list at `ocs-provider/` to enable a somewhat autodiscovery of services.
In the moment it is not possible for applications to add own entries and it is basically hard-coded in the controller. I'm aware that this is not an optimal solution and I'm happy for any pragmatic input that won't pollute our public API too much. (and is not a big super hack, this is already hacky enough ;-))
That said, I'd consider it as a first step also feasible to go with this somewhat hard-coded list and see if this gets adopted...
2015-06-27 18:23:49 +02:00
708c6268ad
Merge pull request #17206 from oparoz/bpg-media-type
...
Adding BPG media type
2015-06-27 10:19:56 +02:00
465606c254
Merge pull request #17199 from owncloud/feature/show-error-when-shareservice-dies
...
add check if server returns a 500 and display error
2015-06-27 09:34:34 +02:00
28c223edc6
[tx-robot] updated from transifex
2015-06-27 01:55:58 -04:00
77ae2d6fc4
Merge pull request #17202 from oparoz/repair-scan-signature
...
Signature of overriding method should match the parent
2015-06-27 02:35:40 +02:00
569c2a8deb
Merge pull request #17203 from owncloud/fix-share-autocomplete
...
fix z-index of share-autocomplete
2015-06-26 22:01:42 +02:00
158c5b5e47
Adding BPG media type
2015-06-26 19:22:12 +02:00
ca1da0acb7
add check if server returns a 500 and display error
...
resolves https://github.com/owncloud/core/issues/17170
2015-06-26 12:50:09 -04:00
0684cc15dc
Merge pull request #17071 from owncloud/share-get-users-non-existing
...
fix getUsersSharingFile with locking
2015-06-26 18:27:53 +02:00
4edf388a38
fix z-index of share-autocomplete
2015-06-26 17:48:35 +02:00
b30515ddda
Signature of overriding method should match the parent
2015-06-26 17:45:04 +02:00
271ef9dedb
Remove test-specific method to make Bjoern and Joas happy
2015-06-26 17:37:04 +02:00
56d9df34cb
Unit test for etag update on custom share folder
2015-06-26 16:32:28 +02:00
c338999032
fix getUsersSharingFile with locking
2015-06-26 16:31:52 +02:00
ac94126393
Merge pull request #17191 from owncloud/issue-17188-group-share-part-file
...
Correctly check if the real file exists, otherwise try the part file
2015-06-26 16:01:41 +02:00
b318b9cf17
Merge pull request #17008 from owncloud/fix-17006
...
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
9b336765b6
Correctly check if the real file exists, otherwise try the part file
2015-06-26 13:17:23 +02:00
796aae4402
Merge pull request #17009 from owncloud/lock-downloadfile
...
Lock file during download
2015-06-26 13:04:34 +02:00
9558562883
Merge pull request #17082 from owncloud/shared-etag-propagate-file
...
Fix etag propagation for single file shares
2015-06-26 12:36:17 +02:00
8cc88fa64f
Merge pull request #17190 from owncloud/lock-changelabel
...
Rename experimental to transactional file locking
2015-06-26 12:27:16 +02:00
eadf789519
Rename experimental to transactional file locking
2015-06-26 11:10:10 +02:00
6c3a4282e5
Merge pull request #17165 from owncloud/federated_cloud_sharing_search_address_book
...
Search address book for federated cloud id
2015-06-26 10:53:02 +02:00
569157d529
Merge pull request #17185 from rullzer/fix_17178
...
Fix for #17178
2015-06-26 08:21:32 +02:00
Morris Jobke
Joas Schilling
Thomas Müller
Lukas Reschke
Joas Schilling
Vincent Petry
Jenkins for ownCloud
Roeland Douma
Björn Schießle
Olivier Paroz
Clark Tomlinson
Jan-Christoph Borchardt
Robin Appelman