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
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
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
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
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
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
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
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
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
287fbdf77a
[IE8] Fix file list checkboxes
2015-09-30 17:38:35 +02:00
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
2d1214d21d
adjust style of disabled button
2015-09-30 15:28:28 +02:00
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
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
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
def76bed2a
[IE8] opacity for active newFileMenu items
2015-09-30 14:03:51 +02:00
08fd4b38f8
Do noy allow empty urls to be submitted in "add to your owncloud"
...
Fixes #19382
2015-09-30 13:55:13 +02:00
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
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
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
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
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
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
97bfc20ac8
[IE8] Fix popover menu borders for IE8
...
- fixes "New" menu
- fixes file actions menu
2015-09-29 18:28:34 +02:00
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
733673b39d
Merge pull request #19365 from owncloud/files-detailsbar-interaction
...
Fix sidebar interaction
2015-09-29 14:44:28 +02:00
1015ca72c3
Prevent sort indicator hover to bypass multiselect restriction
2015-09-29 14:38:29 +02:00
d52361b09b
Disable sorting when multiselect is enabled in file list
2015-09-29 13:24:33 +02:00
580a961020
Merge pull request #17601 from owncloud/publicwebdav-allowajaxwhendisabled
...
Allow ajax requests on public webdav interface
2015-09-29 13:21:50 +02:00
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
54b507306a
Merge pull request #19409 from owncloud/files-sidebar-hiding-tabs
...
Hide sidebar tab headers conditionally
2015-09-29 13:17:38 +02:00
fbe296df17
adjust aspect ratio of preview size when for aspect ratios > 16/9
2015-09-29 13:07:08 +02:00
a40a2b0d64
improve handling of small images
2015-09-29 13:07:08 +02:00
222a4bd4ac
Scale portrait images correctly
2015-09-29 13:07:08 +02:00
f41a38ba15
Cover both width and height for the sidebar preview
2015-09-29 13:07:03 +02:00
aa3596a410
[tx-robot] updated from transifex
2015-09-29 01:55:02 -04:00
0dde79b75b
memberOf resembles a DN as well and is actively used
2015-09-28 18:40:01 +02:00
7fa9f29d7f
Merge pull request #19408 from owncloud/fix-trashbin-checkbox
...
Fix checkbox in trashbin
2015-09-28 18:27:52 +02:00
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
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
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
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
24ee83db30
fix checkbox in trashbin
2015-09-28 13:45:24 +02:00
72024ad201
Merge pull request #19404 from owncloud/files-sidebar-sorttabs
...
Fix tabs order in files sidebar
2015-09-28 12:55:38 +02:00
d007c32907
Merge pull request #19402 from owncloud/public-recognizeauthsession
...
Allow public webdav auth to recognize sesssion
2015-09-28 12:53:33 +02:00
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
5e4a52d3c2
Fix tabs order in files sidebar
2015-09-28 12:30:12 +02:00
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
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
f35b6833ff
Fix order of actions in the files actions menu
2015-09-28 11:19:49 +02:00
60f123193b
[tx-robot] updated from transifex
2015-09-28 05:07:18 -04:00
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
465063e386
Merge pull request #19395 from owncloud/15037-universal-shebang
...
Use a universal shebang
2015-09-28 09:45:34 +02:00
c7f7747b48
remove border around button of password protected link confirmation
2015-09-28 09:30:09 +02:00
ff4227bbfc
Use a universal shebang
...
Fixes #15037
2015-09-27 13:03:31 +02:00
46475b8114
Switch from Math.floor() to Math.ceil() when sending the dimension to Preview
...
Fixes #18203
2015-09-27 12:46:25 +02:00
0ae931ed57
fix sidebar spinner
2015-09-25 20:48:47 +02:00
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
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
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
1694f21387
Add the method to the mock
2015-09-25 11:16:26 +02:00
dba9211d5d
fix filecomparator
2015-09-25 00:51:39 +02:00
28d3c1cc0b
fix filelist checkboxes
2015-09-25 00:51:39 +02:00
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
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
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
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
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
90f1e3dc94
no need to list users if all users already had a key-pair
2015-09-24 12:47:46 +02:00
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
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
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
8387411b99
Merge branch 'master' into large-sidebar-preview-resize
2015-09-24 08:57:54 +02:00
002b6bf059
do not throw exception when no attribute is specified
2015-09-23 17:27:40 +02:00
97c4691c05
Unit tests for storage validation in service
2015-09-23 16:00:21 +01:00
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
845485cfe6
adjust to nested group fix
2015-09-23 16:38:39 +02:00
9d03b7c6b7
read all relevant user attributes on login and user search, in one query. saves us some.
2015-09-23 16:38:39 +02:00
7d53427ee6
only initialize once
2015-09-23 16:22:53 +02:00
88f03192ba
Delay listening to owner changes untill we use a share for that owner
2015-09-23 16:22:53 +02:00
19e7a08cbf
Do not allow user enumeration if the config is disabled
2015-09-23 15:11:02 +02:00
4eb299a308
hide sort indicator when in multiselect mode, ref #19056
2015-09-23 15:09:49 +02:00
d0ea62a51c
adjust the height of the sidebar preview image when resizing the browser
2015-09-23 14:56:13 +02:00
634c1c497c
Mark SMB_OC and SFTP_Key as deprecated backends
2015-09-23 12:10:02 +02:00
2bef3ef34b
Hide deprecated backends in external storage GUI
...
Selecting/deselecting the deprecate-to backends in the user mountable
storages selection will also change the corresponding deprecated
backend.
2015-09-23 12:10:02 +02:00
060d169615
Add deprecation mechanic to IdentifierTrait
...
Deprecation allows a backend/auth mechanism to designate an object that
it deprecates to, allowing clean transitions to updated codebases.
2015-09-23 12:10:02 +02:00
38a260e963
Revert "Implement more fine-grained external storage permissions model"
...
This reverts commit 0b97a05e7bd2e3c17c00cc88c5f4b8
2015-09-23 12:10:02 +02:00
bcdb3c26da
Merge pull request #19236 from owncloud/call_dot_directories_function
...
Replaces if ($file === '.' || $file === '..') by public function call isIgnoredDir
2015-09-23 11:34:23 +02:00
4c62d71db7
Merge pull request #19277 from owncloud/files-plusbuttonfix
...
Only render the plus button when it makes sense
2015-09-23 11:31:52 +02:00
9fbd3fa6c1
Merge pull request #19270 from owncloud/files-sidebar-fixfortrashandco
...
Properly show sidebar for trash and sharing sections
2015-09-22 23:53:15 +02:00
491250320a
Replaces if ($file === '.' || $file === '..') by if(\OC\Files\Filesystem::isIgnoredDir($file)). Eases to find where this operation is used.
2015-09-22 17:53:15 +02:00
a7d84287ad
Only render the plus button when it makes sense
2015-09-22 16:47:52 +02:00
0c93de5a65
Merge pull request #19266 from owncloud/fileactions-translate-details
...
Properly translate file actions
2015-09-22 15:56:04 +02:00
ce359b3a8c
Merge pull request #19257 from owncloud/fix-floating-in-sidebar
...
remove float from file/folder name in sidebar, fix #19243
2015-09-22 09:51:14 -04:00
fa725fba73
Properly show sidebar for trash and sharing sections
2015-09-22 15:28:48 +02:00
4dba046712
Respect disabled sharing API settings
...
If the sharing API setting is disabled that sharing check middle ware
should block the request. Thus making link shares unavailable.
Fixes #18970
* Unit test added
* Unit tests updated
2015-09-22 15:12:16 +02:00
a35144e961
Properly translate file actions
2015-09-22 14:52:52 +02:00
f6aeb023cf
remove float from file/folder name in sidebar, fix #19243
2015-09-22 14:13:56 +02:00
2e1cfe03e9
Publish an activity when sending a share link via email
2015-09-22 13:09:21 +02:00
c8a6fea1b4
Allow ajax requests on public webdav interface
...
Whenever outgoing shares are disabled, still allow ajax requests to make
it possible to use the Webdav interface in the public link page.
Please note that disabling outgoing shares isn't strong anyway as
someone could abuse the ajax endpoints to access files anyway. To
properly disable remote sharing, public link sharing must be disabled
too.
2015-09-22 12:19:56 +02:00
36ce254ffd
Move dummy backend to Tests namespace
2015-09-22 11:01:11 +02:00
b1f05ef1f3
Move WebDAVAuth to User_External
2015-09-21 17:59:48 +02:00
daf5d1ff2e
fix small typo
2015-09-21 16:48:15 +02:00
1d2f4aa540
Merge pull request #19215 from owncloud/fix_trashbin_previews
...
fix trashbin previews for text files
2015-09-21 16:12:10 +02:00
964cfc8e08
fix missing checkboxes in file comparator
2015-09-21 12:57:34 +02:00
a174ba5a36
make sure to add the correct file size to the file info, otherwise we will not show the preview for every filetype
2015-09-21 12:41:19 +02:00
d7d3e8d802
Merge pull request #19176 from owncloud/fix-19118
...
Fix checkboxes in files_external
2015-09-21 11:22:22 +02:00
7b483dfcbe
[tx-robot] updated from transifex
2015-09-21 01:54:41 -04:00
04b14df35c
Fix preview of old file on public upload conflicts
2015-09-20 12:38:21 +02:00
b3ff773bbf
delete cached preview when rolling back file's version
...
add random number using OC.parseQueryString and _.extend()
version rollback: add missing prefix to OC\Preview::post_delete
add test to assure that the rollback hook is called
2015-09-20 11:22:40 +02:00
bbd1e99605
[tx-robot] updated from transifex
2015-09-20 01:54:48 -04:00
624f5de67a
fix checkboxes in files_external
2015-09-19 10:36:38 +02:00
c433d48d8e
[tx-robot] updated from transifex
2015-09-19 01:55:22 -04:00
3325fb4cdd
Merge pull request #19058 from owncloud/multiselect-bar-style
...
adjust multiselect bar to controls bar, fix #18989
2015-09-18 15:52:05 +02:00
a4a5c9dafd
Merge pull request #18943 from owncloud/trashbin-expiration-cronjob-no-db
...
Add Trashbin expiration cronjob
2015-09-18 12:01:23 +02:00
b59c42e5df
Merge pull request #18983 from owncloud/fix_18926
...
check for the right user if we can change his password
2015-09-18 11:59:57 +02:00
75425b28df
Merge pull request #18679 from owncloud/add-reshare-activities
...
Add reshare activities for the parent sharee and the original file owner
2015-09-18 11:59:30 +02:00
93eb73b0bb
Merge pull request #18986 from owncloud/federated_capabilities
...
Expose federated sharing capabilities to authenticated users
2015-09-18 11:58:54 +02:00
0c37a28a60
Merge pull request #19087 from owncloud/disable-remote-share-notifications-for-now
...
Disable remote share notifications for now
2015-09-18 11:58:20 +02:00
8fa4ebaf6d
Merge pull request #18724 from owncloud/expiration-cronjob
...
Versions expiration cronjob
2015-09-18 11:11:47 +02:00
e37ee9a814
Merge pull request #19069 from owncloud/ext-s3-ceph
...
AmazonS3 automatic tests
2015-09-18 11:11:05 +02:00
2b21c80335
[tx-robot] updated from transifex
2015-09-18 01:54:55 -04:00
9803d68e55
Merge pull request #19090 from owncloud/ext-priority-logic
...
Properly implement external mount priorities
2015-09-17 18:11:53 +02:00
c18156a4fe
Merge pull request #19121 from owncloud/sidebar-design-details
...
fix Files sidebar layout of Versions and Sharing
2015-09-17 18:03:56 +02:00
5eddde6486
Add a Sabre plugin that emits an event for apps
2015-09-17 13:59:27 +02:00
3eeea852b3
fix sidebar Sharing layout a bit
2015-09-17 13:18:03 +02:00
de1bc0b653
fix sidebar Versions layout
2015-09-17 13:15:45 +02:00
4cff2f1ab3
Merge pull request #19046 from owncloud/issue-18924-throw-error-on-invalid-page
...
Throw an error when the page count or perPage setting is invalid
2015-09-17 13:02:14 +02:00
6bc93c7401
Disable the remote sharing notifications until they work properly
2015-09-17 11:14:28 +02:00
9e1cd6d873
Change the order of the buttons
2015-09-17 11:14:27 +02:00
a377b332aa
Merge pull request #19108 from owncloud/ext-smb-storageconfig
...
Correct manipulateStorageConfig parameter
2015-09-17 08:57:23 +02:00
91365a8969
[tx-robot] updated from transifex
2015-09-17 01:57:20 -04:00
0155bcf278
[tx-robot] updated from transifex
2015-09-17 01:55:25 -04:00
b8cded6755
Correct manipulateStorageConfig parameter
2015-09-17 00:24:01 +01:00
Thomas Müller
Roeland Jago Douma
Morris Jobke
Joas Schilling
Vincent Petry
Jörn Friedrich Dreyer
Jenkins for ownCloud
Hendrik Leppelsack
Bjoern Schiessle
Lukas Reschke
Robin Appelman
Arthur Schiwon
Robin Appelman
Jan-Christoph Borchardt
Olivier Paroz
Robin McCorkell
Martin
Frank Karlitschek
Joas Schilling
Georg Ehrke