Commit Graph

22349 Commits

Author SHA1 Message Date
Thomas Müller 847dd6d04c Merge pull request #13205 from owncloud/remove-shared-icon
replace outdated 'shared' people icon with regular share icon as fallback
2015-01-09 16:40:26 +01:00
Jan-Christoph Borchardt c26e669c4c replace outdated 'shared' people icon with regular share icon as fallback 2015-01-09 16:18:42 +01:00
Bjoern Schiessle 0500d3a506 unit tests 2015-01-09 15:49:44 +01:00
Bjoern Schiessle 6cc40552b1 don't move encryption keys if a mount point was renamed 2015-01-09 15:39:36 +01:00
Robin Appelman 22ab56a592 Fix js error in personal settings if there is no password field 2015-01-09 15:38:39 +01:00
Vincent Petry c897a14d56 Fix reshare permission issue
The actual share permissions sent to the server on reshare are now based
on possiblePermissions + permissions inherited from parent share
2015-01-09 15:19:53 +01:00
Robin McCorkell 631d6571fd Merge pull request #13181 from owncloud/filecache-preventleadingslash
Trim leading or trailing slashes in file cache paths
2015-01-09 13:54:17 +00:00
Morris Jobke 800738f51a Merge pull request #12011 from owncloud/reuse-etag-default
Default to reusing etags in the scanner
2015-01-09 14:38:45 +01:00
Robin McCorkell c291383116 Memcache binary executable searching
It's slow, this makes it fast!
2015-01-09 13:18:00 +00:00
Robin McCorkell 17dd5d0816 Add Null memcacher 2015-01-09 13:18:00 +00:00
Thomas Müller 1f1643b35f Merge pull request #12995 from owncloud/tbelau666-master
Use Doctrines filter by table name
2015-01-09 14:17:14 +01:00
Morris Jobke d2ca9e9c0f Merge pull request #13191 from owncloud/fix-rename-field
fix rename field position, fix #12927
2015-01-09 13:16:37 +01:00
Jan-Christoph Borchardt 720fe858a3 fix rename field position, fix #12927 2015-01-09 13:05:22 +01:00
Bjoern Schiessle d699d31518 make versions of shared files downloadable 2015-01-09 12:46:24 +01:00
Lukas Reschke 1cfcec8684 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.
2015-01-09 11:55:18 +01:00
Jörn Friedrich Dreyer 45a20744fc add js tests for filelist filtering 2015-01-09 10:49:22 +01:00
Lukas Reschke a5099b01f9 Merge pull request #12984 from owncloud/ldap-user-cleanup-master
Ldap user cleanup master
2015-01-09 10:47:02 +01:00
Lukas Reschke b4606ec24f Merge pull request #13184 from owncloud/fix-key
Verify existence of $_GET key
2015-01-09 10:39:22 +01:00
Vincent Petry 888ce4d4f9 Fix cache jail to not duplicate slashes 2015-01-09 10:18:32 +01:00
Jenkins for ownCloud d4fc2f555b [tx-robot] updated from transifex 2015-01-09 01:55:22 -05:00
Lukas Reschke 199276bcbb 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.
2015-01-09 02:31:59 +01:00
Lukas Reschke 6c59253978 Merge pull request #13179 from owncloud/fix-fatal-php-error-for-not-existing-files
Verify whether type is correct
2015-01-09 02:27:51 +01:00
Morris Jobke 6a5f12beca Merge pull request #12988 from owncloud/logfile_download
Logfile download
2015-01-09 00:33:22 +01:00
Vincent Petry aa821ecc00 Trim leading or trailing slashes in file cache paths 2015-01-08 19:43:02 +01:00
Lukas Reschke ceaaab6295 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.
2015-01-08 18:38:17 +01:00
Arthur Schiwon c1a79d24c5 fix order of initalizing instance properties, and paremeter order in a method call 2015-01-08 17:45:07 +01:00
Morris Jobke 5311d92c5c Merge pull request #13148 from owncloud/self-destroying-notifications
Add timeout for notifications
2015-01-08 15:50:47 +01:00
Thomas Müller 6b0ae34de6 Merge pull request #13170 from owncloud/extstorage-fixsharedmountpointrootleadingslash
Fix source path when share is a mount point
2015-01-08 15:02:16 +01:00
Arthur Schiwon c7f273040e fix table name for getList 2015-01-08 14:21:40 +01:00
Lukas Reschke bdfb039e05 Merge pull request #13165 from mypetyak/typos-in-external-storage-xml
Minor typo updates to External Storage description
2015-01-08 14:00:00 +01:00
Lukas Reschke af269258d3 Merge pull request #13172 from owncloud/addCheckForOldRewriteRulesToMakeOurCrappyIntegrationWorking
Add version to .htaccess
2015-01-08 13:48:48 +01:00
Morris Jobke 8e1904386f 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
2015-01-08 13:06:45 +01:00
Lukas Reschke 7fbb7f4dc4 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
2015-01-08 12:49:02 +01:00
Vincent Petry 01c83158bb 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.
2015-01-08 11:46:11 +01:00
Morris Jobke 14e534e933 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...
2015-01-08 11:08:24 +01:00
Thomas Müller 296a852063 check for working htaccess will result in a dead lock because the server is blocking the request to itself - fixes #13153 2015-01-08 09:13:18 +01:00
Jenkins for ownCloud 6bda95037f [tx-robot] updated from transifex 2015-01-08 01:56:00 -05:00
Christopher Bunn 0f715708dc Minor typo updates to External Storage description
This text is visible to admin users when they read the description of
the External Storage app.
2015-01-07 22:37:20 -06:00
Morris Jobke 8b95494073 Merge #13074 from branch 'mmattel-smb_rename_text_root_to_subfolder' 2015-01-07 20:54:25 +01:00
Martin edcba11a91 smb: rename textfield from root to subfolder
"root" or "subfolder" -> "Remote subfolder" on selected storages

missed ftp...
2015-01-07 20:54:05 +01:00
Morris Jobke bfb6e350d5 Merge pull request #13016 from owncloud/sharing_fixes
don't delete share table entries for the unique name if re-share permission was removed
2015-01-07 18:14:53 +01:00
Bjoern Schiessle e9e7ee67d3 shareType and permissions are integers 2015-01-07 16:36:13 +01:00
Bjoern Schiessle b6f63e9b3d don't delete share table entries for the unique name if re-share permission was removed 2015-01-07 16:36:13 +01:00
Morris Jobke 10505bdb0d Merge pull request #13150 from owncloud/fix-sharing-activity-extension
Correctly return false when translating a foreign activity
2015-01-07 16:10:38 +01:00
Jörn Friedrich Dreyer 0bb91cfcf3 don't show no files yet when mask is in place, fixes #13141 2015-01-07 15:59:39 +01:00
Joas Schilling 70dcebbf92 Correctly return false when translating a foreign activity 2015-01-07 15:02:25 +01:00
Georg Ehrke f579f2bd94 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
2015-01-07 14:55:53 +01:00
Arthur Schiwon 9668405ec7 doc fixes and removal of unnecessary use statements 2015-01-07 13:28:56 +01:00
Morris Jobke 5ce295907f Merge pull request #12687 from owncloud/auto-escape-t-placeholders
Auto escape t placeholders
2015-01-07 12:57:33 +01:00
Morris Jobke bfdf0db7c0 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
2015-01-07 12:56:32 +01:00