525745caf5
Merge pull request #17140 from owncloud/trashbin_occ
...
add occ command to remove deleted files
2015-07-03 15:10:50 +02:00
9da10788bc
Merge pull request #17349 from owncloud/share-onlyshowstaticownerifavailable
...
Do not show static share owner if not available
2015-07-03 09:31:40 +02:00
b8f5b2c47a
[tx-robot] updated from transifex
2015-07-03 01:54:57 -04:00
a3df41ddb6
Merge pull request #17159 from owncloud/fix-duplicate-id
...
remove duplicate ID in HTML template for public shares
2015-07-02 17:50:39 +02:00
71ae96bb56
Do not show static share owner if not available
...
In some corner cases, an outgoing share exists but sharing is not
allowed for the current user. This would cause the file list to break
because the static text could not be rendered as the owner was
undefined.
2015-07-02 16:38:20 +02:00
e65034e4bc
Do not register JS share plugin if core sharing API is disabled
2015-07-02 14:56:33 +02:00
063071b58d
Merge pull request #17328 from owncloud/revert-15363-ext-ocp
...
Revert "Use OCP classes as much as possible in files_external"
2015-07-02 13:02:35 +02:00
f5c57e076e
Merge pull request #17077 from owncloud/files-scan-absolute-path
...
fix getting mount points when passing a path to the files:scan command
2015-07-02 13:02:20 +02:00
aedf4848f7
Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-block
...
Fix duplicated line in doc block
2015-07-02 13:00:22 +02:00
079e9cecba
Revert "Use OCP classes as much as possible in files_external"
2015-07-02 13:00:21 +02:00
c7968d202f
Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-specified
...
[Master] Delete OCS ID from DB if none is specified
2015-07-02 12:37:31 +02:00
bfcb8ffeb3
Merge pull request #17246 from owncloud/share-lock-owner-parent
...
lock parent folders for the owner when locking a shared file as recipient
2015-07-02 10:38:08 +02:00
a6ea91996c
Fix duplicated line in doc block
2015-07-02 10:24:16 +02:00
b100036457
Bump versions
2015-07-02 09:18:41 +02:00
68f8717056
[master] Remove OCS IDs
...
While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307
Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
2015-07-02 08:45:16 +02:00
d2e1cae331
[tx-robot] updated from transifex
2015-07-02 01:59:26 -04:00
9c06975bd5
Fix scanFile signature to avoid boring warning
2015-07-01 16:29:11 +02:00
3c0be7d126
only lock the parent folders
2015-07-01 15:10:25 +02:00
d6f56ea609
lock parent folders for the owner when locking a shared file as recipient
2015-07-01 15:10:22 +02:00
5caeda33f1
Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypes
...
Catch more error codes thrown by federated shares
2015-07-01 12:30:32 +02:00
5d3aa36355
Catch more error codes thrown by federated shares
...
Most of the time it doesn't make sense to forward Guzzle's
RequestException, so we convert it to StorageNotAvailable instead.
This prevents unpredictable error codes to block access to unrelated
folders needlessly.
2015-07-01 11:14:03 +02:00
728a22cda1
Use OCP classes as much as possible in files_external
2015-07-01 09:08:28 +02:00
8f05d4b662
Merge pull request #16535 from rullzer/ocs_share_api_url
...
OCS Share API link shares now always have an url
2015-07-01 08:54:48 +02:00
044d2ece07
Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util
...
Move core apps from OC_Log::write to OCP\Util
2015-07-01 08:53:16 +02:00
f25b71f70e
Merge pull request #15475 from rullzer/files_sharing_OCP_DB
...
Move files sharing app (mostly) to OCP\DB
2015-07-01 08:53:03 +02:00
0a23d566ba
Merge pull request #17255 from owncloud/fix-17119
...
[LDAP] Filter user groups obtained by memberof
2015-07-01 00:33:39 +02:00
5f4db0540a
tests solidity
2015-06-30 14:09:11 +02:00
646f2f1d41
adjust unit test
2015-06-30 13:56:25 +02:00
663cd7af4d
integration test
2015-06-30 12:52:27 +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
abb0c728ef
handle error during setup
2015-06-29 14:06:32 +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
4d565a8447
[tx-robot] updated from transifex
2015-06-28 01:55:19 -04: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
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
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
b30515ddda
Signature of overriding method should match the parent
2015-06-26 17:45:04 +02:00
8625a8cf23
ensure groups match filter when using memberOf to read users group, refs #17119
2015-06-26 16:42:11 +02:00
56d9df34cb
Unit test for etag update on custom share folder
2015-06-26 16:32:28 +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
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
b1e29c7dde
[tx-robot] updated from transifex
2015-06-26 01:55:35 -04:00
0128a86df1
add some docs
2015-06-25 14:29:40 +02:00
f63915d0c8
update license headers and authors
2015-06-25 14:13:49 +02:00
5cb1e20214
remove duplicate ID in HTML template for public shares
2015-06-25 10:13:56 +02:00
160d8003f8
Merge pull request #17152 from owncloud/LDAP/AD-Typo
...
Ldap/ad typo
2015-06-25 07:56:04 +02:00
dddbfb903f
[tx-robot] updated from transifex
2015-06-25 01:55:15 -04:00
Björn Schießle
Morris Jobke
Jenkins for ownCloud
Vincent Petry
Thomas Müller
Joas Schilling
Joas Schilling
Lukas Reschke
Robin Appelman
Robin McCorkell
Arthur Schiwon
Clark Tomlinson
Olivier Paroz