summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [tx-robot] updated from transifexJenkins for ownCloud2013-11-246-1/+6
|
* 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.
* Merge pull request #6003 from owncloud/incognito_modeVincent Petry2013-11-221-1/+13
|\ | | | | Incognito mode
| * 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
* | 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-226-3/+110
|\ \ \ | | | | | | | | 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-214-76/+32
| | | |
| * | | 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-215-3/+7
| | | |
* | | | Merge pull request #5773 from owncloud/fix-2152-masterThomas Müller2013-11-212-9/+10
|\ \ \ \ | | | | | | | | | | Make working en_US.UTF-8 locale a hard requirement
| * | | | Fixing the warning notificationsThomas Müller2013-11-211-1/+1
| | | | |
| * | | | Update error messagesBart Visscher2013-11-151-1/+1
| | | | |
| * | | | 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-2130-29/+1
| | | | |
* | | | | Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershomeVincent Petry2013-11-212-8/+30
|\ \ \ \ \ | | | | | | | | | | | | 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-211-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 sentenceThomas Müller2013-11-211-1/+1
|/ / / /
* | | | Merge pull request #5965 from owncloud/mimetype-only-pathVincent Petry2013-11-204-37/+7
|\ \ \ \ | | | | | | | | | | Change default mimetype detection for storage backends to only use filename
| * | | | Change default mimetype detection for storage backends to only use filenameRobin Appelman2013-11-204-37/+7
| | | | |
* | | | | always get the right node for the given file pathThomas Müller2013-11-201-0/+2
|/ / / /
* | | | Fixed getLocalFile() condition for x-send-fileVincent Petry2013-11-201-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-excludeextstorageMorris Jobke2013-11-184-7/+12
|\ \ \ \ | | | | | | | | | | External storage space is now not counted in total space
| * | | | External storage space is now not counted in total spaceVincent Petry2013-11-184-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" subdirVincent Petry2013-11-181-0/+13
|/ / / / | | | | | | | | | | | | Fixes #4593
* | | | one tab lessFrank Karlitschek2013-11-181-1/+1
| | | |
* | | | fix the version check for downloaded apps. Fixes ↵Frank Karlitschek2013-11-181-2/+9
| | | | | | | | | | | | | | | | https://github.com/owncloud/apps/issues/1485
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-153-17/+23
| | | |
* | | | Merge pull request #5789 from ogasser/db_fix_default_for_numericBart Visscher2013-11-151-1/+4
|\ \ \ \ | | | | | | | | | | DB: Set correct default value for numeric types
| * | | | treat numeric as an alias for decimalOliver Gasser2013-11-121-0/+3
| | | | |
| * | | | changed type to decimalOliver Gasser2013-11-121-1/+1
| | | | |
| * | | | DB: Set correct default value for numeric typesOliver Gasser2013-11-101-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-masterThomas Müller2013-11-151-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 specifiedBart Visscher2013-11-111-1/+1
| |/ / /
* | | | Merge branch 'master' into moviepreviewfallbackThomas Müller2013-11-1417-53/+222
|\ \ \ \ | | | | | | | | | | | | | | | | | | | | Conflicts: lib/private/preview/movies.php
| * \ \ \ Merge pull request #5824 from owncloud/fix-publicshare-non-existingThomas Müller2013-11-141-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 linkRobin Appelman2013-11-121-1/+1
| | | | | |
| * | | | | Merge pull request #5862 from owncloud/files-singledotdirsThomas Müller2013-11-141-3/+17
| |\ \ \ \ \ | | | | | | | | | | | | | | Files singledotdirs
| | * | | | | Fixed normalizePath() to strip out single dot dirsVincent Petry2013-11-141-3/+17
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Now removing "/./" and trailing "/." from the paths when normalizing.
| * | | | | | Merge pull request #5850 from owncloud/oc_api_testsThomas Müller2013-11-141-17/+46
| |\ \ \ \ \ \ | | | | | | | | | | | | | | | | Add unit tests for OC_API::mergeResponses and fix error with api returning incorrect status codes.