15042 Commits (b4e7258a04f9b634031984aea655ed964aa003d3)

 

All Branches   

Search

Author	SHA1	Message	Date
Bjoern Schiessle	b4e7258a04	Merge branch 'master' into encryption_check_if_file_is_encrypted	13 years ago
Vincent Petry	30b8f4ec8e	Merge pull request #5961 from owncloud/core-fixgetfiletempfilecondition ... Fixed getLocalFile() condition for x-send-file	13 years ago
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.	13 years ago
Bjoern Schiessle	f3e2a63712	check if it is a cached file or a version to resolve the correct path to the file key	13 years ago
Bjoern Schiessle	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	13 years ago
Frank Karlitschek	8bc339413b	Merge pull request #5926 from owncloud/less-bold ... remove bold from legend, table header, label - less obtrusive	13 years ago
blizzz	93ff86e31f	Merge pull request #5951 from owncloud/ldap_encryption_fix ... fix encryption with LDAP, make sure that the owners home is mounted correctly	13 years ago
Bjoern Schiessle	b823505bd1	make sure that the owners home is mounted correctly	13 years ago
Vincent Petry	5f6f78ee03	Merge pull request #5878 from owncloud/extstorage-smb ... [SMB] Fix stat and unlink	13 years ago
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	13 years ago
Vincent Petry	8ab40f1959	Removing trailing dot in path that samba doesn't seem to like ... Fixes #5778 Added unit test for getId() and constructUrl()	13 years ago
Vincent Petry	a7962faa56	Fixed delete action to show error message as notification	13 years ago
Morris Jobke	b55a66187c	Merge pull request #5916 from owncloud/extstorage-smb-ignorenetbioserror ... SMB ignore connection errors when NetBIOS is disabled	13 years ago
Morris Jobke	4a0d295e4a	Merge pull request #5927 from owncloud/quota-excludeextstorage ... External storage space is now not counted in total space	13 years ago
Morris Jobke	cdc72ddd8d	Merge pull request #5928 from owncloud/quota-totalsizeoffiles ... Root size for home storage is now size of "files" subdir	13 years ago
Vincent Petry	3e2fd9942b	Root size for home storage is now size of "files" subdir ... Fixes #4593	13 years ago
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	13 years ago
Jan-Christoph Borchardt	b51d405852	Merge pull request #5923 from owncloud/font-weight ... change bold 'deleted files' button to normal for less focus	13 years ago
Jan-Christoph Borchardt	b678766c7d	remove bold from legend, table header, label - less obtrusive	13 years ago
Jörn Friedrich Dreyer	5da2929180	fix filtering number like filenames in filelist ... forward port of 847ad6c40b	13 years ago
Thomas Müller	c8cf3320a4	Merge pull request #5922 from owncloud/fix-time-inputs ... fix input type time fields, have them use the default styles	13 years ago
Jan-Christoph Borchardt	463b054530	adjust input CSS to multiline, coding guidelines	13 years ago
Jan-Christoph Borchardt	f2d18867af	change bold 'deleted files' button to normal for less focus	13 years ago
Jan-Christoph Borchardt	8dd50dc9a6	fix input type time fields, have them use the default styles	13 years ago
Vincent Petry	44c2f9aad2	Merge pull request #5915 from owncloud/fix_apps_versioncheck ... Fix apps versioncheck	13 years ago
Vincent Petry	d306f5c4cf	Merge pull request #5908 from owncloud/fix_errorpage_call ... [encryption] fix redirectToErrorPage() call	13 years ago
Morris Jobke	a2e3821b87	Merge pull request #5914 from owncloud/fix_5832 ... Check which permissions are possible to re-share a file	13 years ago
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	13 years ago
Frank Karlitschek	385a296864	one tab less	13 years ago
Frank Karlitschek	e5994f9c1a	fix the version check for downloaded apps. Fixes https://github.com/owncloud/apps/issues/1485	13 years ago
Bjoern Schiessle	7f3d717037	Check which permissions are possible to re-share a file	13 years ago
Bjoern Schiessle	82f30d37ca	call error page with session as parameter	13 years ago
Jenkins for ownCloud	c3746e866a	[tx-robot] updated from transifex	13 years ago
Vincent Petry	68f278025c	Merge pull request #5894 from owncloud/readd_sharing_token ... readd sharing token to public template	13 years ago
blizzz	cb968c77d1	Merge pull request #5772 from owncloud/fix5741 ... LDAP Wizard: introduce configuration status indicator, fixes #5741	13 years ago
Björn Schießle	3ad546002f	Merge pull request #5833 from owncloud/encryption_fixes ... [encryption] preserve timestamps and etags during encryption/decryption	13 years ago
Vincent Petry	6355af162c	Merge pull request #5880 from owncloud/replace_etmp_files ... write encryption tmp files to the cache folder	13 years ago
Bjoern Schiessle	f36ee69855	tests added	13 years ago
Jörn Friedrich Dreyer	11425d142d	readd sharing token to public template ... necessary for https://github.com/owncloud/apps/pull/1476	13 years ago
Frank Karlitschek	fa44c699f7	Merge pull request #5889 from owncloud/extstorage-smb-brokenfseek ... Fix for smb4php fseek	13 years ago
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	13 years ago
Bart Visscher	630e46f60a	Merge pull request #5789 from ogasser/db_fix_default_for_numeric ... DB: Set correct default value for numeric types	13 years ago
Frank Karlitschek	16dce51917	increase version number to trigger a DB migration to get more testers for the new indexes.	13 years ago
Frank Karlitschek	54364f172e	Merge pull request #5814 from owncloud/add-indexes ... Add some more indexes to tables to improve db queries	13 years ago
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...	13 years ago
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	13 years ago
Morris Jobke	6ef39931cb	Merge pull request #5767 from owncloud/moviepreviewfallback ... Added ffmpeg fallback when avconv is not available	13 years ago
Morris Jobke	57a3141cb1	Merge pull request #5867 from owncloud/users-groupadmindropdown ... Users groupadmindropdown	13 years ago
Thomas Müller	617dc0e468	Merge branch 'master' into moviepreviewfallback ... Conflicts: lib/private/preview/movies.php	13 years ago
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	13 years ago