Thomas Müller
54e19d7ca3
Merge pull request #19514 from owncloud/list_remote_shares_in_shared_with_you
...
List remote shares in shared with you
2015-10-02 14:48:12 +02:00
Thomas Müller
594a3e4e22
Merge pull request #19523 from owncloud/fix-seconds-ago
...
Fix moment.js "a few seconds ago" with "seconds ago"
2015-10-02 14:11:46 +02:00
Roeland Jago Douma
4adc78b78b
Fix and extend unit tests
2015-10-02 12:45:52 +02:00
Roeland Jago Douma
40dd2d9dbe
More fileinfo
2015-10-02 12:45:52 +02:00
Roeland Jago Douma
eeafccb3a6
Start to show remote shares in shared with you section
2015-10-02 12:45:47 +02:00
Thomas Müller
4fb2ef3bac
Merge pull request #19497 from owncloud/ie8-multiselect-delete-action-puke
...
[IE8] Fix dangling Delete action when multiselect is enabled
2015-10-02 12:16:31 +02:00
Thomas Müller
2912d0e3e3
Merge pull request #19499 from owncloud/files-versions-properlyreloadafterrevert
...
Reload versions list after revert
2015-10-02 12:16:10 +02:00
Thomas Müller
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
Thomas Müller
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
Thomas Müller
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
Thomas Müller
daf9a63d43
Merge pull request #19386 from owncloud/ocs_shareapi_extenstion
...
OCS endpoint to list remote shares
2015-10-02 12:13:36 +02:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Morris Jobke
4b3a5a257f
Fix moment.js "a few seconds ago" with "seconds ago"
...
* fixes #18627
2015-10-02 10:51:51 +02:00
Joas Schilling
e478d925c3
Fix intendation
2015-10-02 10:01:33 +02:00
Joas Schilling
17ab8e6c39
Use shorter text on the sidebar for files_sharing activities
2015-10-02 10:01:33 +02:00
Vincent Petry
5dff9d88cb
Make sure the conflict dialog is loaded before adding conflicts
2015-10-02 09:55:43 +02:00
Joas Schilling
f3864c5444
Use shorter text on the sidebar for files activities
2015-10-02 09:54:07 +02:00
Jörn Friedrich Dreyer
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
Jörn Friedrich Dreyer
bf4c3ce134
Merge pull request #19496 from owncloud/ie8-filenamewidth-sickness
...
[IE8] Remove non-working ellipsis support
2015-10-02 08:57:51 +02:00
Roeland Jago Douma
c924b6740a
Do not return unneeded info
2015-10-02 08:11:50 +02:00
Jenkins for ownCloud
3b4592718a
[tx-robot] updated from transifex
2015-10-02 01:54:51 -04:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
4a62021141
Move OCS endpoint ../remote_share to ../pending_shares
2015-10-02 07:39:58 +02:00
Hendrik Leppelsack
d4ce713749
display checkboxes properly after file restore
2015-10-01 22:54:36 +02:00
Bjoern Schiessle
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
Vincent Petry
b6114ba2b6
Reload versions list after revert
2015-10-01 17:06:24 +02:00
Vincent Petry
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
Vincent Petry
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
Jenkins for ownCloud
50874de1ca
[tx-robot] updated from transifex
2015-10-01 01:54:55 -04:00
Thomas Müller
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
Vincent Petry
287fbdf77a
[IE8] Fix file list checkboxes
2015-09-30 17:38:35 +02:00
Thomas Müller
1d8c10cf63
Merge pull request #19468 from owncloud/fix-36-vs-32-previews
...
Change small thumbnails to 32 px
2015-09-30 15:47:34 +02:00
Morris Jobke
2d1214d21d
adjust style of disabled button
2015-09-30 15:28:28 +02:00
Thomas Müller
eeac6e2ab1
Merge pull request #19454 from owncloud/ie8-madness-returns
...
[IE8] Fix file type sizes and popover menus in file list
2015-09-30 15:15:38 +02:00
Thomas Müller
1514c0a9c3
Merge pull request #19470 from owncloud/pass-exception
...
Only intercept exceptions of type "NotFoundException" instead of any …
2015-09-30 14:38:20 +02:00
Thomas Müller
25b0b01f5e
Merge pull request #19467 from owncloud/files-newmenu-highlightcurrent
...
Keep opacity in current item in newFileMenu
2015-09-30 14:21:28 +02:00
Vincent Petry
def76bed2a
[IE8] opacity for active newFileMenu items
2015-09-30 14:03:51 +02:00
Roeland Jago Douma
08fd4b38f8
Do noy allow empty urls to be submitted in "add to your owncloud"
...
Fixes #19382
2015-09-30 13:55:13 +02:00
Lukas Reschke
22e724e829
Only intercept exceptions of type "NotFoundException" instead of any Exception
...
The sharing backend may throw another exception for example when the activity app encounters a problem. Previously this just triggered a 404 error page and the exception got not logged at all. With this change such exceptions get not intercepted and regularly handled as exceptions so that we have meaningful log data. Also the user will be shown a window informing him that an error happened.
Helps to debug cases such as https://github.com/owncloud/core/issues/19465
2015-09-30 13:32:20 +02:00
Thomas Müller
6d743ffac6
Merge pull request #19419 from owncloud/ldap-fix-dn-not-sanitized-when-fetched-by-memberof
...
memberOf resembles a DN as well and is actively used
2015-09-30 11:28:17 +02:00
Thomas Müller
750f19340f
Merge pull request #19310 from owncloud/hide-sort-indicator
...
hide sort indicator when in multiselect mode, ref #19056
2015-09-30 11:07:45 +02:00
Thomas Müller
10978a7a61
Merge pull request #19373 from owncloud/sidebar-preview-cover
...
Cover both width and height for the sidebar preview
2015-09-30 11:07:18 +02:00
Morris Jobke
1051a3c6f5
Change small thumbnails to 32 px
...
* fixes #16913
* fixes issues in IE8 where the thumbnail is too big
2015-09-30 10:49:48 +02:00
Vincent Petry
d835115600
Keep opacity in current item in newFileMenu
...
Whenever the input field appears, the menu item should keep its opacity
instead of reacting on hover.
2015-09-30 10:44:59 +02:00
Vincent Petry
97bfc20ac8
[IE8] Fix popover menu borders for IE8
...
- fixes "New" menu
- fixes file actions menu
2015-09-29 18:28:34 +02:00
Vincent Petry
dbb6692468
[IE8] Fix filetype icon sizes
...
Added hack that uses a "filter" CSS with explicit URL to fix the "New"
menu by scaling down icons and also fix the folder/filetype icon in the sidebar
by scaling it up.
2015-09-29 18:28:31 +02:00
Thomas Müller
733673b39d
Merge pull request #19365 from owncloud/files-detailsbar-interaction
...
Fix sidebar interaction
2015-09-29 14:44:28 +02:00
Vincent Petry
1015ca72c3
Prevent sort indicator hover to bypass multiselect restriction
2015-09-29 14:38:29 +02:00
Vincent Petry
d52361b09b
Disable sorting when multiselect is enabled in file list
2015-09-29 13:24:33 +02:00
Thomas Müller
580a961020
Merge pull request #17601 from owncloud/publicwebdav-allowajaxwhendisabled
...
Allow ajax requests on public webdav interface
2015-09-29 13:21:50 +02:00
Thomas Müller
f2cd334c8a
Merge pull request #19417 from owncloud/files-upload-checkconflictbeforeupload
...
Show conflict dialog before upload when possible
2015-09-29 13:17:47 +02:00
Thomas Müller
54b507306a
Merge pull request #19409 from owncloud/files-sidebar-hiding-tabs
...
Hide sidebar tab headers conditionally
2015-09-29 13:17:38 +02:00
Robin Appelman
fbe296df17
adjust aspect ratio of preview size when for aspect ratios > 16/9
2015-09-29 13:07:08 +02:00
Robin Appelman
a40a2b0d64
improve handling of small images
2015-09-29 13:07:08 +02:00
Robin Appelman
222a4bd4ac
Scale portrait images correctly
2015-09-29 13:07:08 +02:00
Robin Appelman
f41a38ba15
Cover both width and height for the sidebar preview
2015-09-29 13:07:03 +02:00
Jenkins for ownCloud
aa3596a410
[tx-robot] updated from transifex
2015-09-29 01:55:02 -04:00
Arthur Schiwon
0dde79b75b
memberOf resembles a DN as well and is actively used
2015-09-28 18:40:01 +02:00
Robin Appelman
7fa9f29d7f
Merge pull request #19408 from owncloud/fix-trashbin-checkbox
...
Fix checkbox in trashbin
2015-09-28 18:27:52 +02:00
Vincent Petry
cc8efaa037
Show conflict dialog before upload when possible
...
When uploading files, first check if the files exist in the current file
list. For the ones that do, show a conflict dialog.
For the rest, upload directly.
If the upload operation detects a conflict on the server side, it will
also continue populating the conflict dialog.
From now on, server side conflict can only occur if someone concurrently
uploaded a file into the same folder but the current user hasn't
refreshed the list yet.
2015-09-28 17:50:11 +02:00
Vincent Petry
d47d240a35
Still show share link when recipient but no share permission
...
This makes it possible for the recipient to still trigger the sidebar
and share tab to see information about the share.
In the case where the file is not shared and no permissions exists, no
action icon will be displayed.
2015-09-28 16:23:33 +02:00
Vincent Petry
f9acf4627e
Fix sidebar interaction
...
- Clicking a file row or selecting it will open the sidebar.
- When sidebar is open, its contents update with the last selection.
- Dragging doesn't open the sidebar but does update its contents if it was
open already.
- Switching folders closes the sidebar.
- Close sidebar when highlighted file got deleted/removed from list
2015-09-28 15:23:37 +02:00
Vincent Petry
a8fb0038e9
Hide sidebar tab headers conditionally
...
Added canDisplay() in DetailsTabView that should return false if the tab
header of this tab must be hidden
2015-09-28 14:57:44 +02:00
Hendrik Leppelsack
24ee83db30
fix checkbox in trashbin
2015-09-28 13:45:24 +02:00
Thomas Müller
72024ad201
Merge pull request #19404 from owncloud/files-sidebar-sorttabs
...
Fix tabs order in files sidebar
2015-09-28 12:55:38 +02:00
Thomas Müller
d007c32907
Merge pull request #19402 from owncloud/public-recognizeauthsession
...
Allow public webdav auth to recognize sesssion
2015-09-28 12:53:33 +02:00
Thomas Müller
716ff81b27
Merge pull request #19401 from owncloud/files-actionsorder
...
Fix order of actions in the files actions menu
2015-09-28 12:53:11 +02:00
Vincent Petry
5e4a52d3c2
Fix tabs order in files sidebar
2015-09-28 12:30:12 +02:00
Vincent Petry
b4998e7d29
Allow public auth to recognize sesssion
...
When a public link password has been input, its auth is stored in the
session.
This fix makes it possible to recognize the session when using public
webdav from the files UI.
2015-09-28 11:52:04 +02:00
Thomas Müller
0479cefec3
Merge pull request #18469 from owncloud/ldap-batch-read-attrs-ng
...
read all relevant user attributes on login and user search, in one qu…
2015-09-28 11:44:21 +02:00
Vincent Petry
f35b6833ff
Fix order of actions in the files actions menu
2015-09-28 11:19:49 +02:00
Jenkins for ownCloud
60f123193b
[tx-robot] updated from transifex
2015-09-28 05:07:18 -04:00
Thomas Müller
9a010cc8ce
Merge pull request #19379 from owncloud/remove-auth-button-border
...
remove border around button of password protected link confirmation
2015-09-28 10:13:05 +02:00
Thomas Müller
465063e386
Merge pull request #19395 from owncloud/15037-universal-shebang
...
Use a universal shebang
2015-09-28 09:45:34 +02:00
Jan-Christoph Borchardt
c7f7747b48
remove border around button of password protected link confirmation
2015-09-28 09:30:09 +02:00
Olivier Paroz
ff4227bbfc
Use a universal shebang
...
Fixes #15037
2015-09-27 13:03:31 +02:00
Olivier Paroz
46475b8114
Switch from Math.floor() to Math.ceil() when sending the dimension to Preview
...
Fixes #18203
2015-09-27 12:46:25 +02:00
Hendrik Leppelsack
0ae931ed57
fix sidebar spinner
2015-09-25 20:48:47 +02:00
Roeland Jago Douma
db02173627
Reflect enabled shareAPI in capabilities
...
If the shareAPI is disabled we not return the other sharing
capabilities.
This allows clients to properly check if sharing is even available.
2015-09-25 20:12:41 +02:00
Thomas Müller
787c668b39
Merge pull request #19360 from owncloud/move-filter-method-into-config-object
...
Move the filtering of sensitive data to the config class
2015-09-25 14:05:04 +02:00
Thomas Müller
2c37d5f7d8
Merge pull request #13145 from owncloud/issue/11951-activity-sharing-email
...
Publish an activity when sending a share link via email
2015-09-25 13:48:33 +02:00
Joas Schilling
1694f21387
Add the method to the mock
2015-09-25 11:16:26 +02:00
Hendrik Leppelsack
dba9211d5d
fix filecomparator
2015-09-25 00:51:39 +02:00
Hendrik Leppelsack
28d3c1cc0b
fix filelist checkboxes
2015-09-25 00:51:39 +02:00
Thomas Müller
e7bc2a10e3
Merge pull request #15098 from owncloud/fix_preview_versions_revert_issue
...
fix issue with version rollback and thumbnails
2015-09-24 21:06:27 +02:00
Thomas Müller
846b826867
Merge pull request #18517 from owncloud/17753_to_master
...
Fix preview of old file on public upload conflicts
2015-09-24 15:20:00 +02:00
Thomas Müller
30377e958f
Merge pull request #18834 from owncloud/delay-listen-owner-changes
...
Delay listening to owner changes untill we use a share for that owner
2015-09-24 15:06:27 +02:00
Thomas Müller
594a31d260
Merge pull request #19341 from owncloud/enc_all_improved_messages
...
no need to list users if all users already had a key-pair
2015-09-24 14:51:18 +02:00
Arthur Schiwon
8e57757045
LDAP Wizard: enable/disable test login name button depending on whether a login name is provided or not
2015-09-24 13:33:37 +02:00
Bjoern Schiessle
90f1e3dc94
no need to list users if all users already had a key-pair
2015-09-24 12:47:46 +02:00
Thomas Müller
4621d4ed21
Merge pull request #19313 from owncloud/ext-validate-mount
...
Validate storage backend and auth mechanism before mounting
2015-09-24 11:33:57 +02:00
Thomas Müller
158c962fcc
Merge pull request #19307 from owncloud/large-sidebar-preview-resize
...
adjust the height of the sidebar preview image when resizing the browser
2015-09-24 09:44:35 +02:00
Thomas Müller
8c0cf07d2f
Merge pull request #18352 from owncloud/ocs_api_sharees_autocomplete_blocker
...
Implement the autocomplete blocker from #18341 into the OCS endpoint
2015-09-24 09:43:37 +02:00
Morris Jobke
8387411b99
Merge branch 'master' into large-sidebar-preview-resize
2015-09-24 08:57:54 +02:00
Arthur Schiwon
002b6bf059
do not throw exception when no attribute is specified
2015-09-23 17:27:40 +02:00
Robin McCorkell
97c4691c05
Unit tests for storage validation in service
2015-09-23 16:00:21 +01:00
Robin McCorkell
2404333300
Perform visibility checks on storages
...
StoragesService::getStorages() will check the visibility of the backend
and auth mechanism for the storage, and if either are not visible to the
user (aka disabled by admin) then the storage will be filtered out. The
original method StoragesService::getAllStorages() still exists in case
such storages need to be detected, but its use is discouraged.
2015-09-23 16:00:11 +01:00