Commit message (Collapse) | Author | Age | Files | Lines | |
---|---|---|---|---|---|
* | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-24 | 6 | -1/+6 |
| | |||||
* | 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. | ||||
* | Merge pull request #6003 from owncloud/incognito_mode | Vincent Petry | 2013-11-22 | 1 | -1/+13 |
|\ | | | | | Incognito mode | ||||
| * | 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 | ||||
* | | 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 | 6 | -3/+110 |
|\ \ \ | | | | | | | | | 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 | 4 | -76/+32 |
| | | | | |||||
| * | | | 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 |
| | | | | |||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-21 | 5 | -3/+7 |
| | | | | |||||
* | | | | Merge pull request #5773 from owncloud/fix-2152-master | Thomas Müller | 2013-11-21 | 2 | -9/+10 |
|\ \ \ \ | | | | | | | | | | | Make working en_US.UTF-8 locale a hard requirement | ||||
| * | | | | Fixing the warning notifications | Thomas Müller | 2013-11-21 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | Update error messages | Bart Visscher | 2013-11-15 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | 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 | 30 | -29/+1 |
| | | | | | |||||
* | | | | | Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome | Vincent Petry | 2013-11-21 | 2 | -8/+30 |
|\ \ \ \ \ | | | | | | | | | | | | | 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 | 1 | -9/+24 |
| | |_|/ / | |/| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | 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. | ||||
* / | | | | fixing spelling and restructure sentence | Thomas Müller | 2013-11-21 | 1 | -1/+1 |
|/ / / / | |||||
* | | | | 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 | ||||
| * | | | | Change default mimetype detection for storage backends to only use filename | Robin Appelman | 2013-11-20 | 4 | -37/+7 |
| | | | | | |||||
* | | | | | always get the right node for the given file path | Thomas Müller | 2013-11-20 | 1 | -0/+2 |
|/ / / / | |||||
* | | | | Fixed getLocalFile() condition for x-send-file | Vincent Petry | 2013-11-20 | 1 | -3/+5 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Until now, addSendfileHeader() was called even when no x-send-file headers were set. Even though the method itself doesn't do anything, a call to getLocalFile() was done and would trigger a full download when using external storage. Additionally, the storage resolution code is wrong and always returns the local storage of the root filesystem, which caused the code to be run anyway. This commit fixes both issues. | ||||
* | | | | Merge pull request #5927 from owncloud/quota-excludeextstorage | Morris Jobke | 2013-11-18 | 4 | -7/+12 |
|\ \ \ \ | | | | | | | | | | | External storage space is now not counted in total space | ||||
| * | | | | External storage space is now not counted in total space | Vincent Petry | 2013-11-18 | 4 | -7/+12 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Added argument to getFileInfo() to disable adding the size of mountpoints to a directory's size. Fixes #5924 | ||||
* | | | | | Root size for home storage is now size of "files" subdir | Vincent Petry | 2013-11-18 | 1 | -0/+13 |
|/ / / / | | | | | | | | | | | | | Fixes #4593 | ||||
* | | | | one tab less | Frank Karlitschek | 2013-11-18 | 1 | -1/+1 |
| | | | | |||||
* | | | | fix the version check for downloaded apps. Fixes ↵ | Frank Karlitschek | 2013-11-18 | 1 | -2/+9 |
| | | | | | | | | | | | | | | | | https://github.com/owncloud/apps/issues/1485 | ||||
* | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-15 | 3 | -17/+23 |
| | | | | |||||
* | | | | Merge pull request #5789 from ogasser/db_fix_default_for_numeric | Bart Visscher | 2013-11-15 | 1 | -1/+4 |
|\ \ \ \ | | | | | | | | | | | DB: Set correct default value for numeric types | ||||
| * | | | | treat numeric as an alias for decimal | Oliver Gasser | 2013-11-12 | 1 | -0/+3 |
| | | | | | |||||
| * | | | | changed type to decimal | Oliver Gasser | 2013-11-12 | 1 | -1/+1 |
| | | | | | |||||
| * | | | | DB: Set correct default value for numeric types | Oliver Gasser | 2013-11-10 | 1 | -1/+1 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Set 0 as default value for columns with numeric data type instead of the empty string ''. Otherwise the database complains about an invalid default value for this column. To reproduce put the following in your ````appinfo/database.xml````: ```` <field> <name>modified</name> <type>decimal</type> <default/> <notnull>true</notnull> <length>15</length> </field> ```` See owncloud/mozilla_sync#14 | ||||
* | | | | | Merge pull request #5813 from owncloud/fix-4736-master | Thomas Müller | 2013-11-15 | 1 | -1/+1 |
|\ \ \ \ \ | |_|_|_|/ |/| | | | | Don't set a default value when there isn't a default specified | ||||
| * | | | | Don't set a default value when there isn't a default specified | Bart Visscher | 2013-11-11 | 1 | -1/+1 |
| |/ / / | |||||
* | | | | Merge branch 'master' into moviepreviewfallback | Thomas Müller | 2013-11-14 | 17 | -53/+222 |
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/preview/movies.php | ||||
| * \ \ \ | Merge pull request #5824 from owncloud/fix-publicshare-non-existing | Thomas Müller | 2013-11-14 | 1 | -1/+1 |
| |\ \ \ \ | | | | | | | | | | | | | Fix fatal error when trying to open a non existing public link | ||||
| | * | | | | Fix fatal error when trying to open a non existing public link | Robin Appelman | 2013-11-12 | 1 | -1/+1 |
| | | | | | | |||||
| * | | | | | Merge pull request #5862 from owncloud/files-singledotdirs | Thomas Müller | 2013-11-14 | 1 | -3/+17 |
| |\ \ \ \ \ | | | | | | | | | | | | | | | Files singledotdirs | ||||
| | * | | | | | Fixed normalizePath() to strip out single dot dirs | Vincent Petry | 2013-11-14 | 1 | -3/+17 |
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | Now removing "/./" and trailing "/." from the paths when normalizing. | ||||
| * | | | | | | Merge pull request #5850 from owncloud/oc_api_tests | Thomas Müller | 2013-11-14 | 1 | -17/+46 |
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | | Add unit tests for OC_API::mergeResponses and fix error with api returning incorrect status codes. |