Thomas Müller
cf3cb4d75e
docker containers should be stopped before being removed - refs https://github.com/docker/docker/issues/18758
2016-03-09 14:02:08 +01:00
Thomas Müller
290a16e5d7
Merge pull request #22930 from owncloud/bugfix-submit-disable-password-length-zero
...
Public link share disabled if password length is equal to 0
2016-03-09 12:22:01 +01:00
Thomas Müller
447e8d2313
Merge pull request #22961 from owncloud/fix-gdrive-on-php54
...
Fix compatibility with PHP 5.4
2016-03-09 12:20:42 +01:00
Thomas Müller
30cec687ae
Merge pull request #22972 from owncloud/use-httpclient-instead-of-file-get-contents
...
Use HTTPClient instead of file_get_contents
2016-03-09 12:20:06 +01:00
Thomas Müller
3608421800
Merge pull request #22974 from owncloud/php-automagics-type-conversion-is-fun
...
Use "hasKey" instead of checking the value
2016-03-09 12:19:45 +01:00
Morris Jobke
52f02fe93e
Remove disabled autocorrect for new file names
...
* ref #22784
2016-03-09 08:38:05 +01:00
Jenkins for ownCloud
afe3fdbf49
[tx-robot] updated from transifex
2016-03-09 01:55:42 -05:00
Lukas Reschke
c0200bc5c3
Use "hasKey" instead of checking the value
...
If the check is negative it would depending on the used cache store the value as an empty string. When reading the value this check would thus return "false" even if a value exists.
2016-03-08 23:24:44 +01:00
Lukas Reschke
8214fae9ae
Use HTTPClient instead of file_get_contents
...
Allows us to catch exceptions like 404's and thus prevents stuff like:
```
{"reqId":"fnmS0hc+fL4+WXKAruo5","remoteAddr":"192.168.39.100","app":"PHP","message":"file_get_contents(http:\/\/ckamm.blaucloud.de\/\/status.php): failed to open stream: HTTP request failed! HTTP\/1.1 404 Not Found\r\n at \/var\/www\/owncloud\/apps\/files_sharing\/lib\/external\/storage.php#260","level":3,"time":"2016-03-08T21:00:33+00:00","method":"PROPFIND","url":"\/remote.php\/webdav\/"}
```
2016-03-08 22:13:00 +01:00
Lukas Reschke
d14adb2351
Fix compatibility with PHP 5.4
...
Fixes https://github.com/owncloud/core/issues/22960
2016-03-08 18:04:24 +01:00
Vincent Petry
e5a107cc45
Fix share mounting recursion
2016-03-08 14:46:42 +01:00
Thomas Müller
20db92c71a
Fix group sharing and sharing permissions - fixes #22932
2016-03-08 11:22:07 +01:00
Thomas Müller
31c89bd3a2
Merge pull request #22885 from owncloud/master-show-version-to-update-to
...
Show version to update to properly
2016-03-08 09:41:52 +01:00
Thomas Müller
2ebf512412
Merge pull request #22915 from owncloud/cleanup_ocs_share_api
...
Cleanup OCS Share Api
2016-03-08 09:41:20 +01:00
Jenkins for ownCloud
a8bafb9bf3
[tx-robot] updated from transifex
2016-03-08 01:55:39 -05:00
prastut
7e52aac771
Public link share disabled if password length is equal to 0
2016-03-08 04:25:35 +05:30
Thomas Müller
0487b541a0
Merge pull request #22880 from owncloud/fix-21656
...
improve log output when no LDAP user was found on login attempt
2016-03-07 17:12:01 +01:00
Roeland Jago Douma
b1dae2a4b9
Can't convert node to string
2016-03-07 16:15:01 +01:00
Roeland Jago Douma
218d042142
Move common code to function
...
The code to get a share by id is somewhat messy. And was duplicated.
Now this is done is a separate function
2016-03-07 16:14:57 +01:00
Thomas Müller
deca1979aa
Calendar and addressbook migration commands are always available
2016-03-07 15:04:19 +01:00
Thomas Müller
3b25ccef65
Handle addressbook migration issue by writing the faulty event to the log and continue
2016-03-07 15:04:19 +01:00
Thomas Müller
d32b35fc7f
Handle calendar migration issue by writing the faulty event to the log and continue
2016-03-07 15:04:19 +01:00
Thomas Müller
a61fa5b526
Merge pull request #22902 from owncloud/share-archivenamedownloadall
...
Fix archive file name when downloading public share
2016-03-07 14:47:35 +01:00
Thomas Müller
8ef760eb5d
Merge pull request #22898 from owncloud/quota-allowuploadwhenfreespaceisunlimited
...
Fix uploading to fed share when free space is unlimited
2016-03-07 14:47:01 +01:00
Thomas Müller
e5b5eca5a9
Merge pull request #22787 from owncloud/versions-fixmtimetooltip
...
Fix tooltip for versions mtime
2016-03-07 14:41:46 +01:00
Thomas Müller
46af7db3e3
Merge pull request #22785 from owncloud/trash-returnfalseon401
...
Return false on 401 in file list + trash file list
2016-03-07 14:41:31 +01:00
Thomas Müller
bd4b61f52b
Merge pull request #22896 from owncloud/fix-v1-carddav-endpoint
...
Correctly default to null and add type hint
2016-03-07 13:50:53 +01:00
Thomas Müller
296a46cc38
Merge pull request #22244 from owncloud/dont-update-shared-resource-properties
...
For 9.0 we don't have the possibility to store calendar and addressbo…
2016-03-07 12:42:52 +01:00
Vincent Petry
dbea268332
Remove "files" arg from download URL in public link page
...
When no files were specified for download, it means folder download.
In this case, no need to pass an empty "files" argument.
2016-03-07 11:55:55 +01:00
Vincent Petry
d8e592d670
Fix archive file name when downloading public share
...
When download a public link share folder using the button on the top
right, it doesn't provide a list of files.
This fix makes sure to trigger the correct logic when no file list was
given.
2016-03-07 11:37:49 +01:00
Joas Schilling
c99ae62c33
Correctly default to null and add type hint
2016-03-07 10:48:16 +01:00
Vincent Petry
60d8046c35
Fix uploading when free space is unlimited
...
A federated share can report unlimited quota as -3, so the
ajax/upload.php code needs to be adjusted to block uploads when the free
space is unlimited.
2016-03-07 10:42:36 +01:00
Jenkins for ownCloud
c07b731689
[tx-robot] updated from transifex
2016-03-07 01:56:53 -05:00
Thomas Müller
f2088cafb8
Merge pull request #22859 from owncloud/cache-results-in-memcache-for-is-owncloud
...
Cache results of testRemoteUrl
2016-03-06 20:00:47 +01:00
Thomas Müller
6dcf70f244
Merge pull request #22807 from owncloud/remove-empty-translations
...
ne, or_IN, uz and yo have been removed from transifex and will be rem…
2016-03-06 19:59:57 +01:00
Thomas Müller
6f6d659f56
Merge pull request #22888 from owncloud/use-custom-header
...
Use custom header
2016-03-06 19:53:35 +01:00
Jenkins for ownCloud
05d0d9e9e2
[tx-robot] updated from transifex
2016-03-06 01:55:08 -05:00
Lukas Reschke
4301e30741
Use custom header
...
PHP in CGI mode eats the Authorization header => 💣
2016-03-05 23:04:49 +01:00
Lukas Reschke
4caa9e18b0
Show version to update to properly
...
Properly shows the version that will be updated to.
2016-03-05 21:58:58 +01:00
Jenkins for ownCloud
a98f5c03dc
[tx-robot] updated from transifex
2016-03-05 01:56:08 -05:00
Arthur Schiwon
5d3183afcd
improve log output when no LDAP user was found on login attempt
2016-03-05 00:18:34 +01:00
C. Montero Luque
b3656f1434
Merge pull request #22878 from owncloud/use-clob-for-timezone
...
Use CLOB for timezone
2016-03-04 18:00:48 -05:00
C. Montero Luque
fe86e0c2f8
Merge pull request #22870 from owncloud/autoenable-federation-app
...
Automatically enable "federation" app
2016-03-04 17:44:50 -05:00
Lukas Reschke
b302ec8381
Use CLOB for timezone
...
TEXT defaults to a length of 255 which is going to fail in some cases as the timezone can be rather long.
This changes it back to a CLOB as it has been before as well: 8d8bb68b01
. I'm not super convinced that CLOB is the best choice here but at least it seems to work.
Fixes https://github.com/owncloud/core/issues/22876
2016-03-04 21:59:08 +01:00
C. Montero Luque
89315722a1
Merge branch 'master' into autoenable-federation-app
2016-03-04 13:37:42 -05:00
C. Montero Luque
7a0720f300
Merge branch 'master' into fix-db-locking-cleanup
2016-03-04 13:35:04 -05:00
C. Montero Luque
45f49a090a
Merge pull request #22860 from owncloud/trashbin-checkpath
...
Properly check path validity before deleting to trash
2016-03-04 13:33:07 -05:00
Lukas Reschke
1b64982e27
Automatically enable "federation" app
2016-03-04 17:38:51 +01:00
Morris Jobke
138219d74a
Run cleanup of expired DB file locks to background job
...
* fixes #22819
The old way fired a DELETE statement on each destruction of the
DBLockingProvider. Which could cause a lot of queries. It's enough
to run this every 5 minutes in a background job, which in the end
could result in file locks that exists 5 minutes longer - in the
worst case and for not properly released locks.
This makes the DB based locking a lot more performant and could
result in a similar performance to the Redis based locking provider.
2016-03-04 15:52:23 +01:00
Thomas Müller
e2642129a1
Merge pull request #22857 from owncloud/add-release-channel-selection
...
Add release channel selection back
2016-03-04 15:29:52 +01:00
Thomas Müller
b56dbd0607
Merge pull request #22816 from owncloud/external-unavailable-recheck
...
allow availability recheck for external storages
2016-03-04 15:29:17 +01:00
Vincent Petry
0eb5292aaf
Properly check path validity before deleting to trash
...
This prevents deleting the whole "files" folder of the user whenever
$ownerPath is empty. This can happen in concurrency situations.
2016-03-04 15:27:31 +01:00
Lukas Reschke
63bd6b25db
Cache results of testRemoteUrl
...
Otherwise setting up the storage will result in a HTTP request and thus slowing down ownCloud.
Replaces https://github.com/owncloud/core/pull/22855
2016-03-04 15:13:56 +01:00
Lukas Reschke
e3a0a69c73
Add release channel selection back
...
Allows to select the release channels again and also shows the last check date
2016-03-04 14:37:35 +01:00
Thomas Müller
048e11d25f
Merge pull request #22830 from owncloud/fix_dav_permissions
...
Rename and move permissions are set when a file is updatable
2016-03-04 12:01:32 +01:00
Vincent Petry
3a36163e91
Fix download spinner to work with CSS styles
...
A recent change replaced img elements with CSS icons for file actions.
This fix adjusts the logic to work properly with CSS icons instead of
images.
2016-03-04 10:48:08 +01:00
Jenkins for ownCloud
bcc200cf9b
[tx-robot] updated from transifex
2016-03-04 01:55:53 -05:00
Roeland Jago Douma
3bdafc2122
Rename and move permissions are set when a file is updatable
...
* Fix unit tests
2016-03-03 20:03:06 +01:00
Vincent Petry
4255dd2b39
Properly set exception in FailedStorage
2016-03-03 14:37:23 +01:00
Robin Appelman
6990100e6e
allow availability recheck for external storages
2016-03-03 14:19:34 +01:00
Lukas Reschke
72c8187cbb
Keep "encryptedVersion" when calling `\OC\Files\View::copy`
...
When calling `\OC\Files\View::copy` we should also keep the version to ensure that the file will always have the correct version attached and can be successfully decrypted.
To test this the following steps are necessary (from https://github.com/owncloud/core/issues/22781#issuecomment-191328982 ):
1. setup a new ownCloud 9.0 beta2
2. enable encryption
2. upload a docx (5.7MB large)
3. upload the same file again and overwrite the existing file
4. I can download the original file and the first version
5. I restore the first version
6. restored version can no longer be downloaded with the error described above
The manual cache operation in `\OCA\Files_Versions\Storage` is unfortunately necessary since `\OCA\Files_Versions\Storage::copyFileContents` is not using `\OCP\Files\Storage::moveFromStorage` in the case when an object storage is used. Due to the workaround added in 54cea05271
the stream is directly copied and thus bypassing the FS.
2016-03-03 14:15:36 +01:00
Bjoern Schiessle
b6050b44c2
disable the recovery key if the master key is enabled
2016-03-03 12:16:39 +01:00
Thomas Müller
4f25f34178
Merge pull request #22778 from owncloud/fix-22770
...
untangle different user manager instances, fixes #22770
2016-03-03 11:55:10 +01:00
Thomas Müller
c590372aef
Merge pull request #22784 from owncloud/files-newmenu-removebrowsercomplete
...
Remove browser autocomplete in new file menu
2016-03-03 11:54:48 +01:00
Thomas Müller
8cacfce83d
ne, or_IN, uz and yo have been removed from transifex and will be removed from git here now as well
2016-03-03 11:29:57 +01:00
Vincent Petry
dbdf2173ac
Return false on 401 in file list + trash file list
...
This gives a chance to the global ajax error handler to do its work if
the session expired.
2016-03-03 09:09:30 +01:00
Jenkins for ownCloud
8b76e8c57b
[tx-robot] updated from transifex
2016-03-03 01:56:04 -05:00
Vincent Petry
03b90cec35
Fix tooltip for versions mtime
...
It was missing a call to jquery.tooltip
2016-03-02 17:50:46 +01:00
Vincent Petry
5676216e56
Remove browser autocomplete in new file menu
2016-03-02 17:10:29 +01:00
Arthur Schiwon
82b55c4db9
untangle different user manager instances, fixes #22770
2016-03-02 13:02:43 +01:00
Joas Schilling
1b3e7ae82b
Translate strings of federation admin section
2016-03-02 12:54:53 +01:00
Joas Schilling
8885cb1eb9
Increase all versions on master which is now 9.1
2016-03-02 08:53:42 +01:00
Jenkins for ownCloud
702c1a8962
[tx-robot] updated from transifex
2016-03-02 01:56:33 -05:00
C. Montero Luque
4d69e562a0
Merge pull request #22757 from owncloud/apply-license
...
Update copyright information and author file
2016-03-01 15:36:37 -05:00
C. Montero Luque
5a2fe4107c
Merge branch 'master' into part-file-root
2016-03-01 13:35:04 -05:00
C. Montero Luque
745fdc4800
Merge pull request #22742 from owncloud/ceph-keystone-readiness
...
Use readiness notification socket to be absolutely sure this works
2016-03-01 13:34:23 -05:00
Lukas Reschke
3067367ff3
Add new apps
2016-03-01 17:52:32 +01:00
Lukas Reschke
c353d51810
Remove Scrutinizer Auto Fixer
2016-03-01 17:48:23 +01:00
Lukas Reschke
c430f5ba53
Map Maci
2016-03-01 17:45:05 +01:00
Lukas Reschke
933f60e314
Update author information
...
Probably nice for the people that contributed to 9.0 to see themselves in the AUTHORS file :)
2016-03-01 17:25:15 +01:00
Robin Appelman
37f1206818
allow putting the part file in the view root
2016-03-01 15:21:24 +01:00
Thomas Müller
900dcf6594
Merge pull request #22699 from owncloud/checksum_int_test
...
Checksum intergration tests and fixes
2016-03-01 14:47:09 +01:00
Thomas Müller
a83af96dd3
Merge pull request #22686 from owncloud/cleanup_remote_address_books
...
remove remote address book if access was revoked
2016-03-01 14:46:51 +01:00
Vincent Petry
57babe032b
Save some calls to refreshInfo during upload
2016-03-01 11:44:49 +01:00
Roeland Jago Douma
ac392457f2
Fix unit tests
2016-03-01 11:37:16 +01:00
Roeland Jago Douma
ec140fa2ec
Checksums on chunked files
...
We should also store checksums on chunked files.
We do not checksum individual chunks but only the final file.
2016-03-01 11:37:16 +01:00
Roeland Jago Douma
3e88a5067f
Remove checksum on upload of non checksumed file
...
When we overwrite a checksumed file with a file without a checksum we
should remove the checksum from the server.
This is done by setting the column to empty.
2016-03-01 11:37:16 +01:00
Thomas Müller
5fe5233f41
Merge pull request #22681 from owncloud/add-autodiscovery-for-ocs
...
Add autodiscovery support to server-to-server sharing implementation
2016-03-01 11:27:28 +01:00
Thomas Müller
73e145cf63
Merge pull request #22728 from owncloud/external-share-testremote
...
use ocs discover endpoint to test remote
2016-03-01 11:27:07 +01:00
Bjoern Schiessle
1832bd0fa1
increase version number
2016-03-01 11:21:24 +01:00
Thomas Müller
a66899c528
Handle null case
2016-03-01 10:41:05 +01:00
Thomas Müller
1652541150
Merge pull request #22700 from owncloud/only_1_linkshare
...
For now only allow 1 link share per file/folder
2016-03-01 09:22:39 +01:00
Thomas Müller
25a4571dcd
Merge pull request #22731 from owncloud/hide-nodes-from-listening
...
Hides nodes from listing that the user has no access to
2016-03-01 09:22:08 +01:00
Thomas Müller
fd4742d430
Merge pull request #22613 from owncloud/quota-changedavreturnvaluewhennoquotaset
...
Don't return quota when none set
2016-03-01 08:30:58 +01:00
Roeland Jago Douma
ffce4fc6a9
For now only allow 1 link share per file/folder
...
Fixes #22692
This is a temp fix util we get #22327
We just block it in the OCS Share API since we have 1 endpoint now
anyway.
2016-03-01 08:25:40 +01:00
Thomas Müller
eb740d1dac
Merge pull request #22727 from owncloud/decrypt_all_master_key
...
make decrypt all work with the master key
2016-03-01 08:23:27 +01:00
Thomas Müller
f3050b3adb
Merge pull request #22740 from owncloud/fix_resare_updates
...
Check correct permissions when resharing
2016-03-01 08:17:56 +01:00
Jenkins for ownCloud
a06f59c580
[tx-robot] updated from transifex
2016-03-01 01:55:33 -05:00
Thomas Müller
3adb6ae0f5
Merge pull request #22707 from owncloud/use-our-public-api
...
Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*
2016-03-01 07:24:57 +01:00
Lukas Reschke
9ca1e9c7e9
Only use scanner if remote is an ownCloud
2016-03-01 07:01:52 +01:00
Lukas Reschke
e965dcaebf
/shareinfo is not required
2016-03-01 07:01:52 +01:00
Lukas Reschke
8f95d69954
Fix tests
2016-03-01 07:01:52 +01:00
Lukas Reschke
74e47da883
Add missing trailing slash
2016-03-01 07:01:51 +01:00
Robin Appelman
080a62231e
use ocs discover endpoint to test remote
2016-03-01 07:01:51 +01:00
Lukas Reschke
88fc5149ed
Fix Scrutinizer issues
2016-02-29 22:44:40 +01:00
Robin McCorkell
078cc3b3f0
Use readiness notification socket to be absolutely sure this works
2016-02-29 21:20:11 +00:00
Lukas Reschke
d04edfaf0d
Hides nodes from listing that the user has no access to
2016-02-29 20:53:38 +01:00
Roeland Jago Douma
8924b0a0dc
Check correct permissions when resharing
...
Fixes #22675
Since we only get a share id we do not know the path for the sharer.
Now if we edit a share we start searching for shares for that user of
that node. And deduce the permissions that way.
* Intergration test added
* Fix unit tests
2016-02-29 19:30:14 +01:00
Joas Schilling
7a46b30c94
Allow to change properties of readonly calendars
2016-02-29 17:17:57 +01:00
Bjoern Schiessle
9e9cb73987
fix doc-block
2016-02-29 16:50:34 +01:00
Bjoern Schiessle
87e47afed8
remove synced remote address book if the remote server revoked access to his system address book
2016-02-29 16:50:34 +01:00
Bjoern Schiessle
7189c72c33
remove remote address book if the admin removes the server from the trusted servers list
2016-02-29 16:50:33 +01:00
Joas Schilling
6f22784d3d
Allow to hide a shared calendar
2016-02-29 16:49:55 +01:00
Thomas Müller
95e218b00c
For 9.0 we don't have the possibility to store calendar and addressbook properties on a per-user basis and therefore we simple don't allow this for now
2016-02-29 16:49:55 +01:00
Thomas Müller
52d217d775
Merge pull request #22623 from owncloud/docker-logs-on-swift-external
...
Print docker logs to the console fro debugging
2016-02-29 16:36:34 +01:00
Bjoern Schiessle
95ea2ccb53
make decrypt all work with the master key
2016-02-29 14:54:32 +01:00
Vincent Petry
11215f4e27
Return -3 for unlimited quota
...
Returns -3 for unlimited quota in Webdav response.
Also adjusted personal page to show unlimited quota when set.
2016-02-29 14:36:20 +01:00
Thomas Müller
a38e8b6436
Merge pull request #22662 from owncloud/comments-count
...
remove comments count because it is not that relevant to show directly
2016-02-29 13:44:56 +01:00
Joas Schilling
2a0cda74d4
Use IQueryBuilder::PARAM_* instead of \PDO::PARAM_*
2016-02-29 09:44:40 +01:00
Jenkins for ownCloud
5800585039
[tx-robot] updated from transifex
2016-02-29 01:55:04 -05:00
Jenkins for ownCloud
a39332832c
[tx-robot] updated from transifex
2016-02-28 01:55:12 -05:00
Jenkins for ownCloud
f9826ec948
[tx-robot] updated from transifex
2016-02-27 01:56:08 -05:00
Bjoern Schiessle
eccd7cf654
reuse the url_hash instead of calculating a new hash for the address book
2016-02-26 20:00:13 +01:00
Thomas Müller
e9237dd83c
Merge pull request #22671 from owncloud/issue-22670
...
Move the tag filter at the end for now
2016-02-26 10:48:55 +01:00
Thomas Müller
66536f912e
Merge pull request #22640 from owncloud/fix_22587
...
Remove delete permissions for read-only federated reshares
2016-02-26 10:48:07 +01:00
Thomas Müller
c6c15ba825
Merge pull request #22608 from owncloud/collaborative-tags
...
Rename system tags app to collaborative tags
2016-02-26 10:47:40 +01:00
Thomas Müller
96f15a12a9
Merge pull request #22461 from owncloud/fix_6773
...
Allow theming of actions
2016-02-26 10:47:20 +01:00
Joas Schilling
4549b82553
Move the tag filter at the end for now
2016-02-26 10:15:07 +01:00
Lukas Reschke
59028cced0
Add autodiscovery support to server-to-server sharing
...
Adds autodiscovery support to server-to-server sharing as specified in the specification. If no discovery data is found it is using the fallback ownCloud endpoints for legacy support.
2016-02-26 09:26:55 +01:00
Joas Schilling
4471f359b1
Rename system tags app to collaborative tags
2016-02-26 09:14:28 +01:00
Jenkins for ownCloud
5718402277
[tx-robot] updated from transifex
2016-02-26 01:55:44 -05:00
Vincent Petry
867a8aca12
Fix favorite icon unit test for icon image
2016-02-25 23:01:09 +01:00
Vincent Petry
b634f1e2c7
Make more action icons themable + style fixes
...
Action icons now appear properly in public link page.
More actions are now CSS icons.
2016-02-25 23:01:07 +01:00
Roeland Jago Douma
c767030f07
Close class
2016-02-25 22:49:52 +01:00
Roeland Jago Douma
92cff0984d
Make file actions use icon CSS classes
...
This makes theming of file actions possible
2016-02-25 22:49:52 +01:00
Jan-Christoph Borchardt
6e97ab1b71
remove comments count because it is not that relevant to show directly
2016-02-25 20:48:19 +01:00
Thomas Müller
3772a8acdb
Merge pull request #22644 from owncloud/external-share-manager
...
inject the correct external share manager into the storage
2016-02-25 16:58:00 +01:00
Thomas Müller
29e3c4a60e
Merge pull request #22628 from owncloud/fix-thrashbin-cronjob
...
Skip users with no trashbin
2016-02-25 16:55:36 +01:00
Robin Appelman
f338329ddf
inject the correct external share manager into the storage
2016-02-25 14:49:25 +01:00
Thomas Müller
914ac09aae
Merge pull request #22636 from owncloud/fix-ssl-on-external-storages
...
Fix HTTPS support on external storages
2016-02-25 14:36:00 +01:00
Thomas Müller
202bf17e4a
Merge pull request #22604 from owncloud/fix-google-drive-encryption
...
Copy into local file
2016-02-25 14:35:39 +01:00
Thomas Müller
5ecf2d5987
Merge pull request #22600 from owncloud/extstorage-disablesharingoptionbydefault
...
Disable sharing by default for external storage mounts
2016-02-25 14:35:24 +01:00
Thomas Müller
dfaebc36d2
Merge pull request #22599 from owncloud/fix_ldap-cache-2nd-displayname
...
take the first result of that array, if present. Fixes 2nd display na…
2016-02-25 14:35:06 +01:00
Roeland Jago Douma
0c9c7737b4
Remove delete permissions for read-only federated reshares
...
An incomming federated share is just a mount point. Therefor if we
request the permissions on the mountpoint DELETE permissions will be
returned (among others). Since we can always remove a mountpoint, update
a mount point.
However now when trying to reshare we will try to reshare with DELETE
permissions. Which is false.
This PR removes the delete permissions if it is a shared storage.
Basically a quick hack.
Fixes #22587
2016-02-25 12:19:38 +01:00
Lukas Reschke
aebb900cd4
More error handling
2016-02-25 10:12:31 +01:00
Lukas Reschke
3b5ddb417c
Copy into local file
...
Using the Guzzle stream directly here will only return 1739 characters for `fread` instead of all data. This leads to the problem that the stream is read incorrectly and thus the data cannot be properly decrypted => 💣
This approach copies the data into a local temporary file, as done before in all stable releases as well as other storage connectors.
While this approach will load the whole file into memory, this is already was has happened before in any stable release as well. See d608c37c90
for the breaking change.
To test this enable Google Drive as external storage and upload some files with encryption enabled. Reading the file should fail now.
Fixes https://github.com/owncloud/core/issues/22590
2016-02-25 09:40:30 +01:00
Jenkins for ownCloud
32f4bea0ae
[tx-robot] updated from transifex
2016-02-25 01:58:06 -05:00
Arthur Schiwon
b9b85e32be
take the first result of that array, if present. Fixes 2nd display name to be 'Array', if cache is configured and enabled.
2016-02-24 21:32:03 +01:00
Lukas Reschke
db2ddb5441
Properly cast type
...
The current logic is checking whether:
1. The returned value is a boolen
2. The returned value is a string and then matches for "true"
Since the config is now written to the database the data is now a string with the value "1" if HTTPS is set to true. Effectively this option was thus always disabled at the moment, falling back to plain HTTP.
This change casts the data to a boolean if it is defined as boolean.
Fixes https://github.com/owncloud/core/issues/22605
Fixes https://github.com/owncloud/core/issues/22016
2016-02-24 19:58:41 +01:00
Victor Dubiniuk
aac6932e92
Skip users with no trashbin
2016-02-24 18:08:45 +03:00
Vincent Petry
4829a2d421
Disable sharing by default for external storage mounts
...
This is for newly created mount points.
Migrated mount points will have sharing enabled as before.
2016-02-24 13:58:21 +01:00
Thomas Müller
ac9de4ee95
Print docker logs to the console fro debugging
2016-02-24 13:58:13 +01:00
Thomas Müller
faf65e73b7
Merge pull request #22593 from owncloud/swift-docker-fix
...
Enable upstream entrypoint changes with Ceph Docker
2016-02-24 12:17:58 +01:00
Thomas Müller
473cd97a45
Merge pull request #22592 from owncloud/fix-response-header
...
Add header for attachment disposition only once
2016-02-24 12:15:32 +01:00
Thomas Müller
9a0950f10b
Merge pull request #22569 from owncloud/issue-22566-too-much-mapping-entries
...
Allow defining a limit and offset for getObjectIdsForTags
2016-02-23 15:02:08 +01:00
Morris Jobke
403f11633c
Drop unneeded use statements
2016-02-23 14:53:12 +01:00
Robin McCorkell
1d8c1f5692
Enable upstream entrypoint changes with Ceph Docker
2016-02-23 11:52:05 +00:00
Lukas Reschke
fc2c5fe414
Add header for attachment disposition only once
...
Recent refactorings have resulted in the header being added twice, this makes browsers ignore the header which removes any security gains.
This changeset adds the header only once and adds integration tests ensuring the correct header in future.
https://github.com/owncloud/core/issues/22577
2016-02-23 12:23:41 +01:00
Thomas Müller
fae6643e6d
Merge pull request #22582 from owncloud/case-insensitive-contact-search
...
Case insensitive contact search
2016-02-23 10:48:38 +01:00
Thomas Müller
a3d1b2637d
Merge pull request #22516 from owncloud/core-cumulativenotifications
...
Accumulate notifications instead of blinking
2016-02-23 10:36:34 +01:00
Joas Schilling
3a65bdf4d5
Fix dav unit tests
2016-02-23 09:04:15 +01:00
Thomas Müller
4dfdb2720c
Case insensitive search in contacts - fixes #22575
2016-02-22 19:47:10 +01:00
Vincent Petry
27544144ce
Fix unit tests affected by side effects
...
The notification tests were not restoring the clock properly, but
indirectly helped other tests pass.
Since now we're restoring the clock properly, the other tests were fixed
to still work.
2016-02-22 17:25:32 +01:00
Vincent Petry
8ea80e114a
Accumulate notifications instead of blinking
...
This makes it possible to display multiple notifications.
If the options.type is set to "error", it will also add a close button.
2016-02-22 17:25:32 +01:00
Joas Schilling
a0d0edc754
Make non-public-method protected
2016-02-22 15:26:59 +01:00
Thomas Müller
f3b13c7656
Merge pull request #22536 from owncloud/add-integration-tests-for-tags
...
Add integration tests for tags plus fix permissions
2016-02-22 14:14:51 +01:00
Thomas Müller
7f2b3dbfd2
Merge pull request #22555 from owncloud/jenkins-19978
...
Show username when writing "Insufficient storage" into owncloud.log
2016-02-22 14:13:59 +01:00
Vincent Petry
642190f333
Fix public page footer position in IE
...
The content element needs hasLayout, so triggering it with a display
attribute.
Without this, the #content element's height would be as high as the
window's height instead of adjusting itself to its contents' height.
2016-02-22 11:26:50 +01:00
Pierre Jochem
1a8a667863
Solution for Proposal #19974
...
Show username when writing into owncloud.log
2016-02-22 10:02:45 +01:00
Morris Jobke
3e59c04c7f
Fixes pagination in IE
...
* tested in Firefox, Chrome, Safari, IE and Edge with folder and file shares
* fixes #20044
2016-02-22 08:55:20 +01:00
Lukas Reschke
3bd95cca6b
Check if user has permission to create such a tag
...
Fixes https://github.com/owncloud/core/issues/22512
2016-02-19 20:45:20 +01:00
Thomas Müller
f8677628d4
Merge pull request #22503 from owncloud/issue_22500
...
When (re-)sharing an incomming federated share set the corrent owner
2016-02-19 16:07:43 +01:00
Thomas Müller
5b3a79a28b
Merge pull request #22509 from owncloud/add-filesplugin-to-new-webdav-endpoint
...
Add FilesPlugin
2016-02-19 14:44:02 +01:00
Thomas Müller
66f0ba837f
Merge pull request #22348 from owncloud/issue-21812-calendar-old-caldav-url
...
Fix old calendar dav urls
2016-02-19 13:33:16 +01:00
Bjoern Schiessle
4ef035cc61
make sure that the file name doesn't end with a trailing slash. Can for example happen single files shared across servers
2016-02-19 13:15:09 +01:00
Thomas Müller
e987d8cd47
Add FilesPlugin - fixes #22507
2016-02-19 12:37:24 +01:00
Thomas Müller
1106c354ac
Merge pull request #22515 from owncloud/webdav_checksum_only_for_files
...
Only add checksum headers for 'real' files
2016-02-19 12:36:56 +01:00
Joas Schilling
b216be8cca
Add correct principals for the current user before ACL check
2016-02-19 12:35:33 +01:00
Joas Schilling
4e2f9ce05b
Convert the old principal to the new principal before getting calendars
2016-02-19 12:35:33 +01:00
Thomas Müller
ffc2950393
Merge pull request #22198 from owncloud/birthday-calendar
...
Sync a users contacts birthday to the users birthday calendar
2016-02-19 12:33:19 +01:00
Roeland Jago Douma
751d3df469
Only add checksum headers for files
...
We can only add the checksum header for real ownCloud files (so we have
a fileinfo object etc).
2016-02-19 10:56:43 +01:00
Thomas Müller
ae2304f23f
Merge pull request #22405 from owncloud/gdrive-mimetype-and-office-fixes
...
Fix GDrive handling of office files
2016-02-19 09:13:35 +01:00
Thomas Müller
f6e61a296f
Merge pull request #22424 from owncloud/add-generic-csrf-protection-to-webdav
...
Require CSRF token for non WebDAV authenticated requests
2016-02-19 09:13:00 +01:00
Thomas Müller
d1ef43481d
Merge pull request #22444 from owncloud/fix-federated-share-delete
...
get the actual user instead of a federated cloud id
2016-02-18 16:44:57 +01:00
Thomas Müller
d8de7d1e73
Adding cli command to sync birthday calendar
2016-02-18 14:49:45 +01:00
Thomas Müller
6c4cdddba8
Merge pull request #21610 from owncloud/quota-sharedfile
...
Fix quota check for single shared files
2016-02-18 14:25:32 +01:00
Vincent Petry
e1dbae1467
Properly trigger testRemote after getting a 404 from remote fed share
...
Whenever a remote fed share's shareinfo call returns a 404, don't
directly assume the storage is not available by throwing
StorageNotAvailableException. We need to properly throw
NotFoundException to trigger the later logic that calls testRemote()
that verifies that the 404 is not from a broken server but really from
an obsolete share.
2016-02-18 11:57:03 +01:00
Thomas Müller
981c73000c
Prevent deletion of birthday calendar
2016-02-18 11:49:16 +01:00
Thomas Müller
c9187cc820
Sync a users contacts birthday to the users birthday calendar
2016-02-18 11:48:34 +01:00
Lukas Reschke
9b3c4e8dc4
Require CSRF token for non WebDAV authenticated requests
2016-02-18 11:18:36 +01:00
Thomas Müller
73d46afc3c
Merge pull request #22399 from owncloud/issue-22394-index-names-for-oracle
...
Add index names so Doctrine does not use a too long random string
2016-02-18 11:18:32 +01:00
Thomas Müller
bba8875fb5
Merge pull request #22434 from owncloud/share_ocs_api_handle_invalid_shares
...
OCS Share API should not return invalid shares
2016-02-18 11:17:41 +01:00
Thomas Müller
9d24de0ceb
Merge pull request #22478 from owncloud/external-missing-auth
...
dont die when missing an auth backend
2016-02-18 11:17:19 +01:00
Bjoern Schiessle
8985181305
get the actual user instead of a federated cloud id
...
$view->getUidAndFilename($filename); returns the federated cloud id in case of
a federated share. But in this case we need the local user who "owns" the file
which is the current logged in user in case of a federated share
2016-02-18 10:17:00 +01:00
Bjoern Schiessle
ac1c3d27b7
get the actual user instead of a federated cloud id
...
$view->getUidAndFilename($filename); returns the federated cloud id in case of
a federated share. But in this case we need the local user who "owns" the file
which is the current logged in user in case of a federated share
2016-02-18 10:16:59 +01:00
Thomas Müller
3a97a0ad7f
Merge pull request #22475 from owncloud/fix-js-issues
...
Fixes code analysis issues
2016-02-18 10:14:31 +01:00
Thomas Müller
8798f85e88
Merge pull request #22418 from owncloud/issue-22393-filelist-plugins-for-other-views
...
Show the comments and tags on the share filters
2016-02-18 10:14:20 +01:00
Thomas Müller
bfd4a9548b
Merge pull request #22408 from owncloud/gdrive-remove-mimetype-detection
...
Fix GDrive mime type detection with encryption
2016-02-18 10:14:01 +01:00
Robin Appelman
65a283f967
dont die when missing an auth backend
2016-02-17 16:51:40 +01:00
Vincent Petry
ceaefc2c54
Defer quota check in web UI when overwriting shared file
...
When receiving a shared file, the quota for that file counts in the
owner's storage, not the current user's storage.
To make it possible to overwrite the file even when the current user
doesn't have enough space, the quota check is deferred for such files.
2016-02-17 15:38:21 +01:00
Morris Jobke
d55cfb4f89
Fixes code analysis issues
2016-02-17 15:19:42 +01:00
Thomas Müller
7af7d18cfa
Merge pull request #16783 from owncloud/handle-redirects-global
...
Adding global error handler for ajax calls which run into redirection…
2016-02-17 14:49:04 +01:00
Roeland Jago Douma
670557ffbb
Add unit tests for formatShare
2016-02-17 13:55:39 +01:00
Roeland Jago Douma
2aa0b885f6
OCS Share API should not return invalid shares
...
Since we have lazy shares it can happen that a share is actually
invalid. See https://github.com/owncloud/core/issues/20908
This add checks for the get methods to handle the NotFound exception.
2016-02-17 13:55:39 +01:00
Robin Appelman
c2c6caee93
remove global credentials
2016-02-17 13:55:27 +01:00
Vincent Petry
53eff9792f
Check the quota on the actual file's storage in dav quota plugin
...
Fix quota plugin to use the correct file name when chunking
When chunking, the file name is the compound name, so need to convert it
to the correct final file name before doing the free space check.
This ensures that in the case of shared files, the correct storage is
used for the quota check.
2016-02-17 11:52:49 +01:00
Thomas Müller
9e415a956a
Merge pull request #22451 from owncloud/use-proper-user-folder
...
Handles null as return code and uses proper UserFolder in trashbin
2016-02-17 10:58:31 +01:00
Thomas Müller
ff4e040971
Merge pull request #22435 from owncloud/trashbin-hook-nouser
...
Don't resize trash when no user
2016-02-17 10:57:50 +01:00
Jenkins for ownCloud
fe29feae9a
[tx-robot] updated from transifex
2016-02-17 01:56:11 -05:00
Morris Jobke
de58364eb8
Handles null as return code and uses proper UserFolder in trashbin
2016-02-16 18:45:25 +01:00
Vincent Petry
7bed529951
Don't resize trash when no user
...
Happens when overwriting files on federated shares.
2016-02-16 16:29:07 +01:00
Thomas Müller
c6b2457306
Merge pull request #22432 from owncloud/files_external-backends
...
remove login credentails and user provided backends
2016-02-16 16:08:21 +01:00
Robin Appelman
176fb191b7
remove login credentails and user provided backends
2016-02-16 15:27:55 +01:00
Jenkins for ownCloud
7942f3d7ec
[tx-robot] updated from transifex
2016-02-16 08:49:12 -05:00
Thomas Müller
3503eb69f2
Adding transifex to new core apps
2016-02-16 14:40:10 +01:00
Joas Schilling
077a407285
Show the comments and tags on the share filters
2016-02-16 11:24:44 +01:00
Thomas Müller
1cb3583a9a
Merge pull request #22398 from owncloud/fix-card-properties
...
Queries on the cards table by uri require the addressbook as well
2016-02-16 10:19:51 +01:00
Thomas Müller
3a55229915
Merge pull request #22400 from owncloud/files-select-closesidebar
...
Close file detail sidebar when selecting/unselecting files
2016-02-16 09:15:14 +01:00
Thomas Müller
f850871415
Merge pull request #22385 from owncloud/issue-22384-invalid-content-location-on-commenting
...
Posting a comment replies with invalid location URL
2016-02-16 08:30:11 +01:00
Thomas Müller
9942263409
Merge pull request #22392 from owncloud/create-default-calendar-and-addressbook
...
On login we create a default calendar and a default addressbook for t…
2016-02-16 08:29:54 +01:00
Thomas Müller
e5641247a3
Merge pull request #22403 from owncloud/improved-error-handling
...
Remove background job if the server accepted to ask for the shared secret
2016-02-16 08:29:38 +01:00
Jenkins for ownCloud
3dd1961f92
[tx-robot] updated from transifex
2016-02-16 01:55:39 -05:00
Bjoern Schiessle
9d1d08bf9b
forbidden (403) is a valid return status, don't log the whole exception in this case
2016-02-15 18:03:10 +01:00
Bjoern Schiessle
835e70dbe2
throw exception if we don't find a token for a given server
2016-02-15 18:03:10 +01:00
Bjoern Schiessle
cc397da1be
Remove background job if the server accepted to ask for the shared secret
...
If we don't remove it the server will later ask the remote server to ask for
the shared secret which will result in a error log message on the remote server
and in some circumstances maybe even to a failure
2016-02-15 18:03:10 +01:00
Vincent Petry
d38b71f206
Fix GDrive mime type detection with encryption
...
When encryption is enabled, GDrive would think that all files are text
files. This fix falls back to the extension based detection when a
non-special mime type is returned
2016-02-15 17:09:08 +01:00
Vincent Petry
075dd54f6c
Fix GDrive handling of office files
...
1) Properly detect empty file extension, can be null.
2) When renaming part file to final file, use the correct file name
without extension, if it exists
3) When renaming a file, do not delete the original file if it had the
same id, which can happen with part files
2016-02-15 16:49:12 +01:00
Vincent Petry
d565290d16
Close file detail sidebar when selecting/unselecting files
...
Interacting with the checkboxes, also "Select all" will automatically
close the sidebar now.
2016-02-15 14:58:44 +01:00
Joas Schilling
7e4c3b577c
Add index names so Doctrine does not use a too long random string
2016-02-15 14:52:41 +01:00
Thomas Müller
722809c2bd
On login we create a default calendar and a default addressbook for the user - fixes #22360
2016-02-15 14:41:54 +01:00
Thomas Müller
df7280a3c7
Queries on the cards table by uri require the addressbook as well - fixes #22284
2016-02-15 14:29:24 +01:00
Vincent Petry
b8b77709c0
Add handler for global ajax errors
2016-02-15 12:48:47 +01:00
Thomas Müller
46b39c3465
Merge pull request #22337 from owncloud/new_reshare_no_initiator
...
On backend hickups don't crash OCS output
2016-02-15 12:02:52 +01:00
Thomas Müller
fd21bfd9e8
Merge pull request #22358 from owncloud/fix-22278
...
Fix race condition when switching filter mode. Fixes #22278
2016-02-15 12:02:35 +01:00
Joas Schilling
cb836158f0
Deduplicate slashes
2016-02-15 10:54:56 +01:00
Jenkins for ownCloud
be34cea970
[tx-robot] updated from transifex
2016-02-15 01:55:28 -05:00
Jenkins for ownCloud
7061416016
[tx-robot] updated from transifex
2016-02-14 01:55:37 -05:00
Thomas Müller
11707dffce
Merge pull request #22351 from owncloud/fix_22277
...
show remote server on federated share auto-complete
2016-02-13 18:25:04 +01:00
Thomas Müller
248c571c56
Merge pull request #22331 from owncloud/dav-nonexisting-part
...
fix getNodeForPath for non existing part files
2016-02-13 18:24:00 +01:00
Jenkins for ownCloud
2344c8e07d
[tx-robot] updated from transifex
2016-02-13 01:55:39 -05:00
Arthur Schiwon
62aac81c45
Fix race condition when switching filter mode. Fixes #22278
2016-02-12 21:51:06 +01:00
Lukas Reschke
ab5768f7dd
Only register admin page when update is available
...
Fixes https://github.com/owncloud/core/issues/22353
2016-02-12 18:45:42 +01:00
Thomas Müller
ad9dea8edf
Merge pull request #22292 from owncloud/smb-handle-forbidden
...
handle forbidden exceptions in smb backend
2016-02-12 16:09:05 +01:00
Bjoern Schiessle
11abf2487c
add remote server to the result
2016-02-12 15:52:51 +01:00
Thomas Müller
b3323a51c9
Merge pull request #22294 from owncloud/carddav-report-list-groups-2
...
Adding a custom webdav property which holds the list of contacts groups
2016-02-12 13:22:05 +01:00
Thomas Müller
cb1051dae4
Merge pull request #22305 from owncloud/sharestatus_to_ocs_22298
...
Calculate the share statuses in js from the OCS Response
2016-02-12 11:12:14 +01:00
Thomas Müller
e99c4d83dc
Merge pull request #22317 from owncloud/fix_invisible_linkshares
...
Do not allow invisible link shares
2016-02-12 11:10:58 +01:00
Roeland Jago Douma
479c458428
The owner and recipient can also be null
...
If we have backend hickups it can be that we are unable to retrive the
owner and recipient user as well. In such cases just return the UID.
2016-02-12 10:45:33 +01:00
Roeland Jago Douma
0a33cdee0c
If the initiator no longer exists return UID
...
It can happen that the share initiator is deleted. Because of the new
resharing behaviour this share then still exists. We just can fetch the
displayname properly.
2016-02-12 10:45:33 +01:00
Jenkins for ownCloud
f8607ac132
[tx-robot] updated from transifex
2016-02-12 01:56:04 -05:00
Robin Appelman
c3e4ced64a
fix getNodeForPath for non existing part files
2016-02-11 17:22:40 +01:00
Thomas Müller
e3a67d0505
Merge pull request #22320 from owncloud/files_external-crypt
...
encrypt passwords for files_external
2016-02-11 17:19:29 +01:00
Thomas Müller
4d24929e05
Merge pull request #22307 from owncloud/remove-notification-on-unshare-and-on-errors
...
Remove notification on unshare and on errors
2016-02-11 14:02:44 +01:00
Thomas Müller
26939a2873
Merge pull request #22290 from owncloud/dav-upload-scan-in-lock
...
scan the file in the write lock when uploading over dav
2016-02-11 14:02:08 +01:00
Robin Appelman
80eb1aada5
encrypt passwords for files_external
2016-02-11 14:00:08 +01:00
Roeland Jago Douma
745bfda41f
Fix migration step to avoind invisible shares
2016-02-11 13:29:23 +01:00
Roeland Jago Douma
0284c60c3a
Add tests
2016-02-11 13:29:23 +01:00
Roeland Jago Douma
a823485638
Reload list of shares on directory change
2016-02-11 11:06:26 +01:00
Thomas Müller
06af9b817e
Merge pull request #22281 from owncloud/activity-100-unshare-activities
...
Add translations of unshare activities
2016-02-11 11:01:47 +01:00
Joas Schilling
31c9e047a8
Delete the notification when the owner unshares the remote before the user did anything
2016-02-11 10:41:55 +01:00
Joas Schilling
2263b8b693
Remove the notification if accepting/declining failed because of 404
2016-02-11 10:41:55 +01:00
Jenkins for ownCloud
5165998723
[tx-robot] updated from transifex
2016-02-11 01:55:35 -05:00
Vincent Petry
f79fafcf06
Revert back to non-webdav download link for public URLs
...
Fixes issues with browsers not happy with the token.
Fixes activities which were not sent.
2016-02-10 19:09:52 +01:00
Thomas Müller
6b836325cf
Merge pull request #22276 from owncloud/harden-updater-auth
...
Harden updater authentication
2016-02-10 17:31:38 +01:00
Thomas Müller
6ffb83ae19
Merge pull request #22269 from owncloud/issue-22243-avoid-deadlock-with-lots-of-entries-to-cleanup
...
Chunk the cleanup queries to make sure they don't time out
2016-02-10 17:26:11 +01:00
Thomas Müller
10613f7265
Merge pull request #22273 from owncloud/versions-fixpathasrecipient
...
Fix versions path as share recipient when different than owner path
2016-02-10 17:25:14 +01:00
Thomas Müller
c919b41395
Adding a custom webdav property which holds the list of contacts groups
2016-02-10 17:06:13 +01:00
Robin Appelman
edbe5d7b6d
handle forbidden exceptions in smb backend
2016-02-10 16:52:13 +01:00
Robin Appelman
bef70e9448
also fix lock order for chunked dav uploads
2016-02-10 16:31:32 +01:00
Lukas Reschke
5680743c2b
Harden updater authentication
...
- Reset tokens after 2 hours as discussed at https://github.com/owncloud/updater/issues/220#issuecomment-182033453
- Used BCrypt for storing the password in the config.php. This makes it substantially harder in case of a leakage of the token to bruteforce it. In the future we can evaluate also an HMAC including the IP. That's a bit tricker though at the moment considering that we support reverse proxies. Didn't feel brave enough to touch that dragon now as well ;)
2016-02-10 16:31:11 +01:00
Robin Appelman
65554ec333
scan the file in the write lock when uploading over dav
2016-02-10 16:21:13 +01:00
Joas Schilling
5dc63e34b4
Add translations of unshare activities
2016-02-10 15:42:48 +01:00
Thomas Müller
5c89cf9565
Merge pull request #22267 from owncloud/fix_encryption2
...
calculate and update the version of the encryption signature correctly
2016-02-10 15:14:52 +01:00
Thomas Müller
159a0eb597
Merge pull request #20073 from owncloud/files-should-add-download-disposition
...
Serve files with an attachment disposition for new DAV endpoint
2016-02-10 14:35:50 +01:00
Thomas Müller
c4d2f6bb25
Merge pull request #22270 from owncloud/use-cache-directly
...
Use cache directly instead of QueryBuilder
2016-02-10 14:23:04 +01:00
Thomas Müller
c1d21cf873
Merge pull request #22263 from owncloud/fix-group-principals
...
Fix group principal
2016-02-10 14:22:18 +01:00
Vincent Petry
1b9e291913
Use full path of known file when handling versions
...
Instead of relying on the versions API response, use the known file path
when populating version models.
2016-02-10 13:39:25 +01:00
Vincent Petry
a6f997ddae
Remove path from versions response
...
The path attribute contains the path relative to the owner's home
folder, not the one from the recipient, which is useless for the client
and needlessly discloses the owner's original path.
The requested already has access to the full path of the file, so no
need to add it to the response.
2016-02-10 13:38:38 +01:00
Bjoern Schiessle
9dc759b4dc
remember signature version and only set it on update to make sure that other
...
apps like files_versions still get the old signature version
2016-02-10 13:27:32 +01:00
Joas Schilling
0ebb205010
Chunk the queries to make sure they don't time out
2016-02-10 13:04:37 +01:00
Lukas Reschke
762636efcd
Use cache directly instead of QB
...
In case somebody does not use oc_filecache
2016-02-10 12:30:39 +01:00
Bjoern Schiessle
43ed86313c
use the version of the original file if we write the part file to have a proper version if we move the file over to the original location
2016-02-10 11:08:03 +01:00
Thomas Müller
2e94d34dfd
Fix group principal
2016-02-10 10:43:32 +01:00
Joas Schilling
fa893762a2
Fix oracle by using less quotes
2016-02-10 08:40:45 +01:00
Joas Schilling
75d552b29e
Listen to the notification event to reload the file list
2016-02-10 08:40:45 +01:00
Joas Schilling
65e1e4a202
Mark the accept button as primary
2016-02-10 08:40:45 +01:00
Joas Schilling
c769f5775d
Create the actions with the correct ID
2016-02-10 08:40:45 +01:00
Joas Schilling
31cf3b8288
Make sure the share ID is an integer
2016-02-10 08:40:45 +01:00
Joas Schilling
cb8024ca14
Fix action paths
2016-02-10 08:40:45 +01:00
Joas Schilling
49dd693d8f
Bring the messages inline
2016-02-10 08:40:45 +01:00
Joas Schilling
a4a7cf40a1
Fix the notification API usage
2016-02-10 08:40:45 +01:00
Joas Schilling
3ff88c8c84
Revert "Disable the remote sharing notifications until they work properly"
...
This reverts commit 6bc93c7401
.
Conflicts:
apps/files_sharing/lib/external/manager.php
2016-02-10 08:40:44 +01:00
Jenkins for ownCloud
9ebcc4ce31
[tx-robot] updated from transifex
2016-02-10 01:56:05 -05:00
Lukas Reschke
ca350294a6
Add tests for setVersion
2016-02-09 23:43:28 +01:00
Vincent Petry
45c78476f5
Use cache update instead of put for encryption version
...
Saves a call to fetch the file id which didn't even work for a reason.
This fix properly sets the version in the database.
2016-02-09 23:43:28 +01:00
Lukas Reschke
6724f76573
Use cache and add tests
2016-02-09 23:43:27 +01:00
Bjoern Schiessle
377d7fb8a8
don't decrease ->version for part files but only a local variable, otherwise it can happen that we decrease it twice and end up with the wrong value
2016-02-09 23:43:27 +01:00
Bjoern Schiessle
966eb4b084
realPath should contain the path to the file we want to read, e.g. the version and not the original file
2016-02-09 23:43:27 +01:00
Lukas Reschke
5ccb9dfa7e
Use database for keeping track of the version
2016-02-09 23:43:27 +01:00
Lukas Reschke
3badf5caf5
Use number of chunk for HMAC as well
...
Prevents switching single blocks within the encrypted file.
2016-02-09 23:43:26 +01:00