summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* [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.
| | * | | | Merge multiple failed third party responses when returning the resulttomneedham2013-11-141-3/+10
| | | | | |
| | * | | | Merge multiple shipped failures before responding.tomneedham2013-11-141-2/+10
| | | | | |
| | * | | | Return failed shipped responses over succedded shipped responsestomneedham2013-11-141-3/+3
| | | | | |
| | * | | | Return result object when only one successful response is returnedtomneedham2013-11-141-2/+2
| | | | | |
| | * | | | Update lib/private/api.php after merge conflicttomneedham2013-11-141-1/+1
| | | | | |
| | * | | | Merge branch 'ocs_api_fix_success_code' into oc_api_teststomneedham2013-11-141-2/+13
| | |\ \ \ \
| | | * | | | Pick any none 100 status code before defaulting to 100Tom Needham2013-11-131-2/+13
| | | | | | |
| | * | | | | Merge branch 'master' into oc_api_teststomneedham2013-11-145-12/+101
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | * | | | | Remove OC_App dependancy from OC_API::mergeResponses()tomneedham2013-11-131-9/+12
| | | |/ / / | | |/| | |
| * | | | | Merge pull request #5827 from owncloud/avoid_preview_errorsThomas Müller2013-11-145-7/+12
| |\ \ \ \ \ | | |_|/ / / | |/| | | | Use dedicated OC_Image loader methods in previews
| | * | | | Use dedicated OC_Image loader methodsThomas Tanghus2013-11-135-7/+12
| | |/ / / | | | | | | | | | | | | | | | This prevents excessive logging and disk access
| * | | | Merge pull request #5768 from ↵Morris Jobke2013-11-134-9/+76
| |\ \ \ \ | | | | | | | | | | | | | | | | | | | | | | | | owncloud/quota-workaroundwhenmissingrootsize-home-only Do not use -1 as the size for the root folder of the home storage
| | * | | | Now using HomeStorage for legacy home storage idsVincent Petry2013-11-122-4/+24
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Legacy home storage ids with the format "local://path/to/datadir/user1" are now also wrapped by the HomeStorage.
| | * | | | Now calling parent method when path is not rootVincent Petry2013-11-121-16/+8
| | | | | |
| | * | | | Do not use -1 as the size for the root folder of the home storageRobin Appelman2013-11-123-5/+60
| | | |/ / | | |/| |
| * | | | Merge pull request #5447 from owncloud/fixing-5117-masterVincent Petry2013-11-131-3/+25
| |\ \ \ \ | | |_|/ / | |/| | | No data corruption duriing parallel upload
| | * | | make it possible to detect transferID partBjoern Schiessle2013-11-111-1/+1
| | | | |
| | * | | adding oc-mtime handling to chunked uploadThomas Müller2013-10-211-0/+9
| | | | |
| | * | | chunked files are assembled into a part file on the target storage followed ↵Thomas Müller2013-10-211-3/+16
| | | | | | | | | | | | | | | | | | | | by an atomic rename operation.
| * | | | add trash bin and file versions delete hooks in OC::registerPreviewHooksGeorg Ehrke2013-11-121-0/+2
| | |/ / | |/| |
| * | | Merge pull request #5701 from owncloud/sharing-updateownerfoldersizesMorris Jobke2013-11-111-3/+6
| |\ \ \ | | |_|/ | |/| | Fixed watcher to also update the owner's folder sizes
| | * | Fixed watcher to also update the owner's folder sizesVincent Petry2013-11-051-3/+6
| | | | | | | | | | | | | | | | Note that the root folder size is mandatory for quota calculation.
| * | | Merge pull request #5687 from owncloud/fixing-5659-masterThomas Müller2013-11-091-8/+3
| |\ \ \ | | | | | | | | | | display the exception instead of meaningless message