summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
...
| * | | | | the filesystem has to be initialized once we know the userThomas Müller2013-11-081-0/+8
| |/ / / /
| * | | | Merge pull request #5747 from owncloud/scanner-post-hooksMorris Jobke2013-11-071-0/+5
| |\ \ \ \ | | | | | | | | | | | | Add post hooks for filesystem scanner
| | * | | | Add post hooks for filesystem scannerRobin Appelman2013-11-071-0/+5
| | | | | |
* | | | | | Added missing escapingVincent Petry2013-11-111-1/+1
| | | | | |
* | | | | | Fixed undefined variable error when using avconvVincent Petry2013-11-101-0/+2
| | | | | |
* | | | | | Fixed the rebellous space, replaced with a tabVincent Petry2013-11-081-1/+1
| | | | | |
* | | | | | Added ffmpeg fallback when avconv is not availableVincent Petry2013-11-081-11/+45
|/ / / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | On some distros, avconv isn't available yet. This fix adds a fallback to ffmpeg. When none is found, no error message is displayed in the console any more. Fixes #5745 Also, this now uses exec() instead of shell_exec() to be able to get the return code. The binary path found with "which" is now used to prevent further FS binary lookup when running the commands. Moved the "-ss" parameter before "-i" for ffmpeg.
* / / / / Now removing stray old cookies from 5.0.12Vincent Petry2013-11-071-0/+5
|/ / / / | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | Cookies from 5.0.12 seemed to have an extra slash in the path. Firefox doesn't allow to remove them if the trailing slash isn't there, thus making it impossible to logout correctly. This fix adds extra code to delete such stray cookies. Ported from stable5 branch 99e5c6f7eb58404be2cc5448ec380f29c9a71225
* | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-061-1/+1
| | | |
* | | | Merge pull request #5691 from owncloud/switch-to-oc6-documentationblizzz2013-11-051-1/+1
|\ \ \ \ | | | | | | | | | | move to oc6 documentation
| * | | | move to oc6 documentationThomas Müller2013-11-041-1/+1
| |/ / /
* | | | decode arguments as arrayThomas Müller2013-11-051-1/+1
| | | |
* | | | Merge pull request #5582 from owncloud/files-previewcachingThomas Müller2013-11-051-2/+2
|\ \ \ \ | | | | | | | | | | Append file etag to preview URLs
| * | | | Append file etag to preview URLsVincent Petry2013-10-281-2/+2
| | | | | | | | | | | | | | | | | | | | Fixes #5534
* | | | | Merge pull request #5673 from owncloud/oc6-windows-server-mssql-masterThomas Müller2013-11-052-11/+3
|\ \ \ \ \ | |_|_|/ / |/| | | | Oc6 windows server mssql master
| * | | | Inherit lastInsertId() from Adapter.Andreas Fischer2013-11-041-5/+0
| | | | |
| * | | | WIN: fixing Fatal error: Call to a member function logicToPhysical() on a ↵Thomas Mueller2013-11-021-4/+3
| | | | | | | | | | | | | | | | | | | | non-object in C:\jenkins2\workspace\server-stable5-windows\database\mssql\label\WINDOWS\lib\files\storage\mappedlocal.php on line 311
| * | | | mssql: fixing lastInsertId() implementationThomas Mueller2013-11-021-4/+2
| | | | |
* | | | | Merge pull request #5540 from owncloud/scanner-enhancments-masterThomas Müller2013-11-042-3/+17
|\ \ \ \ \ | |_|_|/ / |/| | | | Scanner enhancments master
| * | | | set log level to DEBUGThomas Müller2013-11-041-2/+4
| | | | |
| * | | | using array_diff_assoc to detect diffs in values as wellThomas Müller2013-10-251-1/+1
| | | | |
| * | | | cast storage_mtime to intThomas Müller2013-10-251-0/+1
| | | | |
| * | | | log the data arraysThomas Müller2013-10-241-1/+3
| | | | |
| * | | | some logging added ....Thomas Müller2013-10-241-2/+11
| | | | |
* | | | | Merge pull request #5544 from owncloud/fixing-3593-2-masterThomas Müller2013-11-042-1/+17
|\ \ \ \ \ | | | | | | | | | | | | Add FileId header and switch fileid and instance id
| * | | | | add header 'OC-FileId' on PUTThomas Müller2013-10-251-0/+16
| | | | | |
| * | | | | switch instance id and file idThomas Müller2013-10-251-1/+1
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-031-0/+2
| | | | | |
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2013-11-031-0/+8
| | | | | |
* | | | | | Merge pull request #5678 from owncloud/fix-api-documentationThomas Müller2013-11-0350-391/+842
|\ \ \ \ \ \ | | | | | | | | | | | | | | Fix api documentation
| * | | | | | unify license headers for public API filesMorris Jobke2013-11-0345-382/+676
| | | | | | |
| * | | | | | fix "No page-level DocBlock"Morris Jobke2013-11-0323-9/+166
| | | | | | |
* | | | | | | Merge pull request #5671 from owncloud/fixing-5668-masterMorris Jobke2013-11-032-2/+2
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | replace template function link_to_docs() with \OC_Helper::linkToDocs()
| * | | | | | replace template function link_to_docs() with \OC_Helper::linkToDocs()Thomas Mueller2013-11-022-2/+2
| | |_|/ / / | |/| | | |
* | | | | | Always select item_source.Andreas Fischer2013-11-031-3/+3
| | | | | |
* | | | | | Deduplicate expiration date check into a method.Andreas Fischer2013-11-031-15/+21
| | | | | |
* | | | | | Use unshareItem() when unsharing expired shares.Andreas Fischer2013-11-031-2/+2
| | | | | |
* | | | | | Use unshareItem() in unshareAll().Andreas Fischer2013-11-031-1/+1
| | | | | |
* | | | | | Extract unshare() code into unshareItem().Andreas Fischer2013-11-031-17/+1
| | | | | |
* | | | | | OCP\Share::unshareAll(): Deduplicate hook parameters.Andreas Fischer2013-11-031-8/+26
|/ / / / /
* | | | | Merge pull request #5443 from owncloud/fix-autoloader-cachingBart Visscher2013-11-012-24/+33
|\ \ \ \ \ | | | | | | | | | | | | Remove Autoloader Cache Hack. Do not use Cache on Install.
| * | | | | Allow null as cache parameter (if no cache was found) and for cache removal.Andreas Fischer2013-10-221-1/+1
| | | | | |
| * | | | | Only write-back on cache miss.Andreas Fischer2013-10-221-3/+3
| | | | | |
| * | | | | Only use autoloader cache when 'instanceid' is available.Andreas Fischer2013-10-221-5/+9
| | | | | |
| * | | | | Inject memoryCache into Autoloader. Remove recursion-prevention hack.Andreas Fischer2013-10-222-28/+33
| | | | | |
* | | | | | Merge pull request #5658 from owncloud/session-error-full-sentenceMorris Jobke2013-11-011-1/+1
|\ \ \ \ \ \ | | | | | | | | | | | | | | [Trivial] Make "Please contact your system administrator" a full sentence.
| * | | | | | Make "Please contact your system administrator" a full sentence.Andreas Fischer2013-11-011-1/+1
| | | | | | |
* | | | | | | Merge pull request #5653 from owncloud/fix-api-documentationMorris Jobke2013-11-018-417/+413
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | fix documentation stuff
| * | | | | | fix documentation stuffMorris Jobke2013-10-318-417/+413
| | | | | | |
* | | | | | | Merge pull request #5551 from owncloud/fix-5202-masterMorris Jobke2013-10-311-1/+5
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | When updating an appstore app, execute a database update