]>
source.dussan.org Git - nextcloud-server.git/log
Lukas Reschke [Fri, 9 Jan 2015 23:54:38 +0000 (00:54 +0100)]
Fix URL to developer manual
Vincent Petry [Fri, 9 Jan 2015 17:40:51 +0000 (18:40 +0100)]
Merge pull request #13204 from owncloud/enc_fix_key_lost
Encryption fix key lost if group share gets renamed
Morris Jobke [Fri, 9 Jan 2015 17:05:05 +0000 (18:05 +0100)]
Merge pull request #13195 from owncloud/resharepermfix
Fix reshare permission issue
Thomas Müller [Fri, 9 Jan 2015 17:02:28 +0000 (18:02 +0100)]
Merge pull request #13208 from owncloud/hhvm-streamwrapper-exception
HHVM Workaround: Do not use Exception from Stream.
Thomas Müller [Fri, 9 Jan 2015 16:46:36 +0000 (17:46 +0100)]
Merge pull request #13192 from owncloud/cache_binary_path
Use memcache for findBinaryPath
Andreas Fischer [Fri, 9 Jan 2015 16:01:17 +0000 (17:01 +0100)]
HHVM Workaround: Do not use Exception from Stream.
Works around https://github.com/facebook/hhvm/issues/2436#issuecomment-
69351373
Thomas Müller [Fri, 9 Jan 2015 15:45:53 +0000 (16:45 +0100)]
Merge pull request #13188 from owncloud/add-check-if-user-is-logged-in
Add check if user is logged-in
Robin Appelman [Fri, 9 Jan 2015 15:45:32 +0000 (16:45 +0100)]
Merge pull request #13196 from owncloud/js-personal-no-password
Fix js error in personal settings if there is no password field
Thomas Müller [Fri, 9 Jan 2015 15:40:26 +0000 (16:40 +0100)]
Merge pull request #13205 from owncloud/remove-shared-icon
replace outdated 'shared' people icon with regular share icon as fallback
Jan-Christoph Borchardt [Fri, 9 Jan 2015 15:18:42 +0000 (16:18 +0100)]
replace outdated 'shared' people icon with regular share icon as fallback
Bjoern Schiessle [Fri, 9 Jan 2015 14:39:51 +0000 (15:39 +0100)]
unit tests
Bjoern Schiessle [Fri, 9 Jan 2015 14:39:36 +0000 (15:39 +0100)]
don't move encryption keys if a mount point was renamed
Robin Appelman [Fri, 9 Jan 2015 14:38:39 +0000 (15:38 +0100)]
Fix js error in personal settings if there is no password field
Vincent Petry [Fri, 9 Jan 2015 14:19:53 +0000 (15:19 +0100)]
Fix reshare permission issue
The actual share permissions sent to the server on reshare are now based
on possiblePermissions + permissions inherited from parent share
Robin McCorkell [Fri, 9 Jan 2015 13:54:17 +0000 (13:54 +0000)]
Merge pull request #13181 from owncloud/filecache-preventleadingslash
Trim leading or trailing slashes in file cache paths
Morris Jobke [Fri, 9 Jan 2015 13:38:45 +0000 (14:38 +0100)]
Merge pull request #12011 from owncloud/reuse-etag-default
Default to reusing etags in the scanner
Robin McCorkell [Fri, 9 Jan 2015 13:13:02 +0000 (13:13 +0000)]
Memcache binary executable searching
It's slow, this makes it fast!
Robin McCorkell [Fri, 9 Jan 2015 13:12:21 +0000 (13:12 +0000)]
Add Null memcacher
Thomas Müller [Fri, 9 Jan 2015 13:17:14 +0000 (14:17 +0100)]
Merge pull request #12995 from owncloud/tbelau666-master
Use Doctrines filter by table name
Morris Jobke [Fri, 9 Jan 2015 12:16:37 +0000 (13:16 +0100)]
Merge pull request #13191 from owncloud/fix-rename-field
fix rename field position, fix #12927
Jan-Christoph Borchardt [Fri, 9 Jan 2015 12:01:30 +0000 (13:01 +0100)]
fix rename field position, fix #12927
Lukas Reschke [Fri, 9 Jan 2015 10:50:17 +0000 (11:50 +0100)]
Add check if user is logged-in
Otherwise a fatal PHP error is thrown since the filesystem is not setup:
```
( ! ) Fatal error: Call to a member function getOwner() on null in /Users/lreschke/Programming/core/lib/private/files/filesystem.php on line 817
Call Stack
1 0.0004 247792 {main}( ) ../index.php:0
2 0.0946
5088776 OC::handleRequest( ) ../index.php:28
3 0.1423
7491280 OC\Route\Router->match( ) ../base.php:748
4 0.1664
8592152 call_user_func:{/Users/lreschke/Programming/core/lib/private/route/router.php:250} ( ) ../router.php:250
5 0.1664
8592216 __lambda_func( ) ../router.php:250
6 0.1665
8599064 require_once( '/Users/lreschke/Programming/core/apps/files_versions/ajax/getVersions.php' ) ../route.php(135) : runtime-created function:1
7 0.1801
9061096 OCA\Files_Versions\Storage::getUidAndFilename( ) ../getVersions.php:7
8 0.1801
9061144 OC\Files\Filesystem::getOwner( ) ../storage.php:45
```
Furthermore this adds the CSRF check as a nice-to-have addition, the requests accessing this are done via the jQuery AJAX methods and thus the header is automatically added to all requests already.
Lukas Reschke [Fri, 9 Jan 2015 09:47:02 +0000 (10:47 +0100)]
Merge pull request #12984 from owncloud/ldap-user-cleanup-master
Ldap user cleanup master
Lukas Reschke [Fri, 9 Jan 2015 09:39:22 +0000 (10:39 +0100)]
Merge pull request #13184 from owncloud/fix-key
Verify existence of $_GET key
Vincent Petry [Fri, 9 Jan 2015 09:18:32 +0000 (10:18 +0100)]
Fix cache jail to not duplicate slashes
Jenkins for ownCloud [Fri, 9 Jan 2015 06:55:22 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Lukas Reschke [Fri, 9 Jan 2015 01:31:59 +0000 (02:31 +0100)]
Verify existence of $_GET key
Otherwise when the file without any specified mimetype was accessed the error log was flooded with entries such as "Undefined index: mime", there can be multiple issues found about this in the forum and our bugtracker.
To test this access `/index.php/apps/files/ajax/mimeicon.php` with and without `$_GET['mime']`.
Fixes itself.
Lukas Reschke [Fri, 9 Jan 2015 01:27:51 +0000 (02:27 +0100)]
Merge pull request #13179 from owncloud/fix-fatal-php-error-for-not-existing-files
Verify whether type is correct
Morris Jobke [Thu, 8 Jan 2015 23:33:22 +0000 (00:33 +0100)]
Merge pull request #12988 from owncloud/logfile_download
Logfile download
Vincent Petry [Thu, 8 Jan 2015 18:43:02 +0000 (19:43 +0100)]
Trim leading or trailing slashes in file cache paths
Lukas Reschke [Thu, 8 Jan 2015 17:33:35 +0000 (18:33 +0100)]
Verify whether type is correct
`$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.
Arthur Schiwon [Thu, 8 Jan 2015 16:45:07 +0000 (17:45 +0100)]
fix order of initalizing instance properties, and paremeter order in a method call
Morris Jobke [Thu, 8 Jan 2015 14:50:47 +0000 (15:50 +0100)]
Merge pull request #13148 from owncloud/self-destroying-notifications
Add timeout for notifications
Thomas Müller [Thu, 8 Jan 2015 14:02:16 +0000 (15:02 +0100)]
Merge pull request #13170 from owncloud/extstorage-fixsharedmountpointrootleadingslash
Fix source path when share is a mount point
Arthur Schiwon [Thu, 8 Jan 2015 13:21:40 +0000 (14:21 +0100)]
fix table name for getList
Lukas Reschke [Thu, 8 Jan 2015 13:00:00 +0000 (14:00 +0100)]
Merge pull request #13165 from mypetyak/typos-in-external-storage-xml
Minor typo updates to External Storage description
Lukas Reschke [Thu, 8 Jan 2015 12:48:48 +0000 (13:48 +0100)]
Merge pull request #13172 from owncloud/addCheckForOldRewriteRulesToMakeOurCrappyIntegrationWorking
Add version to .htaccess
Morris Jobke [Wed, 7 Jan 2015 13:51:20 +0000 (14:51 +0100)]
Add timeout for notifications
* options for timeout in seconds and if it contains HTML
* if timeout is 0 it will show the message permanently
* removes the notification after a given (default: 5 seconds) timeframe
* based on work by @brantje
* provide JS unit tests for notifications
Lukas Reschke [Thu, 8 Jan 2015 11:05:54 +0000 (12:05 +0100)]
Add version to .htaccess
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
Vincent Petry [Thu, 8 Jan 2015 10:40:47 +0000 (11:40 +0100)]
Fix source path when share is a mount point
Whenever an external storage mount point is shared directly, its path is
empty which causes a leading slash to appear in the source path.
This fix removes the bogus leading slash in such situation.
Morris Jobke [Thu, 8 Jan 2015 10:08:24 +0000 (11:08 +0100)]
Merge pull request #13166 from owncloud/support-setup-in-php-dev-server
check for working htaccess will result in a dead lock because the server...
Thomas Müller [Thu, 8 Jan 2015 08:13:18 +0000 (09:13 +0100)]
check for working htaccess will result in a dead lock because the server is blocking the request to itself - fixes #13153
Jenkins for ownCloud [Thu, 8 Jan 2015 06:56:00 +0000 (01:56 -0500)]
[tx-robot] updated from transifex
Christopher Bunn [Thu, 8 Jan 2015 04:27:12 +0000 (22:27 -0600)]
Minor typo updates to External Storage description
This text is visible to admin users when they read the description of
the External Storage app.
Morris Jobke [Wed, 7 Jan 2015 19:54:25 +0000 (20:54 +0100)]
Merge #13074 from branch 'mmattel-smb_rename_text_root_to_subfolder'
Martin [Thu, 1 Jan 2015 20:06:22 +0000 (21:06 +0100)]
smb: rename textfield from root to subfolder
"root" or "subfolder" -> "Remote subfolder" on selected storages
missed ftp...
Morris Jobke [Wed, 7 Jan 2015 17:14:53 +0000 (18:14 +0100)]
Merge pull request #13016 from owncloud/sharing_fixes
don't delete share table entries for the unique name if re-share permission was removed
Bjoern Schiessle [Wed, 7 Jan 2015 15:34:51 +0000 (16:34 +0100)]
shareType and permissions are integers
Bjoern Schiessle [Tue, 23 Dec 2014 16:10:05 +0000 (17:10 +0100)]
don't delete share table entries for the unique name if re-share permission was removed
Morris Jobke [Wed, 7 Jan 2015 15:10:38 +0000 (16:10 +0100)]
Merge pull request #13150 from owncloud/fix-sharing-activity-extension
Correctly return false when translating a foreign activity
Joas Schilling [Wed, 7 Jan 2015 14:02:25 +0000 (15:02 +0100)]
Correctly return false when translating a foreign activity
Georg Ehrke [Sat, 20 Dec 2014 21:44:41 +0000 (22:44 +0100)]
add Download logfile button to admin settings
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
Arthur Schiwon [Wed, 7 Jan 2015 12:28:56 +0000 (13:28 +0100)]
doc fixes and removal of unnecessary use statements
Morris Jobke [Wed, 7 Jan 2015 11:57:33 +0000 (12:57 +0100)]
Merge pull request #12687 from owncloud/auto-escape-t-placeholders
Auto escape t placeholders
Morris Jobke [Mon, 8 Dec 2014 08:42:20 +0000 (09:42 +0100)]
Autoescape of placeholders in t() and p() - for JS
* add disableEscape parameter to disable this functionality
* drop usage of escapeHTML() that is now done inside t()
* add unit test for escaped and not escaped placeholder
* proper JSDoc
Arthur Schiwon [Wed, 7 Jan 2015 11:39:04 +0000 (12:39 +0100)]
add test for mapping's getList method
Arthur Schiwon [Wed, 7 Jan 2015 11:21:28 +0000 (12:21 +0100)]
inject and use user manager to delete command instead of using old static oc_user way
Morris Jobke [Wed, 7 Jan 2015 11:09:26 +0000 (12:09 +0100)]
Merge pull request #13140 from owncloud/issue/13139-provisioning-api-tests
Extend Test\TestCase and do not use uniqid()
Lukas Reschke [Wed, 7 Jan 2015 09:39:07 +0000 (10:39 +0100)]
Merge pull request #13138 from owncloud/issue/13134-incorrect-admin-warning-overwrite-cli-url
Fix incorrect warning about setting the overwrite.cli.url
Morris Jobke [Wed, 7 Jan 2015 09:36:27 +0000 (10:36 +0100)]
Merge pull request #13132 from aptivate/improve_debug_logging_messages
Improve debugging for ServiceUnavailable exceptions
Joas Schilling [Wed, 7 Jan 2015 09:34:42 +0000 (10:34 +0100)]
Extend Test\TestCase and do not use uniqid()
Thomas Müller [Wed, 7 Jan 2015 08:36:26 +0000 (09:36 +0100)]
Merge pull request #13063 from AdamWill/assets-relocate
allow css/js asset directory to be relocated ('assetdirectory')
Joas Schilling [Wed, 7 Jan 2015 08:02:33 +0000 (09:02 +0100)]
Fix incorrect warning about setting the overwrite.cli.url
Jenkins for ownCloud [Wed, 7 Jan 2015 06:55:42 +0000 (01:55 -0500)]
[tx-robot] updated from transifex
Morris Jobke [Wed, 7 Jan 2015 00:17:27 +0000 (01:17 +0100)]
Merge pull request #13131 from owncloud/db-connect-stacktrace
Prevent leaking db connection info in the stacktrace
Arthur Schiwon [Tue, 6 Jan 2015 23:52:18 +0000 (00:52 +0100)]
inject DB Connection to user manager
Arthur Schiwon [Tue, 6 Jan 2015 22:40:00 +0000 (23:40 +0100)]
inject IDateTimeFormatter to show-remnants command
Arthur Schiwon [Tue, 6 Jan 2015 22:28:49 +0000 (23:28 +0100)]
inject oc config to User_LDAP
Thomas Müller [Tue, 6 Jan 2015 18:47:28 +0000 (19:47 +0100)]
Merge pull request #13126 from owncloud/update-jquery-strengthify
Update jquery strengthify
Robin Appelman [Tue, 6 Jan 2015 17:37:32 +0000 (18:37 +0100)]
Merge pull request #13129 from owncloud/group-select-fix-autocomplete
Fix group select autocomplete
Lukas Reschke [Tue, 6 Jan 2015 17:35:09 +0000 (18:35 +0100)]
Merge pull request #13130 from owncloud/getstoragestats-error-handling
Add error handling to getstoragestats.php
Thomas Müller [Tue, 6 Jan 2015 17:17:19 +0000 (18:17 +0100)]
Merge pull request #13128 from owncloud/files-scan-path
Fix check if a path argument is passed to occ files:scan
Arthur Schiwon [Tue, 6 Jan 2015 16:52:54 +0000 (17:52 +0100)]
revert changes to deprecated preferences as it is a not needed leftover
Arthur Schiwon [Tue, 6 Jan 2015 16:50:06 +0000 (17:50 +0100)]
smaller fixes: coding style, PHPdoc, typos and few for DI
Chris Wilson [Tue, 6 Jan 2015 15:59:38 +0000 (15:59 +0000)]
Improve debugging for ServiceUnavailable exceptions
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"}
Robin Appelman [Tue, 6 Jan 2015 15:54:41 +0000 (16:54 +0100)]
Prevent leaking db connection info in the stacktrace
Morris Jobke [Tue, 6 Jan 2015 15:44:58 +0000 (16:44 +0100)]
Merge pull request #12653 from owncloud/full_content_search_results
Full content width search results
Robin Appelman [Tue, 6 Jan 2015 14:56:06 +0000 (15:56 +0100)]
Add error handling to getstoragestats.php
Robin Appelman [Tue, 6 Jan 2015 14:40:40 +0000 (15:40 +0100)]
Fix group select autocomplete
Robin Appelman [Tue, 6 Jan 2015 14:27:03 +0000 (15:27 +0100)]
Fix check if a path argument is passed to occ files:scan
Jörn Friedrich Dreyer [Tue, 6 Jan 2015 14:18:41 +0000 (15:18 +0100)]
use cancelable timeout, on scroll only fetch next page if last query had any results
Morris Jobke [Tue, 6 Jan 2015 13:46:15 +0000 (14:46 +0100)]
bower update for jquery.strengthify 0.4.1
Thomas Müller [Tue, 6 Jan 2015 13:40:51 +0000 (14:40 +0100)]
Merge pull request #13122 from owncloud/fix-licence-apps-management
fixing wrong usage of license vs licence
Thomas Müller [Tue, 6 Jan 2015 13:38:50 +0000 (14:38 +0100)]
Merge pull request #13125 from owncloud/lower-deprecation-warning-level
degraded logging policy for server container in AppFramework
Thomas Müller [Tue, 6 Jan 2015 13:36:51 +0000 (14:36 +0100)]
Merge pull request #13116 from owncloud/fix_assets
Fix JS asset generation
Jörn Friedrich Dreyer [Tue, 6 Jan 2015 13:34:35 +0000 (14:34 +0100)]
use class for no results div instead of id. the elements are not unique.
Jörn Friedrich Dreyer [Tue, 6 Jan 2015 12:55:51 +0000 (13:55 +0100)]
clear search when navigating via breadcrumbs
Morris Jobke [Tue, 6 Jan 2015 12:21:04 +0000 (13:21 +0100)]
bump jquery.strengthify to 0.4.1
Morris Jobke [Tue, 6 Jan 2015 12:43:40 +0000 (13:43 +0100)]
degraded logging policy for server container in AppFramework
Thomas Müller [Tue, 6 Jan 2015 12:07:17 +0000 (13:07 +0100)]
fixing wrong usage of license vs licence
Jenkins for ownCloud [Tue, 6 Jan 2015 06:54:59 +0000 (01:54 -0500)]
[tx-robot] updated from transifex
Adam Williamson [Tue, 30 Dec 2014 20:03:07 +0000 (12:03 -0800)]
allow css/js asset directory to be relocated (#13053)
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.
Thomas Müller [Mon, 5 Jan 2015 19:09:10 +0000 (20:09 +0100)]
Merge pull request #13101 from 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
Jörn Friedrich Dreyer [Mon, 5 Jan 2015 16:53:14 +0000 (17:53 +0100)]
correctly clear searchbox when switching filelists
Robin McCorkell [Mon, 5 Jan 2015 15:48:04 +0000 (15:48 +0000)]
Fix JS asset generation
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.
Jörn Friedrich Dreyer [Mon, 5 Jan 2015 13:28:09 +0000 (14:28 +0100)]
fix onScroll breaking search, fix keyboard navigation, fix filter for files in other dirs
Jörn Friedrich Dreyer [Mon, 5 Jan 2015 12:53:56 +0000 (13:53 +0100)]
search with endless scrolling
Morris Jobke [Mon, 5 Jan 2015 12:26:56 +0000 (13:26 +0100)]
Merge pull request #13103 from owncloud/fix-htaccess-regex
escape . in htaccess regex for CSS and JS HTTP headers
Morris Jobke [Mon, 5 Jan 2015 12:23:13 +0000 (13:23 +0100)]
Merge pull request #13108 from owncloud/fix-public-link-mount-for-pre-oc7
Check for version before mounting a public link
Jörn Friedrich Dreyer [Mon, 5 Jan 2015 12:11:50 +0000 (13:11 +0100)]
filter trashbin and share views