server

Author	SHA1	Message	Date
Bjoern Schiessle	06d0a41915	add social media button for diaspora, twitter, facebook and google+	2015-06-17 13:53:59 +02:00
Thomas Müller	d2305f2527	Merge pull request #16729 from owncloud/scanner-read-lock keep a read lock while scanning a file or folder	2015-06-17 11:52:54 +02:00
Jenkins for ownCloud	3898b8c9b8	[tx-robot] updated from transifex	2015-06-17 01:55:34 -04:00
Bjoern Schiessle	b645d795d2	add occ tool to delete versions	2015-06-16 16:56:27 +02:00
Morris Jobke	b052eccd9a	Merge pull request #16938 from owncloud/ext-s3-opendirduplicate Skip directory entry in S3 opendir	2015-06-16 09:48:10 +02:00
Jenkins for ownCloud	0a5d73b874	[tx-robot] updated from transifex	2015-06-16 01:55:41 -04:00
Vincent Petry	f98030020f	Properly set mtime on S3 for touch operation The code was missing the "MetadataDirective". Once added, some other parts of the code failed because the format of mtime was wrong. So this PR uses the RFC format that the S3 library already uses. Additionally, the code path where mtime is null was missing. Now defaulting to the current time.	2015-06-15 17:35:09 +02:00
Vincent Petry	d3f828af45	Skip directory entry in S3 opendir The result set contains the directory itself, so skip it to avoid scanning a non-existing directory	2015-06-15 17:30:09 +02:00
Robin Appelman	f02e110aea	explain pre-hook scan	2015-06-15 15:43:19 +02:00
Robin Appelman	5efbab4ab8	ensure we dont have to scan a file in the trash wrapper	2015-06-15 14:32:29 +02:00
Thomas Müller	433db48027	Merge pull request #16911 from oparoz/prettier-public-thumbnails Determine the size we need before asking for a thumbnail	2015-06-15 13:30:44 +02:00
Thomas Müller	3ce616fb03	Merge pull request #16885 from owncloud/files-previewurlresolutionrounding Truncate preview resolution	2015-06-15 12:53:05 +02:00
Jenkins for ownCloud	2806c9476c	[tx-robot] updated from transifex	2015-06-15 01:54:58 -04:00
Jenkins for ownCloud	fe9b28a800	[tx-robot] updated from transifex	2015-06-14 01:54:49 -04:00
Jenkins for ownCloud	51d181f331	[tx-robot] updated from transifex	2015-06-13 01:55:04 -04:00
Olivier Paroz	7b84343cfc	floats are not welcome when setting the size of a preview	2015-06-12 18:56:18 +02:00
Olivier Paroz	8ff4a66f01	Determine the size we need before asking for a thumbnail We need to set the size of the preview using the devicePixelRatio and use that as arguments when using the preview endpoint or that endpoint will use the default 36x36 and thumbnails will be blurry on high DPI devices	2015-06-12 18:50:21 +02:00
Jenkins for ownCloud	abd70932c6	[tx-robot] updated from transifex	2015-06-12 01:55:11 -04:00
Arthur Schiwon	97127cd971	the user is gone, userExists will not bring him back. But the user's folder needs to be deleted anyway	2015-06-11 18:24:45 +02:00
Vincent Petry	d256425aba	Truncate preview resolution This prevents having float numbers appear in the URL	2015-06-11 17:17:40 +02:00
Jenkins for ownCloud	88d3c9ad40	[tx-robot] updated from transifex	2015-06-11 01:55:05 -04:00
Thomas Müller	4747c7f509	Merge pull request #16736 from owncloud/utilize-member-of Utilize memberOf to boost loading time on users page (depending on LDAP server config)	2015-06-10 08:47:53 +02:00
Jenkins for ownCloud	4d88302b3a	[tx-robot] updated from transifex	2015-06-10 01:54:55 -04:00
Thomas Müller	5f4f7e69cf	Merge pull request #16810 from owncloud/disable-search-if-not-implemented Disable search field in case there is no search available to the curr…	2015-06-09 23:49:25 +02:00
Morris Jobke	7550bf0917	Disable video preview if previews are disabled	2015-06-09 17:49:59 +02:00
Thomas Müller	0fde0e6569	Search results have to explicitly be added to the content area of the app	2015-06-09 12:39:40 +02:00
Morris Jobke	bacd5de453	Merge pull request #16811 from espenfjo/master Fix regression in preview height calculation	2015-06-09 09:31:30 +02:00
Jenkins for ownCloud	75bd040f1c	[tx-robot] updated from transifex	2015-06-09 01:55:06 -04:00
Bjoern Schiessle	d743d6d356	add hint to exception	2015-06-08 21:16:23 +02:00
Espen Fjellvær Olsen	308b97db4c	Fix regression in preview height calculation Fix regressions introduced in `a672e9d` regarding the image height calculation	2015-06-08 20:57:19 +02:00
Jenkins for ownCloud	2fb1b0864a	[tx-robot] updated from transifex	2015-06-08 01:55:01 -04:00
Jenkins for ownCloud	3542148761	[tx-robot] updated from transifex	2015-06-07 01:55:03 -04:00
Jenkins for ownCloud	16708ae187	[tx-robot] updated from transifex	2015-06-06 01:55:26 -04:00
Morris Jobke	62ae39208a	Add owner to the storage stats to enable better notifications * getstoragestats.php returns now the owner and it's display name * show proper storage stats notifications for shared folders	2015-06-05 18:21:41 +02:00
Thomas Müller	9899e10a04	Merge pull request #16753 from owncloud/issue-16752-check-for-existing-user-in-expire-tasks Check whether the user exists before trying to set up his file system	2015-06-05 16:22:03 +02:00
Joas Schilling	bd0b9a0fe0	Add unit tests for non existing users	2015-06-05 13:23:50 +02:00
Thomas Müller	ccbb1cce3c	Merge pull request #16718 from owncloud/files-catchajaxexceptions Catch exceptions in files ajax calls	2015-06-05 12:01:01 +02:00
Joas Schilling	4e24486a89	Check whether the user exists before trying to set up his file system	2015-06-05 11:31:49 +02:00
Morris Jobke	c747a58978	Merge pull request #16748 from owncloud/fix-ldap-port-detection-regression port detection needs to take care of now thrown exceptions when LDAP …	2015-06-05 11:10:37 +02:00
Jenkins for ownCloud	e544d5b2c6	[tx-robot] updated from transifex	2015-06-05 01:55:04 -04:00
Arthur Schiwon	6f69fab384	port detection needs to take care of now thrown exceptions when LDAP server is not available	2015-06-04 16:28:48 +02:00
Jenkins for ownCloud	66a24ff479	[tx-robot] updated from transifex	2015-06-04 01:56:24 -04:00
Arthur Schiwon	090478a95e	if possible, getUserGroups should get memberships using memberOf virtual attribute	2015-06-03 17:38:27 +02:00
Morris Jobke	a90a84b0a7	Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversions Keep versions when deleting as recipient	2015-06-03 16:03:31 +02:00
Arthur Schiwon	91841bb25d	Implement a faster way for checking availability of memberOf. Users tab in the wizard benefits.	2015-06-03 15:23:37 +02:00
Vincent Petry	263bb46ff8	Catch exceptions in files ajax calls	2015-06-03 14:31:58 +02:00
Joas Schilling	d3e3a84cae	Move the helpful method to the TestCase class	2015-06-03 12:33:29 +02:00
Jenkins for ownCloud	410a836702	[tx-robot] updated from transifex	2015-06-03 01:55:29 -04:00
Vincent Petry	61356b5560	Keep versions when deleting as recipient The original owner could not be resolved because the original file was already deleted, so no versions were retained. This fix passes the owner and path to retainVersions() since it was already resolved before the file deletion. This reactivates the versions logic and creates a copy of the versions in each trashbin.	2015-06-02 17:13:00 +02:00
Lukas Reschke	1cccb227c3	Merge pull request #16686 from owncloud/show_cloud_id show federated cloud id in the personal settings	2015-06-02 17:05:33 +02:00
Morris Jobke	70f0cf67a5	L10n for federated cloud ID and rtrim '/' on ID	2015-06-02 15:16:21 +02:00
Bjoern Schiessle	6e5ed81064	show federated cloud id in the personal settings	2015-06-02 14:09:53 +02:00
Morris Jobke	cf2c599218	Merge pull request #16200 from owncloud/kill-globalfilecache Drop file caching	2015-06-02 09:11:33 +02:00
Jenkins for ownCloud	baca5c60c0	[tx-robot] updated from transifex	2015-06-02 01:56:23 -04:00
Lukas Reschke	418f4e1a90	Bump Dropbox library to newest upstream version	2015-06-01 17:03:46 +02:00
Robin Appelman	661c9e2444	add changeLock to the storage api	2015-06-01 13:24:02 +02:00
Robin Appelman	536e187e51	add locking to the storage api	2015-06-01 13:22:56 +02:00
Vincent Petry	5a38964218	Merge pull request #16629 from owncloud/files-renametoreservedname Check target name on rename with web UI	2015-06-01 11:07:08 +02:00
Lukas Reschke	88ee082115	Merge pull request #16638 from owncloud/fix-handlebars-l10n-method-calls Fix files_external l10n	2015-06-01 09:11:21 +02:00
Jenkins for ownCloud	b1ac538679	[tx-robot] updated from transifex	2015-06-01 01:54:54 -04:00
Jenkins for ownCloud	8d23b34402	[tx-robot] updated from transifex	2015-05-31 01:54:44 -04:00
Morris Jobke	80d4309669	Fix files_external l10n * current l10n..pl script can't extract JS functions that are within a handlebars template - therefore they are duplicated until the script is fixed	2015-05-30 14:00:52 +02:00
Jenkins for ownCloud	a3bc112412	[tx-robot] updated from transifex	2015-05-30 01:55:46 -04:00
Vincent Petry	13617c8bf1	Check target name on rename with web UI When renaming over the web UI, check early that the target name is valid. This prevents nonsensical error messages when renaming to a name with a trailing backslash.	2015-05-29 19:30:09 +02:00
Björn Schießle	01a241f711	Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfiles Abort expiration when file is gone	2015-05-29 15:19:04 +02:00
Vincent Petry	9a6d253af3	Abort expiration when file is gone Sometimes a background job for versions expiration was scheduled for a file that has been moved or deleted since. This prevents showing useless warnings in the log and simply bail out.	2015-05-29 13:15:12 +02:00
Thomas Müller	c700f42b68	Merge pull request #16517 from owncloud/remove-logo-wide replace logo-wide on share page as well with better icon + text	2015-05-29 12:15:02 +02:00
Martin	f084eb07f2	Missing translation in ldap part.wizard-server.php	2015-05-29 10:50:02 +02:00
Jenkins for ownCloud	fff0fb66d6	[tx-robot] updated from transifex	2015-05-29 01:56:13 -04:00
Thomas Müller	b95ebb76e5	Merge pull request #16607 from owncloud/ie9-textpreviewfallback Fallback to picture preview for IE <= 9	2015-05-28 20:45:14 +02:00
Thomas Müller	863139c1e2	Merge pull request #16585 from mmattel/Missing_translation_in_External_storage_back_end Make string 'SFTP with secret key login' translateable	2015-05-28 20:42:08 +02:00
Vincent Petry	29c68a4e61	Return 404 in shareinfo.php when outgoing s2s disabled	2015-05-28 17:59:43 +02:00
Vincent Petry	2daef7c7dc	Fallback to picture preview for IE <= 9 IE 9 and below do not provide window.btoa and there is currently no way to generate base64 strings without introducting further dependencies. So for now the solution is to fall back to the ugly picture mode for text files whenever IE <= 9 is used.	2015-05-28 15:36:28 +02:00
Björn Schießle	e1483f65c3	Merge pull request #16591 from owncloud/enc_improved_error_message improved error message for various states	2015-05-28 10:55:53 +02:00
Jenkins for ownCloud	1726d84e73	[tx-robot] updated from transifex	2015-05-28 01:55:22 -04:00
Bjoern Schiessle	68db3059ee	detect migration status	2015-05-27 21:00:02 +02:00
Bjoern Schiessle	5549641f1f	improve error messages displayed to the user	2015-05-27 21:00:02 +02:00
Martin	cdbf472c4d	Make string 'SFTP with secret key login' translatable	2015-05-27 15:38:05 +02:00
Jenkins for ownCloud	fda0995e4c	[tx-robot] updated from transifex	2015-05-27 01:55:34 -04:00
Björn Schießle	9366dde875	Merge pull request #15985 from owncloud/hotfix/fix-encryption-references [enc2] fix references to legacy encryption app name	2015-05-26 17:28:27 +02:00
Vincent Petry	39c6a36488	Merge pull request #16532 from owncloud/cors-no-cookie-auth Disallow cookie auth for cors requests	2015-05-26 12:12:04 +02:00
Jenkins for ownCloud	6198fb20cb	[tx-robot] updated from transifex	2015-05-26 01:54:57 -04:00
Jenkins for ownCloud	fe610a65d3	[tx-robot] updated from transifex	2015-05-25 01:55:06 -04:00
Jenkins for ownCloud	06934e7c00	[tx-robot] updated from transifex	2015-05-24 01:55:03 -04:00
Jenkins for ownCloud	e189435499	[tx-robot] updated from transifex	2015-05-23 01:55:05 -04:00
Roeland Jago Douma	41a8f45b93	OCS Share API link shares now always have an url To make sure clients have the correct and latest link add an url field to all OCS Share API return statements on public link shares. * Added unit tests	2015-05-22 14:42:57 +02:00
Bernhard Posselt	c8e3599cad	disallow cookie auth for cors requests testing ... fixes fix test add php doc fix small mistake add another phpdoc remove not working cors annotations from files app	2015-05-22 14:06:26 +02:00
Jenkins for ownCloud	156881efce	[tx-robot] updated from transifex	2015-05-22 01:55:04 -04:00
Jan-Christoph Borchardt	78a0464354	replace logo-wide on share page as well with better icon + text	2015-05-22 00:04:47 +02:00
Jenkins for ownCloud	42dd40ad80	[tx-robot] updated from transifex	2015-05-21 01:55:57 -04:00
Vincent Petry	d560d1ef2a	Merge pull request #16469 from oparoz/restore-minheight-for-single-public-previews Restore min-height for single previews	2015-05-20 16:48:27 +02:00
Morris Jobke	39d1e99228	Merge pull request #16322 from owncloud/trash-view dont go trough the view when moving to trash	2015-05-20 14:44:01 +02:00
Morris Jobke	1a67e5cdc3	Merge pull request #16465 from owncloud/s2s-returnpropererrorwhenpublicwebdavdisabled Return 401 when accessing public webdav and s2s is disabled	2015-05-20 14:28:45 +02:00
Olivier Paroz	13ab251c6d	Restore min-height for single previews	2015-05-20 14:09:31 +02:00
Vincent Petry	7386257676	Merge pull request #16075 from owncloud/skeleton-copy-delay wait with copying the skeleton untill login and setupfs are done	2015-05-20 13:52:08 +02:00
Vincent Petry	f2a900e04c	Return 401 when accessing public webdav and s2s is disabled	2015-05-20 12:19:03 +02:00
Morris Jobke	3a4568313f	Merge pull request #16326 from owncloud/fix-16192 include base dn test in functionality test	2015-05-20 12:12:52 +02:00
Jan-Christoph Borchardt	0d78ebf6cd	Merge pull request #16444 from owncloud/close-new-dropdown Closes "New" dropdown when switching category	2015-05-20 11:15:21 +02:00
Lukas Reschke	9be6d8cd39	Merge pull request #16446 from owncloud/fix-url-generation Fix URL generation	2015-05-20 08:20:38 +02:00
Jenkins for ownCloud	c49a06a684	[tx-robot] updated from transifex	2015-05-20 01:56:19 -04:00
Thomas Müller	f9d04f62a8	Merge pull request #16440 from owncloud/scrutinizer-patch-1 Scrutinizer Auto-Fixes	2015-05-19 22:12:35 +02:00
Vincent Petry	f7a2b5e7a9	Added unit tests for download URL in public sharing page	2015-05-19 17:41:06 +02:00
Thomas Müller	f59576c3ca	Merge pull request #16447 from owncloud/fix-minor-code-problems Fix unexisting class and broken doc	2015-05-19 16:23:36 +02:00
Morris Jobke	d3d70e5d90	Re-add use statement	2015-05-19 16:15:00 +02:00
Joas Schilling	d832c4ae23	Fix unexisting class and broken doc	2015-05-19 15:27:50 +02:00
Lukas Reschke	07483033c1	Fix URL generation `params` in the `OC.generateUrl` function call only replaces all specified occurences of a key just like the l10n PHP functionality does. This means that to build a query string we have to use `OC.buildQueryString` instead of the params parameters. Fixes https://github.com/owncloud/core/issues/16336 which is a regression introduced with `58a87d0bab` of https://github.com/owncloud/core/pull/15652. Without this fix downloading single files from a public shared folder is not possible.	2015-05-19 15:12:08 +02:00
Morris Jobke	581227324a	Closes "New" dropdown when switching category * fixes #16394 * return false - stops all following event callbacks	2015-05-19 14:47:13 +02:00
Robin Appelman	733784ae41	cleanup move/copy logic in trash	2015-05-19 14:22:09 +02:00
Scrutinizer Auto-Fixer	fdbc21fc6c	Scrutinizer Auto-Fixes This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com	2015-05-19 11:23:06 +00:00
Arthur Schiwon	76dfc87227	add primary group users to resultset before caching	2015-05-19 12:56:07 +02:00
Arthur Schiwon	6b218039ba	Fixes returns of group memberships and counting if all members have the specific groups as primary set.	2015-05-19 12:56:07 +02:00
Thomas Müller	6d97dfb00c	Catch NotFoundException and return no quota information which simply reflects the current state - no file storage has been initialized for the user.	2015-05-19 12:38:03 +02:00
Thomas Müller	d90b83725f	Merge pull request #16085 from owncloud/encryption-module-rename rename to 'Default encryption module'	2015-05-19 11:13:33 +02:00
Joas Schilling	9e0cb4460e	Merge pull request #16354 from owncloud/remove-browser-from-publicwebdav Show a empty response for GET on non-files instead of the Browser Plugin	2015-05-19 10:54:11 +02:00
Morris Jobke	68a593a667	Merge pull request #16181 from owncloud/fix-15982 catch unallowed anonymous auth attempt and show specific error	2015-05-19 10:36:35 +02:00
Jenkins for ownCloud	313994a33d	[tx-robot] updated from transifex	2015-05-19 01:55:35 -04:00
Arthur Schiwon	cdb0689334	handle unallowed auth exception on port detection	2015-05-18 18:14:05 +02:00
Arthur Schiwon	5a56393657	throw exception on LDAP error 1, which we usually do not see and is pretty generic. AD uses is for uses not enlisted in the RFC, like on issues with anonymous binds. we also try to guess this case and show a hint.	2015-05-18 18:14:05 +02:00
Arthur Schiwon	b9e5309757	catch unallowed anonymous auth attempt and show specific error	2015-05-18 18:14:05 +02:00
Robin Appelman	8f1a609512	adjust test	2015-05-18 17:16:13 +02:00
Robin Appelman	89959a856c	fix target path for move	2015-05-18 17:16:13 +02:00
Robin Appelman	a0854b36f0	update cache after move to trash	2015-05-18 17:16:13 +02:00
Robin Appelman	b70e1ffc6d	dont go trough the view when moving to trash	2015-05-18 17:16:12 +02:00
Clark Tomlinson	7d2666699b	removing encryption preview check	2015-05-18 09:47:46 -04:00
Clark Tomlinson	d557519746	removing deletion of encryption keys this will be handled in the wrapper now	2015-05-18 09:47:46 -04:00
Joas Schilling	30d165ebf2	Add missing import for the exception	2015-05-18 15:45:47 +02:00
Clark Tomlinson	a0c6c01137	fix references to legacy encryption app name	2015-05-18 09:45:41 -04:00
Joas Schilling	4444db61b7	Add a unit test for the decrypt method	2015-05-18 15:45:11 +02:00
Bjoern Schiessle	7676166254	add l10n to constructor	2015-05-18 15:43:53 +02:00
Vincent Petry	86cf8e1f68	Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash also encrypt files in trash bin	2015-05-18 14:59:34 +02:00
Bjoern Schiessle	7d492fefae	also encrypt files in trash bin	2015-05-18 12:51:47 +02:00
Vincent Petry	5899b7b6ea	Fix provisioning API unit tests for login Properly login the user every time to make sure their FS is properly setup.	2015-05-18 12:28:54 +02:00
Robin Appelman	724f88d9ff	fix tests	2015-05-18 12:11:32 +02:00
Robin Appelman	415f16eb24	fix tests	2015-05-18 12:11:31 +02:00
Roeland Jago Douma	dd3d0194a6	Move files sharing app (mostly) to OCP\DB	2015-05-18 11:06:23 +02:00
Roeland Jago Douma	be8d0a08ec	Move away from private static deprecated functio	2015-05-18 11:03:48 +02:00
Roeland Jago Douma	7a8072e958	Move core apps from OC_Log::write to OCP\Util	2015-05-18 10:57:52 +02:00
Bjoern Schiessle	887be709f5	a new approach to display the error message	2015-05-18 10:15:17 +02:00
Jenkins for ownCloud	73a3086945	[tx-robot] updated from transifex	2015-05-18 01:54:58 -04:00
Jenkins for ownCloud	16c320df26	[tx-robot] updated from transifex	2015-05-17 01:55:56 -04:00
Jenkins for ownCloud	744a9f2c78	[tx-robot] updated from transifex	2015-05-16 01:54:47 -04:00
Vincent Petry	246000f799	Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota Validate the quota value to be a correct value	2015-05-15 18:07:13 +02:00
Thomas Müller	8e61ad0872	Merge pull request #15811 from owncloud/exception-on-lost-ldap-connection throw exception when LDAP Connection was lost	2015-05-15 17:32:07 +02:00
Joas Schilling	03e26a0fbe	Merge pull request #16337 from owncloud/versions-expireforowner Use owner when expiring versions, not the logged in user	2015-05-15 15:02:26 +02:00
Vincent Petry	f86699cd48	Fix restoring files from trash with unique name When restoring a file, a unique name needs to be generated if a file with the same name already exists. Also fixed the restore() method to return false if the file to restore does not exist. Added unit tests to cover restore cases.	2015-05-15 12:42:27 +02:00
Vincent Petry	f8a4cc0284	Added unit tests for versions storing	2015-05-15 12:24:34 +02:00
Joas Schilling	e1923bac07	Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrash Added rmdir to trashbin storage wrapper	2015-05-15 11:16:13 +02:00
Thomas Müller	937306b416	Merge pull request #16323 from owncloud/enc_webdav_fixes some encryption fixes	2015-05-15 10:38:22 +02:00
Jenkins for ownCloud	49c4ee98b4	[tx-robot] updated from transifex	2015-05-15 01:54:49 -04:00
Lukas Reschke	e0a136d344	Show a empty response for GET on non-files instead of the Browser Plugin As discussed in https://github.com/owncloud/core/pull/14151, we missed to add this to the `files_sharing` S2S public WebDAV backend though.	2015-05-14 14:02:32 +02:00
Jenkins for ownCloud	1596a1fd32	[tx-robot] updated from transifex	2015-05-14 01:54:47 -04:00
Bjoern Schiessle	ccbefb6e75	delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories	2015-05-13 19:06:23 +02:00
Vincent Petry	033b3dac92	Use owner when expiring versions, not the logged in user	2015-05-13 18:40:35 +02:00
Arthur Schiwon	2bf92e0a43	include base dn test in functionality test	2015-05-13 16:21:50 +02:00
Lukas Reschke	5941e826b8	Merge pull request #16284 from owncloud/shared-storage-view dont go trough the view when renaming/copying on shared storages	2015-05-13 10:37:04 +02:00
Jenkins for ownCloud	504586aec6	[tx-robot] updated from transifex	2015-05-13 01:55:14 -04:00
Robin Appelman	3b1dde7005	dont go trough the view when renaming/copying on shared storages	2015-05-12 17:09:37 +02:00
Morris Jobke	44091a1a12	Merge pull request #16277 from owncloud/fix-15971 remove superflous button. fixes #15971	2015-05-12 15:54:49 +02:00
Jan-Christoph Borchardt	46e4d8818c	Merge pull request #16127 from owncloud/fix-file-icons-in-shared-file-view Enable file icons & previews in "Shared ..." categories	2015-05-12 15:17:43 +02:00
Arthur Schiwon	acafc8ca46	remove superflous button. fixes #15971	2015-05-12 14:54:05 +02:00
Vincent Petry	beb6a38d85	Added rmdir to trashbin storage wrapper This makes sure that folders are moved to trash when deleted with rmdir() instead of unlink(). This happens for example when deleting a folder over WebDAV. The web UI uses unlink() so it wasn't affected.	2015-05-12 11:09:02 +02:00
Jenkins for ownCloud	deeeca69fe	[tx-robot] updated from transifex	2015-05-12 01:55:10 -04:00
Vincent Petry	20d2d8d3dd	Merge pull request #15881 from owncloud/share-moveversionsproperly Fix version rename with files and folders	2015-05-11 18:24:34 +02:00
Morris Jobke	90d8e4bc00	Merge pull request #15815 from owncloud/unshare-etag-propagate Update etag of direct parent on unshare	2015-05-11 13:42:20 +02:00
Morris Jobke	f057efc42e	Merge pull request #16213 from cmeh/patch-5 Grammar, removal of line break	2015-05-11 09:18:45 +02:00
Jenkins for ownCloud	a331f6b83e	[tx-robot] updated from transifex	2015-05-11 01:54:43 -04:00
Jenkins for ownCloud	52fc45e6e3	[tx-robot] updated from transifex	2015-05-10 01:56:13 -04:00
Christian Hoffmann	6441721626	Grammar, removal of line break * Corrected "… if the user forgets their password." to "… if the user forgets his or her password" in line 17. * Removed line break from line 17 to line 18.	2015-05-09 11:31:21 +02:00
Jenkins for ownCloud	6f5854a8de	[tx-robot] updated from transifex	2015-05-09 01:55:35 -04:00
Arthur Schiwon	90611e6594	only use memcache, if available	2015-05-08 13:27:27 +02:00
Bjoern Schiessle	4a450c9d0d	improved admin settings	2015-05-08 11:41:38 +02:00
Thomas Müller	e4c05acf94	Merge pull request #16170 from owncloud/fix-15621 drop global file cache support, fixes #15621	2015-05-08 11:06:00 +02:00
Thomas Müller	dfd451777c	Merge pull request #16183 from owncloud/fix-16147 check optional parameter before using it, fixes #16147	2015-05-08 10:47:33 +02:00
Morris Jobke	1fbf9c3d71	Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pathinfo Do not run method when the path is empty	2015-05-08 09:49:51 +02:00
Jenkins for ownCloud	ff0faacf0b	[tx-robot] updated from transifex	2015-05-08 01:54:52 -04:00
Arthur Schiwon	f2d23d7f02	check optional parameter before using it, fixes #16147	2015-05-07 22:18:29 +02:00
Thomas Müller	15d134124b	Validate the quota value to be a correct value	2015-05-07 17:56:13 +02:00
Joas Schilling	2b092f2e93	Add a test for getting the versions of an empty path	2015-05-07 16:02:35 +02:00
Arthur Schiwon	57e8b76f48	drop global file cache support, fixes #15621	2015-05-07 14:52:44 +02:00
Joas Schilling	05fe2006ee	Do not run method when the path is empty	2015-05-07 14:31:21 +02:00
Morris Jobke	12b24ee567	Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page Display the module settings in the list of the encryption modules	2015-05-07 10:44:03 +02:00
Jenkins for ownCloud	3dee907b70	[tx-robot] updated from transifex	2015-05-07 01:56:44 -04:00
Morris Jobke	b1713b2f75	Enable file icons & previews in "Shared ..." categories * sharing API returns now the mimetype icon path * file previews are now lazyloaded by default (as the doc says) * fixes #16086	2015-05-06 18:32:52 +02:00
Arthur Schiwon	71e6644ec8	fix filter index on selected groups is updated too early	2015-05-06 15:34:44 +02:00
Jan-Christoph Borchardt	35292eb66c	rename to 'Default encryption module'	2015-05-06 15:31:05 +02:00
Arthur Schiwon	795a48d45c	fix broken group presentation in selected groups list	2015-05-06 15:29:36 +02:00
Jenkins for ownCloud	910146824e	[tx-robot] updated from transifex	2015-05-06 01:55:19 -04:00
Arthur Schiwon	0e7fd82e89	cleanup	2015-05-05 14:21:12 +02:00
Arthur Schiwon	1c791e6000	not only send them back but also apply defaults to a new configuration. Fixes #15933	2015-05-05 14:20:58 +02:00
Joas Schilling	efce8ff905	Merge pull request #16052 from owncloud/fix-phpdoc-sharecontroller Fix PHPDoc for the ext. share controller	2015-05-05 10:52:28 +02:00
Björn Schießle	2ce01ee0bf	Merge pull request #15938 from owncloud/enc_update_recovery_share_key [encryption] check recovery key setting for the correct user	2015-05-05 10:48:09 +02:00
Jenkins for ownCloud	b60dcd91bb	[tx-robot] updated from transifex	2015-05-05 01:55:36 -04:00
Lukas Reschke	d9746d8abd	Fix PHPDoc for the ext. share controller	2015-05-04 18:06:16 +02:00
Björn Schießle	ed16127a8d	Merge pull request #16026 from owncloud/enc_ux_improvements [encryption] some small ux improvements	2015-05-04 17:40:05 +02:00
Thomas Müller	08b98a8ede	Merge pull request #16042 from owncloud/fix-output-buffering Remove hard-dependency on disabled output_buffering	2015-05-04 16:43:32 +02:00
Joas Schilling	eadc2c330c	Display the module settings in the list of the encryption modules	2015-05-04 15:04:03 +02:00
Lukas Reschke	4b9e034968	Remove hard-dependency on disabled output_buffering This removes the hard-dependency on output buffering as requested at https://github.com/owncloud/core/issues/16013 since a lot of distributions such as Debian and Ubuntu decided to use `4096` instead of the PHP recommended and documented default value of `off`. However, we still should encourage disabling this setting for improved performance and reliability thus the setting switches in `.user.ini` and `.htaccess` are remaining there. It is very likely that we in other cases also should disable the output buffering but aren't doing it everywhere and thus causing memory problems. Fixes https://github.com/owncloud/core/issues/16013	2015-05-04 14:15:15 +02:00
Morris Jobke	760ce3bd63	Fix DeleteOrphanedSharesJob * remove unneeded use statements * the the interval properly in the constructor * set the log level to debug (from info) - fixes #16036	2015-05-04 13:58:58 +02:00
Bjoern Schiessle	f76c055244	some small ux improvements	2015-05-04 11:55:06 +02:00
Lukas Reschke	17fedc80da	Merge pull request #15652 from oparoz/better-text-previews Show a text preview instead of a bitmap preview of text	2015-05-04 11:44:51 +02:00
Thomas Müller	0f7b8dd338	Merge pull request #15752 from owncloud/feature/fix-encryption-return-values [enc2] fixing return values and adding tests	2015-05-04 11:44:15 +02:00
Thomas Müller	7376ea9b26	Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder skip user if we don't have a public key	2015-05-04 09:57:19 +02:00
Jenkins for ownCloud	7fa308977b	[tx-robot] updated from transifex	2015-05-04 01:54:47 -04:00
Morris Jobke	7a3b74a8b9	Merge pull request #15486 from owncloud/versions-rollbackkeepfileid Keep fileid when restoring version, using stream copy	2015-05-03 13:12:54 +02:00
Jenkins for ownCloud	aa0d439ed9	[tx-robot] updated from transifex	2015-05-02 01:54:49 -04:00
Jenkins for ownCloud	eda4d45836	[tx-robot] updated from transifex	2015-05-01 01:54:43 -04:00
Vincent Petry	972e189605	Use moveFromStorage instead of streamCopy when restoring version	2015-04-30 16:15:18 +02:00
Vincent Petry	2228faaa39	Fix version rollback to keep fileid	2015-04-30 16:15:18 +02:00
Joas Schilling	4a6808a0f4	Simplify the test	2015-04-30 12:04:02 +02:00
Bjoern Schiessle	4ef9df8750	skip user if we don't have a public key	2015-04-30 12:04:02 +02:00
Bjoern Schiessle	70a44621be	check recovery setting for the right user	2015-04-30 11:38:53 +02:00
Thomas Müller	7795265d93	Moving encryption_dummy to the apps repo - fixes #15950	2015-04-30 10:51:51 +02:00
Jenkins for ownCloud	ae853445ef	[tx-robot] updated from transifex	2015-04-30 03:27:57 -04:00
Clark Tomlinson	4209757d61	Merge pull request #15919 from owncloud/enc_handle_empty_files Encryption improve handling of empty and unencrypted files	2015-04-29 19:32:02 -04:00
Vincent Petry	002d74f95a	Merge pull request #15908 from owncloud/fix-replace-with-sed Replace `replace` with `sed` statement	2015-04-29 12:28:23 +02:00
Morris Jobke	8c7db2536d	Merge pull request #15596 from owncloud/issue/15589 Correctly generate the feedback URL for remote share	2015-04-29 10:52:43 +02:00
Morris Jobke	0ab16cb823	Replace `replace` with `sed` statement	2015-04-29 09:53:45 +02:00
Björn Schießle	6ebb021359	Merge pull request #15911 from owncloud/enc_create_header_for_new_key make sure that we create a header for the encrypted private key	2015-04-29 09:43:54 +02:00
Lukas Reschke	3e06fd9342	Merge pull request #15706 from owncloud/fix-15705-master move creation of shared key to the login handler	2015-04-29 09:36:34 +02:00
Thomas Müller	416ef1eb62	Merge pull request #15921 from cmeh/patch-4 Spelling in wizardTabElementary.js: Correct "More then …" to "More than …"	2015-04-29 09:28:27 +02:00
Jenkins for ownCloud	9db338df29	[tx-robot] updated from transifex	2015-04-29 01:54:45 -04:00
cmeh	5e3fe7fb06	Update wizardTabElementary.js Corrected "More then …" to "More than …".	2015-04-28 22:11:24 +02:00
Bjoern Schiessle	29bcfb2fdb	method shouldn't be static	2015-04-28 20:21:53 +02:00
Bjoern Schiessle	d5cbb66b66	also create encryption keys for empty files	2015-04-28 20:21:53 +02:00
Bjoern Schiessle	df428b76ac	skip update of encryption keys if file is not encrypted	2015-04-28 20:21:53 +02:00
Joas Schilling	b55ef51a27	Add tests for the correct share id on the call aswell	2015-04-28 14:56:13 +02:00
Joas Schilling	34181c3aef	Correctly send Federate-Cloud Share Feedback against the remote share ID	2015-04-28 14:29:04 +02:00
Vincent Petry	65fbb5eda0	Update etag of direct parent on unshare Only call dirname() once instead of twice when propagating etags to the recipient's parent folders.	2015-04-28 13:11:23 +02:00
Bjoern Schiessle	7d05f387fb	make sure that we create a header for the encrypted private key	2015-04-28 13:00:09 +02:00
Joas Schilling	66dca76f72	check the called URL	2015-04-28 11:28:54 +02:00
Joas Schilling	8f7c64253e	Correctly generate the feedback URL for remote share The trailing slash was added in `c78e3c4a7f` to correctly generate the encryption keys	2015-04-28 11:28:54 +02:00
Morris Jobke	de8c15e1a4	Merge pull request #14764 from owncloud/shared-etag-propagate Propagate etags across shared storages	2015-04-28 10:58:50 +02:00
Thomas Müller	5fa5f46a88	Merge pull request #15773 from owncloud/fix-15766 LDAP Wizard: increasing server numbers and avoid configID collisions, fixes #15766	2015-04-28 10:46:23 +02:00
Jenkins for ownCloud	6679ef287a	[tx-robot] updated from transifex	2015-04-28 01:54:44 -04:00
Vincent Petry	69f88b38c9	Fix file name validation in New menu	2015-04-27 16:31:18 +02:00
Robin Appelman	5304afbecb	dont pass floats as timestamp to the changepropagator	2015-04-27 15:18:25 +02:00
Thomas Müller	678b7d7e4d	Merge pull request #15860 from owncloud/enc_fallback_old_encryption [encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)	2015-04-27 14:32:19 +02:00
Robin Appelman	0789a6433e	safer teardown	2015-04-27 14:07:16 +02:00
Robin Appelman	32067f9e80	use microtime to prevent race conditions	2015-04-27 14:07:16 +02:00
Robin Appelman	83b8ac0d7b	cleanup hooks	2015-04-27 14:07:16 +02:00
Robin Appelman	2e897f05b1	triger propagation for webdav uploads use post hooks for share etag propagator	2015-04-27 14:07:16 +02:00
Robin Appelman	dd9601ae8f	fix merge	2015-04-27 14:07:16 +02:00
Robin Appelman	45784f213f	fix propagation when renaming a directly reshared folder	2015-04-27 14:07:16 +02:00
Robin Appelman	f488624e5f	minor fixes	2015-04-27 14:07:16 +02:00
Robin Appelman	526ea3fcba	add rename hook for propagation	2015-04-27 14:07:16 +02:00
Robin Appelman	77fbb4125b	propagate changes up reshares	2015-04-27 14:07:16 +02:00
Robin Appelman	8cb40f6043	Make sure the owner mountpoints are setup	2015-04-27 14:07:16 +02:00
Robin Appelman	d5434c9c4e	more propagation tests	2015-04-27 14:07:16 +02:00
Robin Appelman	b5c62cdad6	remove duplicates from rebase	2015-04-27 14:07:15 +02:00
Robin Appelman	19486837b2	adjust test	2015-04-27 14:07:15 +02:00
Robin Appelman	be55a90323	dont use our now non existing hook	2015-04-27 14:07:15 +02:00
Robin Appelman	30ad56813a	propagate etags for all user of a share	2015-04-27 14:07:15 +02:00
Robin Appelman	518d5aadf5	Allow getting all share entries owned by a user	2015-04-27 14:07:15 +02:00
Robin Appelman	2dc11cf20e	unit test for etag propagation across shared storage boundary	2015-04-27 14:07:15 +02:00
Vincent Petry	63e2a4a5fa	Fix version rename with files and folders - fix moving folder into another folder - fix moving file or folder into shared folder as recipient	2015-04-27 13:17:03 +02:00
Bjoern Schiessle	27683f9442	fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header	2015-04-27 13:01:18 +02:00
Joas Schilling	6f5de37f5b	Fix module registration	2015-04-27 12:21:27 +02:00
Jenkins for ownCloud	e58029f8ad	[tx-robot] updated from transifex	2015-04-27 01:54:46 -04:00
Jenkins for ownCloud	37adf6df01	[tx-robot] updated from transifex	2015-04-26 01:54:49 -04:00
Jenkins for ownCloud	7855174879	[tx-robot] updated from transifex	2015-04-25 01:55:13 -04:00
Lukas Reschke	b9df932e3c	Merge pull request #15683 from owncloud/block-legacy-clients Block old legacy clients	2015-04-24 18:21:10 +02:00
Arthur Schiwon	9b6a988926	add integration test to ensure correct behaviour on lost connections	2015-04-24 15:50:03 +02:00
Clark Tomlinson	8c0856779b	change error codes to 400	2015-04-24 09:42:02 -04:00
Lukas Reschke	a2f9a2dc6d	Merge pull request #15855 from owncloud/teardownaftercommand Tear down FS after running trash expire	2015-04-24 13:52:55 +02:00
Vincent Petry	18506387c0	Tear down FS after running trash expire	2015-04-24 12:09:09 +02:00
Jan-Christoph Borchardt	5b998e13d7	Merge pull request #15835 from owncloud/delete-permission-icon Show hint if there is no delete permission	2015-04-24 11:57:47 +02:00
Jenkins for ownCloud	33d197db29	[tx-robot] updated from transifex	2015-04-24 01:55:15 -04:00
Morris Jobke	f4bc852db3	Show hint if there is no delete permission * add class .no-permission which shows the default delete icon * fixes #15172 * add unit test for no permission and for delete permission	2015-04-23 21:49:59 +02:00
Olivier Paroz	0729fc2fbc	Remove overflow+watermark	2015-04-23 18:19:34 +02:00
Olivier Paroz	58a87d0bab	Use authorization headers for better compatibility + add ellipsis + fix OC.generateUrl calls	2015-04-23 18:19:29 +02:00
Olivier Paroz	a968877a8b	An idea to suggest that this is just a sample of the full text	2015-04-23 18:19:21 +02:00
Olivier Paroz	530c290555	Use webDAV to have access to HTTP byte ranges	2015-04-23 18:19:17 +02:00
Olivier Paroz	e113d67430	Cache the token value	2015-04-23 18:19:12 +02:00
Olivier Paroz	8d3f88cf16	Show a text preview instead of a bitmap preview of text + fix the preview height	2015-04-23 18:19:07 +02:00
Vincent Petry	a672e9d556	Merge pull request #15814 from owncloud/public-reshare-webdav Fix webdav access for public reshare	2015-04-23 15:28:10 +02:00
Thomas Müller	d1ef96dc9b	Merge pull request #15828 from owncloud/smb-1.0.1 update icewind/smb to 1.0.1	2015-04-23 14:48:25 +02:00
Robin Appelman	7a3a8e4032	fix subfolder reshares over webdav	2015-04-23 13:42:51 +02:00
Vincent Petry	cc3bc6345b	Only get encryption status when logged in This removes useless warnings in the logs.	2015-04-23 13:06:00 +02:00
Jenkins for ownCloud	f8f354b351	[tx-robot] updated from transifex	2015-04-23 01:54:51 -04:00
Robin Appelman	57f49391dc	remove unneeded readonlycache	2015-04-22 20:07:54 +02:00
Robin Appelman	7eabd96e4c	update icewind/smb to 1.0.1	2015-04-22 20:05:38 +02:00
Clark Tomlinson	29168665cb	fix messages from settings crontroller	2015-04-22 13:26:06 -04:00
Clark Tomlinson	e3ec1a8bb8	remove status's and adjust js	2015-04-22 11:07:56 -04:00
Clark Tomlinson	1747117edf	destupify tests	2015-04-22 10:46:56 -04:00
Clark Tomlinson	c81bc152d7	fixing return values and adding tests	2015-04-22 10:46:55 -04:00
Robin Appelman	2adb79c794	resolve reshares in public webdav	2015-04-22 16:19:52 +02:00
Thomas Müller	750f0bc489	Merge pull request #15799 from owncloud/fix-enc-folder-move Fix enc folder move	2015-04-22 16:04:29 +02:00
Arthur Schiwon	b96b0063f6	throw exception when LDAP Connection was lost	2015-04-22 15:39:28 +02:00
Robin Appelman	03b7f1d015	use the permissions mask cache wrapper instead of the read only cache	2015-04-22 15:28:06 +02:00
Morris Jobke	42d9ba0f83	Merge pull request #15787 from owncloud/trash-partfiles Do not trash part files, delete directly	2015-04-22 14:10:26 +02:00
Thomas Müller	fc4127dd62	add $encryptionModuleId to methods of Keys/IStorage	2015-04-22 11:53:05 +02:00
Jenkins for ownCloud	d7bdf60559	[tx-robot] updated from transifex	2015-04-22 01:55:38 -04:00
Vincent Petry	ffc796edcb	Do not trash part files, delete directly	2015-04-21 18:28:15 +02:00
Morris Jobke	9dc12d40d8	Merge pull request #15782 from owncloud/hide-modified-multiselect hide modified header when multiselect is active, fix #15779	2015-04-21 16:41:41 +02:00
Thomas Müller	438cb27471	Merge pull request #15721 from oparoz/fix-readonly-cache Fix read-only cache	2015-04-21 16:30:56 +02:00
Jan-Christoph Borchardt	723804ffd7	hide modified header when multiselect is active, fix #15779	2015-04-21 15:38:34 +02:00
Jan-Christoph Borchardt	1d1e188a7a	Merge pull request #15769 from owncloud/files-emptycontentreadonly Added empty content message for empty read-only folders	2015-04-21 15:30:57 +02:00
Morris Jobke	503243e191	Merge pull request #15770 from owncloud/fix-15764 bring back border in host input field for consistency	2015-04-21 14:59:46 +02:00
Olivier Paroz	9695e33e34	Renamed class + split methods	2015-04-21 14:40:11 +02:00
Vincent Petry	53a23364ef	Added empty content message for empty read-only folders	2015-04-21 14:31:13 +02:00
Arthur Schiwon	52025e9839	save configs when requesting a config ID. They are empty, but avoid configID collisioning when creating many new configs in the wizard without saving anything directly.	2015-04-21 13:20:31 +02:00
Arthur Schiwon	8593415c12	LDAP Wizard: have always-increasing 'nth Server' number per full page load, fixes #15766	2015-04-21 13:14:35 +02:00
Morris Jobke	4b968da9e6	Merge pull request #15713 from owncloud/fix-15707-master [enc2] Fixing JS errors	2015-04-21 12:47:43 +02:00
Arthur Schiwon	19a2a22de1	bring back border in host input field for consistency	2015-04-21 12:22:40 +02:00
Thomas Müller	490e779424	doc and indent	2015-04-21 12:19:15 +02:00
Thomas Müller	4a2f8f81ca	Don't pollute the global namespace	2015-04-21 12:01:56 +02:00
Jenkins for ownCloud	c548066d2c	[tx-robot] updated from transifex	2015-04-21 01:55:37 -04:00
Thomas Müller	55962c5f5a	make jshint happy This reverts commit `ae681f0061`.	2015-04-20 20:51:15 +02:00
Thomas Müller	3bc5c1c3cf	use a simple function - OC.Encryption is already defined - fixes #15707 This reverts commit `0ca6398aa3`.	2015-04-20 20:50:08 +02:00
Thomas Müller	b78e76a1cb	Merge pull request #15677 from owncloud/enc_reset_private_key_password [encryption] let user update the private key password	2015-04-20 20:48:12 +02:00
Joas Schilling	04674c06cc	Dont use the old .status way	2015-04-20 18:26:14 +02:00
Joas Schilling	3f96662609	Fix several minor things	2015-04-20 17:44:34 +02:00
Thomas Müller	a637bd7f2b	Avoid function name collision in dropbox external storage	2015-04-20 14:56:51 +02:00
Lukas Reschke	3959f8ac4e	Merge pull request #15637 from owncloud/migrate-certificate-stuff Migrate personal certificate handling to AppFramework controllers	2015-04-20 13:56:35 +02:00
Lukas Reschke	20a6073a9f	Migrate personal certificate handling into AppFramework controllers Also added unit-tests and better error-handling	2015-04-20 12:58:58 +02:00
Arthur Schiwon	460a78436f	move away from deprecated consts	2015-04-20 11:22:11 +02:00
Lukas Reschke	4ea205e262	Block old legacy clients This Pull Request introduces a SabreDAV plugin that will block all older clients than 1.6.1 to connect and sync with the ownCloud instance. This has multiple reasons: 1. Old ownCloud client versions before 1.6.0 are not properly working with sticky cookies for load balancers and thus generating sessions en masse 2. Old ownCloud client versions tend to be horrible buggy In some cases we had in 80minutes about 10'000 sessions created by a single user. While this change set does not really "fix" the problem as 3rdparty legacy clients are affected as well, it is a good work-around and hopefully should force users to update their client	2015-04-20 11:12:17 +02:00
Morris Jobke	9cb260d310	Merge pull request #15717 from owncloud/issue/15716-fixing-ocp-api-namespace-usage Fixing OCS API namespace usage	2015-04-20 09:43:19 +02:00
Jenkins for ownCloud	75bf03a605	[tx-robot] updated from transifex	2015-04-20 01:54:44 -04:00
Thomas Müller	fad76bd1b8	Merge pull request #15724 from owncloud/ldap-remove-deprecated-const-usage LDAP - move from constants to class member constants	2015-04-19 21:00:04 +02:00
Jenkins for ownCloud	fd3c1484ad	[tx-robot] updated from transifex	2015-04-19 01:54:41 -04:00
Thomas Müller	cdf82909b8	Merge pull request #15718 from owncloud/issue/15694-display-name-of-encryption-modules Issue/15694 display name of encryption modules	2015-04-18 22:51:15 +02:00
Thomas Müller	d2a31bcd93	Merge pull request #15727 from owncloud/cleanup-db-interface DB: remove unused parameter - was forgotten during the migration to doct...	2015-04-18 22:47:40 +02:00
Olivier Paroz	80a1f1858e	Tests for read-only cache	2015-04-18 19:43:20 +02:00
Morris Jobke	e837927ad5	fix followup issues with unneeded parameters	2015-04-18 17:02:39 +02:00
Morris Jobke	58e5878b4d	LDAP - move from constants to class member constants * fixes scrutinizer warnings * drops the usage of deprecated code usage	2015-04-18 15:29:08 +02:00
Morris Jobke	85d0fc5cf6	LDAP tests: swithc var_dump to exception	2015-04-18 15:09:15 +02:00
Olivier Paroz	fcc1b9b3cc	Thou shalt not corrupt the answer of a cache request	2015-04-18 12:33:43 +02:00
Joas Schilling	3f3f8c2f99	Fix usage of deprecated private constants	2015-04-18 10:30:02 +02:00
Joas Schilling	491e590165	Fix dummy encryption module registration	2015-04-18 10:20:32 +02:00
Jenkins for ownCloud	37a871127b	[tx-robot] updated from transifex	2015-04-18 01:55:19 -04:00
Arthur Schiwon	fe237fd159	always open filter tab in raw mode, when 'Manually enter LDAP filters' is checked	2015-04-17 23:33:59 +02:00
Bjoern Schiessle	d0a6fb1f2c	let user update the private key password in case the login password was changed from outside	2015-04-17 20:11:22 +02:00
Thomas Müller	ae681f0061	Revert "make jshint happy" This reverts commit `a255866a93`.	2015-04-17 18:02:08 +02:00
Thomas Müller	0ca6398aa3	Revert "use a simple function - OC.Encryption is already defined - fixes #15707 " This reverts commit `c1a60a2349`.	2015-04-17 18:02:00 +02:00
Thomas Müller	a255866a93	make jshint happy	2015-04-17 17:59:53 +02:00
Thomas Müller	c1a60a2349	use a simple function - OC.Encryption is already defined - fixes #15707	2015-04-17 17:57:17 +02:00
Thomas Müller	c6e243928c	move creation of shared key to the login handler - fixes #15705	2015-04-17 17:51:18 +02:00
Thomas Müller	2e803fd2cd	Do not concat translation string	2015-04-17 14:26:58 +02:00
Thomas Müller	d9f23c0578	fixing undefined variable	2015-04-17 14:25:57 +02:00
Thomas Müller	295839930a	Merge pull request #15686 from owncloud/enc_fix_change_password fix change password if no user is logged in, occ call	2015-04-17 14:14:29 +02:00
Bjoern Schiessle	195a48b2b8	fix change password if no user is logged in, occ call	2015-04-17 13:26:38 +02:00
Bjoern Schiessle	7d4b1b52d0	always create a new instance of the encryption module	2015-04-17 10:31:33 +02:00
Jenkins for ownCloud	da44df2cfa	[tx-robot] updated from transifex	2015-04-17 01:55:37 -04:00
Clark Tomlinson	ac133e9faa	Merge pull request #15675 from owncloud/enc_error_messages [encryption] display warning if password changed or if the keys are not initialized	2015-04-16 09:45:09 -04:00
Clark Tomlinson	1174ad0681	Merge pull request #15445 from owncloud/enc2_migration add migration script from old encryption to new one	2015-04-16 09:34:47 -04:00
Bjoern Schiessle	e93f262eac	display warning if password changed or if the keys are not initialized	2015-04-16 14:30:19 +02:00
Bjoern Schiessle	959665003b	decrypt private key for public shares correctly	2015-04-16 14:15:04 +02:00
Bjoern Schiessle	6bcf88ca96	fix decryption of legacy private key	2015-04-16 14:15:04 +02:00
Bjoern Schiessle	e7a4f4f3e4	add version	2015-04-16 14:15:04 +02:00
Bjoern Schiessle	e3d77c4b01	add migration script from old encryption to new one	2015-04-16 14:15:04 +02:00
Jenkins for ownCloud	8606b7ca66	[tx-robot] updated from transifex	2015-04-16 01:54:43 -04:00
Morris Jobke	7b7d05eb74	Merge pull request #15805 from owncloud/fileslist-whitespace add whitespace to bottom of files list to correctly show dropdowns	2015-04-22 23:53:26 +02:00
Jan-Christoph Borchardt	b92dd82e41	add whitespace to bottom of files list to correctly show dropdowns, fix #15801	2015-04-22 13:58:53 +02:00
Morris Jobke	8653da6c16	Merge pull request #15654 from owncloud/enc2_header_system_keys make sure that encrypted private keys always have a header	2015-04-15 20:28:58 +02:00
Bjoern Schiessle	389a101de6	make sure that encrypted private keys always have a header	2015-04-15 19:52:48 +02:00
Morris Jobke	4a5c3eea42	Add visibility for method	2015-04-15 17:40:07 +02:00
Vincent Petry	a6c5d65fd6	Fix SFTP storage id to be compatible with older ids Remove port from SFTP storage id if it is 22. This will prevent recreating a different storage entry due to id mismatch after upgrade.	2015-04-15 16:25:47 +02:00
Thomas Müller	1a2475227b	Merge pull request #15613 from owncloud/allow-files-nav-icons Allow files app nav entries to have a different icon class	2015-04-15 11:18:58 +02:00
Jenkins for ownCloud	1a894bd0d8	[tx-robot] updated from transifex	2015-04-15 01:54:38 -04:00
Jenkins for ownCloud	7f3f191ee9	[tx-robot] updated from transifex	2015-04-14 18:19:31 -04:00
Björn Schießle	4f0437fbde	Merge pull request #15598 from owncloud/fix-enc-file-size-master Fix file size of encrypted files	2015-04-14 16:48:04 +02:00
Morris Jobke	c53a53f705	Allow files app nav entries to have a different icon class	2015-04-14 16:17:24 +02:00
Morris Jobke	82cab25762	Merge pull request #13360 from owncloud/cross-storage-move Proper copy/move between multiple local storages	2015-04-14 14:35:08 +02:00
Thomas Müller	cbe30f740e	remove calculateUnencryptedSize() - not needed	2015-04-14 13:08:59 +02:00
Robin Appelman	0f21303b75	a bit more phpdoc	2015-04-14 12:35:53 +02:00
Thomas Müller	f816acde27	fix reading of private key	2015-04-14 12:23:25 +02:00
Thomas Müller	ffa115b517	Merge pull request #15566 from owncloud/fix-filepicker fix filepicker	2015-04-14 00:39:12 +02:00
Robin Appelman	f605c98531	Fix cross storage move with shared storages	2015-04-13 17:10:05 +02:00
Robin Appelman	8688660825	check that we know the parent	2015-04-13 17:10:02 +02:00
Robin Appelman	6b5daca7b7	check for source cache	2015-04-13 17:10:02 +02:00
Robin Appelman	d4c91dc835	add missing return for shared	2015-04-13 15:13:03 +02:00
Robin Appelman	d26c6cab90	properly return false if we cant delete the source file	2015-04-13 15:13:03 +02:00
Robin Appelman	d16ee4138d	Fix test	2015-04-13 15:13:03 +02:00
Robin Appelman	d726db7459	Implement move/copyFromStorage for shared storage	2015-04-13 15:13:03 +02:00
Morris Jobke	a88e013f72	Merge pull request #15570 from owncloud/shares-properlyformatmountpoint Properly add trailing slash to mount point	2015-04-13 13:16:07 +02:00
Vincent Petry	2822d0579e	Properly add trailing slash to mount point Fixes resolving mount points when shared mount point's target name has the same prefix as the source name	2015-04-13 12:36:47 +02:00
Arthur Schiwon	41ad4f46c8	adjust to current master	2015-04-13 12:04:51 +02:00
Arthur Schiwon	a418150470	fix and more robustness thx to scrutinizer	2015-04-13 11:50:09 +02:00
Arthur Schiwon	66bc8145a9	allow login names to be used for s2s with LDAP users	2015-04-13 11:50:09 +02:00
Roeland Jago Douma	b21dc35355	Do not try to make user subadmin of group twice If the provisioning api is used to make a user subadmin of a group that user is already a subadmin just return success. Added unit test to ensure things keep working.	2015-04-13 11:42:56 +02:00
Morris Jobke	59efcb63a3	fix filepicker * add ability to filter for mimetype * fixes #15526 * fixes #11563	2015-04-13 10:38:08 +02:00
Morris Jobke	7ce4d2dec9	Merge pull request #15535 from owncloud/smb-1.0.0 update icewind/smb to 1.0.0	2015-04-10 23:43:55 +02:00
Clark Tomlinson	294f14a793	Merge pull request #15538 from owncloud/encryption-crypt-tests add unit test for crypt.php	2015-04-10 10:24:01 -04:00
Thomas Müller	7b2d53603c	Merge pull request #15489 from owncloud/dont_hide_exceptions_master Dont hide exceptions master	2015-04-10 15:49:45 +02:00
Morris Jobke	20a1a110de	Merge pull request #15537 from owncloud/master-fixunittestrelatedtoorphanedshares2 Fix master unit test: Clear leftover shares from other tests	2015-04-10 15:42:16 +02:00
Bjoern Schiessle	d1fa3c6b32	add unit test for crypt.php	2015-04-10 15:12:57 +02:00
Robin Appelman	a41fbf7a92	update icewind/smb to 1.0.0	2015-04-10 14:59:16 +02:00
Vincent Petry	4a225aa12c	Clear leftover shares from other tests	2015-04-10 14:53:17 +02:00
Vincent Petry	b51b5b64e6	Fix converting Guzzle error codes in s2s storage	2015-04-10 12:12:05 +02:00
Vincent Petry	73afca6207	Catch more exceptions when connecting to remote DAV server Added InvalidArgumentException to catch HTML parsing errors when XML was expected. Made convertSabreException more generic to be able to handle more exception cases.	2015-04-10 12:02:06 +02:00
Jörn Friedrich Dreyer	fafecd1c05	fix cherrypicking	2015-04-10 11:08:24 +02:00
Morris Jobke	1427ea78d4	fix typo and comment	2015-04-10 09:12:37 +02:00
Morris Jobke	5626a02d69	throw exception if setup is incomplete	2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer	077ab27281	fix_tests Conflicts: apps/user_ldap/tests/user_ldap.php	2015-04-10 09:12:37 +02:00
Jörn Friedrich Dreyer	488405d1ec	do not hide exception when ldap server has a hiccup	2015-04-10 09:12:37 +02:00
Morris Jobke	43b503641c	Merge pull request #15521 from owncloud/shareinfo-catchguzzle503 Properly catch guzzle 503 when querying share info	2015-04-10 00:23:05 +02:00
Thomas Müller	02614d214e	Merge pull request #15437 from owncloud/deleteorphanedfiles [command] delete orphaned file cache entries	2015-04-10 00:09:56 +02:00
blizzz	c6151053ba	Merge pull request #15492 from owncloud/ldap-wizard-overhaul LDAP Wizard Overhaul	2015-04-09 23:52:53 +02:00
Arthur Schiwon	60bf934e6f	change default value of ldap_tls to 0. It will be detected anyway, but starting with 0 will lead to errors and unconfigurability	2015-04-09 21:05:20 +02:00
Arthur Schiwon	a8b831b018	compile user and login filter on the first time automatically, if a suggestion was provided	2015-04-09 21:05:16 +02:00
Lukas Reschke	0bad8f644a	Merge pull request #15511 from owncloud/fix-typos Fix typos and some other adjustments	2015-04-09 19:23:27 +02:00
Vincent Petry	4feb97d8e4	Properly catch guzzle 503 when querying share info	2015-04-09 18:55:28 +02:00
Vincent Petry	2865f09984	Merge pull request #15282 from owncloud/keepsharerelationshipondelete Keep shares when deleting shared folders	2015-04-09 18:10:17 +02:00
Vincent Petry	5803a1f5f7	Remove trashbin storage wrapper when disabling it for tests	2015-04-09 15:02:24 +02:00
Arthur Schiwon	ca9426308d	escape filter for output	2015-04-09 14:49:11 +02:00
Arthur Schiwon	3abc72dad8	fix number and insert position when adding/copying a config	2015-04-09 14:44:40 +02:00
Arthur Schiwon	00c2970547	update back/continue buttons also on tab click	2015-04-09 14:40:00 +02:00
Lukas Reschke	ec69f2838c	Fix typos and some other adjustments	2015-04-09 14:09:09 +02:00
Arthur Schiwon	b4c96e6ba0	cleanup	2015-04-09 14:01:39 +02:00
Arthur Schiwon	630e35d8cc	newlines at end of file yes, IDE is now configured accordingly.	2015-04-09 14:00:34 +02:00
Arthur Schiwon	9ed9741d81	doc	2015-04-09 13:56:20 +02:00
Arthur Schiwon	3354881355	move script and style inclusions into template	2015-04-09 13:52:35 +02:00
Lukas Reschke	96e7f607d5	Remove unneeded file	2015-04-09 13:29:51 +02:00
Arthur Schiwon	8e7081d784	run functionality checks also when host field changes	2015-04-09 12:36:53 +02:00
Vincent Petry	08a9d1d2dc	Remove unused $toRemove	2015-04-09 12:34:19 +02:00
Jan-Christoph Borchardt	c840c18252	Merge pull request #15499 from owncloud/admin-hints add admin documentation hints to Federated Cloud Sharing and cron	2015-04-09 12:12:53 +02:00
Jan-Christoph Borchardt	65dc958418	add admin documentation hints to Federated Cloud Sharing and cron	2015-04-09 12:07:05 +02:00
Arthur Schiwon	40edaa5a69	adjust tests	2015-04-09 12:00:11 +02:00
Lukas Reschke	4ca6419475	Fix PHPDoc	2015-04-09 10:54:53 +02:00
Lukas Reschke	3aad47c0f0	Fix code style	2015-04-09 10:46:46 +02:00
Lukas Reschke	d869f8212b	Enforce string as passed type	2015-04-09 10:45:50 +02:00
Vincent Petry	461302244e	Keep shares when deleting shared folders The share entries will be linked with the fileid while they are kept in the trashbin. In the future a background just will scrape orphaned shares and delete them.	2015-04-09 10:16:40 +02:00
Arthur Schiwon	5355c285fc	LDAP Wizard Overhaul wizard refactor reimplement save spinners and cursor implement Port detector introduced detector queue, added base dn detector disable input fields when detectors are running introduce spinners for fields that are being updated by detector cache jq element objects consolidate processing of detector results in generic / abstract base class display notification if a detector discovered a problem don't run base dn detector if a base is configured reset detector queue on configuration switch implement functionality check and update of status indicator document ConfigModel jsdoc for controller and main view more documentation implement the user filter tab view so far the multiselects get initialized (not filled yet) and the mode can be switched. mode is also restored. reintroduce filter switch confirmation in admin XP mode new detector for user object classes. so we also load user object classes if necessary and are able to save and show the setting. multiselect trigger save actions now on close only show spinners automatically, when a detector is running 20k limit for object classes preselection test adjust wordings, fix grammar add group (for users tab) detector also includes wording fixes error presentation moved from detectors to view, where it belongs add info label to users page missing wording changes show effective LDAP filter in Assisted Mode add user filter detector implement count button for users and limit all count actions to 1001 for performance reasons make port field a bit bigger. not perfect though. do not detect port automatically implement login filter tab view only load features in assisted mode and don't enable assisted fields while in raw mode add tooltips on login filter checkbox options for better understanding permanently show filter on login tab and also compile login filter in assisted mode test/verify button on login attributes tab, with backend changes. only run wizard requests if your an active tab. also run compile filter requests when switching to assisted mode underline toggle filter links to stress that they are clickable unity user and group tab functionality in common abstract class, add group filter tab view. only detectors and template adjustments left to have group tab implementation complete add object class and group detector for groups as well as filter composer show ldap filter permanently on groups tab introduce input element that can deal better with many groups, will be used with > 40 fix disabling complex group chooser while detection is running hide complex group chooser on config switch fix few more issues with complex chooser make complex group chooser available on Users tab as well detect base dn improvements/changes: - do not look for Base DN automatically, offer a button instead - fix for alternative way to detect a base dn (if agent dn is not given) - do not trigger filter composers on config switch Changes with configuration chooser controls - "New" was removed out of the configuration list - and split into buttons "add" and "copy" - delete button is also now an icon add test button for Base DN reimplement advanced tab. The save button is gone. reimplement expert tab remove unused methods implement mail attribute detector implement user display name attribute detection implement member group association detector replace text input with textarea for raw filter input finish functionality check auto-enable good configurations, as it was before cleanup move save confirmation handling to base class, reduces code duplication enable tabs only if no running save processes are left. move onConfigLoaded to base class, avoids code duplication simplify, save LOCs Test Configuration button to be dealt with in main view as it is a cross-tab element require detectorQueue in constructor cleanup put bootstrap into a function and thus make it testable get rid of old stuff	2015-04-09 09:47:49 +02:00
Morris Jobke	56f1ffe820	Merge pull request #14676 from owncloud/deleteorphanedshares Delete orphaned shares in a background job	2015-04-09 00:18:53 +02:00
Morris Jobke	9c76d068c3	Merge pull request #15196 from owncloud/limit-file-activities-to-favorites Limit file activities to favorites	2015-04-09 00:18:31 +02:00
Morris Jobke	62936aa323	Merge pull request #15488 from owncloud/files-navigation-icons add icons to Files sidebar	2015-04-08 21:06:03 +02:00
Morris Jobke	91a90e25ae	fix for IE8	2015-04-08 21:05:31 +02:00
Jan-Christoph Borchardt	84c2fe85b7	add icons to files sidebar, fix shade, fix position of settings icon and text	2015-04-08 19:25:28 +02:00
Clark Tomlinson	fc2711e156	Merge pull request #15472 from owncloud/enc_backward_compatibility make private key handling backward compatible	2015-04-08 09:38:27 -04:00
Morris Jobke	103d451459	Merge pull request #14987 from rullzer/ocs_password_fix2 OCS Fixes to allow setting of password without removing additional settings	2015-04-08 14:44:17 +02:00
Lukas Reschke	d01a2acbcf	Merge pull request #15469 from owncloud/fix/15463 Fix language level incompatibilties	2015-04-08 14:30:56 +02:00
Bjoern Schiessle	4ce5669419	read cipher from key header and always write a key header if a new private key is stored	2015-04-08 14:26:00 +02:00
Vincent Petry	69ba67ec0f	Merge pull request #15464 from owncloud/fixmasterunittests Replace originalStorage in tests with a proper teardown	2015-04-08 14:24:42 +02:00
Lukas Reschke	c3c50fb481	Fix language level incompatibilties Arbitrary expressions in empty are allowed in PHP 5.5 ands upwards. Seems to only affect master. Fixed https://github.com/owncloud/core/issues/15463	2015-04-08 13:55:10 +02:00
Vincent Petry	4acf6747d2	Disable trashbin when testing orphaned shares deletion job	2015-04-08 13:04:06 +02:00
Thomas Müller	19834211b4	Merge pull request #15443 from owncloud/encryption-user-hook-tests adding test for user hooks	2015-04-08 12:56:18 +02:00
Vincent Petry	f8cfc03f36	Replace originalStorage in tests with a proper teardown The purpose of $originalStorage in unit tests was to remount the old root. However that storage itself is already wrapped by storage wrapper, so remounting it would rewrap the storage several times. This fix makes use of "loginAsUser()" and "logout()" from the TestCase class to properly initialize and cleanup the FS as expected.	2015-04-08 12:45:38 +02:00
Vincent Petry	9c3893ce69	Added FIXME about registering jobs in apps.php	2015-04-08 12:09:42 +02:00
James Anslow	d53aa4a816	Fixing issue #15322 - showing Settings button next to gear icon	2015-04-08 11:57:33 +02:00
Vincent Petry	17b141337a	Delete orphaned shares in a background job	2015-04-08 10:47:55 +02:00
Morris Jobke	cefdcea021	[command] delete orphaned file cache entries * ./occ files:cleanup * delete file cache entries without an existing storage	2015-04-08 10:23:56 +02:00
Bjoern Schiessle	215a9bcbc3	fix function call	2015-04-08 09:32:55 +02:00
Clark Tomlinson	4098f5f7fd	adding test for user hooks	2015-04-07 11:49:50 -04:00
Thomas Müller	a4483243ac	fixing license headers - encryption code related	2015-04-07 17:02:49 +02:00
Thomas Müller	54a3bdf1c5	fixing unit test execution related to trashbin	2015-04-07 13:30:31 +02:00
Clark Tomlinson	d637bffac6	adding user setup test and adding 4 tests to keymanager	2015-04-07 13:30:31 +02:00
Clark Tomlinson	28c8017928	adding recoverFileTest	2015-04-07 13:30:31 +02:00
Clark Tomlinson	c7c3caedf5	adding recovery tests	2015-04-07 13:30:31 +02:00
Thomas Müller	111fbabfb4	PHPDoc cleanup - clean code \o/	2015-04-07 13:30:31 +02:00
Bjoern Schiessle	b9e4e61759	userRecovery() was replaced by setRecoveryForUser()	2015-04-07 13:30:31 +02:00
Bjoern Schiessle	9a7fbbbc5a	fix versions tests	2015-04-07 13:30:31 +02:00
Bjoern Schiessle	a7e7151364	remove unused code	2015-04-07 13:30:31 +02:00
Bjoern Schiessle	e8fa3a2370	fix versions download and previews	2015-04-07 13:30:31 +02:00
Bjoern Schiessle	d3e887a7cf	reset init status before login	2015-04-07 13:30:30 +02:00
Thomas Müller	8cf9b423d5	cleanup	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	fac7ec3fc4	fix re-shares with encryption	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	60d8a39f03	store init status per user	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	8b1a12a224	use loginHelper from base class	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	391fab35f0	reset storage for each unit test	2015-04-07 13:30:30 +02:00
Thomas Müller	4c899238e9	fixing unit test execution	2015-04-07 13:30:30 +02:00
Clark Tomlinson	e507dc11a0	adding util test and reducing keymanager instances to one in test	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	2511c32e61	add more descriptive message to the exception, will be displayed to the user	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	ee53ba5ed6	remove encryption specific code from files app	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	5ea94b7c45	add priority to trashbin storage wrapper so that he is always on top	2015-04-07 13:30:30 +02:00
Thomas Müller	664b2bb7af	cleaning up exception mess	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	de4ec21c39	work arround to make sure that shares are initialized only once	2015-04-07 13:30:30 +02:00
Thomas Müller	feb9a6e216	Set human readable module ids	2015-04-07 13:30:30 +02:00
Thomas Müller	43c0af2580	Fix shouldEncrypt and don't throw exception id fileKey not present - can happen	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	a057108c0c	make recovery key work	2015-04-07 13:30:30 +02:00
Thomas Müller	cac83642f2	Finally fixing encryption with public share	2015-04-07 13:30:30 +02:00
Thomas Müller	d203296e35	only encrypt files and files_versions	2015-04-07 13:30:30 +02:00
Thomas Müller	035646c0f6	fix exception handling	2015-04-07 13:30:30 +02:00
Bjoern Schiessle	d90663704c	fix hook registration	2015-04-07 13:30:29 +02:00
Clark Tomlinson	505e0eaf61	remove useless setup base class	2015-04-07 13:30:29 +02:00
Clark Tomlinson	1fb29ec546	adding hook manager test	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	c9ca068427	keyManagerTest: remove code which is no longer needed	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	4efbcb0280	cleanup keymanager test and add some additional tests	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	dac94679c6	delete recovery keys on disable	2015-04-07 13:30:29 +02:00
Clark Tomlinson	ea6b53042d	fixing test helper and undoing fubar in class...	2015-04-07 13:30:29 +02:00
Clark Tomlinson	48e3864c77	💯% coverage for session class	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	1358d07d35	let user enable recovery key	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	e4895bda01	add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files	2015-04-07 13:30:29 +02:00
Thomas Müller	bd933b1c85	Adding app icon and fixing admin setting	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	6bd83c0422	register settings and hooks only once	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	4b4aeaa5b2	fix set recovery key and implement change password	2015-04-07 13:30:29 +02:00
Thomas Müller	a98b7dbf6f	Fix double registration of encryption module	2015-04-07 13:30:29 +02:00
Thomas Müller	3458b5ab4c	Remove old encryption left overs from trashbin	2015-04-07 13:30:29 +02:00
Thomas Müller	f5638d9163	Fix settings	2015-04-07 13:30:29 +02:00
Thomas Müller	bf809ac85a	Removing left overs from old encryption app	2015-04-07 13:30:29 +02:00
Bjoern Schiessle	4843e5ce30	use password change logic to userhooks to avoid recursions	2015-04-07 13:30:28 +02:00
Bjoern Schiessle	0f28d538a0	add session class to handle all session operations	2015-04-07 13:30:28 +02:00
Clark Tomlinson	e6dc6944c2	moving methods to their final places and updating test some.	2015-04-07 13:30:28 +02:00
Thomas Müller	1b42b492dc	kill OC_FileProxy 💥	2015-04-07 13:30:28 +02:00
Thomas Müller	dbdd754c3f	Further cleanup of files_encryption	2015-04-07 13:30:28 +02:00
Thomas Müller	00338f9dca	Removing files_encryption left overs	2015-04-07 13:30:28 +02:00
Bjoern Schiessle	e7a68d1c21	remove old encryption app	2015-04-07 13:30:28 +02:00
Bjoern Schiessle	0eee3a2618	remove unencrypted_size from the cache, size will contain the unencrypted size	2015-04-07 13:30:28 +02:00
Thomas Müller	a905f641b3	various fixes & start to unit test the encryption storage wrapper	2015-04-07 13:30:28 +02:00
Bjoern Schiessle	a85e2e0bfd	make recovery settings work	2015-04-07 13:30:28 +02:00
Bjoern Schiessle	2331298380	fix parameter declaration and class initialisation	2015-04-07 13:30:28 +02:00
Thomas Müller	48fc3f3afe	fix unit test execution, variable naming and kill no longer used $cacheFactory	2015-04-07 13:30:28 +02:00
Bjoern Schiessle	c64e0af4fb	check if recovery key exists and encrypt the file with the recovery key if needed	2015-04-07 13:30:28 +02:00
Bjoern Schiessle	24c6604388	add public link share key to file if it was shared as public link	2015-04-07 13:30:28 +02:00
Bjoern Schiessle	bd99042a66	add setting templates	2015-04-07 13:30:28 +02:00
Bjoern Schiessle	37e8268447	make sharing and unsharing work	2015-04-07 13:30:27 +02:00
Clark Tomlinson	d15c2e52b0	cleanup and removing cachefactory	2015-04-07 13:30:27 +02:00
Bjoern Schiessle	2e00acda07	read encrypted files	2015-04-07 13:30:27 +02:00
Bjoern Schiessle	6c9251d9f8	make sure that all file keys are written to the key storage	2015-04-07 13:30:27 +02:00
Bjoern Schiessle	198b73fe32	write encrypted file to disc	2015-04-07 13:30:27 +02:00
Thomas Müller	7ffd77fac9	enable encryption unit test execution	2015-04-07 13:30:27 +02:00
Bjoern Schiessle	c00e728e5f	encryption app: remove legacy code, we do only server-side encryption	2015-04-07 13:30:27 +02:00
Thomas Müller	ecb3834554	fixing obvious bugs while testing	2015-04-07 13:30:27 +02:00
Clark Tomlinson	0c2f9ca849	Updating keystorage movement and fixing hooks	2015-04-07 13:30:27 +02:00
Clark Tomlinson	39733c8da1	Initial commit	2015-04-07 13:30:27 +02:00
Joas Schilling	e16d61e293	Remove server timezone dependency from files list test	2015-04-07 10:12:15 +02:00
Jenkins for ownCloud	95e55aa4ad	[tx-robot] updated from transifex	2015-04-07 01:54:47 -04:00
Jenkins for ownCloud	2bff92ade5	[tx-robot] updated from transifex	2015-04-05 01:54:51 -04:00
Thomas Müller	4996706078	Merge pull request #15338 from owncloud/encryption-mount-option Add mount point to disable the encryption wrapper	2015-04-04 12:51:41 +02:00
Jenkins for ownCloud	9b250baf9e	[tx-robot] updated from transifex	2015-04-04 01:54:43 -04:00
Thomas Müller	3bf269e565	Merge pull request #15229 from owncloud/response-setContentLengthHeader Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround...	2015-04-03 22:51:36 +02:00
Jenkins for ownCloud	23f1702f24	[tx-robot] updated from transifex	2015-04-03 01:54:53 -04:00
Robin Appelman	519d568847	add unit test	2015-04-02 18:31:26 +02:00
Robin Appelman	10b85871cc	adjust unt tests	2015-04-02 18:17:28 +02:00
Thomas Müller	4082436419	Merge pull request #15367 from owncloud/pre-setup-hook setup storage wrappers before setting up the filesystem	2015-04-02 17:40:23 +02:00
Jenkins for ownCloud	cc96105ebe	[tx-robot] updated from transifex	2015-04-02 01:54:47 -04:00
Robin Appelman	3cb53b7756	setup storage wrappers before setting up the filesystem	2015-04-01 17:12:06 +02:00
Roeland Jago Douma	9e3dcd01bc	Use URLGenerator instread of OC_Helper	2015-04-01 14:57:01 +02:00
Roeland Douma	8ff94f0d15	Merge pull request #15356 from rullzer/apps_oc_to_ocs Move core apps from private to public functions (trivial part)	2015-04-01 13:24:54 +02:00
Joas Schilling	730efe25a4	Make scrutinizer happy	2015-04-01 12:13:49 +02:00
Roeland Jago Douma	2b81d0f237	Move core apps from private to public functions Apps still use OC_Helper and OC_Util functions even when public ones are already available. Sometimes the public one is even used in the same file.	2015-04-01 12:06:04 +02:00
Morris Jobke	297e29248d	Merge pull request #15336 from owncloud/revive-15215 Properly quote file names in listFiles query for GDrive	2015-04-01 10:35:39 +02:00
Jenkins for ownCloud	f5c7ba6b81	[tx-robot] updated from transifex	2015-04-01 01:55:33 -04:00
Joas Schilling	efcc2e87ab	Adjust by/self filter aswell and fix tests	2015-03-31 17:35:04 +02:00
Joas Schilling	116b257b4d	DeMorgan applied the wrong transformation	2015-03-31 17:07:44 +02:00
Robin Appelman	bac9b54bef	Add mount point to disable the encryption wrapper	2015-03-31 16:25:33 +02:00
Lukas Reschke	c052ee7584	Only escape single quotes	2015-03-31 15:30:49 +02:00
Vincent Petry	7036309e22	Added rawurlencode for other params in GDrive storage	2015-03-31 15:14:08 +02:00
Vincent Petry	5c9998179f	Properly quote file names in listFiles query for GDrive	2015-03-31 15:14:03 +02:00
Lukas Reschke	53f67fc65d	Revert "Properly quote file names in listFiles query for GDrive"	2015-03-31 15:12:35 +02:00
Frank Karlitschek	b216b3fad0	Merge pull request #15215 from owncloud/ext-gdrivelistfilequoting Properly quote file names in listFiles query for GDrive	2015-03-31 09:08:59 -04:00
Jenkins for ownCloud	1d06d93d27	[tx-robot] updated from transifex	2015-03-31 01:55:55 -04:00
Joas Schilling	9233d32834	Move tag related code into a helper so we can test the query without a view	2015-03-30 17:21:06 +02:00
Lukas Reschke	8e0fef74ff	Merge pull request #15312 from owncloud/activity-fix-compilation Correct the app name for sharing events	2015-03-30 17:12:54 +02:00
Robin McCorkell	308a43a10e	Merge pull request #15076 from owncloud/fix-smb-oc-admin Support constructing an SMB_OC without saved session credentials	2015-03-30 15:38:22 +01:00
Joas Schilling	e365ea7ec5	Use DI for the objects where possible	2015-03-30 15:23:10 +02:00
Joas Schilling	17f882c3cf	Add a filter for favorites and allow limiting the all-list to favorites WARNING: do not use this, when you have a lot of favorites, ~50 should be the limit	2015-03-30 15:23:09 +02:00
Joas Schilling	4c9c73bef9	Correct the app name for sharing events	2015-03-30 15:14:31 +02:00
Roeland Jago Douma	b0aa17b13f	OCS Fixes to allow setting of password without removing additional settings - Added setPassword to share.php - Fixed OCS API call - Added unit tests	2015-03-30 14:00:50 +02:00
Morris Jobke	cfe241a959	Merge pull request #13964 from rullzer/capabilities Add OCS sharing info to capabilities - take 2	2015-03-30 10:06:05 +02:00
Morris Jobke	00b2be11dd	Merge pull request #15239 from owncloud/see-no-evil Move federated cloud sharing, files externals and updater to special pos...	2015-03-30 09:05:31 +02:00
Jenkins for ownCloud	da55ff630c	[tx-robot] updated from transifex	2015-03-30 01:54:41 -04:00
Jenkins for ownCloud	1db9605afb	[tx-robot] updated from transifex	2015-03-29 01:55:31 -04:00
Jenkins for ownCloud	8b9b600644	[tx-robot] updated from transifex	2015-03-28 01:55:46 -04:00
Thomas Müller	4d12c4a38b	Merge pull request #13938 from owncloud/deprecate-iappconfig Deprecated \OCP\IAppConfig - add missing methods to IConfig	2015-03-27 16:07:41 +01:00
Thomas Müller	0ecc1c89ad	Merge pull request #15254 from owncloud/fix-14853-master Adding a pending indicator to the files summary	2015-03-27 14:18:47 +01:00
Vincent Petry	7ad4dfa201	Merge pull request #15227 from owncloud/ocetag-header Copy Etag header to OC-Etag for sabre calls	2015-03-27 13:10:27 +01:00
Morris Jobke	5aa81833f9	Merge pull request #15260 from owncloud/adjust-controls-bar-width adjust controls bar width to not overlay scrollbar	2015-03-27 11:56:22 +01:00
Jan-Christoph Borchardt	908538d863	fix layout for Sharing settings	2015-03-27 09:38:13 +01:00
Joas Schilling	495562f40c	Move federated cloud sharing, files externals and updater to special positions	2015-03-27 09:38:09 +01:00
Jenkins for ownCloud	880b31c513	[tx-robot] updated from transifex	2015-03-27 01:56:21 -04:00
Jan-Christoph Borchardt	d728b85fdd	adjust controls bar width to not overlay scrollbar	2015-03-27 01:34:55 +01:00
Thomas Müller	2b0906cdff	Adding a pending indicator to the files summary - fixes #14853	2015-03-27 01:16:29 +01:00
Jan-Christoph Borchardt	e09fd331eb	adjust emptycontent messages for files and files_external	2015-03-26 23:22:26 +01:00
Morris Jobke	d082e37270	Merge pull request #15244 from owncloud/use_default_share_folder always fall back to default share folder	2015-03-26 22:39:04 +01:00
Robin McCorkell	c2909355bf	Merge pull request #14925 from owncloud/ext-mountoptions-ui Mount options GUI for external storage	2015-03-26 21:36:34 +00:00
Morris Jobke	e8109f0bc3	Merge pull request #13802 from owncloud/share-partfilepermissions Fix share permission checks	2015-03-26 22:01:05 +01:00
Bjoern Schiessle	a3592534ef	always fall back to default share folder	2015-03-26 21:56:44 +01:00
Thomas Müller	7bff0681fe	Merge pull request #15001 from owncloud/kill-share-proxy Replace share proxy with a hook	2015-03-26 21:20:05 +01:00
Thomas Müller	232518ac54	Merge pull request #15234 from owncloud/encryption2_core core part of encryption 2.0	2015-03-26 21:14:59 +01:00
Bjoern Schiessle	ff9c85ce60	implement basic encryption functionallity in core to enable multiple encryption modules	2015-03-26 20:56:51 +01:00
Thomas Müller	0cb133003c	Merge pull request #15237 from owncloud/remove-ide-autocomplete-fail Remove IDE autocomplete fail	2015-03-26 20:21:26 +01:00
Morris Jobke	d3ed020d34	Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-master no php execution timeout for webdav	2015-03-26 20:18:01 +01:00
Robin Appelman	1be7da4a57	replace share proxy with hook	2015-03-26 19:56:57 +01:00
Robin Appelman	173c31e42a	rename proxy test	2015-03-26 19:56:31 +01:00
Lukas Reschke	c8c722bc6d	Merge pull request #15129 from owncloud/version-command-bus expire versions in a background command	2015-03-26 19:55:13 +01:00
Lukas Reschke	071a339593	Remove IDE autocomplete fail 🙈 cough cough	2015-03-26 19:39:15 +01:00
Vincent Petry	58b4c2c0e5	Make sure mountOptions keep their data type str_replace for $user substitution was converting the data type of mountOptions to string. This fix prevents this to happen by making sure only strings are processed by substitution. Also added a int conversion when reading the watcher policy	2015-03-26 19:24:37 +01:00
Jan-Christoph Borchardt	e3d60ee5b0	Merge pull request #14958 from owncloud/dropdown-style popover style for apps and user dropdown menus	2015-03-26 18:07:35 +01:00
Robin Appelman	6447962f2a	teardown after we're done	2015-03-26 17:30:43 +01:00
Thomas Müller	a8b756154a	Merge pull request #14495 from owncloud/update-mailmap-01 Updating .mailmap	2015-03-26 17:17:18 +01:00
Robin Appelman	1969c8d5c8	save uid instead of user object in command	2015-03-26 17:11:34 +01:00
Robin Appelman	176fba83ea	Setup the filesystem in the expire command	2015-03-26 17:07:02 +01:00
Robin Appelman	7ec8f12ad4	expire versions in a background command	2015-03-26 17:07:01 +01:00
Andreas Fischer	0f58315543	Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround. Do not send Content-Length headers with a value larger than PHP_INT_MAX (2147483647) on Apache PHP SAPI 32-bit. PHP will eat them and send 2147483647 instead. When X-Sendfile is enabled, Apache will send a correct Content-Length header, even for files larger than 2147483647 bytes. When X-Sendfile is not enabled, ownCloud will not send a Content-Length header. This prevents progress bars from working, but allows the actual transfer to work properly.	2015-03-26 16:37:38 +01:00
Vincent Petry	70acd58336	Copy Etag header to OC-Etag for sabre calls	2015-03-26 16:06:43 +01:00
Robin McCorkell	a323d781a6	Revert "add https:// placeholder for From Link feature. closes #13255 " This reverts commit `18b5966f3a`.	2015-03-26 14:47:21 +00:00
Vincent Petry	534892d456	Added rawurlencode for other params in GDrive storage	2015-03-26 13:57:28 +01:00
Thomas Müller	7804d0445b	Merge pull request #15206 from owncloud/mark-dot-files-gray Show hidden files (dot files) in gray	2015-03-26 12:40:47 +01:00
Jan-Christoph Borchardt	f0b0287333	adjust animations of Share, Versions and others to OC.menuSpeed	2015-03-26 12:21:40 +01:00
Vincent Petry	43588fe2f7	Properly quote file names in listFiles query for GDrive	2015-03-26 12:15:02 +01:00
Thomas Müller	f9525b153e	no php execution timeout for webdav	2015-03-26 11:55:26 +01:00
Jenkins for ownCloud	b585d87d9d	Update license headers	2015-03-26 11:44:36 +01:00
Vincent Petry	ca6b715b31	Added ext storage mount options GUI Added option to disable autoscan of external storages Mount option file system scan is now an int Move priority field to avoid undefined field in storage options All input elements inside the storage options block get parsed into storage options. Moving the priority field outside prevents it to appear in the storage config, as expected. It is still parsed by special code.	2015-03-26 11:21:03 +01:00
Morris Jobke	20f5290462	Merge pull request #15195 from owncloud/reanimate-add-guzzle Add wrapper for Guzzle	2015-03-26 11:06:48 +01:00
Morris Jobke	92f0dba3c8	Show hidden files (dot files) in gray	2015-03-26 10:35:27 +01:00
Jenkins for ownCloud	40b77eb97a	[tx-robot] updated from transifex	2015-03-26 01:55:29 -04:00
Morris Jobke	dac4436807	Merge pull request #15170 from owncloud/middleclickbreadcrumb Fix middle click on breadcrumb	2015-03-26 00:19:52 +01:00
Vincent Petry	bdd749ba5b	Merge pull request #15185 from owncloud/fix-14775-master tearDown the file system before reinitializing	2015-03-25 16:26:58 +01:00
Lukas Reschke	5f044ebf1b	Add wrapper for Guzzle	2015-03-25 16:04:41 +01:00
Morris Jobke	d83741396a	Merge pull request #15180 from owncloud/ext-tabbing Use individual timers for separate config rows	2015-03-25 15:46:59 +01:00
Vincent Petry	13904a7f89	Merge pull request #15179 from owncloud/trash-recreatetrashfolderafterfulldelete Recreate trashbin folder after full deletion	2015-03-25 14:58:06 +01:00
Thomas Müller	1f6d8f2fdb	tearDown the file system before reinitializing - fixes #14775	2015-03-25 10:55:54 +01:00
Vincent Petry	b3de3d7245	Fix breadcrumb click JS unit test	2015-03-25 09:27:55 +01:00
Jan-Christoph Borchardt	e188f0e436	Merge pull request #14970 from owncloud/sidebar-enhancements sidebar fixes	2015-03-25 09:16:49 +01:00
Jenkins for ownCloud	fb61889490	[tx-robot] updated from transifex	2015-03-25 01:55:46 -04:00
Robin McCorkell	c68fd6d5e3	Use individual timers for separate config rows	2015-03-24 22:25:30 +00:00
Vincent Petry	f8f543945f	Recreate trashbin folder after full deletion	2015-03-24 23:02:14 +01:00
Vincent Petry	2b8ef3aca9	Fix middle click on breadcrumb	2015-03-24 22:05:02 +01:00
Morris Jobke	1db177b841	Merge pull request #15055 from owncloud/share-activity-grouping Group sharing activities by user/group and file respectively	2015-03-24 20:23:36 +01:00
Morris Jobke	09ea260957	Merge pull request #15160 from owncloud/deduplicate-external-manager-tests Deduplicate external manager tests	2015-03-24 20:15:56 +01:00
Roeland Jago Douma	0ea3878111	No longer directly output OC_Image for thumbnails * Only use public interfaces - Injected IPreview * Added unit tests	2015-03-24 18:55:06 +01:00
Robin Appelman	1bd141b655	Merge pull request #15158 from owncloud/fix-failing-master Fix failing master unit tests	2015-03-24 17:54:11 +01:00
Joas Schilling	8c33f05e93	Merge the two tests into one	2015-03-24 17:26:38 +01:00
Joas Schilling	7de15f3125	cough	2015-03-24 17:08:03 +01:00
Morris Jobke	2370af62ea	Merge pull request #14998 from rullzer/ocs_api_new_url OCS API should return fancy OC url	2015-03-24 17:04:31 +01:00
Jan-Christoph Borchardt	7ea061e6f0	correctly align file list summary when the list has the favorite feature	2015-03-24 15:26:17 +01:00
Jan-Christoph Borchardt	fcac7d8c13	double padding to account for Deleted files entry, issue with Firefox	2015-03-24 15:14:20 +01:00
Morris Jobke	965d97a8f5	Merge pull request #14580 from owncloud/issue/13765-duplicate-remote-share "Integrity constraint violation" when sharing the same item twice with the same user	2015-03-24 15:05:58 +01:00
Vincent Petry	302c19067a	Merge pull request #15145 from owncloud/fix-15097-master Properly catch whether a share is `null`	2015-03-24 13:37:47 +01:00
Vincent Petry	46475bf580	Merge pull request #15003 from owncloud/issue/14859-speed-up-favorite-list Do not walk over the users directory, but over the list of tagged objects	2015-03-24 13:26:59 +01:00
Robin Appelman	d46b7d73e7	when the path doesnt exist show a proper error page	2015-03-24 12:21:25 +01:00
Joas Schilling	f2be172ae8	Do not duplicate the empty content css	2015-03-24 11:29:29 +01:00
Lukas Reschke	e2453d78c0	Properly catch whether a share is `null` Despite it's PHPDoc the function might return `null` which was not properly catched and thus in some situations the share was resolved to the sharing users root directory. To test this perform the following steps: * Share file in owncloud 7 (7.0.4.2) * Delete the parent folder of the shared file * The share stays is in the DB and the share via the sharelink is inaccessible. (which is good) * Upgrade to owncloud 8 (8.0.2) (This step is crucial. The bug is not reproduceable without upgrading from 7 to 8. It seems like the old tokens are handled different than the newer ones) * Optional Step: Logout, Reset Browser Session, etc. * Access the share via the old share url: almost empty page, but there is a dowload button which adds a "/download" to the URL. * Upon clicking, a download.zip is downloaded which contains EVERYTHING from the owncloud directory (of the user who shared the file) * No exception is thrown and no error is logged. This will add a check whether the share is a valid one and also adds unit tests to prevent further regressions in the future. Needs to be backported to ownCloud 8. Adding a proper clean-up of the orphaned shares is out-of-scope and would probably require some kind of FK or so. Fixes https://github.com/owncloud/core/issues/15097	2015-03-24 11:21:58 +01:00
Jenkins for ownCloud	9cb07f126d	[tx-robot] updated from transifex	2015-03-24 01:55:24 -04:00
blizzz	8906158d3b	Merge pull request #15123 from owncloud/fix_14098 offset needs to be considered in computed limit	2015-03-23 17:50:24 +01:00
Lukas Reschke	02c0fe8d43	Merge pull request #13941 from owncloud/fix-folder-upload-on-firefox Show message if upload of folder isn't allowed	2015-03-23 17:18:46 +01:00
Arthur Schiwon	7520d0fb3d	offset needs to be considered in computed limit	2015-03-23 16:51:40 +01:00
Morris Jobke	7f2b06dfa0	Merge pull request #15120 from owncloud/ldap-occ-fix-warnings fix PHP warnings when using occ with some LDAP commands	2015-03-23 16:29:27 +01:00
Arthur Schiwon	468fc675a4	fix PHP warnings when using occ with some LDAP commands	2015-03-23 15:19:41 +01:00
Joas Schilling	1a26263123	Do not walk over the users directory, but over the list of tagged objects Way quicker	2015-03-23 15:10:58 +01:00
Clark Tomlinson	0e4ba618cf	Merge pull request #14383 from jknockaert/newbranch make encryption stream wrapper seekable	2015-03-23 09:22:36 -04:00
Jenkins for ownCloud	a9b4f0d842	[tx-robot] updated from transifex	2015-03-23 01:54:48 -04:00
Jenkins for ownCloud	a79d973005	[tx-robot] updated from transifex	2015-03-22 01:55:21 -04:00
Roeland Jago Douma	bdde2156da	Added extra unit test	2015-03-21 09:47:07 +01:00
Roeland Jago Douma	9ce8e1ddc7	OCS API should return fancy OC url * Also use the URLGenerator	2015-03-21 09:47:06 +01:00
Jenkins for ownCloud	e36a33c89a	[tx-robot] updated from transifex	2015-03-21 01:56:09 -04:00
Robin McCorkell	1f3fdf17ef	Support constructing an SMB_OC without saved session credentials	2015-03-20 16:24:30 +00:00
Thomas Müller	afa8872955	Merge pull request #14857 from owncloud/preview-provider-registration-in-manager Preview provider registration in manager	2015-03-20 16:34:22 +01:00
Vincent Petry	e44ab2dcfe	Merge pull request #11884 from owncloud/ext-appframework Cleanup ext storage CRUD code, introduce storage config id	2015-03-20 14:17:32 +01:00
Vincent Petry	67160e0861	Do not automatically add "update" permission to shared mounts In the past it seems the update permission was needed to be able to rename shared mounts, but it doesn't seem to be the case any more. Removing the "update" permission that used to be added automatically fixes the read-only permission check when trying to overwrite a read-only file over WebDAV.	2015-03-20 12:33:59 +01:00
Vincent Petry	eef5851a67	Fix share permission related unit tests	2015-03-20 11:30:51 +01:00
Robin McCorkell	c37913b1d5	Introduce async status checking	2015-03-20 09:48:14 +00:00
Joas Schilling	7776e088d6	Group sharing activities by user/group and file respectively	2015-03-20 09:49:33 +01:00
Jenkins for ownCloud	e8680e6637	[tx-robot] updated from transifex	2015-03-20 01:55:23 -04:00
Vincent Petry	5f7b3a4dbe	Rename must be possible with update-only permission and this as long as the rename is done within the same folder.	2015-03-19 21:55:56 +01:00
Thomas Müller	c57fb62029	Merge pull request #14946 from owncloud/dropbox-root-fix Fix root request path for Dropbox	2015-03-19 17:19:57 +01:00
Thomas Müller	857b22c61b	Merge pull request #15025 from rullzer/ocs_respect_enforced_date Ocs respect enforced date	2015-03-19 17:06:04 +01:00
Robin Appelman	be6edd465a	Merge pull request #14537 from owncloud/oci-external-share Fix external shares without password on oracle	2015-03-19 16:20:12 +01:00
Roeland Jago Douma	dd3307dd19	Added unit test Tests added to make sure that removing an expire date when this is enforced is not allowed.	2015-03-19 10:47:09 +01:00

... 11 12 13 14 15 ...

11180 commits