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

8770 commits

Author SHA1 Message Date
Robin Appelman
f1091280de Merge pull request #10184 from owncloud/getbyid-node 
Fix Folder::getById
 2014-08-07 13:40:17 +02:00
Jan-Christoph Borchardt
9e6b65fabe Merge pull request #10223 from dannosaur/patch-1 
fix tiny thumbnails in public preview/share mode
 2014-08-07 12:36:57 +02:00
Thomas Müller
8b2fe69bb2 Merge pull request #10218 from owncloud/pzy-master 
Adding link tag to enable facebook timeline previews
 2014-08-07 12:14:30 +02:00
Thomas Müller
d2365afad6 Merge pull request #8915 from owncloud/MorrisJobke-travis 
Travis support for PRs and master, stable5 and stable6
 2014-08-07 11:33:13 +02:00
Thomas Müller
2fb8fcf6cb we can only close the session if encryption is not used 2014-08-07 11:07:11 +02:00
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