summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | | | | | | | | | | | | | Make working en_US.UTF-8 locale a hard requirementBart Visscher2013-11-082-7/+8
* | | | | | | | | | | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-21630-8468/+8323
* | | | | | | | | | | | | | | Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershomeVincent Petry2013-11-214-8/+94
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | |
| * | | | | | | | | | | | | | Now using the "Home" storage detection approach for quotaVincent Petry2013-11-212-15/+22
| * | | | | | | | | | | | | | Quota storage wrapper is now used for all users in sharing modeVincent Petry2013-11-213-9/+88
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5988 from owncloud/files-mobilequickfixMorris Jobke2013-11-211-0/+3
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | Added min width to files tableVincent Petry2013-11-211-0/+3
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #5983 from owncloud/fixing-l10n-again-masterThomas Müller2013-11-213-3/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | fixing spelling and restructure sentenceThomas Müller2013-11-211-1/+1
| * | | | | | | | | | | | | unify translation string - less work for the translatorsThomas Müller2013-11-212-2/+4
* | | | | | | | | | | | | | Merge pull request #5979 from owncloud/fix5881blizzz2013-11-211-1/+1
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | LDAP Wizard: add objectclass for group detection in ZimbraArthur Schiwon2013-11-211-1/+1
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | |
* | | | | | | | | | | | | | Merge pull request #5980 from owncloud/public_view_fixesVincent Petry2013-11-212-2/+10
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | disable trahs in files_sharing/public.phpBjoern Schiessle2013-11-212-1/+2
| * | | | | | | | | | | | | fix undefined index errors if public share viewBjoern Schiessle2013-11-212-2/+9
|/ / / / / / / / / / / / /
| | | | | | | | | * | | | remove unused variableBjoern Schiessle2013-11-221-2/+0
| | | | | | | | | * | | | use oc filesystem operations to calc the versions size. This makes sure that ...Bjoern Schiessle2013-11-191-12/+13
| | | | | | | | | | | | * Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-211-4/+10
| | | | | | | | | | | | |\
| | | | | | | | | | | | | * check HTTP Referer to check if we come from public.php or from a internal page.Bjoern Schiessle2013-11-211-4/+10
| | | | | | | | | | | | |/ | | | | | | | | | | | |/|
| | | | | | | | | | | | * Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-211-1/+1
| | | | | | | | | | | | |\ | | | | | | | | | | | | |/ | | | | | | | | | | | |/|
| | | | | | | | | | | * | fix getFileKey() callBjoern Schiessle2013-11-211-1/+1
| | | | | | | | | | | | * Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-2112-60/+36
| | | | | | | | | | | | |\ | | | | | | | | | | | | |/ | | | | | | | | | | | |/|
| | | | | | | | | | | * | Merge branch 'master' into encryption_work_with_public_galleryBjoern Schiessle2013-11-2112-60/+36
| | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5897 from hkjolhede/masterVincent Petry2013-11-211-6/+8
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fixed error-checking error in sftp.phphkjolhede2013-11-151-6/+8
* | | | | | | | | | | | | | Merge pull request #5972 from owncloud/extstorage-webdav-moveoperationfixVincent Petry2013-11-211-2/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Fixed move operation to pass the whole URL as expectedVincent Petry2013-11-201-2/+2
* | | | | | | | | | | | | | beta 5 is herev6.0.0beta5Frank Karlitschek2013-11-201-2/+2
|/ / / / / / / / / / / / /
* | | | | | | | | | | | | Merge pull request #5967 from owncloud/encryption-extstorage-fixsizeresetVincent Petry2013-11-202-1/+5
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Fix for extstorage + encryption where unencrypted size is not keptVincent Petry2013-11-202-1/+5
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | |
* | | | | | | | | | | | | Merge pull request #5965 from owncloud/mimetype-only-pathVincent Petry2013-11-204-37/+7
|\ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | Change default mimetype detection for storage backends to only use filenameRobin Appelman2013-11-204-37/+7
* | | | | | | | | | | | | | Merge pull request #5966 from owncloud/fixing-fileid-webdav-masterblizzz2013-11-201-0/+2
|\ \ \ \ \ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | | | | | always get the right node for the given file pathThomas Müller2013-11-201-0/+2
| |/ / / / / / / / / / / / /
* | | | | | | | | | | | | | Merge pull request #5959 from owncloud/encryption_check_if_file_is_encryptedVincent Petry2013-11-204-24/+20
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | Merge branch 'master' into encryption_check_if_file_is_encryptedBjoern Schiessle2013-11-201-3/+5
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | |
| * | | | | | | | | | | | | check if it is a cached file or a version to resolve the correct path to the ...Bjoern Schiessle2013-11-201-1/+5
| * | | | | | | | | | | | | only check if the key file exists to decide if it is an encrypted file or not.Bjoern Schiessle2013-11-204-25/+17
| |/ / / / / / / / / / / /
| | | | | | | | | | | | * Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub...Bjoern Schiessle2013-11-212-29/+34
| | | | | | | | | | | | |\ | | | | | | | | | | | | |/ | | | | | | | | | | | |/|
| | | | | | | | | | | * | better distinction between userID and keyIdBjoern Schiessle2013-11-212-28/+32
| | | | | | | | | | | | * public upload now also works with encryption enabledBjoern Schiessle2013-11-217-27/+20
| | | | | | | | | | | |/
| | | | | | | | | | | * adapt tests to the new codeBjoern Schiessle2013-11-201-9/+13
| | | | | | | | | | | * make sure that we always use the correct user idBjoern Schiessle2013-11-203-11/+21
| | | | | | | | | | | * fix some getShareKey() and getFileKey() callsBjoern Schiessle2013-11-201-3/+3
| | | | | | | | | | | * [wip] make encryption work with public gallery sharingBjoern Schiessle2013-11-205-56/+65
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | |
* | | | | | | | | | | Merge pull request #5961 from owncloud/core-fixgetfiletempfileconditionVincent Petry2013-11-201-3/+5
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | |
| * | | | | | | | | | Fixed getLocalFile() condition for x-send-fileVincent Petry2013-11-201-3/+5
|/ / / / / / / / / /
* | | | | | | | | | Merge pull request #5926 from owncloud/less-boldFrank Karlitschek2013-11-191-2/+0
|\ \ \ \ \ \ \ \ \ \
| * | | | | | | | | | remove bold from legend, table header, label - less obtrusiveJan-Christoph Borchardt2013-11-181-2/+0
* | | | | | | | | | | Merge pull request #5951 from owncloud/ldap_encryption_fixblizzz2013-11-191-0/+4
|\ \ \ \ \ \ \ \ \ \ \