7867604e22
remove app specific code
2013-12-03 10:54:18 +01:00
d673dd066a
fix details for buttons in header and controls bar
2013-12-03 10:54:18 +01:00
83ec234f53
[tx-robot] updated from transifex
2013-12-02 17:28:29 -05:00
ee66db447f
make it possible to select folders
2013-12-02 16:30:03 +01:00
a81d4175ba
Merge pull request #6148 from owncloud/fix_trash_restore
...
Fix restore anbd delete operations in trash bin
2013-12-02 04:33:37 -08:00
fac2f2a626
check explicitely all possible dir values
2013-12-02 12:13:32 +01:00
edc4447d6a
set delete all to true if a complete folder was deleted
2013-12-02 11:59:09 +01:00
8ce3ea3e2c
fix delete files from trash bin
2013-12-02 11:50:55 +01:00
efbf18652c
Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).
2013-11-29 20:34:57 +01:00
baa587fd3c
Merge pull request #6123 from owncloud/extstorage-deletedirs2
...
Fixed FTP and SMB to use rmdir() when deleting folders
2013-11-29 11:23:02 -08:00
1b18c5a047
[tx-robot] updated from transifex
2013-11-29 14:10:40 -05:00
71589e65d2
fix restore from files in sub-folders
2013-11-29 16:43:50 +01:00
d69243ee51
Fixed FTP and SMB to use rmdir() when deleting folders
...
Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().
Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)
Note that the extra is_dir() should be fast because it's read from the
stat cache.
2013-11-29 13:01:01 +01:00
0b698e6901
Merge pull request #6111 from owncloud/non-floating-trash-button-chrome
...
Fix resize issue for trash button in chrome and overflowing spinner in ....
2013-11-29 02:44:49 -08:00
41a1a32e5a
Merge pull request #6099 from owncloud/fix_source_not_found_warnings
...
make sure that we don't try to access an already deleted files
2013-11-28 12:59:24 -08:00
0cbe9d79ba
Merge pull request #6106 from owncloud/fix_preview_creation
...
Fix preview creation
2013-11-28 12:48:19 -08:00
587fc1aff3
Fix resize issue for trash button in chrome and overflowing spinner in .update class
...
fixes #6108
2013-11-28 21:36:43 +01:00
b3724cd9c6
remove duplicate
2013-11-28 20:58:32 +01:00
348706854c
use better coding style
2013-11-28 19:31:35 +01:00
bef5108218
detect mimetype from the original filename, without the versioning timestamp
2013-11-28 18:59:38 +01:00
863aedf784
detect mimetype from the original filename, without the delete timestamp
2013-11-28 18:59:12 +01:00
f723bf744a
Merge pull request #6090 from ganomi/summaryfix
...
Fix filellist/rename/summary problem
2013-11-28 08:00:41 -08:00
3a31f7eb4a
Merge pull request #6097 from owncloud/extstorage-ftptrailingslash
...
Add trailing slash in FTP root path when missing
2013-11-28 04:52:08 -08:00
603613e6e6
Merge pull request #6098 from owncloud/files-renamediriconfix
...
Fixed directory icon after rename
2013-11-28 04:50:17 -08:00
eaedda2116
make sure that we don't try to access an already deleted files, fixes some file source not found warnings
2013-11-28 13:31:08 +01:00
ee78d48186
loginname is not necessarily username
2013-11-28 13:26:31 +01:00
da1a89fd15
Fixed directory icon after rename
2013-11-28 13:15:20 +01:00
dab3629ff5
Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename
...
Redetect mime type whenever extension is renamed
2013-11-28 03:46:42 -08:00
30b2ed588b
Merge pull request #6096 from owncloud/files-txtextfornewfiles
...
New file box now has default file name + extension
2013-11-28 03:38:58 -08:00
84f3dd15a6
Add trailing slash in FTP root path when missing
...
Fixes #6093
2013-11-28 11:45:26 +01:00
69a3327f47
Moved new file extension out of the translated string
2013-11-28 10:52:59 +01:00
a1d2f0f516
Merge pull request #6094 from owncloud/enc_fix_reshares
...
fix path reconstruction for reshares
2013-11-28 01:41:34 -08:00
24a08c686d
New file box now has default file name + extension
...
Whenever a user creates a file or folder in the web UI, the input field
will contain a default file name, pre-selected up to the extension for
easier typing.
The purpose is mostly to prevent users creating text files without an
extension.
Fixes #6045
2013-11-28 10:18:31 +01:00
efe7c4075a
fix path reconstruction for reshares
2013-11-27 23:26:04 +01:00
bc64931cd0
Fixed unit tests for ajax rename
2013-11-27 23:19:57 +01:00
54b24ca88d
Merge pull request #6048 from owncloud/encryption_initial_enc_indicator
...
show a message at the log-in screen if inital encryption take place
2013-11-27 14:10:11 -08:00
55d7cf8ffd
improve encryption message
2013-11-27 23:07:19 +01:00
d9729168f9
some small js fixes
2013-11-27 22:42:03 +01:00
0219b8b3b9
add spinner to the template so that it can be loaded in time
2013-11-27 22:36:47 +01:00
e0924a5f07
switch to large spinner
2013-11-27 21:58:38 +01:00
68f610a90e
Update file list entry on rename
...
Whenever a file is renamed, if the extension changes, the mime type and
preview might change. This fix passes the updated info to the client
that updates it.
2013-11-27 21:35:00 +01:00
5295993144
Merge pull request #6088 from owncloud/fix_public_previews
...
fix public preview creation if a user is logged in
2013-11-27 11:05:27 -08:00
34a8c3c4cd
Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash
...
move files to owners trash
2013-11-27 10:24:55 -08:00
f94180a996
Fix filellist/rename/summary problem
...
Fixes #6055
This contribution is MIT licensed!
2013-11-27 19:09:49 +01:00
aee7781f22
fix public preview creation if a user ios logged in
2013-11-27 18:44:01 +01:00
4a78f12682
[tx-robot] updated from transifex
2013-11-27 12:10:54 -05:00
d2840a045d
Fixed sharing hook to not remove the share before the trashbin
...
Fixed the hook order between sharing app and trashbin
2013-11-27 17:22:48 +01:00
1536c7ea58
switch from "name" attribute to "id"
2013-11-27 17:01:21 +01:00
1065c33543
Merge branch 'master' into encryption_initial_enc_indicator
2013-11-27 16:44:06 +01:00
060e0ad0cd
with the latest changes in master $this-userID is always the correct ID, so we no longer need the extra parameter
2013-11-27 15:35:32 +01:00
9fb71af988
Merge branch 'master' into encryption_enable_public_upload
...
Conflicts:
apps/files_encryption/lib/helper.php
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/keymanager.php
2013-11-27 15:08:09 +01:00
5b7b053634
Merge pull request #5976 from owncloud/encryption_work_with_public_gallery
...
Encryption work with public gallery
2013-11-27 04:25:54 -08:00
7f2bdb0e97
typo fixed
2013-11-27 12:25:04 +01:00
7f3b178d73
some small changes according to the review comments
2013-11-27 11:46:24 +01:00
34704eded6
Merge pull request #5955 from owncloud/fix5863
...
LDAP Wizard: Add raw login filter to corresponding tab for consistency, fix behaviour on raw filter input
2013-11-27 00:30:15 -08:00
4f15282bc9
Merge pull request #6058 from owncloud/ldap2avatar
...
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
7240d349da
Merge branch 'master' into encryption_initial_enc_indicator
2013-11-26 19:15:53 +01:00
e2ca88af5e
Merge pull request #6066 from owncloud/extstorage-sftp-overwriteonrename
...
Fixed SFTP storage to overwrite on rename
2013-11-26 09:01:41 -08:00
c7e1fe50c2
added a small version of the dark loading gif, looks nicer on the blue background
2013-11-26 17:14:16 +01:00
fb7aa2f014
[tx-robot] updated from transifex
2013-11-26 10:47:07 -05:00
30e086fb53
Fixed SFTP storage to overwrite on rename
2013-11-26 16:32:44 +01:00
2653d914d9
Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefix
...
Fixed SMB rename function to overwrite target file
2013-11-26 06:42:36 -08:00
a48fc120d0
Merge pull request #6054 from owncloud/extstorage-dropboxfixes
...
Fixed various Dropbox issues + unit tests
2013-11-26 04:48:54 -08:00
5d2299eab8
only create complete share key if we know the exact path
2013-11-26 13:30:59 +01:00
69518b9013
Make sure Avatar is set from LDAP upon first login, not later, but also not before due to missing user folder
2013-11-26 12:57:39 +01:00
712b47757a
Updated unit tests for SMB
...
- coverage for touch return value
- fixed directory provider to exclude unsupported cases
2013-11-26 12:53:03 +01:00
e102eec89a
Return true when touch succeeds
2013-11-26 12:47:00 +01:00
7c81ac3d28
Fixed various Dropbox issues + unit tests
...
- fixed touch function to return true on success
- fixed local metadata cache to remove deleted files/directories
- fixed getMetaData() to ignore files reported as deleted by
Dropbox
- fixed "file not found" case to not log as exception
- fixed "overwrite on rename" case
- fixed unit tests to exclude unsupported cases
- added unit test for touch return value
- unit tests for Dropbox should all run correctly now
2013-11-26 11:59:36 +01:00
0617e06f69
use POST instead of GET
2013-11-26 11:38:49 +01:00
35a6ad255d
fix typo in var name
2013-11-26 11:38:45 +01:00
dc67c7efa9
[tx-robot] updated from transifex
2013-11-26 04:04:05 -05:00
46dff0677d
Merge branch 'master' into calc_version_size
2013-11-26 00:03:54 +01:00
8974107b4e
remove debug output
2013-11-25 23:57:08 +01:00
d6fb2afa85
show a message at the log-in screen if inital encryption take place
2013-11-25 23:49:05 +01:00
03375d6c52
LDAP: username2dn should only return DNs that belong to the current LDAP server. Might be not perfect. Easy perfect solution would increase communication with LDAP server. Let's see if it is good enough
2013-11-25 22:08:11 +01:00
3955388f20
LDAP: proxy: configurable return to determine when to try the next LDAP server and when to return (multi server setup)
2013-11-25 22:05:00 +01:00
944d4156bf
Fixed FTP storage unit tests to use the correct class
2013-11-25 18:44:34 +01:00
f8fcd567a7
move files to owners trash
2013-11-25 16:51:31 +01:00
31d0ba0344
Merge pull request #5641 from owncloud/filestrash-emptytrash
...
Deleting all files in trash now only sends a single flag
2013-11-25 05:24:11 -08:00
d88025bf6b
Fixed ext storage touch function to return true on success
...
Some ext storage impl didn't return true on success.
Fixes #5943 (Dropbox)
Fixes #6010 (WebDAV)
2013-11-25 12:44:27 +01:00
1b0c5e57e5
Fixed SMB rename function to overwrite target file
...
When uploading files through WebDAV, a part file is created and a rename
operation is performed with the expectation that the part file
overwrites an existing file, if any.
This fix makes the SMB external storage delete the target file before
renaming, as smbclient doesn't support overwrite on move/rename.
Fixes #5348
2013-11-25 11:17:38 +01:00
49038545f8
Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/core into encryption_work_with_public_gallery
2013-11-25 10:29:53 +01:00
9c4b8ae54c
fix typo in comment
2013-11-25 10:29:05 +01:00
b82146eeee
Merge pull request #5991 from owncloud/extstorage-mountpointvalidation
...
Prevent using root as mount point for external storage
2013-11-25 00:30:06 -08:00
2a465fb20f
Merge branch 'master' into encryption_work_with_public_gallery
2013-11-24 23:20:46 +01:00
aef34618de
Merge pull request #5995 from owncloud/extstorage-isreadablefix
...
Return plausible isReadable() default impl for ext storage
2013-11-24 03:04:33 -08:00
ba0e09adce
[tx-robot] updated from transifex
2013-11-24 00:14:51 -05:00
d9347f2c9b
LDAP: last avatar lookup must be stored per user. Someone had a blackout, eh?
2013-11-22 23:58:30 +01:00
2d947835b9
Now also preventing the user of "Shared" as mountpoint
2013-11-22 18:36:27 +01:00
c62cce8269
Moved default isReadable/isUpdatable impl into Common class
...
Also adjusted all ext storage backends to not override these when the
default behavior is expected.
2013-11-22 18:21:17 +01:00
a49e873d3f
Return plausible isReadable() default impl for ext storage
...
When an ext storage doesn't implement isReadable(), always returning
true made the file scanner believe that the file exists and creates a
cache entry with the size zero.
This fix makes the default impl of isReadable() use file_exists().
Fixes #5940
2013-11-22 18:21:17 +01:00
acf74b24f2
remove unused variable
2013-11-22 16:10:30 +01:00
c67b8f2b22
fixed documentation
2013-11-22 14:58:36 +01:00
6fdce3b7e9
LDAP: user proxy must support canChangeAvatar too
2013-11-22 13:25:20 +01:00
54f0deff2a
LDAP: get user photo from LDAP and set it as avatar if available
2013-11-22 13:25:20 +01:00
60cfdae503
[tx-robot] updated from transifex
2013-11-21 21:07:12 -05:00
3b48d23478
Merge pull request #5970 from owncloud/extstorage-webdavdotdirfix
...
Fixed path normalization to prevent dot dirs
2013-11-21 09:01:47 -08:00
476d8e6de0
Added unit test for root mount point validation
2013-11-21 17:26:13 +01:00
0b2c9b823c
Prevent using root as mount point for external storage
...
Fixes #5981
2013-11-21 17:22:12 +01:00
39cbdca429
Fixed path normalization to prevent dot dirs
...
Fixes #5945 where stat(.) would cause the backend OC to cache a dot dir
(only in older versions)
2013-11-21 16:07:01 +01:00
5d9731cef2
[tx-robot] updated from transifex
2013-11-21 10:05:34 -05:00
6443e570c2
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 16:00:21 +01:00
d0265f3388
Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome
...
Quota storage wrapper is now used for all users in sharing mode
2013-11-21 06:59:50 -08:00
d2e6f7d979
check HTTP Referer to check if we come from public.php or from a internal page.
...
Necessary to detect public access also if a user is logged in.
2013-11-21 15:57:49 +01:00
3e1ade4397
Merge pull request #5988 from owncloud/files-mobilequickfix
...
Added min width to files table
2013-11-21 06:09:11 -08:00
14ad1ebf53
Added min width to files table
...
Having a too small widths for the files table doesn't make sense as it
overlaps file actions with the files themselves and make them
unclickable, especially when viewed on mobile phone.
The compromise that this fix introduces is to have a minimum width that
will trigger horizontal scrolling, which will at least make it possible
to click files on mobile phones.
2013-11-21 14:45:24 +01:00
a20c6049c3
Merge pull request #5979 from owncloud/fix5881
...
LDAP Wizard: add objectclass for group detection in Zimbra
2013-11-21 04:03:33 -08:00
9d16353e09
disable trahs in files_sharing/public.php
2013-11-21 12:06:35 +01:00
356eef0739
Quota storage wrapper is now used for all users in sharing mode
...
When accessing a shared folder, the folder's owner appears as mountpoint
but wasn't wrapped by a quota storage wrapper.
This fix makes sure that all home storages are wrapped by a quota
storage wrapper, if applicable, to make sure quotas are respected when
uploading into shared folders.
2013-11-21 12:04:54 +01:00
c9646ddc4c
fix undefined index errors if public share view
2013-11-21 12:03:27 +01:00
dd5e1092c7
LDAP Wizard: add objectclass for group detection in Zimbra
2013-11-21 11:20:31 +01:00
87f2696e6a
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 11:18:53 +01:00
c7dc6dc2c2
fix getFileKey() call
2013-11-21 11:11:15 +01:00
009bbef17e
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
2013-11-21 10:34:25 +01:00
16b484209c
Merge branch 'master' into encryption_work_with_public_gallery
...
Conflicts:
apps/files_encryption/lib/keymanager.php
apps/files_encryption/lib/stream.php
apps/files_encryption/lib/util.php
apps/files_encryption/tests/crypt.php
2013-11-21 10:33:37 +01:00
18c80e47b6
Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload
...
Conflicts:
apps/files_encryption/lib/stream.php
2013-11-21 10:24:47 +01:00
391f267d38
Merge pull request #5897 from hkjolhede/master
...
Fixed error-checking error in sftp.php
2013-11-21 01:22:05 -08:00
2b361ea085
better distinction between userID and keyId
2013-11-21 10:09:07 +01:00
b27fc42e1f
public upload now also works with encryption enabled
2013-11-21 00:23:38 +01:00
318db64b2d
adapt tests to the new code
2013-11-20 23:27:42 +01:00
b9c18d16fe
make sure that we always use the correct user id
2013-11-20 23:23:23 +01:00
e11afd3066
fix some getShareKey() and getFileKey() calls
2013-11-20 22:44:23 +01:00
e26500045f
Fixed move operation to pass the whole URL as expected
...
The MOVE and COPY spec expect the "Destination" header to receive the
full URL, not only the root.
Fixes #5942
2013-11-20 18:59:02 +01:00
c5cb4206f5
[wip] make encryption work with public gallery sharing
2013-11-20 18:10:56 +01:00
5de5c317c1
Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset
...
Fix for extstorage + encryption where unencrypted size is not kept
2013-11-20 09:04:37 -08:00
fe44024868
Fix for extstorage + encryption where unencrypted size is not kept
...
Fix for external storage with encryption where the unencrypted size is
first written in the DB, then set back to zero, causing performance
issue because the file needs to be reopened every time to find out the
unencrypted size (and potentially needs a full redownload)
2013-11-20 16:22:55 +01:00
ce1318c9f1
LDAP Wizard: clear the cache on save so changes have immediate effect
2013-11-20 15:56:25 +01:00
f3e2a63712
check if it is a cached file or a version to resolve the correct path to the file key
2013-11-20 12:34:23 +01:00
0c24c7c420
only check if the key file exists to decide if it is an encrypted file or not.
...
This solves problems with external storage which doesn't support fseek
2013-11-20 11:02:22 +01:00
ff9ecc8a51
LDAP Wizard: proper behaviour for raw filter input. remember the editing mode and compose filter only when desired.
2013-11-19 23:58:08 +01:00
b823505bd1
make sure that the owners home is mounted correctly
2013-11-19 18:28:51 +01:00
5b6d1d79d0
Fixed SMB file deletion success detection
...
Since unlink() smb4php doesn't return true on deletion success, we need
to check whether the file was deleted to confirm success.
Fixes #5866
2013-11-19 15:05:11 +01:00
8ab40f1959
Removing trailing dot in path that samba doesn't seem to like
...
Fixes #5778
Added unit test for getId() and constructUrl()
2013-11-19 15:05:11 +01:00
a7962faa56
Fixed delete action to show error message as notification
2013-11-19 15:05:11 +01:00
c309067c81
use oc filesystem operations to calc the versions size. This makes sure that we can handle missing directories correctly
2013-11-19 12:23:14 +01:00
b55a66187c
Merge pull request #5916 from owncloud/extstorage-smb-ignorenetbioserror
...
SMB ignore connection errors when NetBIOS is disabled
2013-11-18 15:23:11 -08:00
b51d405852
Merge pull request #5923 from owncloud/font-weight
...
change bold 'deleted files' button to normal for less focus
2013-11-18 08:39:46 -08:00
5da2929180
fix filtering number like filenames in filelist
...
forward port of 847ad6c40b
2013-11-18 17:18:31 +01:00
f2d18867af
change bold 'deleted files' button to normal for less focus
2013-11-18 15:06:38 +01:00
d306f5c4cf
Merge pull request #5908 from owncloud/fix_errorpage_call
...
[encryption] fix redirectToErrorPage() call
2013-11-18 05:17:28 -08:00
7e6f3817d0
SMB ignore connection errors when NetBIOS is disabled
...
When NetBIOS is blocked or disabled, a smb::look() call can still get
the list of shares from smbclient, even though the name resolution at
the end of the command fails.
This fix makes it ignore the connection error if we already got the list
of shares.
Fixed #5860
2013-11-18 12:31:55 +01:00
82f30d37ca
call error page with session as parameter
2013-11-17 13:23:07 +01:00
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
3e2d4c1bc1
Fixed error-checking error in sftp.php
2013-11-15 21:10:09 +01:00
68f278025c
Merge pull request #5894 from owncloud/readd_sharing_token
...
readd sharing token to public template
2013-11-15 09:25:46 -08:00
cb968c77d1
Merge pull request #5772 from owncloud/fix5741
...
LDAP Wizard: introduce configuration status indicator, fixes #5741
2013-11-15 08:52:41 -08:00
3ad546002f
Merge pull request #5833 from owncloud/encryption_fixes
...
[encryption] preserve timestamps and etags during encryption/decryption
2013-11-15 08:47:22 -08:00
6355af162c
Merge pull request #5880 from owncloud/replace_etmp_files
...
write encryption tmp files to the cache folder
2013-11-15 07:53:23 -08:00
f36ee69855
tests added
2013-11-15 16:49:50 +01:00
11425d142d
readd sharing token to public template
...
necessary for https://github.com/owncloud/apps/pull/1476
2013-11-15 16:27:41 +01:00
Jan-Christoph Borchardt
Jenkins for ownCloud
Bjoern Schiessle
Vincent Petry
Andreas Fischer
Frank Karlitschek
Morris Jobke
ganomi
Arthur Schiwon
Björn Schießle
Jörn Friedrich Dreyer
hkjolhede