Commit Graph

8538 Commits

Author SHA1 Message Date
Vincent Petry 480f5ddda3 Merge pull request #9516 from owncloud/kill-legacy-encryption-oc8
[OC8] Kill legacy encryption migration
2014-07-10 14:01:06 +02:00
Jenkins for ownCloud 77792b5b7e [tx-robot] updated from transifex 2014-07-10 04:59:40 -04:00
Vincent Petry b63e646053 Merge pull request #9460 from owncloud/versions-local
Dont assume local home storage for files_version
2014-07-10 10:28:24 +02:00
Vincent Petry 22653e21a2 Propagate file action changes to the file lists
Whenever an app needs to register an event late, it does that on the
original file actions object.

Since the file actions that the file list work on is a merged list, not
the original one, the registration event needs to be propagated there as
well.
2014-07-09 12:26:33 +02:00
Jenkins for ownCloud 6e2e0108ee [tx-robot] updated from transifex 2014-07-09 01:55:51 -04:00
blizzz 51ee4fc5df Merge pull request #9385 from owncloud/fix-7052
support for AD primary groups
2014-07-08 21:33:50 +02:00
Arthur Schiwon da490bdbbe support for AD primary groups
support for primary groups

actually the problem is only known on AD, it is only needed to take care of their attributes

adjust to ADs special behaviour

this change was not intended

cache the SID value so it is not requested over and over again

theres only one, use singular

we are access

add tests for new Access methods

add tests for new Group methods

address scrutinizer findings, mostly doc

call ldap_explode_dn from ldap wrapper, enables tests without php5-ldap

PHP Doc

yo dawg, i heard you like backslashes … php doc fix

PHPDoc updated and typos fixed while reviewing
2014-07-08 21:32:21 +02:00
Vincent Petry 87adbf1c6e Merge pull request #9515 from owncloud/update-sharecleanupfix
Fix update cleanup to only affect file and folders
2014-07-08 18:09:26 +02:00
Thomas Müller 10978a80c2 Merge pull request #9507 from owncloud/fix-9302-master
Upload abortion is now detected within the  OC_Connector_Sabre_File::put...
2014-07-08 17:39:34 +02:00
Arthur Schiwon 3338a0f236 port of #9500
don't trigger update from checkPassword, it is already  called by userExists, this is enough.

do not write to database when the value is the same

add test cases. also split test classes in a file each, looks like only the first class is being executed

also appconfig shall not write to database if the value is unchanged
2014-07-08 16:32:01 +02:00
Vincent Petry f4f52cf242 Fix update cleanup to only affect file and folders
Fix bug in the SQL query that cleans up stray shares for removed
files/folders, which is now correctly limited to that item type instead
of also removing all other share types.
2014-07-08 14:53:31 +02:00
Thomas Müller 064ac77e44 Kill legacy encryption migration 2014-07-08 13:07:05 +02:00
Thomas Müller ea269f0067 Upload abortion is now detected within the OC_Connector_Sabre_File::put()
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless

Adding unit test testUploadAbort()
2014-07-08 11:09:59 +02:00
Christopher T. Johnson 599ab7a802 Fix Signiture Does Not Match when mounting Amazon S3 external storage
For some reason the aws-sdk-php package does not caclulate the
signiture correctly when accessing an object in a bucket with a name of
'.'.

When we are at the top of a S3 bucket there is a need(?) to have a directory
name.  Per standard Unix the name picked was '.' (dot or period).  This
choice exercises the aws-sdk bug.

This fix is to add a field to the method to store the name to use instead of
'.' which at this point is hard coded to '<root>'.  We also add a private
function 'cleanKey()' which will test for the '.' name and replace it with
the variable.  Finally all calls to manipulate objects where the path is
not obviously not '.' are processed through cleanKey().

An example where we don't process through clean key would be
	'Key' => $path.'/',

Use correct relationship operator

Per feed back use === instead of ==

use '/' instead of '<root>'
2014-07-08 10:16:48 +02:00
Jenkins for ownCloud 20fc4b8b53 [tx-robot] updated from transifex 2014-07-08 01:55:17 -04:00
Vincent Petry 5506f9dc81 Merge pull request #9495 from owncloud/remove-moved-mount
When changing the mountpoint of an external storage, ensure the old one ...
2014-07-07 23:23:04 +02:00
Morris Jobke 45a4751f0e Merge pull request #9499 from owncloud/shares-hidetokenrecipient
Do not show recipient for link shares in file list
2014-07-07 20:02:59 +02:00
Morris Jobke 29bdfc0ce2 Merge pull request #9502 from owncloud/add_ocsids
Add ocsids for shipped apps in core repo
2014-07-07 19:58:41 +02:00
Morris Jobke 54a8dce380 Merge pull request #9415 from owncloud/external-sharedialog
Improved external share dialog
2014-07-07 19:51:54 +02:00
Georg Ehrke e5e8e28ae7 add ocsids to info.xml 2014-07-07 17:11:50 +02:00
Vincent Petry 4ba492f28d Fixed shared list sorting
Use Array.sort instead of underscore's sortBy() as they don't use the
same method/function signature.
2014-07-07 16:49:32 +02:00
Vincent Petry 8ddff52c51 Do not show recipient for link shares in file list
In the "Shared with link" section, the share_with field can contain a
value when a password was set.

This fix prevents this value to be shown as it is not intended for the
end user.
2014-07-07 16:33:23 +02:00
Vincent Petry 130b8018a1 Improved external share dialog
Changed title, label and buttons.
Removed icon.
2014-07-07 15:57:26 +02:00
Robin Appelman 18572b2367 Dont delete versions as local files 2014-07-07 15:49:08 +02:00
Robin Appelman 128c226063 When changing the mountpoint of an external storage, ensure the old one is removed 2014-07-07 15:40:01 +02:00
Jenkins for ownCloud 6e9905d7cf [tx-robot] updated from transifex 2014-07-07 01:54:28 -04:00
Frank Karlitschek a468687682 Merge pull request #9453 from owncloud/enc_fix_wrong_file_size
[encryption] always take unencrypted size
2014-07-06 10:38:06 -04:00
Jenkins for ownCloud 33492b4448 [tx-robot] updated from transifex 2014-07-06 01:54:33 -04:00
Jenkins for ownCloud 23e0ef6ed0 [tx-robot] updated from transifex 2014-07-05 01:56:33 -04:00
Björn Schießle a544bd3a0f Merge pull request #9357 from owncloud/sharing_unshare_on_delete
[sharing] unshare childrens on delete
2014-07-04 17:42:52 +02:00
Bjoern Schiessle 5397101e1c improved unit tests 2014-07-04 17:37:35 +02:00
Bjoern Schiessle ddac446c5b always take unencrypted size 2014-07-04 16:44:50 +02:00
icewind1991 d3fab824f7 Merge pull request #9445 from owncloud/filelist-auth-error
Reload the page when the files app encounters an authentication error
2014-07-04 16:39:00 +02:00
Robin Appelman 4fe1cdd2a7 Add machine readable error messages to OC\JSON
Reload the files app in case of authentication errors, expired tokens or disabled app

Reloading will triger the full server side handeling of those errors

formatting

fix missing semicolon + some jshint warnings
2014-07-04 16:20:27 +02:00
Morris Jobke 574cb15c2d Merge pull request #9434 from owncloud/files-reloadpromiseissue
Fix reload call for all subclasses
2014-07-04 16:13:33 +02:00
Thomas Müller 2327d41b11 Merge pull request #9269 from owncloud/fix_versions_preview
change order of registering api and capabilities to fix file version previews
2014-07-04 15:25:24 +02:00
Morris Jobke aae118890a Merge pull request #9440 from owncloud/files-fileactionsdeepcopy
Fix FileActions merging override
2014-07-04 14:49:00 +02:00
Morris Jobke 3d13e04170 Merge pull request #9426 from owncloud/design-remoteshare-confirm
use icon-confirm instead of text for accepting remote share, works better with translations
2014-07-04 14:13:44 +02:00
Vincent Petry 07118f599e Fix FileActions merging override
When merging FileActions, the register() functio needs to correctly
override the previously merged action handler without affecting the
original one.
2014-07-04 12:56:04 +02:00
Bjoern Schiessle 673b0f5eb9 add owner as parameter for delShareKey 2014-07-04 12:19:59 +02:00
Vincent Petry 59ca30d462 Fix reload call for all subclasses
All subclasses must also properly return the ajax call object.
2014-07-04 11:45:36 +02:00
Vincent Petry 5e8959a5b3 Return and use isPreviewAvailable for share previews
Since the mime type is known, now isPreviewAvailable is returned as well
and used by the JS side to properly render mime icon and previews.
2014-07-04 11:16:23 +02:00
Bjoern Schiessle e9f5730869 make sure that the umount hook always contains the path relative to data/user/files 2014-07-04 10:34:54 +02:00
Bjoern Schiessle 3b9fa81581 if a folder gets deleted we unshare all shared files/folders below 2014-07-04 10:34:54 +02:00
Morris Jobke ac00e4b6e6 IE8 fixes 2014-07-04 08:13:05 +02:00
Jenkins for ownCloud e4a3f8d3c4 [tx-robot] updated from transifex 2014-07-04 01:56:01 -04:00
Jan-Christoph Borchardt 8e617453e5 use icon-confirm instead of text for accepting remote share, works better with translations 2014-07-04 00:07:24 +02:00
Morris Jobke 3cbea82bd0 Merge pull request #9420 from owncloud/trashbin-hidesummarysize
Hide the size in the trashbin summary row
2014-07-03 17:37:33 +02:00
Morris Jobke c223977794 Merge pull request #9407 from owncloud/fix-share-logo
for shared links, use wide logo on desktop and icon on mobile
2014-07-03 17:33:34 +02:00
Vincent Petry 52248d4d81 Hide the size in the trashbin summary row
This also fixes the extra spacing that appearing on the right of the
table.
2014-07-03 17:16:50 +02:00
Morris Jobke a829d07234 Merge pull request #9403 from owncloud/design-fix-fileslistbottom
Fix bottom of files list, add proper space to have room for dropdowns
2014-07-03 16:40:38 +02:00
Jan-Christoph Borchardt 6c174813b6 Merge pull request #9394 from owncloud/design-fix-rename
fix position of rename function, and text size
2014-07-03 13:44:00 +02:00
Jan-Christoph Borchardt c7101d26db fix checkbox shifting when rename input appears 2014-07-03 13:34:12 +02:00
Jan-Christoph Borchardt e5f68bafb9 for shared links, use wide logo on desktop and icon on mobile 2014-07-03 12:20:44 +02:00
Jan-Christoph Borchardt cee5afa8af reduce file list bottom whitespace a bit 2014-07-03 11:43:59 +02:00
Jan-Christoph Borchardt 6f14034c48 fix left margin of file list summary 2014-07-03 11:40:11 +02:00
Jan-Christoph Borchardt 4c97f2b3af add whitespace to bottom of Files list – more obvious it's the end, and space for share dropdown 2014-07-03 11:36:04 +02:00
Jan-Christoph Borchardt e9f616b0a0 Merge pull request #9391 from owncloud/design-mobile-share
Fix mobile share view glitches
2014-07-03 09:45:19 +02:00
Jenkins for ownCloud 1a1c5aa3c0 [tx-robot] updated from transifex 2014-07-03 01:56:24 -04:00
Jan-Christoph Borchardt e695244f32 fix position of rename function, and text size 2014-07-03 02:08:53 +02:00
Jan-Christoph Borchardt 079fee2c2a Merge pull request #9389 from owncloud/fix-nametext-height
fix nametext height, was higher than the row
2014-07-03 01:09:19 +02:00
Jan-Christoph Borchardt 019e1b1065 Merge pull request #9365 from owncloud/design-controls-polish
Design controls polish
2014-07-03 01:08:15 +02:00
Volkan Gezer bf08e3a85e Merge pull request #9382 from owncloud/server2server-css
fix lineheight of server2server share
2014-07-03 00:39:37 +02:00
Jan-Christoph Borchardt 0df04975b0 use same logo for mobile as for when logged in, fix #9360 2014-07-02 23:33:20 +02:00
Jan-Christoph Borchardt 560c530875 hide text of download button, only show icon 2014-07-02 23:21:06 +02:00
Jan-Christoph Borchardt 0a91c22ebb shared view: remove whitespace glitch on right 2014-07-02 23:14:21 +02:00
Jan-Christoph Borchardt a94130509a fix nametext height, was higher than the row 2014-07-02 22:54:30 +02:00
Volkan Gezer 586c4236fd fix lineheight of server2server share 2014-07-02 21:46:52 +02:00
Vincent Petry ed29e7d160 Merge pull request #9329 from owncloud/sharing_check_target
don't move a share mount point into a different mount point
2014-07-02 21:01:03 +02:00
Vincent Petry f1f66ff686 Merge pull request #9373 from owncloud/design-fix-modified
shade color for modified dates again, fix #9363
2014-07-02 21:00:32 +02:00
Vincent Petry 615d037d3e Merge pull request #9364 from owncloud/sharing_rename_mount_points
[sharing] rename mount point of children if parent was renamed
2014-07-02 18:48:07 +02:00
Vincent Petry f4eb90e229 Merge pull request #9311 from owncloud/storage-not-available
Handle storages not being available in webui and webdav
2014-07-02 18:15:58 +02:00
Morris Jobke b6aeea8c0b simplify formula and add comment 2014-07-02 17:20:56 +02:00
Jan-Christoph Borchardt 053b0a4063 shade color for modified dates again, fix #9363 2014-07-02 16:37:15 +02:00
Jan-Christoph Borchardt 2a9fb130ec make sure table header is white instead of slightly grey 2014-07-02 15:40:52 +02:00
Bjoern Schiessle ea31ab7b5c rename mount point of children if parent was renamed 2014-07-02 15:39:38 +02:00
Morris Jobke d2f3ff5c34 Merge pull request #9245 from owncloud/server2server-sharing-design-fixes
drop unneeded code
2014-07-02 15:34:57 +02:00
Robin Appelman edb67f9f4d Remove invalid mounts from the active fs 2014-07-02 15:00:12 +02:00
Robin Appelman 0008db9995 Fix unit test 2014-07-02 14:39:45 +02:00
Morris Jobke 59629e688c Merge pull request #9341 from owncloud/sharing-fileactions-fix
Fix fileActionsReady event after deferred file actions update
2014-07-02 14:36:59 +02:00
Morris Jobke 456770fde9 Merge pull request #9344 from owncloud/files-scrollissue
Fix files list scroll behavior
2014-07-02 13:26:23 +02:00
Morris Jobke 5e986271ef Merge pull request #9336 from owncloud/fix-version-dropdown
increase width of version dropdown - fixes #9270
2014-07-02 12:04:04 +02:00
Jenkins for ownCloud 9933b33166 [tx-robot] updated from transifex 2014-07-02 01:55:17 -04:00
Vincent Petry 32d2457e58 Fix files list scroll behavior
View container height needs to be accurate and span over the whole
scroll container for infinite scrolling to work properly.
2014-07-01 21:48:06 +02:00
Vincent Petry 025b71d068 Use fileActionsReady to re-render sharing icons
Whenever file actions are modified, either by registering new actions or
when appending a new page of entries, the sharing app is now notified so
it can correctly refresh the sharing icon status.

Additionally, the core's loadIcons() method is also used to load the
existing shares and also refresh the sharing icons afterwards.
2014-07-01 21:32:04 +02:00
Jan-Christoph Borchardt 7760fd4bef add ellipsizing to restore string if text is too long 2014-07-01 20:37:14 +02:00
Bjoern Schiessle bb935978fa don't move a share mount point into a different mount point 2014-07-01 19:38:55 +02:00
Vincent Petry 509cdebab7 Fix fileActionsReady event after deferred file actions update 2014-07-01 18:50:54 +02:00
Vincent Petry fd68034357 Fixed remote share password param detection 2014-07-01 17:34:01 +02:00
Morris Jobke eaf9d6eccc increase width of version dropdown - fixes #9270 2014-07-01 16:17:00 +02:00
Robin Appelman 8339618ead More error catching in list.php 2014-07-01 14:58:17 +02:00
Robin Appelman 8061a4ccc0 Remove external shares if the share is invalid 2014-07-01 14:58:07 +02:00
Vincent Petry 577d06ea4d Merge pull request #9328 from owncloud/extstorage-annoyingwarnings
Fix warnings when personal is not set
2014-07-01 14:51:01 +02:00
Robin Appelman 1c43081d38 Detect removed public shares 2014-07-01 14:36:06 +02:00
blizzz 16ce23d19d Merge pull request #9006 from owncloud/ldap_fix_bgjob
LDAP: fix background job, fixes #8995
2014-07-01 14:28:04 +02:00
Jörn Friedrich Dreyer 12420d08e2 change order of registering api and capabilities to fix file version previews 2014-07-01 14:09:48 +02:00
Vincent Petry 5e6f6da786 Fix warnings when personal is not set 2014-07-01 13:32:57 +02:00
Jörn Friedrich Dreyer abc521dbf7 add missing backticks 2014-07-01 12:29:30 +02:00
Morris Jobke 08e49e9b07 Merge pull request #9313 from owncloud/design-icon-cancel
change 'Cancel upload' text to x icon for more space in breadcrumbs bar
2014-07-01 11:00:17 +02:00
Vincent Petry 19ab6165e7 Merge pull request #9300 from owncloud/extstorage-listfilterfix
Use filtered list for ext storage list mounts API
2014-07-01 09:56:47 +02:00