summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge branch 'master' into fix-5388-masterThomas Mueller2013-11-24137-381/+451
|\
| * Merge pull request #5874 from owncloud/fix-5845Thomas Müller2013-11-242-2/+2
| |\ | | | | | | Fix file uploads on Windows with SQL Server
| | * Compare dirname() results to DIRECTORY_SEPARATOR, not '/'ringmaster2013-11-141-1/+1
| | |
| | * Alias the aggregate columns so SQL Server doesn't combine them.ringmaster2013-11-141-1/+1
| | |
| * | Merge pull request #6018 from owncloud/fix_overwritehostThomas Müller2013-11-242-1/+28
| |\ \ | | | | | | | | fix overwrite host support and make the code a bit more readable
| | * | adding simple unit test to test scriptName() under overwrite conditionThomas Mueller2013-11-241-0/+26
| | | |
| | * | update PHPDocThomas Mueller2013-11-241-0/+1
| | | |
| | * | fix overwrite host support and make the code a bit more readableFrank Karlitschek2013-11-241-1/+1
| |/ /
| * | Merge pull request #5995 from owncloud/extstorage-isreadablefixVincent Petry2013-11-248-52/+13
| |\ \ | | | | | | | | Return plausible isReadable() default impl for ext storage
| | * | Moved default isReadable/isUpdatable impl into Common classVincent Petry2013-11-228-57/+13
| | | | | | | | | | | | | | | | | | | | Also adjusted all ext storage backends to not override these when the default behavior is expected.
| | * | Return plausible isReadable() default impl for ext storageVincent Petry2013-11-221-2/+7
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When an ext storage doesn't implement isReadable(), always returning true made the file scanner believe that the file exists and creates a cache entry with the size zero. This fix makes the default impl of isReadable() use file_exists(). Fixes #5940
| * | | [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 ↵Bjoern Schiessle2013-11-221-16/+15
| | | | | | | | | | | | | | | | | | works if" This reverts commit 3488f0b77a2d03747bf20b5d870639cb40440083.
* | | ref 3rdparty branch without MDB2 codeThomas Müller2013-11-221-0/+0
| | |
* | | Merge branch 'master' into fix-5388-masterThomas Müller2013-11-2212-24/+162
|\| |
| * | Merge pull request #6003 from owncloud/incognito_modeVincent Petry2013-11-222-1/+14
| |\ \ | | | | | | | | Incognito mode
| | * | set incognito mode for public.php calls. Because in this case ownCloud ↵Bjoern Schiessle2013-11-221-0/+1
| | | | | | | | | | | | | | | | should always work the same way as if no user is logged in
| | * | add incognito mode, allows to hide my user ID. For example, this is useful ↵Bjoern Schiessle2013-11-221-1/+13
| | | | | | | | | | | | | | | | to access public resources while a user is still logged in
| * | | fixed documentationThomas Müller2013-11-221-1/+1
| | | |
| * | | Merge pull request #5882 from owncloud/preview-movie-5sThomas Müller2013-11-221-4/+6
| |\ \ \ | | | | | | | | | | Movie preview - use frame after 5 seconds
| | * | | we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB.Thomas Müller2013-11-221-1/+3
| | | | | | | | | | | | | | | | | | | | in some cases 1MB was no enough to generate thumbnail
| | * | | Working on a chunked video can result in a broken frame index the option ↵Thomas Müller2013-11-221-1/+1
| | | | | | | | | | | | | | | | | | | | -vsync 1 can heal that
| | * | | 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.
| | * | | | use relative paths to create images from a file. This way it also works ifBjoern Schiessle2013-11-221-15/+16
| | | |/ / | | |/| | | | | | | | | | | | no user is logged in (e.g. public gallery share)
| * | | | Merge pull request #5040 from owncloud/public_api_avatar_masterblizzz2013-11-227-3/+125
| |\ \ \ \ | | | | | | | | | | | | Add public API for \OC\Avatar
| | * | | | 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
| | | | | |
* | | | | | Change OC_Migrate from MDB2 to DoctrineBart Visscher2013-11-223-107/+26
|/ / / / /
* | | | | [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 dirs
| * | | | | Fixed path normalization to prevent dot dirsVincent Petry2013-11-211-5/+3
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Fixes #5945 where stat(.) would cause the backend OC to cache a dot dir (only in older versions)
* | | | | | Merge pull request #5773 from owncloud/fix-2152-masterThomas Müller2013-11-214-13/+22
|\ \ \ \ \ \ | | | | | | | | | | | | | | Make working en_US.UTF-8 locale a hard requirement
| * | | | | | 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
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Quota storage wrapper is now used for all users in sharing mode
| * | | | | | | Now using the "Home" storage detection approach for quotaVincent Petry2013-11-212-15/+22
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | To find out whether to apply a quota, we now try and detect whether the storage to wrap is a "Home" storage.
| * | | | | | | Quota storage wrapper is now used for all users in sharing modeVincent Petry2013-11-213-9/+88
| | |_|_|/ / / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | When accessing a shared folder, the folder's owner appears as mountpoint but wasn't wrapped by a quota storage wrapper. This fix makes sure that all home storages are wrapped by a quota storage wrapper, if applicable, to make sure quotas are respected when uploading into shared folders.
* | | | | | | Merge pull request #5988 from owncloud/files-mobilequickfixMorris Jobke2013-11-211-0/+3
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | Added min width to files table
| * | | | | | | Added min width to files tableVincent Petry2013-11-211-0/+3
| |/ / / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Having a too small widths for the files table doesn't make sense as it overlaps file actions with the files themselves and make them unclickable, especially when viewed on mobile phone. The compromise that this fix introduces is to have a minimum width that will trigger horizontal scrolling, which will at least make it possible to click files on mobile phones.
* | | | | | | Merge pull request #5983 from owncloud/fixing-l10n-again-masterThomas Müller2013-11-213-3/+5
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | Fixing l10n again master
| * | | | | | 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
| | | | | | |