Commit Graph

8865 Commits

Author SHA1 Message Date
pzy dc15633111 Update public.php
added tag to make facebook load a preview picture

Update public.php

add check ifMimeSupported and put the thumbsize in a variable

generate preview for all supported mimes
2014-08-07 10:44:07 +02:00
Jenkins for ownCloud 2821f7241b [tx-robot] updated from transifex 2014-08-07 01:55:10 -04:00
Dan Jones 4bbea118c2 fix tiny thumbnails in public preview/share mode 2014-08-06 19:32:21 +01:00
Robin Appelman eb8683e6ee trim leading slash 2014-08-06 14:57:54 +02:00
Robin Appelman 12207ec0c7 Fix SharedCache::getPathById 2014-08-06 13:38:14 +02:00
Thomas Müller 6599dc1b5c Merge pull request #10186 from owncloud/versioning_fix_path
[versioning] make sure that getVersions() return the correct path
2014-08-06 09:30:28 +02:00
Morris Jobke 9fb79c86f0 Merge pull request #10191 from owncloud/sharing_rm_trailing_slash
[sharing] remove trailing slash
2014-08-05 23:13:35 +02:00
Bjoern Schiessle f451173817 remove unused variable 2014-08-05 20:34:18 +02:00
Morris Jobke e15b4d08a6 Disable encryption migration tests 2014-08-05 18:35:53 +02:00
Morris Jobke e717833b07 mark tests as skipped - TODO travis
* swift causes some timeouts and test failures
2014-08-05 18:35:47 +02:00
Bjoern Schiessle 785ae5dc9a add unit test to make sure getVersions returns the correct result 2014-08-05 17:26:23 +02:00
Bjoern Schiessle b7ada5da57 make sure that the versions array contains the correct path 2014-08-05 17:25:55 +02:00
Morris Jobke 676fa459d7 Minor fixes
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
2014-08-05 16:53:28 +02:00
Morris Jobke c83c90342e Merge pull request #10168 from owncloud/parallel-download-on-public-shared-folder-master
close session right before the download starts - this enables parallel d...
2014-08-05 14:54:44 +02:00
Arthur Schiwon 7fd7706542 Hack to avoid Agent DN + Password being overwritten by some ugly browsers with stored site credentials
Conflicts:
	apps/user_ldap/css/settings.css
2014-08-05 12:14:29 +02:00
Thomas Müller b68275baba close session right before the download starts - this enables parallel downloads 2014-08-05 11:21:42 +02:00
Jenkins for ownCloud 5ecbc27753 [tx-robot] updated from transifex 2014-08-05 02:05:17 -04:00
Jenkins for ownCloud 5a2952e2eb [tx-robot] updated from transifex 2014-08-04 01:54:39 -04:00
Jenkins for ownCloud d1aaa7a12e [tx-robot] updated from transifex 2014-08-02 01:54:33 -04:00
Robin Appelman 73607e5d16 Only load personal external storages for allowed backends 2014-08-01 17:15:46 +02:00
Robin Appelman 4886c8582d Merge pull request #9529 from helmutschneider/fix-8326
Fixes #8326: deletion of directories on S3
2014-08-01 14:04:21 +02:00
Morris Jobke 6cbfe8fd98 Merge pull request #10067 from owncloud/fix-#9119
Quick fix for #9119. Increase preview to keep empty message more centered
2014-08-01 09:25:15 +02:00
Jenkins for ownCloud 86cdfa3db3 [tx-robot] updated from transifex 2014-08-01 01:54:28 -04:00
Jörn Friedrich Dreyer dc6180427c Merge pull request #10048 from owncloud/fix_search_in_shared_files
traverse folders in php to search in shared files
2014-07-31 18:27:47 +02:00
Jörn Friedrich Dreyer 1af436cb59 add test for search() in shared cache 2014-07-31 15:07:49 +02:00
Jörn Friedrich Dreyer a7b4cd77b1 traverse folders in php to search in shared files 2014-07-31 12:05:29 +02:00
Thomas Müller 4eb2b4e1b0 Merge pull request #10051 from owncloud/preview-empty-text
Use svg mimeicons for empty text files
2014-07-31 11:38:29 +02:00
Jenkins for ownCloud c1562057e8 [tx-robot] updated from transifex 2014-07-31 01:55:01 -04:00
Remco Brenninkmeijer a1b5bc8684 Quick fix for #9119. Increase preview to keep empty message more centered and push footer down. 2014-07-30 22:41:17 +02:00
Jan-Christoph Borchardt 8389ff5875 Merge pull request #10054 from owncloud/dont_preload_videos
don't preload videos on public sharing, fixes #10042
2014-07-30 21:10:57 +02:00
Morris Jobke 62b37fbb99 Merge pull request #10024 from owncloud/preview-restrict-height
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 17:22:20 +02:00
Georg Ehrke 3d0bcb7c46 don't preload videos on public sharing, fixes #10042 2014-07-30 17:06:41 +02:00
Robin Appelman 4a9b0d5465 Use svg mimeicons for empty text files 2014-07-30 16:31:37 +02:00
Bjoern Schiessle 1a797f90bb add unit test for rename and copy operation 2014-07-30 15:14:01 +02:00
Bjoern Schiessle dba2574c52 make sure that we always find all versions 2014-07-30 15:14:01 +02:00
Bjoern Schiessle c738f71657 make the versions and encryption app aware of the copy operation 2014-07-30 15:14:01 +02:00
Robin Appelman c066320208 Also keep maxY into account when scaling a preview while preserving aspect ratio 2014-07-30 13:52:40 +02:00
Björn Schießle 2946a63f6b Merge pull request #9721 from owncloud/enc_define_type_in_pre_hook
[encryption] define type in pre hook
2014-07-29 16:29:28 +02:00
Björn Schießle f7d60f1190 Merge pull request #9951 from owncloud/enc_inproved_error_messages
show a warning in the personal settings and admin settins if the encyption keys are not initialized
2014-07-29 16:27:24 +02:00
Björn Schießle 03f7c5c561 Merge pull request #9983 from owncloud/sharing_add_unshare_to_overview
update attributes for share-with-user view
2014-07-29 14:00:57 +02:00
Jenkins for ownCloud 29a3f1e2af [tx-robot] updated from transifex 2014-07-29 09:16:02 +02:00
Bjoern Schiessle aff948925a update attributes for share with user list, file should always have delete permissions, this means unshare in this context, and the overview page is always a root view 2014-07-28 22:04:13 +02:00
Björn Schießle c53b56e313 Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date
[share api] add OCS api call to set expire date for link shares
2014-07-28 17:28:32 +02:00
Jan-Christoph Borchardt 13ca1c6a99 Merge pull request #9585 from owncloud/design-fix-public-footer
move public page footer rules from sharing app to core so it is used by other apps too
2014-07-28 12:53:29 +02:00
Bjoern Schiessle b7958f79c3 adjust error code 2014-07-28 12:39:22 +02:00
Bjoern Schiessle de4233bc1c show a warning in the personal settings and admin settins if the encyption keys are not initialized 2014-07-28 11:31:06 +02:00
Jenkins for ownCloud a169572223 [tx-robot] updated from transifex 2014-07-28 01:54:30 -04:00
Jenkins for ownCloud 9a4d2871eb [tx-robot] updated from transifex 2014-07-27 01:54:31 -04:00
Jenkins for ownCloud 010732019a [tx-robot] updated from transifex 2014-07-26 01:54:40 -04:00
Bjoern Schiessle ecc1f92bb6 add OCS api call to set expire date for link shares 2014-07-25 13:38:18 +02:00
Björn Schießle 40f2a34be1 Merge pull request #9867 from owncloud/fix_sharing_update
fix sharing update, add proper escaping
2014-07-25 10:16:22 +02:00
Jenkins for ownCloud 3f58d949e0 [tx-robot] updated from transifex 2014-07-25 01:54:32 -04:00
Bjoern Schiessle c22b5c7884 fix sharing update, add proper escaping 2014-07-24 20:16:40 +02:00
Morris Jobke fa333c02a0 Merge pull request #9703 from owncloud/files-preview-animate
[OC 7] Fix preview animation on uploading
2014-07-24 14:19:00 +02:00
Jean-Louis Dupond 71f3326035 Fix memberOf detection. Fixes: #9835 2014-07-24 14:18:41 +02:00
Jenkins for ownCloud e2327f83ed [tx-robot] updated from transifex 2014-07-24 01:54:37 -04:00
Robin Appelman 97de7bb23e Fix remote share when remote server is installed at the root 2014-07-23 13:45:56 +02:00
Bjoern Schiessle ffa6b33047 add unit test for aes256/aes128 2014-07-23 12:14:02 +02:00
Bjoern Schiessle de9d3797ff update existing unit tests 2014-07-23 12:14:02 +02:00
Bjoern Schiessle 4bbdcfbccf support aes 256 2014-07-23 12:14:01 +02:00
Vincent Petry 5565eabb81 Merge pull request #9683 from owncloud/fix_#8819_sorting
Fix #8819 sorting
2014-07-22 10:11:00 +02:00
Jenkins for ownCloud 5696a88fc3 [tx-robot] updated from transifex 2014-07-22 01:54:29 -04:00
Remco Brenninkmeijer 319caa7089 Sorting triangles pointing up for ascending, down for descending 2014-07-21 23:07:52 +02:00
Jenkins for ownCloud ddd8eae932 [tx-robot] updated from transifex 2014-07-21 01:54:30 -04:00
Jenkins for ownCloud ddc85a9871 [tx-robot] updated from transifex 2014-07-20 01:54:40 -04:00
Jenkins for ownCloud d09ec36751 [tx-robot] updated from transifex 2014-07-19 01:54:42 -04:00
Vincent Petry c8a2418815 Merge pull request #9720 from owncloud/sftp-stream-wrapper-new-connection
Pass existing Net_SFTP object into Net_SFTP_Stream.
2014-07-18 19:19:33 +02:00
blizzz 1d520108c5 Merge pull request #9576 from owncloud/bcmath-check
LDAP Active Directory Primary Groups support depends on bcmath module
2014-07-18 19:15:36 +02:00
Andreas Fischer a27753dd80 Pass existing Net_SFTP object into Net_SFTP_Stream. 2014-07-18 15:47:13 +02:00
Bjoern Schiessle b5cb1cfe4e define type in pre hook 2014-07-18 14:34:04 +02:00
blizzz 6c28c9b141 Merge pull request #9718 from owncloud/sftp-early-login
SFTP: login() must be called after getServerPublicHostKey().
2014-07-18 13:34:28 +02:00
Jenkins for ownCloud 80983f5853 [tx-robot] updated from transifex 2014-07-18 01:54:43 -04:00
Remco Brenninkmeijer 3ebcc29ee3 Before I get spanked ;) 2014-07-17 21:31:54 +02:00
Remco Brenninkmeijer d0cd4d5ad9 Adjusted tests for new default sorting 2014-07-17 20:27:55 +02:00
Remco Brenninkmeijer 4f747aaa7a While busy cleaning, also removed extra enters 2014-07-17 13:05:58 +02:00
Remco Brenninkmeijer 616c5b2681 Corrected (Netbeans?) inserted spaces 2014-07-17 12:48:50 +02:00
Vincent Petry 7a1048956f Fix preview animation on uploading
When adding/uploading files, the preview is now animated.
When loading a list of files directly the preview is displayed directly.
2014-07-17 12:42:09 +02:00
Bjoern Schiessle 78b13de4bf check that the file proxies are enabled after each test 2014-07-17 11:22:22 +02:00
Bjoern Schiessle 6e447b6724 update keys recursively if a folder was moved 2014-07-17 11:22:22 +02:00
Jenkins for ownCloud b736864e78 [tx-robot] updated from transifex 2014-07-17 01:55:09 -04:00
Remco Brenninkmeijer e307572e8d Fixed comments from PVince81 2014-07-16 22:53:14 +02:00
Remco Brenninkmeijer c8c00d27c4 Cleanup of unnecesary addition 2014-07-16 22:08:03 +02:00
Remco Brenninkmeijer 742589fe01 Show sorting icons when hovering over 2014-07-16 21:52:08 +02:00
Vincent Petry 7a43c623ae Merge pull request #9653 from owncloud/fix-9590
external storage table layout fixes
2014-07-16 16:52:08 +02:00
Björn Schießle cbf3e2b829 Merge pull request #9662 from owncloud/enc_error_handling_master
[encryption] improved error handling
2014-07-16 15:31:20 +02:00
Robin McCorkell ec2686db91 Merge pull request #9647 from owncloud/files_external_multiuser_tests
Add unit test for multi-user configuration loading
2014-07-16 13:42:12 +01:00
Morris Jobke 454d8d9362 Merge pull request #9664 from owncloud/enc-removelegacytests
[OC8] Removed legacy encryption tests
2014-07-16 14:39:48 +02:00
Morris Jobke 384be680be fix CSS coding style 2014-07-16 14:30:58 +02:00
Vincent Petry 5a33c9c360 Removed legacy encryption tests 2014-07-16 12:38:41 +02:00
Bjoern Schiessle 8105f2ac8a introduce some encryption exceptions and catch additional error cases 2014-07-16 12:36:30 +02:00
Bjoern Schiessle de69c05f99 make sure that the crypt library is loaded 2014-07-16 12:10:52 +02:00
Vincent Petry 658828867c Correctly return the owner display name for children of shares 2014-07-16 12:07:02 +02:00
Jenkins for ownCloud 0155326227 [tx-robot] updated from transifex 2014-07-16 01:55:55 -04:00
Stephane V 934229d1fb Fix #9590. Fix #9612.
For external storage with lots of parameter settings (>4), wrap the content of the cell to let a full view of the parameters.
The rows of the table are now always visible until the end (the trash icon is accessible).
(Note : A strange 3px margin forces me to add a class on the row added by javascript, to be able to align them with the rows rendered by the server.)
2014-07-15 22:33:30 +02:00
Robin McCorkell 483f86513f Add unit test for multi-user configuration loading 2014-07-15 18:39:09 +01:00
icewind1991 bf657883d2 Merge pull request #9639 from owncloud/prevent-irc-trolls-fro-using-this
Add warning because there are people that enable this app because they think it's the WebDAV implementation of ownCloud
2014-07-15 17:28:17 +02:00
Vincent Petry a8d95356ca Merge pull request #8987 from owncloud/lastindexid-debug
[DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL
2014-07-15 17:01:57 +02:00
Lukas Reschke bebecc6bbf Update info.xml 2014-07-15 15:35:02 +02:00
Bjoern Schiessle 40fe1275de throw exception if file is to large for trash bin 2014-07-15 13:56:02 +02:00
blizzz 0ce8f85bae Merge pull request #9570 from PhilJung/master
[Issue #9559] identifiers uid=xxx must be considered as user DN and not ...
2014-07-15 11:43:31 +02:00
Morris Jobke 4c0ca27909 Merge pull request #9596 from owncloud/fixing-9503-master
reduce share action text to the user name only
2014-07-15 09:15:32 +02:00
Jenkins for ownCloud ff11ef3c5b [tx-robot] updated from transifex 2014-07-15 01:55:20 -04:00
Philippe Jung c13cb6145b File written by blizzz 2014-07-14 22:21:56 +02:00
Thomas Müller 7159d6118e reduce share action text to the user name only 2014-07-14 21:11:50 +02:00
Vincent Petry 10a29556b0 - Added test to trigger index id error
- re-enable encryption migration tests
- sqlite requires reconnect after schema changes
2014-07-14 16:20:09 +02:00
Björn Schießle 45c3a948b9 Merge pull request #9572 from owncloud/deleteunsharetooltip
mountType attribute + delete hint fix
2014-07-14 11:50:19 +02:00
Vincent Petry 8cad574379 Merge pull request #9605 from owncloud/sftp-missing-streamwrapper
Re-add missing sftp:// stream wrapper
2014-07-14 11:45:35 +02:00
Vincent Petry dd7529da98 Added mountType attribute and adapted Delete action text
Added mountType attribute for files/folder to indicated whether they are
regular, external or shared.

The client side then adapts the "Delete" action hint text based on this
information.

Only the mount roots must have the delete icon hint adapted.
To make this detectable on the client side, the mountType can now
be null, "shared", "shared-root", "external" or "external-root".

This also gives room to icon customization on the client side.
2014-07-14 10:36:04 +02:00
Jenkins for ownCloud 5dd76b510f [tx-robot] updated from transifex 2014-07-14 01:54:27 -04:00
Morris Jobke ec3224aab9 Merge pull request #9563 from owncloud/version-delete-cache
Remove deleted versions from the cache
2014-07-13 18:14:14 +02:00
Jenkins for ownCloud d7b8e3209b [tx-robot] updated from transifex 2014-07-13 01:54:35 -04:00
Andreas Fischer e18c8f23df login() must be called after getServerPublicHostKey(). 2014-07-12 20:41:35 +02:00
Andreas Fischer d02604b3fb Add short description explaining how SFTP ext storage class works. 2014-07-12 13:58:49 +02:00
Andreas Fischer c8024934c0 The file providing the sftp:// scheme needs to be included manually. 2014-07-12 13:57:27 +02:00
Jenkins for ownCloud c1e95d62ec [tx-robot] updated from transifex 2014-07-12 01:54:39 -04:00
Vincent Petry 9fa28aa3f4 Disable legacy encryption tests
It seems these tests are not needed any more, but will now be skipped
instead until the case is cleared out.
2014-07-11 15:20:58 +02:00
Arthur Schiwon 537468f4c4 make tests deal with missing bcmath 2014-07-11 14:08:19 +02:00
Arthur Schiwon ebee3543ce warn and continue gracefully if bcmath is not installed 2014-07-10 21:26:31 +02:00
Thomas Müller b8c2e644cc remove pointless require of Blowfish.php 2014-07-10 16:42:21 +02:00
Vincent Petry e391108ebc Merge pull request #9538 from owncloud/fileactions-cleanup
Propagate file action changes to the file lists
2014-07-10 16:15:23 +02:00
Robin Appelman aab33b8b0e Remove deleted versions from the cache 2014-07-10 15:19:40 +02:00
Philippe Jung 79a108c116 [Issue #9559] identifiers uid=xxx must be considered as user DN and not as owncloud users 2014-07-10 14:27:31 +02:00
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
Johan Björk ac75a24597 Converted an array to PHP5.3 compatible version 2014-07-09 14:54:03 +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
Johan Björk e44a7aa034 Fixes #8326: deletion of directories on S3 2014-07-08 22:41:11 +02: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
Remco Brenninkmeijer 1a65d09f70 Changed default sorting except for names. 2014-07-08 19:52:28 +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
Jan-Christoph Borchardt 498adda0f4 move public page footer rules from sharing app to core so it is used by other apps too 2014-07-07 12:21:48 +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
Jenkins for ownCloud a878b42b42 [tx-robot] updated from transifex 2014-07-01 01:54:43 -04:00
Björn Schießle f3973c1c20 Merge pull request #9240 from owncloud/enc_check_if_file_exists
[encryption] check if file still exists before removing encryption keys
2014-06-30 21:23:59 +02:00
Jan-Christoph Borchardt 07ba9442db Merge pull request #9305 from owncloud/design-share-fixes
Design share fixes
2014-06-30 18:46:37 +02:00
Jan-Christoph Borchardt 24277f0dd6 change 'Cancel upload' text to x icon for more space in breadcrumbs bar 2014-06-30 18:20:35 +02:00
Bjoern Schiessle 618c9fd033 improved error message 2014-06-30 16:28:40 +02:00
Robin Appelman 30c240a145 If loading a directory fails, navigate back to the previous directory 2014-06-30 16:27:31 +02:00
Robin Appelman 4526bc0ba6 Handle StorageNotAvailableException in ajax/list.php 2014-06-30 16:12:12 +02:00
Jörn Friedrich Dreyer f35f14aa37 Merge pull request #9303 from owncloud/issue/8841
Do not strict compare item source id so the dropdown is closed correctly
2014-06-30 14:46:46 +02:00
Joas Schilling 5e4ac548bb Use attr() instead of data() so the item ids work as intended
Fix #8841
2014-06-30 14:21:27 +02:00
Jan-Christoph Borchardt a4c693dd75 remove obsolete CSS, fix visual bug in share dialog #9255 2014-06-30 14:00:43 +02:00
Bjoern Schiessle 372d58544f no longer check if the external storage app is enabled, we use no the webdav implementation from core 2014-06-30 12:34:49 +02:00
Vincent Petry 8977a68548 Use filtered list for ext storage list mounts API
Now the external storage correctly returns the mount points visible only
for the current user by using the method getAbsoluteMountPoints() which
is already filtered.

Since that call was missing the backend name which is important for the
UI, this one was added as well.
2014-06-30 12:33:11 +02:00
Jenkins for ownCloud 589f68ebf6 [tx-robot] updated from transifex 2014-06-30 01:54:47 -04:00
Jenkins for ownCloud ebf93448f2 [tx-robot] updated from transifex 2014-06-29 01:56:00 -04:00
Volkan Gezer d918e5a68c Merge pull request #9278 from owncloud/l10n-servershare-dialog
fix server share dialog title
2014-06-28 14:44:37 +02:00
Morris Jobke d5462fdb50 Merge pull request #9265 from owncloud/fix-whitespace
fix trailing whitespace noted by Scrutinizer
2014-06-28 12:26:09 +02:00
Morris Jobke cec20d5049 Merge pull request #9020 from owncloud/l10n-external-errors-fix
some strings to localize external mount api responses. fix #8094
2014-06-28 11:40:32 +02:00
Jenkins for ownCloud 26d0978993 [tx-robot] updated from transifex 2014-06-28 01:54:54 -04:00
Volkan Gezer 11788c9579 fix server share dialog title 2014-06-28 01:54:51 +02:00
Bjoern Schiessle 1004836fd3 unit tests 2014-06-27 23:09:31 +02:00
Bjoern Schiessle e4c45b5e26 check if file exists before deleting keys, and add debug output for every
delete operation
2014-06-27 23:09:31 +02:00
Bjoern Schiessle 706a8ace58 normalize path before comparison to make sure that we always find the mount point 2014-06-27 22:53:26 +02:00
Arthur Schiwon fe0b75ccab also adapt result check from readAttribute 2014-06-27 20:09:16 +02:00
icewind1991 1a3e698294 Merge pull request #9263 from owncloud/remote-share-update
Better detecting of remote changes for external shares
2014-06-27 19:31:18 +02:00
Arthur Schiwon ef7ab856f6 fix instantiation of Access class 2014-06-27 18:49:11 +02:00
Arthur Schiwon df7678f01e specify no attribute for group exists check, as done with users 2014-06-27 18:49:11 +02:00
Jan-Christoph Borchardt b7cb4f5a63 fix trailing whitespace noted by Scrutinizer 2014-06-27 18:25:56 +02:00
Vincent Petry 7a1b45c43b Merge pull request #9260 from owncloud/fileactions-lateregisterinpublicpage
Allow late registration of file actions in public page
2014-06-27 18:00:32 +02:00
Jan-Christoph Borchardt a18658fa7f Merge pull request #9256 from owncloud/design-mobile-shared
show share action of shared items darker to distinguish from non-shared,...
2014-06-27 17:59:48 +02:00
Morris Jobke 44e1bfb0ea Merge pull request #9259 from owncloud/fix-rename-icon
fix rename icon, fix #9257
2014-06-27 17:41:23 +02:00
Robin Appelman 1bb1504d24 Improve comment 2014-06-27 17:31:51 +02:00
Robin Appelman 6f5d5b9a30 Also check for updated permissions for webdav storages 2014-06-27 17:27:47 +02:00
Vincent Petry fd8b5680dd Merge pull request #8383 from owncloud/object_storage
Object storage
2014-06-27 16:53:03 +02:00
Vincent Petry 0ff30a7d5e Remove missed console.log in file list 2014-06-27 16:10:37 +02:00
Vincent Petry 13b7937381 Allow late registration of file actions in public page 2014-06-27 16:10:20 +02:00
Jan-Christoph Borchardt e33fa226cd fix rename icon, fix #9257 2014-06-27 15:53:32 +02:00
Jan-Christoph Borchardt b86b7fd143 show share action of shared items darker to distinguish from non-shared, fix #8898 2014-06-27 15:39:54 +02:00
Morris Jobke 3b2fd5e4e6 Merge pull request #9254 from owncloud/fileactions-deferred
Sync file list with file actions
2014-06-27 15:03:21 +02:00
Jan-Christoph Borchardt b975f0e718 Merge pull request #9174 from owncloud/breadcrumbfix
Breadcrumb width calculation fix
2014-06-27 13:51:18 +02:00
Vincent Petry 586b3a9683 Sync file list with file actions
Whenever file actions are registered later, now the file lists are
automatically notified.

Added FileActions.addUpdateListener() to be able to receive such
notifications.

This removes the need for apps to manually call FileActions.display()
after registering new actions.

This fixes issues with race conditions when file actions are
registered after the file list was already rendered.
2014-06-27 13:41:01 +02:00
Thomas Müller 4d6019b73f Merge pull request #9247 from owncloud/move-webdav-class-to-core-master
Move webdav class to core master
2014-06-27 12:59:59 +02:00
Vincent Petry 4b5bf606cb Merge pull request #9215 from owncloud/officemimetypesupdatefix
Office mime types update fix
2014-06-27 11:23:19 +02:00
Vincent Petry ec4cf96f0d Breadcrumb width calculation fix
Rewrote the breadcrumb calculation to be more readable.

Breadcrumb now has a setMaxWidth() method to set the maximum allowed
width which is used to fit the breadcrumbs.

The breadcrumb width is now based on the container width, passed through
setMaxWidth() by the FileList class.

Now using fixed widths for the test crumbs to simulate consistent
widths across browsers which rendering engines might usually yield
different results.
2014-06-27 11:11:34 +02:00
Thomas Müller ef4057d382 remove pointless require - we should kill all require_once like that in our tests 2014-06-27 09:30:42 +02:00
Thomas Müller 171475b95a fix autoloader 2014-06-27 08:52:40 +02:00
Thomas Müller c745240543 Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies 2014-06-27 08:52:28 +02:00
Jenkins for ownCloud 36f771e9f0 [tx-robot] updated from transifex 2014-06-27 01:55:44 -04:00
Morris Jobke d9aa8c9f0e drop unneeded code 2014-06-27 00:30:14 +02:00
Frank Karlitschek 2daffbc44e Merge pull request #9051 from owncloud/Bagera-master
Fix delete action height
2014-06-26 17:48:55 -04:00
icewind1991 1b1bebdcb2 Merge pull request #9236 from owncloud/sharing-settingswording
Fix wording for remote shares in settings page
2014-06-26 22:56:46 +02:00
Vincent Petry c6b89cc55a Fix wording for remote shares in settings page 2014-06-26 19:35:57 +02:00
Raghu Nayyar 5b189315b5 Merge pull request #9234 from owncloud/fix-ellipsis-for-folders
Fix ellipsis for folders on mobile screens
2014-06-26 22:45:40 +05:30
Vincent Petry 8526556110 Merge pull request #9206 from owncloud/occ-scan-user
Prevent running the files:scan command as the wrong user
2014-06-26 17:03:23 +02:00
icewind1991 46adf8cb19 Merge pull request #9223 from owncloud/occ-scan-arguments
Add error message when no users specified to files:scan command
2014-06-26 17:01:39 +02:00
Morris Jobke cbd5e31d33 fix padding for last cell in summary of trashbin 2014-06-26 16:58:49 +02:00
Morris Jobke 9eb7ed4925 Fix ellipsis for folders on mobile screens
* fixes #9162
2014-06-26 16:37:34 +02:00
Björn Schießle aabee3e4b0 Merge pull request #9171 from owncloud/enc_always_use_oc_view
[encryption] always use oc view
2014-06-26 15:11:08 +02:00
Vincent Petry fd04b3070f Add error message when no users specified to files:scan command 2014-06-26 11:58:38 +02:00
Björn Schießle 1822bba5e9 Merge pull request #9193 from owncloud/sharing_etag_propagation
make sure that the etags get propagated correctly
2014-06-26 10:26:24 +02:00
Jenkins for ownCloud a5154450cf [tx-robot] updated from transifex 2014-06-26 01:54:40 -04:00
Vincent Petry 93a6792da7 Merge pull request #9205 from owncloud/remoteshare-fixurlpath
Fix parsing of remote URL when mounting remote shares
2014-06-25 19:59:39 +02:00
Vincent Petry b1e778d5fd Moved office mimetype update to a repair step 2014-06-25 19:49:18 +02:00
Jörn Friedrich Dreyer 42e9d49d72 update files_external swift to php-opencloud v1.9.2 2014-06-25 17:15:59 +02:00
Morris Jobke a9d0e9a5d5 Merge pull request #9202 from owncloud/urlhashfix
Do not clear URL hash when no external mount params given
2014-06-25 16:28:52 +02:00
Robin Appelman 9a2ed86672 Prevent running the files:scan command as the wrong user 2014-06-25 15:22:49 +02:00
Bjoern Schiessle 38ff8173ab make sure that hooks are registered for the tests 2014-06-25 15:20:52 +02:00
Vincent Petry d22559200c Fix parsing of remote URL when mounting remote shares
This fix allows for having the remote ownCloud instance live in a
subpath like "http://example.com/basedir/subdir/owncloud".
Such URLs are now parsed correctly.

Added unit test for URL parsing.
2014-06-25 15:11:43 +02:00
icewind1991 c94c69aea1 Merge pull request #9189 from owncloud/sharing_fix_permissions
Sharing fix permissions
2014-06-25 15:01:34 +02:00
Jörn Friedrich Dreyer e792d38c11 remove rackspace opencloud libs from files_external 3rdparty 2014-06-25 14:54:43 +02:00
Bjoern Schiessle d3d1955ef4 fix unit tests 2014-06-25 12:38:26 +02:00
Jenkins for ownCloud b1116880f8 [tx-robot] updated from transifex 2014-06-25 06:33:53 -04:00
Bjoern Schiessle 3d0805f27d always use a \OC\Files\View 2014-06-25 12:27:30 +02:00
Bjoern Schiessle 709691548d always use oc filesystem for rename operation 2014-06-25 12:27:30 +02:00
Vincent Petry 363f8f3205 Do not clear URL hash when no external mount params given
Whenever external share parameters were passed through the URL hash, the
URL hash will now be cleared.

In other cases, the hash needs to be left alone because it is used as
workaround for the lack of history API in IE8 / IE9

Removed getParamterByName() and use OC.Util.History.parseUrlQuery() that
does the same, including replacing the "+" with spaces.
2014-06-25 12:24:46 +02:00