summaryrefslogtreecommitdiffstats
path: root/lib
Commit message (Collapse)AuthorAgeFilesLines
* Merge pull request #13179 from ↵Lukas Reschke2015-01-091-2/+3
|\ | | | | | | | | owncloud/fix-fatal-php-error-for-not-existing-files Verify whether type is correct
| * Verify whether type is correctLukas Reschke2015-01-081-2/+3
| | | | | | | | `$this->info` can very well contain an empty array or possibly other values. This means that when this code path is called a PHP Fatal error might get thrown which is not what we want.
* | Merge pull request #12988 from owncloud/logfile_downloadMorris Jobke2015-01-092-1/+50
|\ \ | |/ |/| Logfile download
| * add Download logfile button to admin settingsGeorg Ehrke2015-01-072-1/+50
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | add logSettingsController add download logfile button move getEntries to LogSettingsController move set log level to logsettingscontroller.php add warning if logfile is bigger than 100MB add unit test for set log level fix typecasting, add new line at EoF show log and logfile download only if log_type is set to owncloud add unit test for getFilenameForDownload
* | Add version to .htaccessLukas Reschke2015-01-082-2/+35
| | | | | | | | | | | | | | | | | | Currently if a user does not replace the .htaccess file with the new update this can lead to serious problems in case Apache is used as webserver. This commit adds the version to the .htaccess file and the update routine fails in case not the newest version is specified in there. This obviously means that every release has to update the version specified in .htaccess as well. But I see no better solution for it. Conflicts: lib/private/updater.php
* | check for working htaccess will result in a dead lock because the server is ↵Thomas Müller2015-01-081-0/+5
| | | | | | | | blocking the request to itself - fixes #13153
* | [tx-robot] updated from transifexJenkins for ownCloud2015-01-082-0/+4
| |
* | Merge pull request #13016 from owncloud/sharing_fixesMorris Jobke2015-01-071-4/+4
|\ \ | | | | | | don't delete share table entries for the unique name if re-share permission was removed
| * | don't delete share table entries for the unique name if re-share permission ↵Bjoern Schiessle2015-01-071-4/+4
| | | | | | | | | | | | was removed
* | | Merge pull request #13132 from aptivate/improve_debug_logging_messagesMorris Jobke2015-01-072-9/+9
|\ \ \ | | | | | | | | Improve debugging for ServiceUnavailable exceptions
| * | | Improve debugging for ServiceUnavailable exceptionsChris Wilson2015-01-062-9/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | I was getting a lot of these in my logs for no apparent reason, and file uploads were failing: {"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: ","level":4,"time":"2015-01-06T15:33:39+00:00"} In order to debug it, I had to add unique messages to all the places where this exception was thrown, to identify which one it was, and that made the logs much more useful: {"app":"webdav","message":"Sabre\\DAV\\Exception\\ServiceUnavailable: Encryption is disabled","level":4,"time":"2015-01-06T15:36:47+00:00"}
* | | | Merge pull request #13063 from AdamWill/assets-relocateThomas Müller2015-01-073-7/+9
|\ \ \ \ | | | | | | | | | | allow css/js asset directory to be relocated ('assetdirectory')
| * | | | allow css/js asset directory to be relocated (#13053)Adam Williamson2015-01-053-7/+9
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | This allows the directory where CSS/JS asset collections are written to be changed, in case SERVERROOT is not writeable. Note it does *not* allow the expected URL to be changed: whatever directory is used, the server must be configured to serve it at WEBROOT/assets. It may be possible to add another config parameter to allow the admin to specify a custom asset URL, but I thought I'd keep the first implementation simple.
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-072-2/+2
| | | | |
* | | | | Merge pull request #13131 from owncloud/db-connect-stacktraceMorris Jobke2015-01-071-0/+10
|\ \ \ \ \ | | | | | | | | | | | | Prevent leaking db connection info in the stacktrace
| * | | | | Prevent leaking db connection info in the stacktraceRobin Appelman2015-01-061-0/+10
| | |/ / / | |/| | |
* | | | | Merge pull request #13130 from owncloud/getstoragestats-error-handlingLukas Reschke2015-01-061-0/+3
|\ \ \ \ \ | | | | | | | | | | | | Add error handling to getstoragestats.php
| * | | | | Add error handling to getstoragestats.phpRobin Appelman2015-01-061-0/+3
| |/ / / /
* | | | | Merge pull request #12653 from owncloud/full_content_search_resultsMorris Jobke2015-01-067-6/+103
|\ \ \ \ \ | |/ / / / |/| | | | Full content width search results
| * | | | add SIZE_ALL constJörn Friedrich Dreyer2015-01-021-3/+8
| | | | |
| * | | | fix visibilityJörn Friedrich Dreyer2015-01-022-8/+2
| | | | |
| * | | | move search results below filelist, show hint when results are off screen, ↵Jörn Friedrich Dreyer2015-01-024-11/+14
| | | | | | | | | | | | | | | | | | | | use js plugin mechanism
| * | | | ajax paging, some js cleanupsJörn Friedrich Dreyer2015-01-021-1/+3
| | | | |
| * | | | add paged providerJörn Friedrich Dreyer2015-01-024-2/+94
| | | | |
| * | | | move code from js.js to search.js in the search appJörn Friedrich Dreyer2015-01-021-0/+1
| | | | |
| * | | | new OC.Search, add search result formatters and handlers, use full content ↵Jörn Friedrich Dreyer2015-01-021-1/+1
| | | | | | | | | | | | | | | | | | | | width for results
* | | | | Merge pull request #13125 from owncloud/lower-deprecation-warning-levelThomas Müller2015-01-061-2/+2
|\ \ \ \ \ | | | | | | | | | | | | degraded logging policy for server container in AppFramework
| * | | | | degraded logging policy for server container in AppFrameworkMorris Jobke2015-01-061-2/+2
| | | | | |
* | | | | | Merge pull request #13116 from owncloud/fix_assetsThomas Müller2015-01-062-2/+63
|\ \ \ \ \ \ | |/ / / / / |/| | | | | Fix JS asset generation
| * | | | | Fix JS asset generationRobin McCorkell2015-01-052-2/+63
| | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | | At some point SeparatorFilter should be included upstream (kriswallsmith/assetic), then lib/private/assetic/separatorfilter.php can be removed and the `use` in lib/private/templatelayout.php rewritten. SeparatorFilter inserts a separator between assets, preventing issues when files are incorrectly terminated. For JS this is a semicolon.
* | | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-062-22/+22
| |_|/ / / |/| | | |
* | | | | Merge pull request #13101 from ↵Thomas Müller2015-01-051-26/+57
|\ \ \ \ \ | |/ / / / |/| | | | | | | | | | | | | | owncloud/variable-is-undefined-please-use-a-proper-ide-in-the-future-whoever-did-that Fix undefined variable and write unit tests for OC_Principal connector
| * | | | Use namespaceLukas Reschke2015-01-051-2/+18
| | | | |
| * | | | Write unit-tests and use DILukas Reschke2015-01-051-24/+37
| | | | |
| * | | | Fix code-styleLukas Reschke2015-01-051-2/+4
| | | | |
* | | | | Use info instead of warning log levelLukas Reschke2015-01-051-2/+2
|/ / / / | | | | | | | | | | | | | | | | | | | | Otherwise the log is flooded as can be seen at https://github.com/owncloud/core/issues/13106 Fixes https://github.com/owncloud/core/issues/13106
* | | | Merge pull request #13095 from derkostka/masterMorris Jobke2015-01-051-1/+1
|\ \ \ \ | | | | | | | | | | fix "app":"PHP","message":"Undefined variable: user at/principal.php#66"
| * | | | fix "app":"PHP","message":"Undefined variable: user at/principal.php#66"derkostka2015-01-041-1/+1
| | | | | | | | | | | | | | | changed variable #user to #name
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-058-28/+64
|/ / / /
* | | | Merge pull request #13060 from dratini0/masterMorris Jobke2015-01-041-3/+1
|\ \ \ \ | | | | | | | | | | Fix: X-Accel-Redirect did not support custom data dir and local mounts
| * | | | removed a little duplicationdratini02014-12-301-3/+1
| | | | |
| * | | | Fix: X-Accel-Redirect did not support custom data dir and local mountsdratini02014-12-301-1/+1
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-044-18/+78
| | | | |
* | | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-034-6/+8
| |/ / / |/| | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-024-56/+60
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2015-01-014-2/+20
| | | |
* | | | [tx-robot] updated from transifexJenkins for ownCloud2014-12-318-0/+26
|/ / /
* | | Merge pull request #12854 from owncloud/add-direct-download-linkFrank Karlitschek2014-12-295-0/+58
|\ \ \ | | | | | | | | Adding foundation for the direct download url
| * | | adding getDirectDownload() to WrapperThomas Müller2014-12-282-2/+14
| | | |
| * | | Adding basement for the direct download urlThomas Müller2014-12-284-0/+46
| | | |
generated by cgit v1.2.3 (git 2.39.1) at 2025-01-30 14:54:28 +0000