wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
28268 commits 157 branches 562 tags 714 MiB
Commit graph

11680 commits

Author SHA1 Message Date
Jenkins for ownCloud
c5649a634f [tx-robot] updated from transifex 2015-10-08 01:54:58 -04:00
Arthur Schiwon
4a5cecd6fa allow an attribute to return more than one value 2015-10-07 18:57:49 +02:00
Vincent Petry
da8573840a Move alt text for favorite action to image 2015-10-07 18:01:31 +02:00
Thomas Müller
b2872ef759 Merge pull request #19589 from owncloud/shares-external-mount-provider 
Move the setup of external share mounts to a mountprovider
 2015-10-07 17:46:33 +02:00
Vincent Petry
f3ce5fd234 [IE8] Fix "new" button width 2015-10-07 17:34:38 +02:00
Vincent Petry
8a1a1c1326 Debounce cancel upload message 2015-10-07 16:34:06 +02:00
Thomas Müller
c8021441d0 Merge pull request #19489 from owncloud/fix-18297 
fix possible infinite loop when reading groups in the wizard
 2015-10-07 14:55:48 +02:00
Hendrik Leppelsack
ccfd052e81 move footer to bottom of public page 2015-10-07 13:03:43 +02:00
Jenkins for ownCloud
cd818e7419 [tx-robot] updated from transifex 2015-10-07 01:55:56 -04:00
Hendrik Leppelsack
e7b2da79ec fix public empty message 2015-10-06 23:59:58 +02:00
Thomas Müller
648b86abdd Merge pull request #19610 from owncloud/ext-deletestoragefromdatabase 
Remove oc_storages entries after removing ext storages
 2015-10-06 21:58:59 +02:00
Robin Appelman
59cf817308 Merge pull request #19511 from owncloud/etag-share-permissions-update 
Mark shares as dirty when changing permissions
 2015-10-06 18:09:12 +02:00
Vincent Petry
bbebffb60c Remove oc_storages entries after removing ext storages 
When removing external storages, either system-wide or user-wide,
automatically remove the matching oc_storages and oc_filecache entries.

This can only work if the backend configuration doesn't contain any
substitution variable $user in which case the storage id cannot be
computed, so this case is ignored for now.
 2015-10-06 17:33:16 +02:00
Hendrik Leppelsack
c1a5e96435 fix scrollbars in public template 2015-10-06 16:52:05 +02:00
Robin Appelman
17756ebf5b fix phpdoc 2015-10-06 16:37:43 +02:00
Robin Appelman
d3c1fcf961 Fix getEtag for roots of shared storages 2015-10-06 16:33:37 +02:00
Jörn Friedrich Dreyer
5646e39248 test objectstore with ceph docker 
use default config for swift primary storage test config

allow testsuite to complete

fix timeout, script cleanup, enable debug for now

use btrfs loopback device, requires privileged container and absolute path

throw exception when storage has problems

debug by echo ...

sleep more, more debug
 2015-10-06 16:27:25 +02:00
Joas Schilling
13dd62f7b0 Make sure that remote shares use the correct uid casing 2015-10-06 15:16:19 +02:00
Vincent Petry
d546c5bb59 Propagate shares etag when group membership changed 2015-10-06 15:02:22 +02:00
Thomas Müller
4b31b349b8 Merge pull request #19595 from owncloud/fix-versions-log-entry 
Reset to auto if not set
 2015-10-06 13:45:35 +02:00
Robin Appelman
47c71d8e87 use microtime 2015-10-06 13:00:30 +02:00
Robin Appelman
41f9946272 clear hooks for tests 2015-10-06 11:38:41 +02:00
Robin Appelman
0817024e6f Mark shares as dirty when changing permissions 2015-10-06 11:38:41 +02:00
Thomas Müller
0385a62363 Merge pull request #19597 from owncloud/update-license-headers 
update licence headers via script
 2015-10-06 11:18:35 +02:00
Morris Jobke
8366ce2767 deduplicate @xenopathic 2015-10-06 09:52:19 +02:00
Thomas Müller
1525ef43f9 Merge pull request #18484 from owncloud/fix-17964 
Remove whitespace from base-DNs
 2015-10-06 09:23:24 +02:00
Jenkins for ownCloud
3ff60cc2e3 [tx-robot] updated from transifex 2015-10-06 01:55:00 -04:00
Morris Jobke
b945d71384 update licence headers via script 2015-10-05 21:15:52 +02:00
Victor Dubiniuk
99f1112e33 Reset to auto if not set 2015-10-05 20:52:25 +03:00
Arthur Schiwon
353a8e442f fix possible infinite loop when reading groups in the wizard 2015-10-05 19:10:30 +02:00
Vincent Petry
c17d60165a Fix tooltip placement on rename error 2015-10-05 17:44:25 +02:00
Robin Appelman
e468b38bd4 sanitize mountpoint 2015-10-05 17:14:39 +02:00
Robin Appelman
52c8b488cb fix test 2015-10-05 16:43:10 +02:00
Robin Appelman
e1c562f66b extract the mount provider from the manager 2015-10-05 16:39:11 +02:00
Robin Appelman
a0c9dc2986 register the external share mount provider 2015-10-05 16:19:13 +02:00
Robin Appelman
76a528e511 Make the external share manager a mount provider 2015-10-05 16:18:14 +02:00
Arthur Schiwon
fc273ac88c trim by default, add unit tests 2015-10-05 13:42:20 +02:00
Lennart Rosam
70ffa2f9f8 Spaces -> Tabs, Update PHP-Doc and function logic 2015-10-05 13:42:20 +02:00
Lennart Rosam
b47d15cd20 Remove whitespace from base-DNs 2015-10-05 13:42:20 +02:00
Bjoern Schiessle
bf82015254 add some output to explain the pre-conditions for decrypt-all 2015-10-05 12:41:05 +02:00
Thomas Müller
710b7dd81c Merge pull request #19487 from owncloud/split_share_middleware 
Split files_sharing middelware
 2015-10-05 10:57:11 +02:00
Thomas Müller
28919faff5 Merge pull request #19552 from owncloud/inline_fileactions_alttext 
If an inline files action provides an alt text show it
 2015-10-05 10:24:48 +02:00
Thomas Müller
681ab05e4d Merge pull request #19539 from owncloud/fix-multiselect-overlap-shorter 
Fix filelist size issues, breadcrumb, multiselect
 2015-10-05 09:48:31 +02:00
Thomas Müller
09fe808d48 Merge pull request #19547 from owncloud/fix-16154 
LDAP Wizard: do not be picky about credentials when only looking for …
 2015-10-05 09:48:13 +02:00
Jenkins for ownCloud
bc593f7921 [tx-robot] updated from transifex 2015-10-05 01:54:55 -04:00
Jenkins for ownCloud
2ffb1c2135 [tx-robot] updated from transifex 2015-10-04 01:55:02 -04:00
Roeland Jago Douma
6bf6ff9564 If an inline files action provides an alt text show it 
* Added unit tests for icon display
* Added unit tests for icon alt text display
 2015-10-03 15:47:20 +02:00
Jenkins for ownCloud
e0084059b9 [tx-robot] updated from transifex 2015-10-03 01:56:20 -04:00
Arthur Schiwon
6d06d1c5a4 LDAP Wizard: do not be picky about credentials when only looking for the port 2015-10-03 00:35:24 +02:00
Thomas Müller
94013ffb82 Merge pull request #19534 from owncloud/fix_19532 
if the mountpoint is accessible for all user the array should contain 'all'
 2015-10-02 18:40:50 +02:00
Vincent Petry
f135128664 Fix filelist size issues, breadcrumb, multiselect 
- calculate multiselect header width to exclude scrollbar
- call FileList._onResize() when sidebar is toggled ("appresized"), this
  also updates the breadcrumb width
- moved global getScrollBarWidth() to OC.Util namespace
 2015-10-02 18:03:48 +02:00
Robin Appelman
943c5069d4 Lock files when rolling back version 2015-10-02 17:08:39 +02:00
Bjoern Schiessle
0ce28a574a if mountpoint is applicable to all users the old API expects a array with 'all' 2015-10-02 16:17:28 +02:00
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
Arthur Schiwon
845485cfe6 adjust to nested group fix 2015-09-23 16:38:39 +02:00
Arthur Schiwon
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
Robin Appelman
7d53427ee6 only initialize once 2015-09-23 16:22:53 +02:00
Robin Appelman
88f03192ba Delay listening to owner changes untill we use a share for that owner 2015-09-23 16:22:53 +02:00
Joas Schilling
19e7a08cbf Do not allow user enumeration if the config is disabled 2015-09-23 15:11:02 +02:00
Jan-Christoph Borchardt
4eb299a308 hide sort indicator when in multiselect mode, ref #19056 2015-09-23 15:09:49 +02:00
Robin Appelman
d0ea62a51c adjust the height of the sidebar preview image when resizing the browser 2015-09-23 14:56:13 +02:00
Robin McCorkell
634c1c497c Mark SMB_OC and SFTP_Key as deprecated backends 2015-09-23 12:10:02 +02:00
Robin McCorkell
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
Robin McCorkell
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
Robin McCorkell
38a260e963 Revert "Implement more fine-grained external storage permissions model" 
This reverts commit 0b97a05e7b.
This reverts commit d2e3c17c00.
This reverts commit cc88c5f4b8.
 2015-09-23 12:10:02 +02:00
Thomas Müller
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
Thomas Müller
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
Thomas Müller
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
Martin
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
Vincent Petry
a7d84287ad Only render the plus button when it makes sense 2015-09-22 16:47:52 +02:00
Thomas Müller
0c93de5a65 Merge pull request #19266 from owncloud/fileactions-translate-details 
Properly translate file actions
 2015-09-22 15:56:04 +02:00
Frank Karlitschek
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
Vincent Petry
fa725fba73 Properly show sidebar for trash and sharing sections 2015-09-22 15:28:48 +02:00
Roeland Jago Douma
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
Vincent Petry
a35144e961 Properly translate file actions 2015-09-22 14:52:52 +02:00
Jan-Christoph Borchardt
f6aeb023cf remove float from file/folder name in sidebar, fix #19243 2015-09-22 14:13:56 +02:00
Joas Schilling
2e1cfe03e9 Publish an activity when sending a share link via email 2015-09-22 13:09:21 +02:00
Vincent Petry
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
Lukas Reschke
36ce254ffd Move dummy backend to Tests namespace 2015-09-22 11:01:11 +02:00
Thomas Müller
b1f05ef1f3 Move WebDAVAuth to User_External 2015-09-21 17:59:48 +02:00
Bjoern Schiessle
daf5d1ff2e fix small typo 2015-09-21 16:48:15 +02:00
Thomas Müller
1d2f4aa540 Merge pull request #19215 from owncloud/fix_trashbin_previews 
fix trashbin previews for text files
 2015-09-21 16:12:10 +02:00
Hendrik Leppelsack
964cfc8e08 fix missing checkboxes in file comparator 2015-09-21 12:57:34 +02:00
Bjoern Schiessle
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
Thomas Müller
d7d3e8d802 Merge pull request #19176 from owncloud/fix-19118 
Fix checkboxes in files_external
 2015-09-21 11:22:22 +02:00
Jenkins for ownCloud
7b483dfcbe [tx-robot] updated from transifex 2015-09-21 01:54:41 -04:00
Olivier Paroz
04b14df35c Fix preview of old file on public upload conflicts 2015-09-20 12:38:21 +02:00
Georg Ehrke
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
Jenkins for ownCloud
bbd1e99605 [tx-robot] updated from transifex 2015-09-20 01:54:48 -04:00
Hendrik Leppelsack
624f5de67a fix checkboxes in files_external 2015-09-19 10:36:38 +02:00
Jenkins for ownCloud
c433d48d8e [tx-robot] updated from transifex 2015-09-19 01:55:22 -04:00
Thomas Müller
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
Thomas Müller
a4a5c9dafd Merge pull request #18943 from owncloud/trashbin-expiration-cronjob-no-db 
Add Trashbin expiration cronjob
 2015-09-18 12:01:23 +02:00
Thomas Müller
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
Thomas Müller
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
Thomas Müller
93eb73b0bb Merge pull request #18986 from owncloud/federated_capabilities 
Expose federated sharing capabilities to authenticated users
 2015-09-18 11:58:54 +02:00
Thomas Müller
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
Thomas Müller
8fa4ebaf6d Merge pull request #18724 from owncloud/expiration-cronjob 
Versions expiration cronjob
 2015-09-18 11:11:47 +02:00
Thomas Müller
e37ee9a814 Merge pull request #19069 from owncloud/ext-s3-ceph 
AmazonS3 automatic tests
 2015-09-18 11:11:05 +02:00
Jenkins for ownCloud
2b21c80335 [tx-robot] updated from transifex 2015-09-18 01:54:55 -04:00
Thomas Müller
9803d68e55 Merge pull request #19090 from owncloud/ext-priority-logic 
Properly implement external mount priorities
 2015-09-17 18:11:53 +02:00
Thomas Müller
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
Joas Schilling
5eddde6486 Add a Sabre plugin that emits an event for apps 2015-09-17 13:59:27 +02:00
Jan-Christoph Borchardt
3eeea852b3 fix sidebar Sharing layout a bit 2015-09-17 13:18:03 +02:00
Jan-Christoph Borchardt
de1bc0b653 fix sidebar Versions layout 2015-09-17 13:15:45 +02:00
Thomas Müller
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
Joas Schilling
6bc93c7401 Disable the remote sharing notifications until they work properly 2015-09-17 11:14:28 +02:00
Joas Schilling
9e1cd6d873 Change the order of the buttons 2015-09-17 11:14:27 +02:00
Thomas Müller
a377b332aa Merge pull request #19108 from owncloud/ext-smb-storageconfig 
Correct manipulateStorageConfig parameter
 2015-09-17 08:57:23 +02:00
Jenkins for ownCloud
91365a8969 [tx-robot] updated from transifex 2015-09-17 01:57:20 -04:00
Jenkins for ownCloud
0155bcf278 [tx-robot] updated from transifex 2015-09-17 01:55:25 -04:00
Robin McCorkell
b8cded6755 Correct manipulateStorageConfig parameter 2015-09-17 00:24:01 +01:00
Victor Dubiniuk
b75a1b40a2 Log deleted files 2015-09-16 22:29:54 +03:00
Thomas Müller
9d49e04ee9 Merge pull request #18473 from owncloud/smb-workgroup 
Allow domain to be specified for SMB
 2015-09-16 18:17:23 +02:00
Lukas Reschke
47caac10f5 Add PHPDoc 2015-09-16 17:37:21 +03:00
Victor Dubiniuk
764726ce01 Updates according to review 2015-09-16 17:37:21 +03:00
Victor Dubiniuk
867ed67aa5 Fix tests 2015-09-16 17:37:21 +03:00
Victor Dubiniuk
8ac3d5e36c Add expiration cronjob 2015-09-16 17:37:21 +03:00
Victor Dubiniuk
e3c067c2e1 Correct method title. Add docblock 2015-09-16 17:22:17 +03:00
Robin McCorkell
373e2f890f Unit tests for UserGlobalStoragesService::getUniqueStorages() 2015-09-16 13:13:01 +01:00
Robin McCorkell
ca7b4a42f9 Fix external storage priority logic 2015-09-16 13:12:47 +01:00
Thomas Müller
4d77fac191 Merge pull request #19048 from owncloud/details-icon 
add details icon for file actions dropdown
 2015-09-16 13:56:30 +02:00
Thomas Müller
919b7d203f Merge pull request #19066 from owncloud/fix-new-menu-mobile 
fix new menu not showing on mobile, fix #18879
 2015-09-16 13:54:57 +02:00
Jan-Christoph Borchardt
2356ba2494 fix accessibility of New button, use alt text instead of tooltip 2015-09-16 11:51:58 +02:00
Jan-Christoph Borchardt
475603eeb7 fix new menu not showing on mobile, fix #18879 2015-09-16 09:49:39 +02:00
Thomas Müller
afc7eeacaf Merge pull request #18185 from owncloud/share-dialog-files-sidebar 
Share dialog files sidebar
 2015-09-16 09:40:53 +02:00
Thomas Müller
af517103b1 Merge pull request #18735 from owncloud/checkbox-style 
custom checkbox style
 2015-09-16 09:34:46 +02:00
Thomas Müller
fad963970c Merge pull request #19062 from owncloud/line-height 
fix height of 'All files' entry in sidebar
 2015-09-16 09:26:36 +02:00
Hendrik Leppelsack
0ce3b19e11 fix filelist checkboxes 2015-09-16 09:06:05 +02:00
Raghu Nayyar
7ccd02ec95 Fixes white and black checkboxes in core, files will be next. 2015-09-16 09:06:05 +02:00
Vincent Petry
e7e0cfe93d Properly show sidebar when clicking on share button 2015-09-16 07:23:29 +02:00
Vincent Petry
996639f4fb More unit tests for share dialog 2015-09-16 07:23:29 +02:00
Vincent Petry
886f1ed660 Update JS unit tests for share dialog (WIP) 2015-09-16 07:23:29 +02:00
Vincent Petry
e90065881d Bring back the share icon and update its status 
Display share icon in file list row.
Update share icon status when the sharing state changed.
 2015-09-16 07:23:28 +02:00
Arthur Schiwon
6d832359b6 fix allow upload checkbox appeareance 2015-09-16 07:23:28 +02:00
Arthur Schiwon
9fe6d7c568 implements setting and removing password for link shares, including forced ones 2015-09-16 07:23:28 +02:00
Arthur Schiwon
5fad379bf1 remove obsolete file action 2015-09-16 07:23:27 +02:00
Arthur Schiwon
258a2e2696 now you even can share 2015-09-16 07:23:27 +02:00
Arthur Schiwon
ce1b0c650e show link share 2015-09-16 07:23:27 +02:00
Vincent Petry
f709022559 Fix share permissions for share tab 2015-09-16 07:23:26 +02:00
Vincent Petry
018d07b3e5 Add share dialog into share tab 2015-09-16 07:23:26 +02:00
Arthur Schiwon
edd163a611 refactor share dialog for multi-purpose use (dropdown, sidebar) and better maintainability 2015-09-16 07:23:25 +02:00
Joas Schilling
59967599ac Fix the parameter order in the translation 2015-09-16 06:47:40 +02:00
Robin McCorkell
7fc545470c Make AmazonS3 path style actually work 2015-09-16 02:02:59 +01:00
Robin McCorkell
17d1358aee AmazonS3 Ceph tests 2015-09-16 01:56:49 +01:00
Thomas Müller
d1f7087b6c Merge pull request #18979 from owncloud/sidebare-preview-fixes 
Sidebare preview fixes
 2015-09-16 00:12:25 +02:00
Bjoern Schiessle
9bd4f2d41e occ script to disable encryption and to decrypt all files again 2015-09-15 22:39:44 +02:00
Robin McCorkell
0667c4363d Merge branch 'master' into smb-workgroup 2015-09-15 19:36:43 +01:00
Victor Dubiniuk
1f7ac2c309 Postrebase cleanup 2015-09-15 21:12:49 +03:00
Victor Dubiniuk
0cefbd76b9 Add expiration for versions older than max 2015-09-15 21:12:39 +03:00
Lukas Reschke
82c2e0df7c Merge branch 'master' into version-retention 2015-09-15 19:29:06 +02:00
Jan-Christoph Borchardt
1d56d74c3f fix height of 'All files' entry in sidebar 2015-09-15 19:25:49 +02:00
Jan-Christoph Borchardt
00d756b4d1 adjust multiselect bar to controls bar, fix #18989 2015-09-15 18:11:44 +02:00
Vincent Petry
7ab57f7f27 Add details icon for details menu item 2015-09-15 17:52:01 +02:00
Joas Schilling
fe8ef0dd36 Add reshare activities for the parent sharee and the original file owner 2015-09-15 17:36:56 +02:00
Jan-Christoph Borchardt
accebae356 fix filename display in sidebar, fix #18981 2015-09-15 17:03:46 +02:00
Thomas Müller
ae9ea244f2 Merge pull request #19043 from owncloud/fix-php-doc-of-encrypt-all 
Function does return void
 2015-09-15 17:03:34 +02:00
Victor Dubiniuk
cb529acc5c Follow PSR 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
c3dc5b0317 Add method docblock 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
f46b434a12 Namespacing, reusing 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
c3e055549e Improvements 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
b95d1e6683 Add quota status to expiration check 2015-09-15 17:08:54 +03:00
Victor Dubiniuk
7ef937d8ad Add versions obligation 2015-09-15 17:08:54 +03:00
Joas Schilling
754850f473 Fix status code 2015-09-15 15:51:54 +02:00
Robin Appelman
8767c2b3be fix small mimetype icons 2015-09-15 15:40:42 +02:00
Roeland Jago Douma
91dfcab055 Expose federated sharing capabilities to authenticated users 2015-09-15 15:10:13 +02:00
Joas Schilling
aa8b1b2894 Throw an error when the page count or perPage setting is invalid 2015-09-15 15:04:04 +02:00
Frank Karlitschek
650e600b94 Merge pull request #18273 from owncloud/files-sidebar-toggle 
Keep right sidebar open, add Details action
 2015-09-15 14:45:34 +02:00
Robin Appelman
72cfeaf157 recognize eps, psd and illustrator as image 2015-09-15 14:32:07 +02:00
Robin Appelman
98966329bf crop to the center for landscape images 2015-09-15 14:32:07 +02:00
Robin Appelman
a734606649 Various thumbnail fixes 
- Show square images as portrait
- Set max height based on sidebar width
- cleanup
 2015-09-15 14:32:07 +02:00
Robin Appelman
19e1d35373 Fix path for fileinfomodel in subdirectories 2015-09-15 14:29:37 +02:00
Robin Appelman
1c792b9f43 normal margins for portrait previews 2015-09-15 14:29:37 +02:00
Lukas Reschke
7953cc9494 Function does return void 
This function does return void and not a bool.
 2015-09-15 14:02:10 +02:00
Joas Schilling
665716095b Fix parameter name to match the specs 2015-09-15 12:14:14 +02:00
Jenkins for ownCloud
24d2cbf3de [tx-robot] updated from transifex 2015-09-15 01:54:50 -04:00
Vincent Petry
d0cea82969 Fixed sidebar toggle entry 
Properly highlight the row after selecting the item.
This also fixes the unit tests by changing the order of registration of
file actions.
 2015-09-14 20:45:30 +02:00
Vincent Petry
8a6574e81a Keep right sidebar open, add Details action 2015-09-14 20:45:30 +02:00
Lukas Reschke
4a777d686b Merge pull request #18966 from owncloud/ext-remove-numeric-id 
Remove storing storage_id in mount.json
 2015-09-14 15:04:23 +02:00
Lukas Reschke
1369525e7f Merge pull request #18982 from owncloud/fix_18878 
enforce loading icon in sidebar to be 32x32
 2015-09-14 12:47:53 +02:00
Individual IT Services
04db96adaf Merge pull request #19006 from owncloud/individual-it-patch-1 
allow ".." in folder names
 2015-09-14 15:56:53 +05:45
Bjoern Schiessle
7f459c64cb check for the right user if we can change his password 2015-09-14 11:49:16 +02:00
Jenkins for ownCloud
211a243784 [tx-robot] updated from transifex 2015-09-14 01:55:35 -04:00
Individual IT Services
f7e66d49fc allow ".." in folder names 
".." are valid in folder names, only ".." by itself is invalid
fix for #18987
 2015-09-14 10:42:00 +05:45
Tim Dettrick
1b582ba66b Don't log expected Swift 404 responses 
File existence checks are expected in some cases to be false, so passing
404 Not Found errors through to the logs just causes noise.
 2015-09-14 11:12:52 +10:00
Robin McCorkell
522619f90e Fix dependency check for Swift and SMB_OC 
Mistake caused during merging, where the API had changed
 2015-09-13 21:41:02 +01:00
Robin McCorkell
0dc7181335 Merge pull request #18441 from owncloud/ext-backends.advanced 
Migrate advanced external storage backends to new registration API [part 3]
 2015-09-13 19:38:22 +01:00
Jenkins for ownCloud
ca921fa1e7 [tx-robot] updated from transifex 2015-09-13 01:55:24 -04:00
Jenkins for ownCloud
9860a79441 [tx-robot] updated from transifex 2015-09-12 01:55:35 -04:00
Georg Ehrke
4660fefd01 enforce loading icon in sidebar to be 32x32 2015-09-11 18:15:36 +02:00
Robin McCorkell
57e49d2005 Merge pull request #18733 from owncloud/ext-dependencycheck 
Make checkDependencies a real method
 2015-09-11 09:46:40 +01:00
Robin McCorkell
e99988b9c7 Merge pull request #18676 from owncloud/ext-eventdispatcher 
files_external event dispatcher
 2015-09-11 09:34:05 +01:00
Jenkins for ownCloud
ee1b57d15d [tx-robot] updated from transifex 2015-09-11 01:55:26 -04:00
Robin McCorkell
d67251fe4c Remove storing storage_id in mount.json 
One mount configuration does not necessarily map to a single storage,
due to `$user` substitution or special auth mechanisms.
 2015-09-10 22:09:42 +01:00
Lukas Reschke
fb717f254f Merge pull request #18699 from owncloud/notification-manager 
Notification manager
 2015-09-10 15:26:36 +02:00
Jenkins for ownCloud
0ef7b84d77 [tx-robot] updated from transifex 2015-09-10 01:54:52 -04:00
Morris Jobke
f67a691215 Merge pull request #18895 from owncloud/make-code-analyzers-happier 
Add proper PHPDoc
 2015-09-09 23:40:30 +02:00
Lukas Reschke
46a328a75a Merge pull request #18873 from owncloud/enc_use_master_password 
Allow admin to use a master key for all files
 2015-09-09 17:05:53 +02:00
Jenkins for ownCloud
bf01c3d72a [tx-robot] updated from transifex 2015-09-09 01:54:49 -04:00
Bjoern Schiessle
b2e6d7b5f4 occ command to enable master key 2015-09-08 14:58:42 +02:00
Lukas Reschke
a7f132a964 Add proper PHPDoc 
Makes my IDE happier when going through that file.
 2015-09-08 14:02:30 +02:00