Commit message (Expand) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | | | | | | | | | | Make working en_US.UTF-8 locale a hard requirement | Bart Visscher | 2013-11-08 | 2 | -7/+8 | |
* | | | | | | | | | | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-21 | 630 | -8468/+8323 | |
* | | | | | | | | | | | | | | | Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome | Vincent Petry | 2013-11-21 | 4 | -8/+94 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|_|_|_|_|/ / / / / / / / |/| | | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | | Now using the "Home" storage detection approach for quota | Vincent Petry | 2013-11-21 | 2 | -15/+22 | |
| * | | | | | | | | | | | | | | Quota storage wrapper is now used for all users in sharing mode | Vincent Petry | 2013-11-21 | 3 | -9/+88 | |
| | |_|_|/ / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #5988 from owncloud/files-mobilequickfix | Morris Jobke | 2013-11-21 | 1 | -0/+3 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | Added min width to files table | Vincent Petry | 2013-11-21 | 1 | -0/+3 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #5983 from owncloud/fixing-l10n-again-master | Thomas Müller | 2013-11-21 | 3 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|_|/ / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | fixing spelling and restructure sentence | Thomas Müller | 2013-11-21 | 1 | -1/+1 | |
| * | | | | | | | | | | | | | unify translation string - less work for the translators | Thomas Müller | 2013-11-21 | 2 | -2/+4 | |
* | | | | | | | | | | | | | | Merge pull request #5979 from owncloud/fix5881 | blizzz | 2013-11-21 | 1 | -1/+1 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | LDAP Wizard: add objectclass for group detection in Zimbra | Arthur Schiwon | 2013-11-21 | 1 | -1/+1 | |
| | |/ / / / / / / / / / / / | |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | | Merge pull request #5980 from owncloud/public_view_fixes | Vincent Petry | 2013-11-21 | 2 | -2/+10 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | disable trahs in files_sharing/public.php | Bjoern Schiessle | 2013-11-21 | 2 | -1/+2 | |
| * | | | | | | | | | | | | | fix undefined index errors if public share view | Bjoern Schiessle | 2013-11-21 | 2 | -2/+9 | |
|/ / / / / / / / / / / / / | ||||||
| | | | | | | | | * | | | | remove unused variable | Bjoern Schiessle | 2013-11-22 | 1 | -2/+0 | |
| | | | | | | | | * | | | | use oc filesystem operations to calc the versions size. This makes sure that ... | Bjoern Schiessle | 2013-11-19 | 1 | -12/+13 | |
| | | | | | | | | | | | * | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub... | Bjoern Schiessle | 2013-11-21 | 1 | -4/+10 | |
| | | | | | | | | | | | |\ | ||||||
| | | | | | | | | | | | | * | check HTTP Referer to check if we come from public.php or from a internal page. | Bjoern Schiessle | 2013-11-21 | 1 | -4/+10 | |
| | | | | | | | | | | | |/ | | | | | | | | | | | |/| | ||||||
| | | | | | | | | | | | * | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub... | Bjoern Schiessle | 2013-11-21 | 1 | -1/+1 | |
| | | | | | | | | | | | |\ | | | | | | | | | | | | |/ | | | | | | | | | | | |/| | ||||||
| | | | | | | | | | | * | | fix getFileKey() call | Bjoern Schiessle | 2013-11-21 | 1 | -1/+1 | |
| | | | | | | | | | | | * | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub... | Bjoern Schiessle | 2013-11-21 | 12 | -60/+36 | |
| | | | | | | | | | | | |\ | | | | | | | | | | | | |/ | | | | | | | | | | | |/| | ||||||
| | | | | | | | | | | * | | Merge branch 'master' into encryption_work_with_public_gallery | Bjoern Schiessle | 2013-11-21 | 12 | -60/+36 | |
| | | | | | | | | | | |\ \ | |_|_|_|_|_|_|_|_|_|_|/ / |/| | | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #5897 from hkjolhede/master | Vincent Petry | 2013-11-21 | 1 | -6/+8 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fixed error-checking error in sftp.php | hkjolhede | 2013-11-15 | 1 | -6/+8 | |
* | | | | | | | | | | | | | | Merge pull request #5972 from owncloud/extstorage-webdav-moveoperationfix | Vincent Petry | 2013-11-21 | 1 | -2/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |_|/ / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Fixed move operation to pass the whole URL as expected | Vincent Petry | 2013-11-20 | 1 | -2/+2 | |
* | | | | | | | | | | | | | | beta 5 is herev6.0.0beta5 | Frank Karlitschek | 2013-11-20 | 1 | -2/+2 | |
|/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset | Vincent Petry | 2013-11-20 | 2 | -1/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Fix for extstorage + encryption where unencrypted size is not kept | Vincent Petry | 2013-11-20 | 2 | -1/+5 | |
| | |_|_|_|_|/ / / / / / / | |/| | | | | | | | | | | | ||||||
* | | | | | | | | | | | | | Merge pull request #5965 from owncloud/mimetype-only-path | Vincent Petry | 2013-11-20 | 4 | -37/+7 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | Change default mimetype detection for storage backends to only use filename | Robin Appelman | 2013-11-20 | 4 | -37/+7 | |
* | | | | | | | | | | | | | | Merge pull request #5966 from owncloud/fixing-fileid-webdav-master | blizzz | 2013-11-20 | 1 | -0/+2 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | | | | | always get the right node for the given file path | Thomas Müller | 2013-11-20 | 1 | -0/+2 | |
| |/ / / / / / / / / / / / / | ||||||
* | | | | | | | | | | | | | | Merge pull request #5959 from owncloud/encryption_check_if_file_is_encrypted | Vincent Petry | 2013-11-20 | 4 | -24/+20 | |
|\ \ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | Merge branch 'master' into encryption_check_if_file_is_encrypted | Bjoern Schiessle | 2013-11-20 | 1 | -3/+5 | |
| |\ \ \ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / / / / |/| | | | | | | | | | | | | | ||||||
| * | | | | | | | | | | | | | check if it is a cached file or a version to resolve the correct path to the ... | Bjoern Schiessle | 2013-11-20 | 1 | -1/+5 | |
| * | | | | | | | | | | | | | only check if the key file exists to decide if it is an encrypted file or not. | Bjoern Schiessle | 2013-11-20 | 4 | -25/+17 | |
| |/ / / / / / / / / / / / | ||||||
| | | | | | | | | | | | * | Merge branch 'encryption_work_with_public_gallery' into encryption_enable_pub... | Bjoern Schiessle | 2013-11-21 | 2 | -29/+34 | |
| | | | | | | | | | | | |\ | | | | | | | | | | | | |/ | | | | | | | | | | | |/| | ||||||
| | | | | | | | | | | * | | better distinction between userID and keyId | Bjoern Schiessle | 2013-11-21 | 2 | -28/+32 | |
| | | | | | | | | | | | * | public upload now also works with encryption enabled | Bjoern Schiessle | 2013-11-21 | 7 | -27/+20 | |
| | | | | | | | | | | |/ | ||||||
| | | | | | | | | | | * | adapt tests to the new code | Bjoern Schiessle | 2013-11-20 | 1 | -9/+13 | |
| | | | | | | | | | | * | make sure that we always use the correct user id | Bjoern Schiessle | 2013-11-20 | 3 | -11/+21 | |
| | | | | | | | | | | * | fix some getShareKey() and getFileKey() calls | Bjoern Schiessle | 2013-11-20 | 1 | -3/+3 | |
| | | | | | | | | | | * | [wip] make encryption work with public gallery sharing | Bjoern Schiessle | 2013-11-20 | 5 | -56/+65 | |
| |_|_|_|_|_|_|_|_|_|/ |/| | | | | | | | | | | ||||||
* | | | | | | | | | | | Merge pull request #5961 from owncloud/core-fixgetfiletempfilecondition | Vincent Petry | 2013-11-20 | 1 | -3/+5 | |
|\ \ \ \ \ \ \ \ \ \ \ | |/ / / / / / / / / / |/| | | | | | | | | | | ||||||
| * | | | | | | | | | | Fixed getLocalFile() condition for x-send-file | Vincent Petry | 2013-11-20 | 1 | -3/+5 | |
|/ / / / / / / / / / | ||||||
* | | | | | | | | | | Merge pull request #5926 from owncloud/less-bold | Frank Karlitschek | 2013-11-19 | 1 | -2/+0 | |
|\ \ \ \ \ \ \ \ \ \ | ||||||
| * | | | | | | | | | | remove bold from legend, table header, label - less obtrusive | Jan-Christoph Borchardt | 2013-11-18 | 1 | -2/+0 | |
* | | | | | | | | | | | Merge pull request #5951 from owncloud/ldap_encryption_fix | blizzz | 2013-11-19 | 1 | -0/+4 | |
|\ \ \ \ \ \ \ \ \ \ \ |