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

7582 commits

Author SHA1 Message Date
Vincent Petry
aaa8d6ec02 Fixed broken delete file action 2014-04-01 16:09:48 +02:00
Vincent Petry
27eff1ac30 Merge pull request #7293 from owncloud/update-shares-postgres 
fix update to remove shares where file doesn't exist on postgres
 2014-04-01 14:56:37 +02:00
Björn Schießle
c45793033d Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook 
move check if a file should be encrypted to the pre hook
 2014-04-01 13:56:46 +02:00
Vincent Petry
5807681c09 Merge pull request #7975 from owncloud/fix-7973-master-2 
remove pl_PL - fixes #7973
 2014-04-01 12:38:47 +02:00
Vincent Petry
18acfa8bb3 Merge pull request #7915 from owncloud/replace-personalblock 
Replace personalblock with .section
 2014-04-01 11:20:16 +02:00
Jenkins for ownCloud
7a4a836abe [tx-robot] updated from transifex 2014-04-01 01:56:15 -04:00
Thomas Müller
fe2c6f4e6d remove pl_PL - fixes #7973 2014-03-31 18:03:42 +02:00
Bjoern Schiessle
aa867ad647 don't call getFileInfo() to avoid to open the same file twice 2014-03-31 15:29:16 +02:00
Bjoern Schiessle
8ebb1f15d3 move check if a file should be encrypted to the pre hook 2014-03-31 15:29:16 +02:00
Jan-Christoph Borchardt
2be2a5d2c5 external storage: fix merge conflict, indentation 2014-03-31 13:12:04 +02:00
Jan-Christoph Borchardt
6ac85480f7 replace last personalblock fieldset within files_external 2014-03-31 13:00:46 +02:00
Jenkins for ownCloud
bfb0b9a044 [tx-robot] updated from transifex 2014-03-30 01:55:42 -04:00
Björn Schießle
7adb5ae2c5 Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails 
don't write file if opening a stream to encrypt the data fails
 2014-03-28 14:59:05 +01:00
Vincent Petry
d0012e729a Merge pull request #7879 from owncloud/sharing_cleanup_public_api 
sharing api cleanup, first step
 2014-03-28 12:23:11 +01:00
Bjoern Schiessle
b9100bc2de don't write file if opening a stream to encrypt the data fails 2014-03-28 12:02:49 +01:00
Björn Schießle
0757f87dba Merge pull request #7872 from owncloud/trash-disablestoragestats 
Do not retrieve storage stats for trash bin
 2014-03-28 11:22:19 +01:00
Vincent Petry
f3d6b2f3e9 Do not retrieve storage stats for trash bin 2014-03-28 11:21:33 +01:00
Robin McCorkell
e806b6d9a0 Merge pull request #7842 from Xenopathic/files_external_config_optional 
Enable the use of 'optional' on password fields for mount configuration
 2014-03-28 10:02:28 +00:00
Thomas Müller
5fa8f7cf12 Merge pull request #7107 from owncloud/load-apps-proper-master 
Load apps proper master
 2014-03-28 10:33:55 +01:00
Thomas Müller
e3b951f412 Merge pull request #7724 from owncloud/mobile 
[WIP] Mobile optimization for base layout and Files app
 2014-03-28 10:27:15 +01:00
Jenkins for ownCloud
ccc55f40e6 [tx-robot] updated from transifex 2014-03-28 01:55:47 -04:00
Morris Jobke
d2e5dd2a15 Merge pull request #7913 from owncloud/fix-logo 
fix SVG replacement for logo so it works in IE8, fix #7866
 2014-03-28 02:29:35 +01:00
Morris Jobke
6a8e93ffa6 fix breadcrumbs for IE8 2014-03-27 23:53:19 +01:00
Vincent Petry
531f3cf1a8 Merge pull request #7911 from owncloud/ext-fixswifttouchoperation 
Fix swift touch operation
 2014-03-27 18:10:45 +01:00
Jan-Christoph Borchardt
25326b89da replace personalblock fieldset with section class in core user_ apps 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt
6de572c6e6 replace personalblock fieldset with section class in files apps 2014-03-27 17:00:47 +01:00
Jan-Christoph Borchardt
832d3c954e enable SVG->PNG fallback for 'New' menu 2014-03-27 14:48:54 +01:00
Jan-Christoph Borchardt
f88b24d532 enable SVG->PNG fallback for newly uploaded files and folders 2014-03-27 14:48:35 +01:00
Vincent Petry
2a08e35d72 Fix swift touch operation 
The touch() operation now uses "UpdateMetadata()" instead of "Update()"
which doesn't clear the object's contents.

This fixes syncing, as the sync client needs to use touch to update the
object's mtime.
 2014-03-27 12:34:30 +01:00
Vincent Petry
1f6259d9c2 Merge pull request #7875 from Xenopathic/files_external_smb_auto 
SMB/CIFS mounts using ownCloud login, fixes #7843
 2014-03-27 12:18:51 +01:00
Vincent Petry
1469ce7b38 Merge pull request #7898 from owncloud/ext-swiftmtime 
Fixed mtime reading from OpenStack API
 2014-03-27 09:31:37 +01:00
Jenkins for ownCloud
ed0cba0ff4 [tx-robot] updated from transifex 2014-03-27 01:56:30 -04:00
Vincent Petry
fa00a18677 Fixed mtime reading from OpenStack API 
The API seems to return floating point values, which prevents
the hasUpdated() check to work and causes the scanner to rescan
everything every time.
 2014-03-26 17:20:40 +01:00
Robin McCorkell
50dba97bde Miscellaneous text fixes for core apps 2014-03-26 15:43:03 +00:00
Jan-Christoph Borchardt
eeaefd84c3 change mobile breakpoint for shared view to 768px as well 2014-03-26 16:32:09 +01:00
Robin McCorkell
a1dca821f9 Use braces on single line if statements 2014-03-26 15:11:09 +00:00
Robin McCorkell
cd5ebac7c4 Fix error in $isPersonal setting 2014-03-26 14:37:29 +00:00
Robin McCorkell
b077528087 Perform proper checking for share availability 
To check for shares, the code attempts to connect anonymously to the share.
In most cases this will fail with NT_STATUS_ACCESS_DENIED, so the regex array
used for parsing the output of smbclient in smb4php has been overridden to
treat such output as success.

The 'test' method for storage classes can now take a single parameter,
$isPersonal, which allows the storage to adjust the tests performed based on
if they are being configured as personal shares or as system shares.
 2014-03-26 14:36:45 +00:00
Robin McCorkell
cac4aaa8c4 Rename SMB_Auto to SMB_OC and change visible name 
SMB_Auto is now SMB_OC, and the name has been changed from
"SMB / CIFS Auto" to "SMB / CIFS using OC login"
 2014-03-26 14:35:07 +00:00
Robin McCorkell
86aa6104e6 Revoke sharable permission on automatic SMB shares 
Shares authenticated with user credentials (aka not hard coded) cannot be
accessed by other users, breaking sharing. This change completely revokes
sharing for such shares
 2014-03-26 14:35:07 +00:00
Robin McCorkell
3445c062ec Use loginname instead of display name 
getDisplayName would return the display name of the user, not great if it is a
canonical string. The uid passed back from 'login' is the UUID of the user, so
also not suitable. The login name from the session is the username the user
used to log in to ownCloud in the first place, which is what is needed.
 2014-03-26 14:35:07 +00:00
Robin McCorkell
ba63e46b5e SMB/CIFS mount using OwnCloud logon credentials 
Selecting 'SMB/CIFS Auto' in the mounts configuration allows an SMB/CIFS
mount to be configured that uses the credentials of the user logging in to
authenticate to the server.

Optionally, the username can be used as the share name, permitting home shares
to be dynamically mounted.
 2014-03-26 14:35:07 +00:00
Vincent Petry
b656c68ede Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig 
Fix merging of external storage configurations
 2014-03-26 14:30:35 +01:00
Vincent Petry
e002b7242c Fix merging of external storage configurations 
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.

Fixed merging logic to make sure that class, mount point and options are
the same before merging them.

Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
 2014-03-26 12:41:25 +01:00
Vincent Petry
8d95c0d013 Pretty print mount.json when possible 2014-03-26 11:32:03 +01:00
Vincent Petry
cbfd16089b Fixed share upgrade cleanup tests to use the correct ids 2014-03-26 09:29:28 +01:00
Jenkins for ownCloud
75d8de378c [tx-robot] updated from transifex 2014-03-26 01:56:21 -04:00
Thomas Müller
8958b9147b adding ellipsis on file names to public file list as well 2014-03-26 00:14:38 +01:00
Thomas Müller
d0f84e936f adding proper notification area for multi line messages 2014-03-26 00:04:11 +01:00
Thomas Müller
e6392163a4 adding ellipsis on file names 2014-03-25 23:40:40 +01:00