Lukas Reschke
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
Thomas Müller
e236e564af
In case of maintenance we should add a message to the exception
2015-06-29 12:31:01 +02:00
Joas Schilling
ae3d402dbc
Send OC version to appstore so it can reply with the right links
2015-06-29 12:14:07 +02:00
Lukas Reschke
30145c0b52
Also load enabled apps
2015-06-29 11:38:28 +02:00
Thomas Müller
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
Vincent Petry
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
Jenkins for ownCloud
733d59ed44
[tx-robot] updated from transifex
2015-06-29 01:54:44 -04:00
Thomas Müller
774a38256d
Merge pull request #17219 from owncloud/LukasReschke-patch-1
...
Increase timeout again
2015-06-28 20:19:52 +02:00
Lukas Reschke
a43ba1bf1d
Update comment
2015-06-28 17:06:49 +02:00
Lukas Reschke
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
Lukas Reschke
03498c0b2c
Build base URL
2015-06-28 12:26:47 +02:00
Lukas Reschke
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
Jenkins for ownCloud
4d565a8447
[tx-robot] updated from transifex
2015-06-28 01:55:19 -04:00
Lukas Reschke
717f91a4e8
Merge pull request #17214 from owncloud/fix-php-doc-user-interface
...
Fix PHPDoc + Indentation
2015-06-27 21:58:49 +02:00
Lukas Reschke
dd0625faf3
Merge pull request #17212 from owncloud/ocs-spec
...
Add endpoint with list of OCS providers
2015-06-27 21:56:46 +02:00
Lukas Reschke
a793b98fd0
Fix indentation
2015-06-27 20:37:07 +02:00
Lukas Reschke
af01958f3e
Add missing annotations for parameters
2015-06-27 20:35:47 +02:00
Lukas Reschke
d1f0ff372e
Merge pull request #17163 from owncloud/update-licenses
...
Update license headers
2015-06-27 20:22:23 +02:00
Lukas Reschke
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
Roeland Douma
708c6268ad
Merge pull request #17206 from oparoz/bpg-media-type
...
Adding BPG media type
2015-06-27 10:19:56 +02:00
Lukas Reschke
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
Jenkins for ownCloud
28c223edc6
[tx-robot] updated from transifex
2015-06-27 01:55:58 -04:00
Joas Schilling
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
Björn Schießle
569c2a8deb
Merge pull request #17203 from owncloud/fix-share-autocomplete
...
fix z-index of share-autocomplete
2015-06-26 22:01:42 +02:00
Olivier Paroz
158c5b5e47
Adding BPG media type
2015-06-26 19:22:12 +02:00
Clark Tomlinson
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
Vincent Petry
0684cc15dc
Merge pull request #17071 from owncloud/share-get-users-non-existing
...
fix getUsersSharingFile with locking
2015-06-26 18:27:53 +02:00
Jan-Christoph Borchardt
4edf388a38
fix z-index of share-autocomplete
2015-06-26 17:48:35 +02:00
Olivier Paroz
b30515ddda
Signature of overriding method should match the parent
2015-06-26 17:45:04 +02:00
Vincent Petry
271ef9dedb
Remove test-specific method to make Bjoern and Joas happy
2015-06-26 17:37:04 +02:00
Arthur Schiwon
8625a8cf23
ensure groups match filter when using memberOf to read users group, refs #17119
2015-06-26 16:42:11 +02:00
Vincent Petry
56d9df34cb
Unit test for etag update on custom share folder
2015-06-26 16:32:28 +02:00
Robin Appelman
c338999032
fix getUsersSharingFile with locking
2015-06-26 16:31:52 +02:00
Thomas Müller
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
Björn Schießle
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
Joas Schilling
9b336765b6
Correctly check if the real file exists, otherwise try the part file
2015-06-26 13:17:23 +02:00
Thomas Müller
796aae4402
Merge pull request #17009 from owncloud/lock-downloadfile
...
Lock file during download
2015-06-26 13:04:34 +02:00
Thomas Müller
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
Thomas Müller
8cc88fa64f
Merge pull request #17190 from owncloud/lock-changelabel
...
Rename experimental to transactional file locking
2015-06-26 12:27:16 +02:00
Vincent Petry
eadf789519
Rename experimental to transactional file locking
2015-06-26 11:10:10 +02:00
Thomas Müller
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
Morris Jobke
569157d529
Merge pull request #17185 from rullzer/fix_17178
...
Fix for #17178
2015-06-26 08:21:32 +02:00
Jenkins for ownCloud
b1e29c7dde
[tx-robot] updated from transifex
2015-06-26 01:55:35 -04:00
Roeland Jago Douma
27d5838fb7
Fix for #17178
...
If no array of arrays is submitted make sure we still keep $sharedUsers
and $sharedGroups as arrays so the rest of the code keeps functioning as
it should.
2015-06-25 21:16:18 +02:00
Vincent Petry
eae08d0adc
Release locks after class in tests
2015-06-25 16:33:02 +02:00
Vincent Petry
538e466c30
Keep shared locks in post hooks
...
Instead of unlocking after the file operation, change exclusive locks
back to shared locks during post hooks, and unlock after that.
Also added unit tests to test locking in pre-hooks, during operation and
post-hooks.
2015-06-25 16:33:02 +02:00
Robin Appelman
0128a86df1
add some docs
2015-06-25 14:29:40 +02:00
Morris Jobke
0032cddb40
add additional email address for Georg
2015-06-25 14:14:14 +02:00
Morris Jobke
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
Bjoern Schiessle
a288d0eea3
ne need to check twice if $row['share_with'] is set
2015-06-25 12:14:46 +02:00