Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | Merge branch 'master' into fix-5388-master | Thomas Mueller | 2013-11-24 | 137 | -381/+451 |
|\ | |||||
| * | Merge pull request #5874 from owncloud/fix-5845 | Thomas Müller | 2013-11-24 | 2 | -2/+2 |
| |\ | | | | | | | Fix file uploads on Windows with SQL Server | ||||
| | * | Compare dirname() results to DIRECTORY_SEPARATOR, not '/' | ringmaster | 2013-11-14 | 1 | -1/+1 |
| | | | |||||
| | * | Alias the aggregate columns so SQL Server doesn't combine them. | ringmaster | 2013-11-14 | 1 | -1/+1 |
| | | | |||||
| * | | Merge pull request #6018 from owncloud/fix_overwritehost | Thomas Müller | 2013-11-24 | 2 | -1/+28 |
| |\ \ | | | | | | | | | fix overwrite host support and make the code a bit more readable | ||||
| | * | | adding simple unit test to test scriptName() under overwrite condition | Thomas Mueller | 2013-11-24 | 1 | -0/+26 |
| | | | | |||||
| | * | | update PHPDoc | Thomas Mueller | 2013-11-24 | 1 | -0/+1 |
| | | | | |||||
| | * | | fix overwrite host support and make the code a bit more readable | Frank Karlitschek | 2013-11-24 | 1 | -1/+1 |
| |/ / | |||||
| * | | Merge pull request #5995 from owncloud/extstorage-isreadablefix | Vincent Petry | 2013-11-24 | 8 | -52/+13 |
| |\ \ | | | | | | | | | Return plausible isReadable() default impl for ext storage | ||||
| | * | | Moved default isReadable/isUpdatable impl into Common class | Vincent Petry | 2013-11-22 | 8 | -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 storage | Vincent Petry | 2013-11-22 | 1 | -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 transifex | Jenkins for ownCloud | 2013-11-24 | 124 | -310/+393 |
| |/ / | |||||
| * | | Revert "use relative paths to create images from a file. This way it also ↵ | Bjoern Schiessle | 2013-11-22 | 1 | -16/+15 |
| | | | | | | | | | | | | | | | | | | works if" This reverts commit 3488f0b77a2d03747bf20b5d870639cb40440083. | ||||
* | | | ref 3rdparty branch without MDB2 code | Thomas Müller | 2013-11-22 | 1 | -0/+0 |
| | | | |||||
* | | | Merge branch 'master' into fix-5388-master | Thomas Müller | 2013-11-22 | 12 | -24/+162 |
|\| | | |||||
| * | | Merge pull request #6003 from owncloud/incognito_mode | Vincent Petry | 2013-11-22 | 2 | -1/+14 |
| |\ \ | | | | | | | | | Incognito mode | ||||
| | * | | set incognito mode for public.php calls. Because in this case ownCloud ↵ | Bjoern Schiessle | 2013-11-22 | 1 | -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 Schiessle | 2013-11-22 | 1 | -1/+13 |
| | | | | | | | | | | | | | | | | to access public resources while a user is still logged in | ||||
| * | | | fixed documentation | Thomas Müller | 2013-11-22 | 1 | -1/+1 |
| | | | | |||||
| * | | | Merge pull request #5882 from owncloud/preview-movie-5s | Thomas Müller | 2013-11-22 | 1 | -4/+6 |
| |\ \ \ | | | | | | | | | | | Movie preview - use frame after 5 seconds | ||||
| | * | | | we better use 5MB (1024 * 1024 * 5 = 5242880) instead of 1MB. | Thomas Müller | 2013-11-22 | 1 | -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üller | 2013-11-22 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | -vsync 1 can heal that | ||||
| | * | | | Movie preview - use frame after 5 seconds | Morris Jobke | 2013-11-15 | 1 | -2/+2 |
| | | | | | |||||
| * | | | | Merge pull request #6000 from owncloud/use_relative_path_to_create_images | Raghu Nayyar | 2013-11-22 | 1 | -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 if | Bjoern Schiessle | 2013-11-22 | 1 | -15/+16 |
| | | |/ / | | |/| | | | | | | | | | | | | no user is logged in (e.g. public gallery share) | ||||
| * | | | | Merge pull request #5040 from owncloud/public_api_avatar_master | blizzz | 2013-11-22 | 7 | -3/+125 |
| |\ \ \ \ | | | | | | | | | | | | | Add public API for \OC\Avatar | ||||
| | * | | | | fixing PHPDoc comments and syntax | Thomas Müller | 2013-11-22 | 3 | -4/+6 |
| | | | | | | |||||
| | * | | | | Add missing Avatar Interface | Arthur Schiwon | 2013-11-22 | 1 | -0/+38 |
| | | | | | | |||||
| | * | | | | Round out Avatar Public API | Arthur Schiwon | 2013-11-21 | 5 | -76/+47 |
| | | | | | | |||||
| | * | | | | Fix a regression (Tags→TagManager) | kondou | 2013-11-07 | 1 | -1/+1 |
| | | | | | | |||||
| | * | | | | Remove duplicate getAvatarManager() | kondou | 2013-11-07 | 1 | -9/+0 |
| | | | | | | |||||
| | * | | | | Add public API for \OC\Avatar | kondou | 2013-11-07 | 5 | -2/+122 |
| | | | | | | |||||
* | | | | | | Change OC_Migrate from MDB2 to Doctrine | Bart Visscher | 2013-11-22 | 3 | -107/+26 |
|/ / / / / | |||||
* | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-21 | 159 | -3216/+4017 |
| | | | | | |||||
* | | | | | Merge pull request #5970 from owncloud/extstorage-webdavdotdirfix | Vincent Petry | 2013-11-21 | 1 | -5/+3 |
|\ \ \ \ \ | | | | | | | | | | | | | Fixed path normalization to prevent dot dirs | ||||
| * | | | | | Fixed path normalization to prevent dot dirs | Vincent Petry | 2013-11-21 | 1 | -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-master | Thomas Müller | 2013-11-21 | 4 | -13/+22 |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Make working en_US.UTF-8 locale a hard requirement | ||||
| * | | | | | | Fixing the warning notifications | Thomas Müller | 2013-11-21 | 2 | -2/+10 |
| | | | | | | | |||||
| * | | | | | | Update error messages | Bart Visscher | 2013-11-15 | 3 | -4/+4 |
| | | | | | | | |||||
| * | | | | | | Use \Patchwork\Utf8\Bootup::initLocale | Bart Visscher | 2013-11-15 | 1 | -2/+2 |
| | | | | | | | |||||
| * | | | | | | 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 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Quota storage wrapper is now used for all users in sharing mode | ||||
| * | | | | | | | Now using the "Home" storage detection approach for quota | Vincent Petry | 2013-11-21 | 2 | -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 mode | Vincent Petry | 2013-11-21 | 3 | -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-mobilequickfix | Morris Jobke | 2013-11-21 | 1 | -0/+3 |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | Added min width to files table | ||||
| * | | | | | | | Added min width to files table | Vincent Petry | 2013-11-21 | 1 | -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-master | Thomas Müller | 2013-11-21 | 3 | -3/+5 |
|\ \ \ \ \ \ \ | |_|_|/ / / / |/| | | | | | | Fixing l10n again master | ||||
| * | | | | | | 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 |
| | | | | | | |