aboutsummaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-24124-310/+393
* Revert "use relative paths to create images from a file. This way it also wor...Bjoern Schiessle2013-11-221-16/+15
* Merge pull request #6003 from owncloud/incognito_modeVincent Petry2013-11-222-1/+14
|\
| * set incognito mode for public.php calls. Because in this case ownCloud should...Bjoern Schiessle2013-11-221-0/+1
| * add incognito mode, allows to hide my user ID. For example, this is useful to...Bjoern Schiessle2013-11-221-1/+13
* | fixed documentationThomas Müller2013-11-221-1/+1
* | Merge pull request #5882 from owncloud/preview-movie-5sThomas Müller2013-11-221-4/+6
|\ \
| * | we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.Thomas Müller2013-11-221-1/+3
| * | Working on a chunked video can result in a broken frame index the option -vsy...Thomas Müller2013-11-221-1/+1
| * | Movie preview - use frame after 5 secondsMorris Jobke2013-11-151-2/+2
* | | Merge pull request #6000 from owncloud/use_relative_path_to_create_imagesRaghu Nayyar2013-11-221-15/+16
|\ \ \
| * | | use relative paths to create images from a file. This way it also works ifBjoern Schiessle2013-11-221-15/+16
| | |/ | |/|
* | | Merge pull request #5040 from owncloud/public_api_avatar_masterblizzz2013-11-227-3/+125
|\ \ \
| * | | fixing PHPDoc comments and syntaxThomas Müller2013-11-223-4/+6
| * | | Add missing Avatar InterfaceArthur Schiwon2013-11-221-0/+38
| * | | Round out Avatar Public APIArthur Schiwon2013-11-215-76/+47
| * | | Fix a regression (Tags→TagManager)kondou2013-11-071-1/+1
| * | | Remove duplicate getAvatarManager()kondou2013-11-071-9/+0
| * | | Add public API for \OC\Avatarkondou2013-11-075-2/+122
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-21159-3216/+4017
* | | | 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
* | | | | Merge pull request #5773 from owncloud/fix-2152-masterThomas Müller2013-11-214-13/+22
|\ \ \ \ \
| * | | | | Fixing the warning notificationsThomas Müller2013-11-212-2/+10
| * | | | | Update error messagesBart Visscher2013-11-153-4/+4
| * | | | | Use \Patchwork\Utf8\Bootup::initLocaleBart Visscher2013-11-151-2/+2
| * | | | | 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
|/ / / / /
* | | | | 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