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

8484 commits

Author SHA1 Message Date
Remco Brenninkmeijer
616c5b2681 Corrected (Netbeans?) inserted spaces 2014-07-17 12:48:50 +02: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
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
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
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