f9093688cc
Merge pull request #19500 from owncloud/fix_trash_with_encryption2
...
[trashbin] fix broken versions on restore
2015-10-02 12:15:58 +02:00
3564a837d8
Merge pull request #19521 from owncloud/files-conflictdialog-loadpromise
...
Make sure the conflict dialog is loaded before adding conflicts
2015-10-02 12:15:44 +02:00
d0f6bfe7b6
Merge pull request #19508 from owncloud/setting-to-skip-migration-tests
...
setting to skip migration tests by default
2015-10-02 12:15:23 +02:00
8944cb539e
Merge pull request #19510 from owncloud/json-grouplist-sharing-exclude
...
save excluded groups in json format
2015-10-02 12:14:36 +02:00
ccbdcf0ab3
Merge pull request #19522 from owncloud/activity-395-less-sidebar-text
...
Activity 395 less sidebar text
2015-10-02 12:13:53 +02:00
daf9a63d43
Merge pull request #19386 from owncloud/ocs_shareapi_extenstion
...
OCS endpoint to list remote shares
2015-10-02 12:13:36 +02:00
3d2acb5003
sharingcheckmiddleware now handles externalshares as well
...
Added new annotations for the externalsharescontroller class
* @NoOutgoingFederatedSharingRequired
* @NoIncomingFederatedSharingRequired
By default both are required for all functions in the
externalSharesController.
A proper exception is thrown and then a 405 is returned instead of the
default error page. Since it is only an API endpoint this makes more
sense.
Unit tests added and updated
2015-10-02 12:03:53 +02:00
dc38e674a5
Split files_sharing middelware
...
Since for external shares there is no need for link shares to be enabled
we should check which controller is actually being called.
This makes sure that in all cases we verify that the files_sharing app
is enabled. But only for the share controller (public shares) we check
if the API is enabled and if links are enabled.
TODO: add checks for federated sharing as well
2015-10-02 11:56:11 +02:00
4b3a5a257f
Fix moment.js "a few seconds ago" with "seconds ago"
...
* fixes #18627
2015-10-02 10:51:51 +02:00
aaabe356b5
Merge pull request #19520 from owncloud/issue-17420-modify-group-count-when-changing-memberships
...
Modify the group user count when changing membership of a user
2015-10-02 10:34:57 +02:00
e478d925c3
Fix intendation
2015-10-02 10:01:33 +02:00
17ab8e6c39
Use shorter text on the sidebar for files_sharing activities
2015-10-02 10:01:33 +02:00
5dff9d88cb
Make sure the conflict dialog is loaded before adding conflicts
2015-10-02 09:55:43 +02:00
f3864c5444
Use shorter text on the sidebar for files activities
2015-10-02 09:54:07 +02:00
7707bbe648
Allow identifying whether the current item is the filtered one
2015-10-02 09:53:39 +02:00
3dec30d0e0
Merge pull request #19484 from owncloud/ie8-checkbox-rage
...
[IE8] Fix checkboxes in login page and file list
2015-10-02 08:58:16 +02:00
bf4c3ce134
Merge pull request #19496 from owncloud/ie8-filenamewidth-sickness
...
[IE8] Remove non-working ellipsis support
2015-10-02 08:57:51 +02:00
3098fd0d30
Merge pull request #19505 from owncloud/returnfloatforquota
...
always return float, update doc
2015-10-02 08:57:04 +02:00
b18307aafb
Merge pull request #19480 from owncloud/fix-l10n
...
Fix l10n on master
2015-10-02 08:56:33 +02:00
3ce45863ab
Modify the group user count when changing membership of a user
2015-10-02 08:55:53 +02:00
c924b6740a
Do not return unneeded info
2015-10-02 08:11:50 +02:00
3b4592718a
[tx-robot] updated from transifex
2015-10-02 01:54:51 -04:00
c3e7d324c5
Extend share info
...
The data from the share_external is not to much. Thus we enrich this
data with info from the filecache.
This allows endpoints using this to actually show usefull information.
The filecache might not be up to date but that is a sacrifice we need to
make in terms of speed. Else the number of remote PROPFINDS grows
lineary with the number of remote shares wich will make this endpoint
practically unusable.
2015-10-02 07:41:57 +02:00
0d3009951f
Made routes remote_shares only again
...
Since we need a unique id to accept/reject shares for now we keep the
pending shares under remote_shares.
* remote_shares/pending lists pending shares
* PUT/DELETE to remote_shares/pending/<ID> will accept/reject the share
2015-10-02 07:40:53 +02:00
7310c4166a
Added '../remote_shares' endpoint
...
* list incoming remote shares at 'remote_shares'
* get per share info at 'remote_shares/<ID>'
* delete remote share with a DELETE to 'remote_shares/<ID>'
2015-10-02 07:40:04 +02:00
4a62021141
Move OCS endpoint ../remote_share to ../pending_shares
2015-10-02 07:39:58 +02:00
f891b91cf8
Merge pull request #19518 from owncloud/checkboxes-file-restore
...
Display checkboxes properly after file restore
2015-10-02 00:20:40 +03:00
d4ce713749
display checkboxes properly after file restore
2015-10-01 22:54:36 +02:00
b940287ffa
first copy to owner and then move to current user because the encryption
...
wrapper always expect to work on the owner storage
2015-10-01 17:09:17 +02:00
b6114ba2b6
Reload versions list after revert
2015-10-01 17:06:24 +02:00
b6591084a1
Merge pull request #19463 from owncloud/fix_18132
...
encryption: versions should always use the keys of the original file, no need to …
2015-10-01 16:56:28 +02:00
8ae4f5bf1a
Merge pull request #17703 from owncloud/preview-better-cache-use
...
Better cache usage for previews
2015-10-01 16:24:29 +02:00
b2dd5cb616
save excluded groups in json format - fixes #10983
2015-10-01 15:37:55 +02:00
7cbdd9b90b
setting to skip migration tests by default
...
* if you install owncloud via package it is not
possible to skip migration tests
* this also allows to disable migration tests for
an instance by default
2015-10-01 14:23:25 +02:00
1d617c4bf6
always return float, update doc
2015-10-01 13:45:49 +02:00
9e66653fb3
[IE8] Remove non-working ellipsis support
...
This prevents the name element to be too wide, which would cause users
to mistakenly click on it instead of the empty space when wanting to
focus on a file for the sidebar.
Also fixed the close button on the sidebar (make it appear)
2015-10-01 13:23:56 +02:00
1c3e28a73b
Add tests
2015-10-01 13:17:22 +02:00
dc49e76747
stricter check if thumbnail is cached
2015-10-01 13:14:47 +02:00
884e2fcd6e
to much copy paste
2015-10-01 13:14:47 +02:00
9925ff33f1
use cache data we already have to check if a thumbnail of specific size is cached
2015-10-01 13:14:47 +02:00
52d4495793
use the fileinfo to check if we have a valid file
2015-10-01 13:14:47 +02:00
f4d180ee5c
allow passing the fileinfo to the preview manager
2015-10-01 13:14:47 +02:00
8a34c29b2c
[IE8] Fix dangling Delete action when multiselect is enabled
...
For some reason we need to cancel out the table's top: 95px, but just
for the delete action and not the other ones... whatever, IE8...
2015-10-01 11:50:34 +02:00
64994facce
Merge pull request #19132 from owncloud/sharing-removebogusexpirationdate
...
Repair step to remove bogus expiration dates from non-link shares
2015-10-01 10:38:21 +02:00
e7232a848b
versions should always use the keys of the original file, no need to create new one
2015-10-01 10:10:19 +02:00
8f2600a0ea
Also delete all shares before the test, so the count matches
2015-10-01 08:32:24 +02:00
cc0812332c
add more precise version to also repair git master instances
2015-10-01 08:27:12 +02:00
6e104bc933
Repair step to remove bogus expiration dates from non-link shares
2015-10-01 08:27:12 +02:00
50874de1ca
[tx-robot] updated from transifex
2015-10-01 01:54:55 -04:00
d6e3195b38
Merge pull request #19421 from owncloud/fix_19382
...
Do noy allow empty urls to be submitted in "add to your owncloud"
2015-09-30 22:17:18 +02:00
Thomas Müller
Roeland Jago Douma
Morris Jobke
Jörn Friedrich Dreyer
Joas Schilling
Vincent Petry
Jenkins for ownCloud
VicDeo
Hendrik Leppelsack
Bjoern Schiessle
Robin Appelman
Robin Appelman