Thomas Müller
51a8172868
always get the right node for the given file path
2013-11-20 16:14:08 +01:00
Vincent Petry
30b8f4ec8e
Merge pull request #5961 from owncloud/core-fixgetfiletempfilecondition
...
Fixed getLocalFile() condition for x-send-file
2013-11-20 05:42:21 -08:00
Vincent Petry
726a202cdb
Fixed getLocalFile() condition for x-send-file
...
Until now, addSendfileHeader() was called even when no x-send-file
headers were set. Even though the method itself doesn't do anything,
a call to getLocalFile() was done and would trigger a full download
when using external storage.
Additionally, the storage resolution code is wrong and always
returns the local storage of the root filesystem, which caused the code to
be run anyway.
This commit fixes both issues.
2013-11-20 14:33:59 +01:00
Frank Karlitschek
8bc339413b
Merge pull request #5926 from owncloud/less-bold
...
remove bold from legend, table header, label - less obtrusive
2013-11-19 13:57:21 -08:00
blizzz
93ff86e31f
Merge pull request #5951 from owncloud/ldap_encryption_fix
...
fix encryption with LDAP, make sure that the owners home is mounted correctly
2013-11-19 13:51:12 -08:00
Bjoern Schiessle
b823505bd1
make sure that the owners home is mounted correctly
2013-11-19 18:28:51 +01:00
Vincent Petry
5f6f78ee03
Merge pull request #5878 from owncloud/extstorage-smb
...
[SMB] Fix stat and unlink
2013-11-19 06:13:25 -08:00
Vincent Petry
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
Vincent Petry
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
Vincent Petry
a7962faa56
Fixed delete action to show error message as notification
2013-11-19 15:05:11 +01:00
Morris Jobke
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
Morris Jobke
4a0d295e4a
Merge pull request #5927 from owncloud/quota-excludeextstorage
...
External storage space is now not counted in total space
2013-11-18 14:42:40 -08:00
Morris Jobke
cdc72ddd8d
Merge pull request #5928 from owncloud/quota-totalsizeoffiles
...
Root size for home storage is now size of "files" subdir
2013-11-18 14:31:00 -08:00
Vincent Petry
3e2fd9942b
Root size for home storage is now size of "files" subdir
...
Fixes #4593
2013-11-18 18:17:25 +01:00
Vincent Petry
614e4d485c
External storage space is now not counted in total space
...
Added argument to getFileInfo() to disable adding the size of
mountpoints to a directory's size.
Fixes #5924
2013-11-18 18:09:01 +01:00
Jan-Christoph Borchardt
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
Jan-Christoph Borchardt
b678766c7d
remove bold from legend, table header, label - less obtrusive
2013-11-18 17:32:06 +01:00
Jörn Friedrich Dreyer
5da2929180
fix filtering number like filenames in filelist
...
forward port of 847ad6c40b
2013-11-18 17:18:31 +01:00
Thomas Müller
c8cf3320a4
Merge pull request #5922 from owncloud/fix-time-inputs
...
fix input type time fields, have them use the default styles
2013-11-18 07:17:09 -08:00
Jan-Christoph Borchardt
463b054530
adjust input CSS to multiline, coding guidelines
2013-11-18 16:14:13 +01:00
Jan-Christoph Borchardt
f2d18867af
change bold 'deleted files' button to normal for less focus
2013-11-18 15:06:38 +01:00
Jan-Christoph Borchardt
8dd50dc9a6
fix input type time fields, have them use the default styles
2013-11-18 14:51:43 +01:00
Vincent Petry
44c2f9aad2
Merge pull request #5915 from owncloud/fix_apps_versioncheck
...
Fix apps versioncheck
2013-11-18 05:48:17 -08:00
Vincent Petry
d306f5c4cf
Merge pull request #5908 from owncloud/fix_errorpage_call
...
[encryption] fix redirectToErrorPage() call
2013-11-18 05:17:28 -08:00
Morris Jobke
a2e3821b87
Merge pull request #5914 from owncloud/fix_5832
...
Check which permissions are possible to re-share a file
2013-11-18 05:16:05 -08:00
Vincent Petry
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
Frank Karlitschek
385a296864
one tab less
2013-11-18 12:19:16 +01:00
Frank Karlitschek
e5994f9c1a
fix the version check for downloaded apps. Fixes https://github.com/owncloud/apps/issues/1485
2013-11-18 12:16:03 +01:00
Bjoern Schiessle
7f3d717037
Check which permissions are possible to re-share a file
2013-11-18 11:58:42 +01:00
Bjoern Schiessle
82f30d37ca
call error page with session as parameter
2013-11-17 13:23:07 +01:00
Jenkins for ownCloud
c3746e866a
[tx-robot] updated from transifex
2013-11-15 22:56:31 -05:00
Vincent Petry
68f278025c
Merge pull request #5894 from owncloud/readd_sharing_token
...
readd sharing token to public template
2013-11-15 09:25:46 -08:00
blizzz
cb968c77d1
Merge pull request #5772 from owncloud/fix5741
...
LDAP Wizard: introduce configuration status indicator, fixes #5741
2013-11-15 08:52:41 -08:00
Björn Schießle
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
Vincent Petry
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
Bjoern Schiessle
f36ee69855
tests added
2013-11-15 16:49:50 +01:00
Jörn Friedrich Dreyer
11425d142d
readd sharing token to public template
...
necessary for https://github.com/owncloud/apps/pull/1476
2013-11-15 16:27:41 +01:00
Frank Karlitschek
fa44c699f7
Merge pull request #5889 from owncloud/extstorage-smb-brokenfseek
...
Fix for smb4php fseek
2013-11-15 07:00:36 -08:00
Vincent Petry
f9a64d2b27
Fix for smb4php fseek
...
The stream_fseek function must return a boolean which will be mapped
to 0 for success and -1 for failure for the caller.
This patch fixes stream_fseek of smb4php to also respect this
convention.
Since the encryption app is relying on fseek to detect whether a file is
encrypted by reading the last bit of data, this will fix #5023
2013-11-15 14:23:24 +01:00
Bart Visscher
630e46f60a
Merge pull request #5789 from ogasser/db_fix_default_for_numeric
...
DB: Set correct default value for numeric types
2013-11-15 04:19:33 -08:00
Frank Karlitschek
16dce51917
increase version number to trigger a DB migration to get more testers for the new indexes.
2013-11-15 10:30:04 +01:00
Frank Karlitschek
54364f172e
Merge pull request #5814 from owncloud/add-indexes
...
Add some more indexes to tables to improve db queries
2013-11-15 01:25:59 -08:00
Thomas Müller
1e863cd959
Merge pull request #5700 from owncloud/ldapWizSetDisplayNames
...
LDAP Wizard: do not forget to set display name attributes for user and g...
2013-11-15 01:12:54 -08:00
Thomas Müller
49e9f771ff
Merge pull request #5813 from owncloud/fix-4736-master
...
Don't set a default value when there isn't a default specified
2013-11-15 01:06:38 -08:00
Morris Jobke
6ef39931cb
Merge pull request #5767 from owncloud/moviepreviewfallback
...
Added ffmpeg fallback when avconv is not available
2013-11-14 16:39:39 -08:00
Morris Jobke
57a3141cb1
Merge pull request #5867 from owncloud/users-groupadmindropdown
...
Users groupadmindropdown
2013-11-14 13:28:05 -08:00
Thomas Müller
617dc0e468
Merge branch 'master' into moviepreviewfallback
...
Conflicts:
lib/private/preview/movies.php
2013-11-14 20:57:29 +01:00
Thomas Müller
ecc7b01cee
Merge pull request #5824 from owncloud/fix-publicshare-non-existing
...
Fix fatal error when trying to open a non existing public link
2013-11-14 11:45:08 -08:00
Thomas Müller
2bb4c266a6
Merge pull request #5862 from owncloud/files-singledotdirs
...
Files singledotdirs
2013-11-14 11:40:21 -08:00
Bjoern Schiessle
faa08da944
instead of writing etmp files we write the dummy file to data/user/cache to avoid that etmp files show up in the users files list
2013-11-14 17:32:21 +01:00
