summaryrefslogtreecommitdiffstats
path: root/apps
Commit message (Expand)AuthorAgeFilesLines
* Merge pull request #6058 from owncloud/ldap2avatarblizzz2013-11-266-9/+101
|\
| * Make sure Avatar is set from LDAP upon first login, not later, but also not b...Arthur Schiwon2013-11-261-2/+14
| * LDAP: username2dn should only return DNs that belong to the current LDAP ser...Arthur Schiwon2013-11-251-1/+3
| * LDAP: proxy: configurable return to determine when to try the next LDAP serve...Arthur Schiwon2013-11-253-8/+12
| * LDAP: last avatar lookup must be stored per user. Someone had a blackout, eh?Arthur Schiwon2013-11-221-5/+6
| * LDAP: user proxy must support canChangeAvatar tooArthur Schiwon2013-11-221-0/+9
| * LDAP: get user photo from LDAP and set it as avatar if availableArthur Schiwon2013-11-222-1/+65
* | Merge pull request #6066 from owncloud/extstorage-sftp-overwriteonrenameVincent Petry2013-11-261-0/+3
|\ \
| * | Fixed SFTP storage to overwrite on renameVincent Petry2013-11-261-0/+3
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-264-1/+14
|/ /
* | Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefixVincent Petry2013-11-262-2/+16
|\ \
| * | Fixed SMB rename function to overwrite target fileVincent Petry2013-11-252-2/+16
* | | Merge pull request #6054 from owncloud/extstorage-dropboxfixesMorris Jobke2013-11-262-12/+60
|\ \ \
| * | | Fixed various Dropbox issues + unit testsVincent Petry2013-11-262-12/+60
* | | | Updated unit tests for SMBVincent Petry2013-11-261-0/+5
* | | | Return true when touch succeedsVincent Petry2013-11-261-0/+1
|/ / /
* | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-264-0/+8
* | | Merge branch 'master' into calc_version_sizeBjoern Schiessle2013-11-2662-187/+489
|\ \ \
| * | | Fixed FTP storage unit tests to use the correct classVincent Petry2013-11-251-4/+4
| * | | Merge pull request #5641 from owncloud/filestrash-emptytrashBjörn Schießle2013-11-255-26/+77
| |\ \ \
| | * | | Deleting all files in trash now only sends a single flagVincent Petry2013-11-115-26/+77
| * | | | Fixed ext storage touch function to return true on successVincent Petry2013-11-253-3/+8
| | |/ / | |/| |
| * | | Merge pull request #5991 from owncloud/extstorage-mountpointvalidationMorris Jobke2013-11-252-0/+56
| |\ \ \
| | * | | Now also preventing the user of "Shared" as mountpointVincent Petry2013-11-222-2/+4
| | * | | Added unit test for root mount point validationVincent Petry2013-11-211-0/+49
| | * | | Prevent using root as mount point for external storageVincent Petry2013-11-211-0/+5
| * | | | Merge pull request #5995 from owncloud/extstorage-isreadablefixVincent Petry2013-11-247-52/+0
| |\ \ \ \
| | * | | | Moved default isReadable/isUpdatable impl into Common classVincent Petry2013-11-227-57/+0
| | * | | | Return plausible isReadable() default impl for ext storageVincent Petry2013-11-221-2/+7
| * | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-248-4/+25
| |/ / / /
| * | | / fixed documentationThomas Müller2013-11-221-1/+1
| | |_|/ | |/| |
| * | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-215-1/+7
| * | | Merge pull request #5970 from owncloud/extstorage-webdavdotdirfixVincent Petry2013-11-211-5/+3
| |\ \ \
| | * | | Fixed path normalization to prevent dot dirsVincent Petry2013-11-211-5/+3
| * | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-2124-53/+170
| * | | | Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershomeVincent Petry2013-11-211-0/+15
| |\ \ \ \ | | |_|/ / | |/| | |
| | * | | Quota storage wrapper is now used for all users in sharing modeVincent Petry2013-11-211-0/+15
| * | | | 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 #5979 from owncloud/fix5881blizzz2013-11-211-1/+1
| |\ \ \
| | * | | LDAP Wizard: add objectclass for group detection in ZimbraArthur Schiwon2013-11-211-1/+1
| | |/ /
| * | | 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
| |/ /
| * | Merge pull request #5897 from hkjolhede/masterVincent Petry2013-11-211-6/+8
| |\ \
| | * | Fixed error-checking error in sftp.phphkjolhede2013-11-151-6/+8
| * | | Fixed move operation to pass the whole URL as expectedVincent Petry2013-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
| * | | | 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
| |/ / /