Commit Graph

11492 Commits

Author SHA1 Message Date
Jenkins for ownCloud e16ac12f5a [tx-robot] updated from transifex 2015-10-12 01:54:59 -04:00
Jenkins for ownCloud d29d018cc7 [tx-robot] updated from transifex 2015-10-11 01:54:58 -04:00
Jenkins for ownCloud 188acd5e4e [tx-robot] updated from transifex 2015-10-10 01:55:32 -04:00
Arthur Schiwon e3a148584a adjust fetchList with a single requested attribute accordingly 2015-10-09 20:07:35 +02:00
Arthur Schiwon d127b3f0d2 adjust tests 2015-10-09 14:30:49 +02:00
Arthur Schiwon 2fddb1367a fix primary group retrieval 2015-10-09 14:12:59 +02:00
Thomas Müller 8cbf76755e Merge pull request #19643 from owncloud/public-download-spinner
Set download cookie on public download
2015-10-09 14:10:29 +02:00
Jenkins for ownCloud 5cb83937fa [tx-robot] updated from transifex 2015-10-09 01:55:02 -04:00
Arthur Schiwon a876efda50 treat dn as any other attribute when building the search() return array 2015-10-08 21:18:34 +02:00
Arthur Schiwon dd2e887a8d adjust handling changed return array structure from search() and fetchList() 2015-10-08 20:32:15 +02:00
Thomas Müller 17ffa4a244 Merge pull request #19414 from owncloud/swift_primary_storage_tests
Swift primary storage tests
2015-10-08 14:08:56 +02:00
Thomas Müller e5bbec79a6 Merge pull request #19611 from owncloud/fix-public-scroll
Fix scrollbars in public template
2015-10-08 13:01:01 +02:00
Vincent Petry 8e84ab8613 Remove sidebar for trashbin view 2015-10-08 12:59:13 +02:00
Vincent Petry ececa90709 Set download cookie on public download 2015-10-08 12:50:56 +02:00
Vincent Petry 5bf43ec60a showTemporary instead of show for notifications 2015-10-08 10:52:39 +02:00
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