Commit message (Collapse) | Author | Age | Files | Lines | ||
---|---|---|---|---|---|---|
... | ||||||
| * | | | | | the filesystem has to be initialized once we know the user | Thomas Müller | 2013-11-08 | 1 | -0/+8 | |
| |/ / / / | ||||||
| * | | | | Merge pull request #5747 from owncloud/scanner-post-hooks | Morris Jobke | 2013-11-07 | 1 | -0/+5 | |
| |\ \ \ \ | | | | | | | | | | | | | Add post hooks for filesystem scanner | |||||
| | * | | | | Add post hooks for filesystem scanner | Robin Appelman | 2013-11-07 | 1 | -0/+5 | |
| | | | | | | ||||||
* | | | | | | Added missing escaping | Vincent Petry | 2013-11-11 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Fixed undefined variable error when using avconv | Vincent Petry | 2013-11-10 | 1 | -0/+2 | |
| | | | | | | ||||||
* | | | | | | Fixed the rebellous space, replaced with a tab | Vincent Petry | 2013-11-08 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Added ffmpeg fallback when avconv is not available | Vincent Petry | 2013-11-08 | 1 | -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.12 | Vincent Petry | 2013-11-07 | 1 | -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 transifex | Jenkins for ownCloud | 2013-11-06 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #5691 from owncloud/switch-to-oc6-documentation | blizzz | 2013-11-05 | 1 | -1/+1 | |
|\ \ \ \ | | | | | | | | | | | move to oc6 documentation | |||||
| * | | | | move to oc6 documentation | Thomas Müller | 2013-11-04 | 1 | -1/+1 | |
| |/ / / | ||||||
* | | | | decode arguments as array | Thomas Müller | 2013-11-05 | 1 | -1/+1 | |
| | | | | ||||||
* | | | | Merge pull request #5582 from owncloud/files-previewcaching | Thomas Müller | 2013-11-05 | 1 | -2/+2 | |
|\ \ \ \ | | | | | | | | | | | Append file etag to preview URLs | |||||
| * | | | | Append file etag to preview URLs | Vincent Petry | 2013-10-28 | 1 | -2/+2 | |
| | | | | | | | | | | | | | | | | | | | | Fixes #5534 | |||||
* | | | | | Merge pull request #5673 from owncloud/oc6-windows-server-mssql-master | Thomas Müller | 2013-11-05 | 2 | -11/+3 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Oc6 windows server mssql master | |||||
| * | | | | Inherit lastInsertId() from Adapter. | Andreas Fischer | 2013-11-04 | 1 | -5/+0 | |
| | | | | | ||||||
| * | | | | WIN: fixing Fatal error: Call to a member function logicToPhysical() on a ↵ | Thomas Mueller | 2013-11-02 | 1 | -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() implementation | Thomas Mueller | 2013-11-02 | 1 | -4/+2 | |
| | | | | | ||||||
* | | | | | Merge pull request #5540 from owncloud/scanner-enhancments-master | Thomas Müller | 2013-11-04 | 2 | -3/+17 | |
|\ \ \ \ \ | |_|_|/ / |/| | | | | Scanner enhancments master | |||||
| * | | | | set log level to DEBUG | Thomas Müller | 2013-11-04 | 1 | -2/+4 | |
| | | | | | ||||||
| * | | | | using array_diff_assoc to detect diffs in values as well | Thomas Müller | 2013-10-25 | 1 | -1/+1 | |
| | | | | | ||||||
| * | | | | cast storage_mtime to int | Thomas Müller | 2013-10-25 | 1 | -0/+1 | |
| | | | | | ||||||
| * | | | | log the data arrays | Thomas Müller | 2013-10-24 | 1 | -1/+3 | |
| | | | | | ||||||
| * | | | | some logging added .... | Thomas Müller | 2013-10-24 | 1 | -2/+11 | |
| | | | | | ||||||
* | | | | | Merge pull request #5544 from owncloud/fixing-3593-2-master | Thomas Müller | 2013-11-04 | 2 | -1/+17 | |
|\ \ \ \ \ | | | | | | | | | | | | | Add FileId header and switch fileid and instance id | |||||
| * | | | | | add header 'OC-FileId' on PUT | Thomas Müller | 2013-10-25 | 1 | -0/+16 | |
| | | | | | | ||||||
| * | | | | | switch instance id and file id | Thomas Müller | 2013-10-25 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-03 | 1 | -0/+2 | |
| | | | | | | ||||||
* | | | | | | [tx-robot] updated from transifex | Jenkins for ownCloud | 2013-11-03 | 1 | -0/+8 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #5678 from owncloud/fix-api-documentation | Thomas Müller | 2013-11-03 | 50 | -391/+842 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | Fix api documentation | |||||
| * | | | | | | unify license headers for public API files | Morris Jobke | 2013-11-03 | 45 | -382/+676 | |
| | | | | | | | ||||||
| * | | | | | | fix "No page-level DocBlock" | Morris Jobke | 2013-11-03 | 23 | -9/+166 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #5671 from owncloud/fixing-5668-master | Morris Jobke | 2013-11-03 | 2 | -2/+2 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | replace template function link_to_docs() with \OC_Helper::linkToDocs() | |||||
| * | | | | | | replace template function link_to_docs() with \OC_Helper::linkToDocs() | Thomas Mueller | 2013-11-02 | 2 | -2/+2 | |
| | |_|/ / / | |/| | | | | ||||||
* | | | | | | Always select item_source. | Andreas Fischer | 2013-11-03 | 1 | -3/+3 | |
| | | | | | | ||||||
* | | | | | | Deduplicate expiration date check into a method. | Andreas Fischer | 2013-11-03 | 1 | -15/+21 | |
| | | | | | | ||||||
* | | | | | | Use unshareItem() when unsharing expired shares. | Andreas Fischer | 2013-11-03 | 1 | -2/+2 | |
| | | | | | | ||||||
* | | | | | | Use unshareItem() in unshareAll(). | Andreas Fischer | 2013-11-03 | 1 | -1/+1 | |
| | | | | | | ||||||
* | | | | | | Extract unshare() code into unshareItem(). | Andreas Fischer | 2013-11-03 | 1 | -17/+1 | |
| | | | | | | ||||||
* | | | | | | OCP\Share::unshareAll(): Deduplicate hook parameters. | Andreas Fischer | 2013-11-03 | 1 | -8/+26 | |
|/ / / / / | ||||||
* | | | | | Merge pull request #5443 from owncloud/fix-autoloader-caching | Bart Visscher | 2013-11-01 | 2 | -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 Fischer | 2013-10-22 | 1 | -1/+1 | |
| | | | | | | ||||||
| * | | | | | Only write-back on cache miss. | Andreas Fischer | 2013-10-22 | 1 | -3/+3 | |
| | | | | | | ||||||
| * | | | | | Only use autoloader cache when 'instanceid' is available. | Andreas Fischer | 2013-10-22 | 1 | -5/+9 | |
| | | | | | | ||||||
| * | | | | | Inject memoryCache into Autoloader. Remove recursion-prevention hack. | Andreas Fischer | 2013-10-22 | 2 | -28/+33 | |
| | | | | | | ||||||
* | | | | | | Merge pull request #5658 from owncloud/session-error-full-sentence | Morris Jobke | 2013-11-01 | 1 | -1/+1 | |
|\ \ \ \ \ \ | | | | | | | | | | | | | | | [Trivial] Make "Please contact your system administrator" a full sentence. | |||||
| * | | | | | | Make "Please contact your system administrator" a full sentence. | Andreas Fischer | 2013-11-01 | 1 | -1/+1 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #5653 from owncloud/fix-api-documentation | Morris Jobke | 2013-11-01 | 8 | -417/+413 | |
|\ \ \ \ \ \ \ | |/ / / / / / |/| | | | | | | fix documentation stuff | |||||
| * | | | | | | fix documentation stuff | Morris Jobke | 2013-10-31 | 8 | -417/+413 | |
| | | | | | | | ||||||
* | | | | | | | Merge pull request #5551 from owncloud/fix-5202-master | Morris Jobke | 2013-10-31 | 1 | -1/+5 | |
|\ \ \ \ \ \ \ | | | | | | | | | | | | | | | | | When updating an appstore app, execute a database update |