7376 commits

Author	SHA1	Message	Date
Carlos Cerrillo	b245e2e3d8	Fixing tab/space coding style ... Only set SSL things when ```$this->secure``` is ```true```	2013-12-17 09:38:43 +01:00
Frank Karlitschek	753525c57f	Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb ... always show 'Deleted Files' breadcrumb	2013-12-17 00:25:06 -08:00
Björn Schießle	4ae148cebd	Merge pull request #6183 from owncloud/enc_tests ... enable more encryption tests	2013-12-16 08:46:52 -08:00
Bjoern Schiessle	3e17fbe30d	always show home breadcrumb in files view	2013-12-16 17:40:35 +01:00
Bjoern Schiessle	95892c8be9	update file cache for target file	2013-12-16 16:05:24 +01:00
Bjoern Schiessle	cdd816c930	only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted	2013-12-16 16:05:24 +01:00
Bjoern Schiessle	6d489e0474	call set password hook because it doesn't get triggered during test execution and fix paths	2013-12-16 16:00:16 +01:00
Carlos Cerrillo	7c264c88fe	Fixing Issue #6301 on master branch ... Added private var $certPath to store the user root cert Move logic to determine the $certPath path to the constructor and modify to get the path from OC_User::getHome() Add curl options to use the certificate to avoid certificate errors with self-signed certicates in the downdload/upload method so we don't get blank files	2013-12-15 17:22:52 +01:00
Jenkins for ownCloud	77b68505c2	[tx-robot] updated from transifex	2013-12-13 14:44:31 -05:00
Vincent Petry	769256cb39	Merge pull request #6321 from sevoku/master ... fix smbclient directory listing parser	2013-12-13 09:13:06 -08:00
Arthur Schiwon	1292793c4b	LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng	2013-12-13 16:29:42 +01:00
Bjoern Schiessle	3831b8b1be	always show 'Deleted Files' breadcrumb	2013-12-13 12:17:10 +01:00
ringmaster	e2197c7108	Bump the footer down 20px to avoid overlap. ... Fixes #6335.	2013-12-12 13:06:57 -05:00
Bjoern Schiessle	79719d9ae5	toggle select all checkbox	2013-12-12 17:33:04 +01:00
Arthur Schiwon	5ba9344b0e	LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283	2013-12-12 14:15:39 +01:00
Vincent Petry	335b2f40a6	Fixed download file from URL error messages ... - L10N now converted to string to make them work with json_encode - Added specific error message when server doesn't allow fopen on URLs - Fixed client side to correctly show error message in a notification - Added OCP\JSON::encode() method to encode JSON with support for the OC_L10N_String values	2013-12-12 10:38:12 +01:00
Jenkins for ownCloud	7b20212c0a	[tx-robot] updated from transifex	2013-12-11 13:32:13 -05:00
Vsevolod Kukol	a8f814fe2d	fix smbclient directory listing parser	2013-12-11 17:21:34 +01:00
Vincent Petry	050f87c9e4	Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfix ... Fixed sharing results to include the correct permissions	2013-12-11 02:59:22 -08:00
root	2b127a6ac5	fix indentation ... use identity test where appropriate use camelcase variable names _getGroupsByMember is a private function	2013-12-11 10:43:48 +01:00
Pellaeon Lin	5ddd85ff9c	Contextual upload error message	2013-12-11 15:40:58 +08:00
Pellaeon Lin	4b081be956	#max_upload is needed after all	2013-12-11 12:21:39 +08:00
Pellaeon Lin	0aa38165a4	Update #free_space on getstoragestats AJAX call	2013-12-11 12:18:18 +08:00
root	a18cff4479	remove debug output	2013-12-10 19:02:01 +01:00
root	e1d80b3356	Merge remote branch 'upstream/master' into ldap_nested_groups	2013-12-10 18:57:04 +01:00
root	4fb16804d6	move nested group checkbox to directory settings	2013-12-10 18:47:59 +01:00
Vincent Petry	409b510889	Moved content disposition code+workarounds to OCP\Response ... Added new OC\Response API called setContentDispositionHeader() that contains the needed workarounds for UTF8 and IE. Refactored download code to use the new API. Removed unused trashbin download file.	2013-12-10 12:42:26 +01:00
Vincent Petry	e9255e5d57	Added unit test for sharing permissions	2013-12-10 11:19:09 +01:00
Vincent Petry	89eb3759a8	Fixed sharing results to include the correct permissions ... Passing $includeCollections would return more than one entry which gives mixed up file permissions. Added a method getFile() that doesn't set $includeCollections to make sure we only get one result which is the file itself. Fixes #6265	2013-12-09 18:14:58 +01:00
Jenkins for ownCloud	6aab1ebf44	[tx-robot] updated from transifex	2013-12-09 06:40:22 -05:00
Pellaeon Lin	64bf0fa47f	Display different messages for uploadLimit and freeSpace	2013-12-08 23:17:35 +08:00
root	86809be638	combineFilterWithAnd recently moved to Access	2013-12-08 15:49:25 +01:00
Pellaeon Lin	69f2bde324	Change misleading message when file size exceeds upload limit	2013-12-08 15:41:20 +08:00
Jenkins for ownCloud	079d20a80e	[tx-robot] updated from transifex	2013-12-07 22:28:29 -05:00
Björn Schießle	575a68074f	Merge pull request #6220 from owncloud/debug_oracle_errors ... cherry-picks from #5884, just for debugging purpose	2013-12-06 10:00:04 -08:00
blizzz	b5939324b0	Merge pull request #6218 from leo-b/fix_ldap_setOption_returncode ... correctly propagate the return value of ldap_set_option	2013-12-06 08:54:29 -08:00
Vincent Petry	e13be94e56	Fixed Dropbox/Google storage async save call ... When clicking "Grant access", the settings for Dropbox/Google were saved through a call that gets cancelled when redirecting to the grant page (for example in Firefox) This fix makes sure the "save settings" call finished before redirecting to the grant page. Fixes #6176	2013-12-06 17:25:09 +01:00
Bart Visscher	40f148cc6c	Don't try to encrypt a file when the temp file isn't created	2013-12-06 17:01:13 +01:00
root	48e426b589	add support for nested groups	2013-12-06 16:46:52 +01:00
Bjoern Schiessle	9ff231590c	set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again	2013-12-06 16:11:41 +01:00
Björn Schießle	b18c8e5c53	Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire ... Sharing etag propagation on expire	2013-12-06 05:41:08 -08:00
Bjoern Schiessle	e447d978d3	it is not possible to unshare files	2013-12-06 12:35:47 +01:00
Bjoern Schiessle	9371944e43	fix typo	2013-12-06 12:20:42 +01:00
Bjoern Schiessle	58c0117c3d	only create new key on password change if a recovery key exists or if the user don't have any private/public keys	2013-12-06 12:20:31 +01:00
Bjoern Schiessle	8082ef2073	show change password form if key couldn't be decrypted	2013-12-06 12:20:22 +01:00
Bjoern Schiessle	85467b973a	add method to check if users private/public key exists	2013-12-06 12:20:14 +01:00
root	54e47b4180	correctly propagate the return value of ldap_set_option ... otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn active directory paging will stop working (Operations error on ldap_control_paged_result_response)	2013-12-06 12:04:17 +01:00
Jenkins for ownCloud	4dd84b3627	[tx-robot] updated from transifex	2013-12-05 22:24:39 -05:00
Bjoern Schiessle	ace1d40ed6	get owner from share item, if we expire a share while the user updates his /Shared folder than the owner is different from the currently logged in user	2013-12-05 17:25:01 +01:00
Jenkins for ownCloud	7e702f294f	[tx-robot] updated from transifex	2013-12-04 18:14:17 -05:00
zombiehugs	8fb4ab097d	Fixed indention. ... As per @kabum request, indention on line 694 has been fixed.	2013-12-04 12:30:06 -06:00
Arthur Schiwon	3480766a78	LDAP Wizard: don't generate filter when not allowed	2013-12-04 18:59:30 +01:00
Arthur Schiwon	60b1191c88	some equals are more equal than other equals	2013-12-04 18:59:12 +01:00
Arthur Schiwon	01af3bdb05	LDAP Wizard: return correct var	2013-12-04 18:58:52 +01:00
Arthur Schiwon	06577f1fe2	LDAP Wizard: make sure auto-detected suggestions are really applied initially. Also make initial filter compilation and user counting robust against race conditions.	2013-12-04 18:58:29 +01:00
Arthur Schiwon	cc725674e0	LDAP: on testing configuration, set active property to true, otherwise inactive connections cannot be tested properly	2013-12-04 18:58:09 +01:00
Arthur Schiwon	a10d1977b5	LDAP: set default value for login filter to empty, otherwise the wizard signals completed configuration too early when it might be not correct, i.e. login won't work	2013-12-04 18:57:54 +01:00
Arthur Schiwon	9808dee149	LDAP Wizard: don't send ldap_tls change back to the interface as the element was removed, for it is detected fully automatically. Resolves an JS error and thus an ever-spinning spinner	2013-12-04 18:57:32 +01:00
zombiehugs	be0197a29a	#6051 [ux][files] Move File Spinner ... Added spinner to file icon when moving to new folder or out of folder. Commit is related to #6051	2013-12-04 11:27:24 -06:00
Arthur Schiwon	430f85cc59	LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just opening the admin page	2013-12-04 17:57:47 +01:00
Arthur Schiwon	1c6568cf68	LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143	2013-12-04 17:57:40 +01:00
Bjoern Schiessle	b919a65432	enable more tests	2013-12-04 17:43:38 +01:00
Björn Schießle	737b9a990f	Merge pull request #6181 from owncloud/auto_expire_trash ... config switch to disable auto expire for the trash bin	2013-12-04 07:44:02 -08:00
Bjoern Schiessle	6b7fdda4f5	config switch to disable auto expire for the trash bin	2013-12-04 16:11:40 +01:00
Morris Jobke	36bc6b871f	Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)." ... This reverts commit efbf18652c.	2013-12-04 13:27:38 +01:00
Vincent Petry	72f80c972f	Merge pull request #5946 from owncloud/public-page-details ... Public page details	2013-12-03 07:26:00 -08:00
Morris Jobke	b3a96c081b	fix public page - gallery view issues	2013-12-03 13:46:58 +01:00
Vincent Petry	3b7905364f	Fixed test function for S3 ... Fixes #5752	2013-12-03 12:26:08 +01:00
Vincent Petry	76b1fcbf27	Fixed Amazon S3 ext storage config UI ... Optional parameters are now really optional Fixes #5861	2013-12-03 12:26:08 +01:00
Vincent Petry	d6121464a0	Fixed placeholder after page reload ... The placeholder somehow had too many characters stripping from it...	2013-12-03 12:26:08 +01:00
Morris Jobke	62827376b8	fix trashbin and pbulic page controls	2013-12-03 10:59:22 +01:00
Morris Jobke	a6f10a59fc	fix and cleanup CSS for public page	2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt	5e9ac2f20f	change different shades of grey for public share page to white	2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt	7867604e22	remove app specific code	2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt	d673dd066a	fix details for buttons in header and controls bar	2013-12-03 10:54:18 +01:00
Jenkins for ownCloud	83ec234f53	[tx-robot] updated from transifex	2013-12-02 17:28:29 -05:00
Bjoern Schiessle	ee66db447f	make it possible to select folders	2013-12-02 16:30:03 +01:00
Vincent Petry	a81d4175ba	Merge pull request #6148 from owncloud/fix_trash_restore ... Fix restore anbd delete operations in trash bin	2013-12-02 04:33:37 -08:00
Bjoern Schiessle	fac2f2a626	check explicitely all possible dir values	2013-12-02 12:13:32 +01:00
Bjoern Schiessle	edc4447d6a	set delete all to true if a complete folder was deleted	2013-12-02 11:59:09 +01:00
Bjoern Schiessle	8ce3ea3e2c	fix delete files from trash bin	2013-12-02 11:50:55 +01:00
Andreas Fischer	efbf18652c	Adjust files_encryption requirements to the new core requirement (PHP 5.3.8).	2013-11-29 20:34:57 +01:00
Vincent Petry	baa587fd3c	Merge pull request #6123 from owncloud/extstorage-deletedirs2 ... Fixed FTP and SMB to use rmdir() when deleting folders	2013-11-29 11:23:02 -08:00
Jenkins for ownCloud	1b18c5a047	[tx-robot] updated from transifex	2013-11-29 14:10:40 -05:00
Bjoern Schiessle	71589e65d2	fix restore from files in sub-folders	2013-11-29 16:43:50 +01:00
Vincent Petry	d69243ee51	Fixed FTP and SMB to use rmdir() when deleting folders ... Some storages need to use different calls for deleting files or folders, usually unlink() and rmdir(). Fixes #4532 (SMB dir deletion) Fixes #5941 (FTP dir deletion) Note that the extra is_dir() should be fast because it's read from the stat cache.	2013-11-29 13:01:01 +01:00
Frank Karlitschek	0b698e6901	Merge pull request #6111 from owncloud/non-floating-trash-button-chrome ... Fix resize issue for trash button in chrome and overflowing spinner in ....	2013-11-29 02:44:49 -08:00
Morris Jobke	41a1a32e5a	Merge pull request #6099 from owncloud/fix_source_not_found_warnings ... make sure that we don't try to access an already deleted files	2013-11-28 12:59:24 -08:00
Morris Jobke	0cbe9d79ba	Merge pull request #6106 from owncloud/fix_preview_creation ... Fix preview creation	2013-11-28 12:48:19 -08:00
Morris Jobke	587fc1aff3	Fix resize issue for trash button in chrome and overflowing spinner in .update class ... fixes #6108	2013-11-28 21:36:43 +01:00
Bjoern Schiessle	b3724cd9c6	remove duplicate	2013-11-28 20:58:32 +01:00
Bjoern Schiessle	348706854c	use better coding style	2013-11-28 19:31:35 +01:00
Bjoern Schiessle	bef5108218	detect mimetype from the original filename, without the versioning timestamp	2013-11-28 18:59:38 +01:00
Bjoern Schiessle	863aedf784	detect mimetype from the original filename, without the delete timestamp	2013-11-28 18:59:12 +01:00
ganomi	f723bf744a	Merge pull request #6090 from ganomi/summaryfix ... Fix filellist/rename/summary problem	2013-11-28 08:00:41 -08:00
Morris Jobke	3a31f7eb4a	Merge pull request #6097 from owncloud/extstorage-ftptrailingslash ... Add trailing slash in FTP root path when missing	2013-11-28 04:52:08 -08:00
Morris Jobke	603613e6e6	Merge pull request #6098 from owncloud/files-renamediriconfix ... Fixed directory icon after rename	2013-11-28 04:50:17 -08:00
Bjoern Schiessle	eaedda2116	make sure that we don't try to access an already deleted files, fixes some file source not found warnings	2013-11-28 13:31:08 +01:00
Arthur Schiwon	ee78d48186	loginname is not necessarily username	2013-11-28 13:26:31 +01:00
Vincent Petry	da1a89fd15	Fixed directory icon after rename	2013-11-28 13:15:20 +01:00
Frank Karlitschek	dab3629ff5	Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename ... Redetect mime type whenever extension is renamed	2013-11-28 03:46:42 -08:00
Vincent Petry	30b2ed588b	Merge pull request #6096 from owncloud/files-txtextfornewfiles ... New file box now has default file name + extension	2013-11-28 03:38:58 -08:00
Vincent Petry	84f3dd15a6	Add trailing slash in FTP root path when missing ... Fixes #6093	2013-11-28 11:45:26 +01:00
Vincent Petry	69a3327f47	Moved new file extension out of the translated string	2013-11-28 10:52:59 +01:00
Vincent Petry	a1d2f0f516	Merge pull request #6094 from owncloud/enc_fix_reshares ... fix path reconstruction for reshares	2013-11-28 01:41:34 -08:00
Vincent Petry	24a08c686d	New file box now has default file name + extension ... Whenever a user creates a file or folder in the web UI, the input field will contain a default file name, pre-selected up to the extension for easier typing. The purpose is mostly to prevent users creating text files without an extension. Fixes #6045	2013-11-28 10:18:31 +01:00
Bjoern Schiessle	efe7c4075a	fix path reconstruction for reshares	2013-11-27 23:26:04 +01:00
Vincent Petry	bc64931cd0	Fixed unit tests for ajax rename	2013-11-27 23:19:57 +01:00
Morris Jobke	54b24ca88d	Merge pull request #6048 from owncloud/encryption_initial_enc_indicator ... show a message at the log-in screen if inital encryption take place	2013-11-27 14:10:11 -08:00
Morris Jobke	55d7cf8ffd	improve encryption message	2013-11-27 23:07:19 +01:00
Bjoern Schiessle	d9729168f9	some small js fixes	2013-11-27 22:42:03 +01:00
Bjoern Schiessle	0219b8b3b9	add spinner to the template so that it can be loaded in time	2013-11-27 22:36:47 +01:00
Bjoern Schiessle	e0924a5f07	switch to large spinner	2013-11-27 21:58:38 +01:00
Vincent Petry	68f610a90e	Update file list entry on rename ... Whenever a file is renamed, if the extension changes, the mime type and preview might change. This fix passes the updated info to the client that updates it.	2013-11-27 21:35:00 +01:00
Björn Schießle	5295993144	Merge pull request #6088 from owncloud/fix_public_previews ... fix public preview creation if a user is logged in	2013-11-27 11:05:27 -08:00
Björn Schießle	34a8c3c4cd	Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash ... move files to owners trash	2013-11-27 10:24:55 -08:00
ganomi	f94180a996	Fix filellist/rename/summary problem ... Fixes #6055 This contribution is MIT licensed!	2013-11-27 19:09:49 +01:00
Bjoern Schiessle	aee7781f22	fix public preview creation if a user ios logged in	2013-11-27 18:44:01 +01:00
Jenkins for ownCloud	4a78f12682	[tx-robot] updated from transifex	2013-11-27 12:10:54 -05:00
Vincent Petry	d2840a045d	Fixed sharing hook to not remove the share before the trashbin ... Fixed the hook order between sharing app and trashbin	2013-11-27 17:22:48 +01:00
Bjoern Schiessle	1536c7ea58	switch from "name" attribute to "id"	2013-11-27 17:01:21 +01:00
Bjoern Schiessle	1065c33543	Merge branch 'master' into encryption_initial_enc_indicator	2013-11-27 16:44:06 +01:00
Bjoern Schiessle	060e0ad0cd	with the latest changes in master $this-userID is always the correct ID, so we no longer need the extra parameter	2013-11-27 15:35:32 +01:00
Bjoern Schiessle	9fb71af988	Merge branch 'master' into encryption_enable_public_upload ... Conflicts: apps/files_encryption/lib/helper.php apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/keymanager.php	2013-11-27 15:08:09 +01:00
Thomas Müller	5b7b053634	Merge pull request #5976 from owncloud/encryption_work_with_public_gallery ... Encryption work with public gallery	2013-11-27 04:25:54 -08:00
Bjoern Schiessle	7f2bdb0e97	typo fixed	2013-11-27 12:25:04 +01:00
Bjoern Schiessle	7f3b178d73	some small changes according to the review comments	2013-11-27 11:46:24 +01:00
blizzz	34704eded6	Merge pull request #5955 from owncloud/fix5863 ... LDAP Wizard: Add raw login filter to corresponding tab for consistency, fix behaviour on raw filter input	2013-11-27 00:30:15 -08:00
blizzz	4f15282bc9	Merge pull request #6058 from owncloud/ldap2avatar ... Set Avatar for LDAP users automatically (if a picture is available)	2013-11-26 12:05:32 -08:00
Bjoern Schiessle	7240d349da	Merge branch 'master' into encryption_initial_enc_indicator	2013-11-26 19:15:53 +01:00
Vincent Petry	e2ca88af5e	Merge pull request #6066 from owncloud/extstorage-sftp-overwriteonrename ... Fixed SFTP storage to overwrite on rename	2013-11-26 09:01:41 -08:00
Bjoern Schiessle	c7e1fe50c2	added a small version of the dark loading gif, looks nicer on the blue background	2013-11-26 17:14:16 +01:00
Jenkins for ownCloud	fb7aa2f014	[tx-robot] updated from transifex	2013-11-26 10:47:07 -05:00
Vincent Petry	30e086fb53	Fixed SFTP storage to overwrite on rename	2013-11-26 16:32:44 +01:00
Vincent Petry	2653d914d9	Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefix ... Fixed SMB rename function to overwrite target file	2013-11-26 06:42:36 -08:00
Morris Jobke	a48fc120d0	Merge pull request #6054 from owncloud/extstorage-dropboxfixes ... Fixed various Dropbox issues + unit tests	2013-11-26 04:48:54 -08:00
Bjoern Schiessle	5d2299eab8	only create complete share key if we know the exact path	2013-11-26 13:30:59 +01:00
Arthur Schiwon	69518b9013	Make sure Avatar is set from LDAP upon first login, not later, but also not before due to missing user folder	2013-11-26 12:57:39 +01:00
Vincent Petry	712b47757a	Updated unit tests for SMB ... - coverage for touch return value - fixed directory provider to exclude unsupported cases	2013-11-26 12:53:03 +01:00
Vincent Petry	e102eec89a	Return true when touch succeeds	2013-11-26 12:47:00 +01:00
Vincent Petry	7c81ac3d28	Fixed various Dropbox issues + unit tests ... - fixed touch function to return true on success - fixed local metadata cache to remove deleted files/directories - fixed getMetaData() to ignore files reported as deleted by Dropbox - fixed "file not found" case to not log as exception - fixed "overwrite on rename" case - fixed unit tests to exclude unsupported cases - added unit test for touch return value - unit tests for Dropbox should all run correctly now	2013-11-26 11:59:36 +01:00
Bjoern Schiessle	0617e06f69	use POST instead of GET	2013-11-26 11:38:49 +01:00
Bjoern Schiessle	35a6ad255d	fix typo in var name	2013-11-26 11:38:45 +01:00
Jenkins for ownCloud	dc67c7efa9	[tx-robot] updated from transifex	2013-11-26 04:04:05 -05:00
Bjoern Schiessle	46dff0677d	Merge branch 'master' into calc_version_size	2013-11-26 00:03:54 +01:00
Bjoern Schiessle	8974107b4e	remove debug output	2013-11-25 23:57:08 +01:00
Bjoern Schiessle	d6fb2afa85	show a message at the log-in screen if inital encryption take place	2013-11-25 23:49:05 +01:00
Arthur Schiwon	03375d6c52	LDAP: username2dn should only return DNs that belong to the current LDAP server. Might be not perfect. Easy perfect solution would increase communication with LDAP server. Let's see if it is good enough	2013-11-25 22:08:11 +01:00
Arthur Schiwon	3955388f20	LDAP: proxy: configurable return to determine when to try the next LDAP server and when to return (multi server setup)	2013-11-25 22:05:00 +01:00
Vincent Petry	944d4156bf	Fixed FTP storage unit tests to use the correct class	2013-11-25 18:44:34 +01:00
Bjoern Schiessle	f8fcd567a7	move files to owners trash	2013-11-25 16:51:31 +01:00
Björn Schießle	31d0ba0344	Merge pull request #5641 from owncloud/filestrash-emptytrash ... Deleting all files in trash now only sends a single flag	2013-11-25 05:24:11 -08:00
Vincent Petry	d88025bf6b	Fixed ext storage touch function to return true on success ... Some ext storage impl didn't return true on success. Fixes #5943 (Dropbox) Fixes #6010 (WebDAV)	2013-11-25 12:44:27 +01:00
Vincent Petry	1b0c5e57e5	Fixed SMB rename function to overwrite target file ... When uploading files through WebDAV, a part file is created and a rename operation is performed with the expectation that the part file overwrites an existing file, if any. This fix makes the SMB external storage delete the target file before renaming, as smbclient doesn't support overwrite on move/rename. Fixes #5348	2013-11-25 11:17:38 +01:00
Bjoern Schiessle	49038545f8	Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/core into encryption_work_with_public_gallery	2013-11-25 10:29:53 +01:00
Bjoern Schiessle	9c4b8ae54c	fix typo in comment	2013-11-25 10:29:05 +01:00
Morris Jobke	b82146eeee	Merge pull request #5991 from owncloud/extstorage-mountpointvalidation ... Prevent using root as mount point for external storage	2013-11-25 00:30:06 -08:00
Thomas Mueller	2a465fb20f	Merge branch 'master' into encryption_work_with_public_gallery	2013-11-24 23:20:46 +01:00
Vincent Petry	aef34618de	Merge pull request #5995 from owncloud/extstorage-isreadablefix ... Return plausible isReadable() default impl for ext storage	2013-11-24 03:04:33 -08:00
Jenkins for ownCloud	ba0e09adce	[tx-robot] updated from transifex	2013-11-24 00:14:51 -05:00
Arthur Schiwon	d9347f2c9b	LDAP: last avatar lookup must be stored per user. Someone had a blackout, eh?	2013-11-22 23:58:30 +01:00
Vincent Petry	2d947835b9	Now also preventing the user of "Shared" as mountpoint	2013-11-22 18:36:27 +01:00
Vincent Petry	c62cce8269	Moved default isReadable/isUpdatable impl into Common class ... Also adjusted all ext storage backends to not override these when the default behavior is expected.	2013-11-22 18:21:17 +01:00
Vincent Petry	a49e873d3f	Return plausible isReadable() default impl for ext storage ... When an ext storage doesn't implement isReadable(), always returning true made the file scanner believe that the file exists and creates a cache entry with the size zero. This fix makes the default impl of isReadable() use file_exists(). Fixes #5940	2013-11-22 18:21:17 +01:00
Bjoern Schiessle	acf74b24f2	remove unused variable	2013-11-22 16:10:30 +01:00
Thomas Müller	c67b8f2b22	fixed documentation	2013-11-22 14:58:36 +01:00
Arthur Schiwon	6fdce3b7e9	LDAP: user proxy must support canChangeAvatar too	2013-11-22 13:25:20 +01:00
Arthur Schiwon	54f0deff2a	LDAP: get user photo from LDAP and set it as avatar if available	2013-11-22 13:25:20 +01:00
Jenkins for ownCloud	60cfdae503	[tx-robot] updated from transifex	2013-11-21 21:07:12 -05:00
Vincent Petry	3b48d23478	Merge pull request #5970 from owncloud/extstorage-webdavdotdirfix ... Fixed path normalization to prevent dot dirs	2013-11-21 09:01:47 -08:00
Vincent Petry	476d8e6de0	Added unit test for root mount point validation	2013-11-21 17:26:13 +01:00
Vincent Petry	0b2c9b823c	Prevent using root as mount point for external storage ... Fixes #5981	2013-11-21 17:22:12 +01:00
Vincent Petry	39cbdca429	Fixed path normalization to prevent dot dirs ... Fixes #5945 where stat(.) would cause the backend OC to cache a dot dir (only in older versions)	2013-11-21 16:07:01 +01:00
Jenkins for ownCloud	5d9731cef2	[tx-robot] updated from transifex	2013-11-21 10:05:34 -05:00
Bjoern Schiessle	6443e570c2	Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload	2013-11-21 16:00:21 +01:00
Vincent Petry	d0265f3388	Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome ... Quota storage wrapper is now used for all users in sharing mode	2013-11-21 06:59:50 -08:00
Bjoern Schiessle	d2e6f7d979	check HTTP Referer to check if we come from public.php or from a internal page. ... Necessary to detect public access also if a user is logged in.	2013-11-21 15:57:49 +01:00
Morris Jobke	3e1ade4397	Merge pull request #5988 from owncloud/files-mobilequickfix ... Added min width to files table	2013-11-21 06:09:11 -08:00
Vincent Petry	14ad1ebf53	Added min width to files table ... Having a too small widths for the files table doesn't make sense as it overlaps file actions with the files themselves and make them unclickable, especially when viewed on mobile phone. The compromise that this fix introduces is to have a minimum width that will trigger horizontal scrolling, which will at least make it possible to click files on mobile phones.	2013-11-21 14:45:24 +01:00
blizzz	a20c6049c3	Merge pull request #5979 from owncloud/fix5881 ... LDAP Wizard: add objectclass for group detection in Zimbra	2013-11-21 04:03:33 -08:00
Bjoern Schiessle	9d16353e09	disable trahs in files_sharing/public.php	2013-11-21 12:06:35 +01:00
Vincent Petry	356eef0739	Quota storage wrapper is now used for all users in sharing mode ... When accessing a shared folder, the folder's owner appears as mountpoint but wasn't wrapped by a quota storage wrapper. This fix makes sure that all home storages are wrapped by a quota storage wrapper, if applicable, to make sure quotas are respected when uploading into shared folders.	2013-11-21 12:04:54 +01:00
Bjoern Schiessle	c9646ddc4c	fix undefined index errors if public share view	2013-11-21 12:03:27 +01:00
Arthur Schiwon	dd5e1092c7	LDAP Wizard: add objectclass for group detection in Zimbra	2013-11-21 11:20:31 +01:00
Bjoern Schiessle	87f2696e6a	Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload	2013-11-21 11:18:53 +01:00
Bjoern Schiessle	c7dc6dc2c2	fix getFileKey() call	2013-11-21 11:11:15 +01:00
Bjoern Schiessle	009bbef17e	Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload	2013-11-21 10:34:25 +01:00
Bjoern Schiessle	16b484209c	Merge branch 'master' into encryption_work_with_public_gallery ... Conflicts: apps/files_encryption/lib/keymanager.php apps/files_encryption/lib/stream.php apps/files_encryption/lib/util.php apps/files_encryption/tests/crypt.php	2013-11-21 10:33:37 +01:00
Bjoern Schiessle	18c80e47b6	Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload ... Conflicts: apps/files_encryption/lib/stream.php	2013-11-21 10:24:47 +01:00
Vincent Petry	391f267d38	Merge pull request #5897 from hkjolhede/master ... Fixed error-checking error in sftp.php	2013-11-21 01:22:05 -08:00
Bjoern Schiessle	2b361ea085	better distinction between userID and keyId	2013-11-21 10:09:07 +01:00
Bjoern Schiessle	b27fc42e1f	public upload now also works with encryption enabled	2013-11-21 00:23:38 +01:00
Bjoern Schiessle	318db64b2d	adapt tests to the new code	2013-11-20 23:27:42 +01:00
Bjoern Schiessle	b9c18d16fe	make sure that we always use the correct user id	2013-11-20 23:23:23 +01:00
Bjoern Schiessle	e11afd3066	fix some getShareKey() and getFileKey() calls	2013-11-20 22:44:23 +01:00
Vincent Petry	e26500045f	Fixed move operation to pass the whole URL as expected ... The MOVE and COPY spec expect the "Destination" header to receive the full URL, not only the root. Fixes #5942	2013-11-20 18:59:02 +01:00
Bjoern Schiessle	c5cb4206f5	[wip] make encryption work with public gallery sharing	2013-11-20 18:10:56 +01:00
Vincent Petry	5de5c317c1	Merge pull request #5967 from owncloud/encryption-extstorage-fixsizereset ... Fix for extstorage + encryption where unencrypted size is not kept	2013-11-20 09:04:37 -08:00
Vincent Petry	fe44024868	Fix for extstorage + encryption where unencrypted size is not kept ... Fix for external storage with encryption where the unencrypted size is first written in the DB, then set back to zero, causing performance issue because the file needs to be reopened every time to find out the unencrypted size (and potentially needs a full redownload)	2013-11-20 16:22:55 +01:00
Arthur Schiwon	ce1318c9f1	LDAP Wizard: clear the cache on save so changes have immediate effect	2013-11-20 15:56:25 +01:00
Bjoern Schiessle	f3e2a63712	check if it is a cached file or a version to resolve the correct path to the file key	2013-11-20 12:34:23 +01:00
Bjoern Schiessle	0c24c7c420	only check if the key file exists to decide if it is an encrypted file or not. ... This solves problems with external storage which doesn't support fseek	2013-11-20 11:02:22 +01:00
Arthur Schiwon	ff9ecc8a51	LDAP Wizard: proper behaviour for raw filter input. remember the editing mode and compose filter only when desired.	2013-11-19 23:58:08 +01:00
Bjoern Schiessle	b823505bd1	make sure that the owners home is mounted correctly	2013-11-19 18:28:51 +01:00
Vincent Petry	5b6d1d79d0	Fixed SMB file deletion success detection ... Since unlink() smb4php doesn't return true on deletion success, we need to check whether the file was deleted to confirm success. Fixes #5866	2013-11-19 15:05:11 +01:00
Vincent Petry	8ab40f1959	Removing trailing dot in path that samba doesn't seem to like ... Fixes #5778 Added unit test for getId() and constructUrl()	2013-11-19 15:05:11 +01:00
Vincent Petry	a7962faa56	Fixed delete action to show error message as notification	2013-11-19 15:05:11 +01:00
Bjoern Schiessle	c309067c81	use oc filesystem operations to calc the versions size. This makes sure that we can handle missing directories correctly	2013-11-19 12:23:14 +01:00
Morris Jobke	b55a66187c	Merge pull request #5916 from owncloud/extstorage-smb-ignorenetbioserror ... SMB ignore connection errors when NetBIOS is disabled	2013-11-18 15:23:11 -08:00
Jan-Christoph Borchardt	b51d405852	Merge pull request #5923 from owncloud/font-weight ... change bold 'deleted files' button to normal for less focus	2013-11-18 08:39:46 -08:00
Jörn Friedrich Dreyer	5da2929180	fix filtering number like filenames in filelist ... forward port of 847ad6c40b	2013-11-18 17:18:31 +01:00
Jan-Christoph Borchardt	f2d18867af	change bold 'deleted files' button to normal for less focus	2013-11-18 15:06:38 +01:00
Vincent Petry	d306f5c4cf	Merge pull request #5908 from owncloud/fix_errorpage_call ... [encryption] fix redirectToErrorPage() call	2013-11-18 05:17:28 -08:00
Vincent Petry	7e6f3817d0	SMB ignore connection errors when NetBIOS is disabled ... When NetBIOS is blocked or disabled, a smb::look() call can still get the list of shares from smbclient, even though the name resolution at the end of the command fails. This fix makes it ignore the connection error if we already got the list of shares. Fixed #5860	2013-11-18 12:31:55 +01:00
Bjoern Schiessle	82f30d37ca	call error page with session as parameter	2013-11-17 13:23:07 +01:00
Jenkins for ownCloud	c3746e866a	[tx-robot] updated from transifex	2013-11-15 22:56:31 -05:00
hkjolhede	3e2d4c1bc1	Fixed error-checking error in sftp.php	2013-11-15 21:10:09 +01:00
Vincent Petry	68f278025c	Merge pull request #5894 from owncloud/readd_sharing_token ... readd sharing token to public template	2013-11-15 09:25:46 -08:00
blizzz	cb968c77d1	Merge pull request #5772 from owncloud/fix5741 ... LDAP Wizard: introduce configuration status indicator, fixes #5741	2013-11-15 08:52:41 -08:00
Björn Schießle	3ad546002f	Merge pull request #5833 from owncloud/encryption_fixes ... [encryption] preserve timestamps and etags during encryption/decryption	2013-11-15 08:47:22 -08:00
Vincent Petry	6355af162c	Merge pull request #5880 from owncloud/replace_etmp_files ... write encryption tmp files to the cache folder	2013-11-15 07:53:23 -08:00
Bjoern Schiessle	f36ee69855	tests added	2013-11-15 16:49:50 +01:00
Jörn Friedrich Dreyer	11425d142d	readd sharing token to public template ... necessary for https://github.com/owncloud/apps/pull/1476	2013-11-15 16:27:41 +01:00
Vincent Petry	f9a64d2b27	Fix for smb4php fseek ... The stream_fseek function must return a boolean which will be mapped to 0 for success and -1 for failure for the caller. This patch fixes stream_fseek of smb4php to also respect this convention. Since the encryption app is relying on fseek to detect whether a file is encrypted by reading the last bit of data, this will fix #5023	2013-11-15 14:23:24 +01:00
Thomas Müller	1e863cd959	Merge pull request #5700 from owncloud/ldapWizSetDisplayNames ... LDAP Wizard: do not forget to set display name attributes for user and g...	2013-11-15 01:12:54 -08:00
Thomas Müller	2bb4c266a6	Merge pull request #5862 from owncloud/files-singledotdirs ... Files singledotdirs	2013-11-14 11:40:21 -08:00
Arthur Schiwon	98c9334175	LDAP Wizard: move raw login filter field from advanced tab to login filter tab for consistency	2013-11-14 18:29:18 +01:00
Bjoern Schiessle	faa08da944	instead of writing etmp files we write the dummy file to data/user/cache to avoid that etmp files show up in the users files list	2013-11-14 17:32:21 +01:00
Frank Karlitschek	29e9f2833d	Merge pull request #5214 from owncloud/no_extra_slashes ... Don't double-slash filenames at the root.	2013-11-14 07:53:51 -08:00
Vincent Petry	008c3b80d6	Files app backend now normalizes paths before rendering templates ... Before rendering breadcrumbs or the file list, the paths are now normalized. This prevents the UI to show "." breadcrumbs in case the path contains sections with "/./" Fixes #5848	2013-11-14 13:24:05 +01:00
Bjoern Schiessle	2624a6cb32	remove debug output	2013-11-14 12:13:22 +01:00
Bjoern Schiessle	2df3763675	test encryptAll() and decryptAll() to make sure that mtime and etag stay the same	2013-11-14 12:11:21 +01:00
Frank Karlitschek	58ff8a8673	Merge pull request #5805 from owncloud/shared-storage-copy-folder ... Use View::copy and View::rename when copying or renaming files in the shared storage	2013-11-13 10:17:37 -08:00
Arthur Schiwon	84a882c651	LDAP Wizard: make 'Configuration OK' and 'Help' texts grey so they don't take too much awareness	2013-11-13 19:07:28 +01:00
Arthur Schiwon	7a61dcadd2	LDAP Wizard: move status indicator in one line with back and continue buttons	2013-11-13 19:07:28 +01:00
Arthur Schiwon	4ee296051b	LDAP Wizard: introduce configuration status indicator, fixes #5741	2013-11-13 19:07:28 +01:00
Frank Karlitschek	15c4e4ed09	Merge pull request #5806 from owncloud/styles-fix-external_storage ... Fix spacing issue for checkboxes, vertically center checkboxes on person...	2013-11-13 07:43:59 -08:00
Morris Jobke	5aae550b11	Merge pull request #5809 from owncloud/fix5753 ... LDAP Wizard: proper behaviour with anonymous bind, fixes #5753	2013-11-13 06:52:07 -08:00
Morris Jobke	ac0e87b1cc	Merge pull request #5831 from owncloud/files-charatissue ... Fixed total dirs/files message hiding condition	2013-11-13 05:22:48 -08:00
Bjoern Schiessle	222fa88eec	Merge branch 'master' into encryption_fixes	2013-11-13 12:11:12 +01:00
Vincent Petry	3fa651f2b1	Merge pull request #5447 from owncloud/fixing-5117-master ... No data corruption duriing parallel upload	2013-11-13 02:59:34 -08:00
Vincent Petry	5bdfccfc47	Fixed total dirs/files message hiding condition ... Fixes #5829	2013-11-13 10:53:16 +01:00
Bjoern Schiessle	dd0ebcede2	fixPartialFilePath() is now stripPartialFileExtension()	2013-11-12 18:48:31 +01:00
Bjoern Schiessle	77429c28fd	rename fixPartialFilePath() to stripPartialFileExtension(), this name describes better what the method actually does	2013-11-12 16:48:24 +01:00
Bjoern Schiessle	e2fb8d7128	only update file cache if the file is already indexed to avoid that we create a incomplete file cache entry	2013-11-12 15:55:59 +01:00
Bjoern Schiessle	894856ce01	make sure that we keep the correct timestamp and etag after encryoption/decryption	2013-11-12 15:51:51 +01:00
Georg Ehrke	238e4bc3eb	implement delete hooks in file versions lib	2013-11-12 14:06:32 +01:00
Georg Ehrke	90fac1f371	replace $path with '/files_trashbin/files/' . $file	2013-11-12 14:03:50 +01:00
Georg Ehrke	feee4b865b	add delete hook for trash bin app	2013-11-12 14:00:36 +01:00
Bjoern Schiessle	fcbb5d6cb3	missed some replacements... now tests should work	2013-11-12 11:17:34 +01:00
Bjoern Schiessle	9f10f15fd4	fixing tests for the new part file handling	2013-11-12 10:24:10 +01:00
Arthur Schiwon	550f2d0089	LDAP Wizard: make UI behaviour more consistent and more pleasant when determining Base DN	2013-11-11 19:27:38 +01:00
Arthur Schiwon	082357a670	LDAP Wizard: remove ugly whitespace where it should not be	2013-11-11 19:25:20 +01:00
Morris Jobke	913cde816f	Fix spacing issue for checkboxes, vertically center checkboxes on personal page	2013-11-11 18:03:57 +01:00
Vincent Petry	80c8666d3a	Deleting all files in trash now only sends a single flag ... To prevent having to send the list of all files for deletion, only set a flag "allfiles". This should make it a bit smoother when deleting 5000+ files. Also fixes some "empty trash" message issues.	2013-11-11 17:58:33 +01:00
Robin Appelman	a2015ee065	Use View::copy and View::rename when copying or renaming files in the shared storage	2013-11-11 17:58:20 +01:00
Bjoern Schiessle	802213f7ec	let encryption app detect transfer id in path and handle it correctly	2013-11-11 17:47:59 +01:00
Morris Jobke	808634ac00	Merge pull request #5804 from owncloud/files-selectionsummary ... Selection summary is now displayed properly	2013-11-11 08:41:53 -08:00
Vincent Petry	e285e84e18	Selection summary is now displayed properly ... Fixes #5775	2013-11-11 17:14:40 +01:00
Morris Jobke	43230f11f6	Merge pull request #5769 from owncloud/files-changedirjsevent ... Added JS event for when the user changes the directory	2013-11-11 06:22:44 -08:00
Arthur Schiwon	da61c6ef72	LDAP Wizard: determine port without credentials. don't hide the port input field	2013-11-11 15:16:54 +01:00
Morris Jobke	55331479cd	Merge pull request #5701 from owncloud/sharing-updateownerfoldersizes ... Fixed watcher to also update the owner's folder sizes	2013-11-11 06:16:51 -08:00
Arthur Schiwon	ea9f392f4e	LDAP Wizard: improve check for Agent DN and Credentials	2013-11-11 13:36:28 +01:00
Jenkins for ownCloud	e431ba5ce8	[tx-robot] updated from transifex	2013-11-11 05:47:59 -05:00
Jenkins for ownCloud	3428c03b80	[tx-robot] updated from transifex	2013-11-09 01:45:32 -05:00
Arthur Schiwon	58aad1096f	LDAP Wizard: keep Base DN always visible	2013-11-08 17:48:29 +01:00
Vincent Petry	4998faf343	Added JS event for when the user changes the directory ... This enables apps to detect directory changes which might be caused by the user using the browser back button.	2013-11-08 13:16:28 +01:00
Vincent Petry	c16fbbf386	Increased upload error delay to 10 seconds ... Fixes #5662 Also made it use OC.Notification instead of directly access the notification HTML element.	2013-11-08 11:22:08 +01:00
Morris Jobke	3e916a9f1d	Merge pull request #5737 from owncloud/files-totaldirsnotfoundfix ... Fixed totalDirs JS error	2013-11-07 05:02:43 -08:00
blizzz	0b1749e581	Merge pull request #5682 from owncloud/fix5585 ... LDAP: make buttons on Expert page work again, fixes #5585	2013-11-07 03:34:49 -08:00
Vincent Petry	bdc75e497b	Fixed totalDirs JS error	2013-11-07 10:11:18 +01:00
Jenkins for ownCloud	263603aa4c	[tx-robot] updated from transifex	2013-11-06 21:44:36 -05:00
Morris Jobke	a0ee6aef29	Merge pull request #5399 from frisco82/fixDownloadOverQuota ... Do not count the size of shared folder on total	2013-11-06 13:59:27 -08:00
Arthur Schiwon	95a5ff63b8	LDAP: resolve namespace harakiri, fixes background job	2013-11-06 16:25:31 +01:00
Morris Jobke	1fa1cf46bd	Merge pull request #5711 from owncloud/quota-refreshquotainclientafteroperations ... Fixes for "max upload size" value showed in the UI	2013-11-06 06:49:42 -08:00
Vincent Petry	5d698b72fc	Fixed folder icon for home storage ... Fixes #5713	2013-11-06 15:11:14 +01:00
Ramiro Aparicio	b49530f80b	Do not count the size of shared folder on total ... Changed all array access to dot notation Split comment in a second line	2013-11-06 13:47:03 +01:00
Arthur Schiwon	8b3da23368	LDAP Wizard: l10ned Save button	2013-11-06 12:40:07 +01:00
Vincent Petry	31181e4348	Fixed storage stats to be based on current directory ... Previously, the storage statistics were always for the root dir. This means that the upload button would always show the limit for the root dir, even when uploading to a shared dir or external storage. This fix adds a "dir" argument to getstoragestats.php.	2013-11-06 10:55:19 +01:00
Vincent Petry	5d9ab6e7ac	Update quota value in client after scan and upload ... After uploading, the quota value wasn't refreshed. This fix refreshes the quota value after files have been scanned or uploaded.	2013-11-06 10:15:05 +01:00
Vincent Petry	da126f1692	Fixed unit tests for files sharing watcher	2013-11-06 09:39:52 +01:00
VicDeo	3e5a5567eb	Merge pull request #5692 from miicha/patch-2 ... allow empty user-dn and password	2013-11-05 12:19:27 -08:00
Vincent Petry	9f4fd0161e	Added unit tests for shared files watcher ... - Added base class for sharing unit tests - Added unit tests for shared files watched to check for folder size propagation	2013-11-05 19:30:52 +01:00
Vincent Petry	eb6fc14f84	Removed unused method	2013-11-05 17:14:19 +01:00
Vincent Petry	e3868ba118	Fixed watcher to also update the owner's folder sizes ... Note that the root folder size is mandatory for quota calculation.	2013-11-05 13:58:14 +01:00
Thomas Müller	a438abe2fe	Merge pull request #5699 from owncloud/fixing-4606-master ... calling getstoragestats.php only if a user is logged in because this cal...	2013-11-05 04:30:35 -08:00
Arthur Schiwon	fc040755c1	LDAP Wizard: do not forget to set display name attributes for user and group, makes Test Connection succeed	2013-11-05 13:19:32 +01:00
Thomas Müller	ad336c94dc	Merge pull request #5695 from owncloud/fixing-dropbox-master ... fixing dropbox require path	2013-11-05 04:15:20 -08:00
Thomas Müller	b869fb2a09	calling getstoragestats.php only if a user is logged in because this call requires a user to be logged in	2013-11-05 12:18:25 +01:00
miicha	ef1183bf86	allows agent and password or neither agent nor password ... this contribution is MIT licensed	2013-11-05 11:51:53 +01:00
Thomas Müller	b75c724cc4	fixing dropbox require path	2013-11-05 10:33:21 +01:00
Thomas Müller	3488202f67	Merge pull request #5582 from owncloud/files-previewcaching ... Append file etag to preview URLs	2013-11-05 01:21:51 -08:00
Thomas Müller	d48ba5a5bf	Merge pull request #5540 from owncloud/scanner-enhancments-master ... Scanner enhancments master	2013-11-04 23:58:42 -08:00
miicha	5b9bdaadaa	allow empty user-dn and password ... help tooltip shows completely right: leave both blank for anonyous access. But if you leave it blank js doesn't allow you to edit any other settings...	2013-11-05 01:24:20 +01:00
Thomas Müller	a7cb16aab1	use ===	2013-11-04 21:23:10 +01:00
Arthur Schiwon	3d6030b2ae	LDAP: improve design and placement of Save button	2013-11-04 16:54:48 +01:00
Arthur Schiwon	17820fbef6	LDAP: make buttons on Expert page work again, fixes #5585	2013-11-04 16:48:40 +01:00
Andreas Fischer	26ecf2062c	Merge pull request #5656 from owncloud/fix-wizard-typo ... Fix typo in LDAP wizard * owncloud/fix-wizard-typo: Excpetion->Exception	2013-11-04 09:39:19 +01:00
Jenkins for ownCloud	e89f080f09	[tx-robot] updated from transifex	2013-11-03 14:39:28 -05:00
Jenkins for ownCloud	07e540613e	[tx-robot] updated from transifex	2013-11-03 12:44:12 -05:00
Jörn Friedrich Dreyer	9ae829497a	cleanup and actually execute the query	2013-11-01 15:45:33 +01:00
Jörn Friedrich Dreyer	72ca0a482b	use doctrine to construct concat expression	2013-11-01 15:40:21 +01:00
Jörn Friedrich Dreyer	51ec68a623	Concatenate string in SQL instead of PHP	2013-11-01 15:40:21 +01:00
VicDeo	4e9a23dffe	Excpetion->Exception	2013-11-01 12:19:44 +03:00
Morris Jobke	be07e828ef	Merge pull request #5648 from owncloud/files-fixhidecontrolsinviewermode ... Corretly hide "no permissions" message in controls in viewer mode	2013-10-31 08:08:04 -07:00
Jörn Friedrich Dreyer	adb5de4a88	prefer closest over parent ... closest will search up the tree	2013-10-31 15:56:02 +01:00
Vincent Petry	35dd568f8f	Added missing comma to make the next diff cleaner	2013-10-31 15:12:26 +01:00
Jörn Friedrich Dreyer	a4be1ebeb8	use data-file to retrieve filename ... forward port of https://github.com/owncloud/core/pull/5647#discussion-diff-7341163 trust me, I know what I'm doing	2013-10-31 14:31:57 +01:00
Vincent Petry	1be1c57bc8	Corretly hide "no permissions" message in controls in viewer mode ... Fixes #5622	2013-10-31 12:34:15 +01:00
VicDeo	257084444b	Merge pull request #5628 from owncloud/files-fixsummary ... Fixed summary visibility check	2013-10-30 12:11:01 -07:00
Vincent Petry	cdb3c74632	Merge pull request #5633 from owncloud/files-createdropdownstayswithrightclick ... Prevent closing the create dropdown when right clicking in Firefox	2013-10-30 10:38:03 -07:00
Vincent Petry	19eeb618ff	Prevent closing the create dropdown when right clicking in Firefox ... Firefox sends a click event on the document when right clicking which makes pasting with right click into the field impossible. Fixes #5498	2013-10-30 17:55:41 +01:00
Jörn Friedrich Dreyer	fdaac99526	Merge pull request #5626 from owncloud/fix_search_in_shared_files ... count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected	2013-10-30 09:02:39 -07:00
Vincent Petry	aeac3186ee	Fixed summary visibility check ... Now using the integer values to check whether to show the summary parts instead of trying to parse the html code.	2013-10-30 16:14:08 +01:00
Vincent Petry	d21a5b45f3	Merge pull request #5549 from owncloud/encryption-insertmigrationentrywhenmissing ... Fixed encryption migration when entry is missing in DB	2013-10-30 07:49:49 -07:00
Jörn Friedrich Dreyer	68e88b6e40	count correct array, then using 1000 as MAX_SQL_CHUNK_SIZE works as expected	2013-10-30 15:48:38 +01:00
Bjoern Schiessle	abbacbacb4	remove unused variable	2013-10-30 11:39:30 +01:00
Bjoern Schiessle	6e77fa46f2	if the database doesn't contain any information about the recovery mode than we assume that it is disabled	2013-10-30 11:28:36 +01:00
Vincent Petry	4c7ef85252	Merge pull request #5616 from owncloud/fixing-l10n-master ... Fixing l10n master	2013-10-30 02:44:54 -07:00
Vincent Petry	de342a5ac7	Merge pull request #5603 from owncloud/fix_file_cache_updater_master ... Fix file cache updater (backport to master of #5513)	2013-10-30 02:31:08 -07:00
Jenkins for ownCloud	54ae799cd9	[tx-robot] updated from transifex	2013-10-30 03:33:25 -04:00
Thomas Müller	ffb0e14d7b	replacing ownCloud by theme-able name or avoid it's usage	2013-10-29 23:29:16 +01:00
Bjoern Schiessle	e1e4c7c214	Merge branch 'master' into fix_file_cache_updater_master	2013-10-29 17:47:33 +01:00
Thomas Müller	2534c3bc78	Merge pull request #5606 from owncloud/files-uploaderrorparsingfix ... Added fix to correctly parse non-array error messages	2013-10-29 09:23:19 -07:00
Morris Jobke	404e9c0053	fix style of public share page	2013-10-29 16:08:11 +01:00
Vincent Petry	71cf83b314	Added fix to correctly parse non-array error messages ... Some apps like the antivirus app return messages in a non-array format.	2013-10-29 16:00:34 +01:00
Morris Jobke	7223b5acce	Merge pull request #5396 from owncloud/fix-sharing-code ... Fix sharing error message - id -> file name	2013-10-29 07:33:23 -07:00
Bjoern Schiessle	fcfac51aa1	backport of https://github.com/owncloud/core/pull/5513	2013-10-29 15:08:12 +01:00
Jenkins for ownCloud	b0b76fe064	[tx-robot] updated from transifex	2013-10-29 07:31:51 -04:00
Thomas Müller	a90cefcea2	avoid usage of brand name 'ownCloud'	2013-10-28 21:42:48 +01:00
Vincent Petry	e41ea20ce4	Fixed clicking on the "Home" breadcrumb in the trash app ... Clicking on the "home" breadcrumb now correctly brings the user back to the files app.	2013-10-28 20:24:06 +01:00
Thomas Müller	ffc3bc1914	Merge pull request #5468 from berendt/reworking_OC_Files_Storage_Swift ... Reworking \OC\Files\Storage\Swift	2013-10-29 13:49:24 -07:00
Christian Berendt	70276ca520	settings tags for optional parameters	2013-10-29 10:21:50 +01:00
Christian Berendt	235bf5269d	extended parameter descriptions for Swift	2013-10-29 09:19:43 +01:00
Vincent Petry	efbd79198b	Fixed preview URL + size while dragging an existing file	2013-10-28 15:41:52 +01:00
Vincent Petry	e62ca4ea4f	Append file etag to preview URLs ... Fixes #5534	2013-10-28 14:14:55 +01:00
Jenkins for ownCloud	8df8211225	[tx-robot] updated from transifex	2013-10-27 07:27:22 -04:00
Andreas Fischer	eb2d66d1a0	Fix double not in newfile/newfolder language.	2013-10-27 11:53:14 +01:00
Jenkins for ownCloud	119ecc6f34	[tx-robot] updated from transifex	2013-10-27 02:32:11 -04:00
Vincent Petry	e246e2b669	Fixed encryption migration when entry is missing in DB ... When resetting the DB and some users still have encrypted files, the migration state isn't read properly becaue the migration entries are missing. This causes the wrong file size to be returned. This fix inserts the missing migration entry when this condition is met. Fixes #5541	2013-10-25 15:38:35 +02:00
Arthur Schiwon	81dbe7dab7	Port PR #5457 to master	2013-10-25 14:15:05 +02:00
Thomas Müller	f91a4c89ca	adding storage_mtime handling to SharedCache	2013-10-25 12:39:21 +02:00
Donald Buczek	3fc232370e	make sure the shared ldap connection is rebound to the configured user after being used for password checking.	2013-10-25 11:12:18 +02:00
Thomas Müller	5fd1f552a3	Merge pull request #5532 from owncloud/ldap_fixes ... Ldap fixes	2013-10-24 23:24:39 -07:00
Arthur Schiwon	c48157e3b8	LDAP: don't validate unconfigured (new) LDAP server configs, fixes #5518	2013-10-24 20:26:05 +02:00
Thomas Müller	222f1b8da2	Merge pull request #5494 from owncloud/fixing-3593-master ... introducing new dav property {xmlns:oc="http://owncloud.org/ns}id	2013-10-24 09:41:56 -07:00
Arthur Schiwon	7fa418c81a	LDAP Wizard: always show correct Back+Continue Buttons, fixes #5520	2013-10-24 18:21:02 +02:00
Christian Berendt	dd82481f59	add configuration parameter to manually set the timeout of HTTP requests	2013-10-24 16:19:17 +02:00
Arthur Schiwon	20f46602bd	LDAP: when multiline values are passed as array, do not try to preg_split them. Fixes #5521	2013-10-24 14:27:33 +02:00
Arthur Schiwon	6284e95e2b	typo, fixes #5517	2013-10-24 14:16:58 +02:00
Thomas Müller	535bc7b664	Merge pull request #5477 from owncloud/prevent_user_from_creating_or_renaming_to_an_existing_filename ... prevent user from creating or renaming sth. to an existing filename	2013-10-23 13:45:27 -07:00
Thomas Müller	e95ad29d90	Merge pull request #5435 from owncloud/share-improvements ... Share improvements	2013-10-23 09:56:24 -07:00
Thomas Müller	1317b7c03d	pass the name of the item source from the browser to the server - no need to get the data via complicated db queries	2013-10-23 18:39:37 +02:00
Jörn Friedrich Dreyer	4991a7bd06	fix translations	2013-10-23 17:02:41 +02:00
Bjoern Schiessle	2221aa9ca4	run first getUsersItemShared() with the owner	2013-10-23 16:34:26 +02:00
Bjoern Schiessle	60e219da43	update etags for user we haven't checked yet	2013-10-23 16:34:03 +02:00
Bjoern Schiessle	6ae761d946	keep a list of users we already checked to avoid loops	2013-10-23 16:33:44 +02:00
Bjoern Schiessle	dd972f65a8	fix infinite loop while updating etags, fix for #4365	2013-10-23 16:33:28 +02:00
Markus Goetz	af58360434	files_encryption: Fix getFileSize() ... For certain file sizes, we rounded to the wrong chunk number and the returned bogus results. This should fix https://github.com/owncloud/mirall/issues/1009 Conflicts: apps/files_encryption/tests/util.php	2013-10-23 16:28:43 +02:00
Thomas Müller	b60ae11db8	introducing new dav property {xmlns:oc="http://owncloud.org/ns}id	2013-10-23 16:03:57 +02:00
Arthur Schiwon	30c0f5dee6	LDAP Wizard: proper strings and translations for user and group count text	2013-10-23 12:20:13 +02:00
Jörn Friedrich Dreyer	3121dc8cb5	Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename ... Conflicts: apps/files/js/filelist.js	2013-10-23 12:02:06 +02:00
Arthur Schiwon	d78a80a689	merge master with resolved conflicts	2013-10-23 12:01:45 +02:00
Jörn Friedrich Dreyer	8ed73e5ced	use a more descriptive error message when the user tries to create '/Shared'	2013-10-23 11:08:30 +02:00
Jörn Friedrich Dreyer	a9735c8a6f	cleanup array value assignment	2013-10-23 11:01:05 +02:00
Jörn Friedrich Dreyer	af7ec3169b	cleanup precondition checking when creating new files / folders ... - use i18n - use trim when checking for empty file / folder name - use more verbose error descriptions	2013-10-23 10:59:01 +02:00
Jörn Friedrich Dreyer	bc0faa1c4e	use correct filename in error result json	2013-10-23 10:59:01 +02:00
Björn Schießle	2d14daf36b	Merge pull request #5472 from owncloud/enc_init_status_on_enable ... Encryption set init status on enable	2013-10-23 01:02:45 -07:00
Christian Berendt	128d3221cc	make Swift::testLocal workable by using a delimiter	2013-10-23 08:07:59 +02:00
Christian Berendt	a1e956263c	Revert "make Swift::testLocal workable by fixing the prefix used with the object listing in opendir" ... This reverts commit b92061da5a.	2013-10-23 08:01:32 +02:00
Christian Berendt	b92061da5a	make Swift::testLocal workable by fixing the prefix used with the object listing in opendir	2013-10-23 07:57:41 +02:00
Christopher Schäpers	70c0d7d6bc	Merge pull request #5310 from owncloud/hide_filestable-header_when_empty ... Hide files list header, when theres no files to see	2013-10-22 14:39:14 -07:00
Thomas Müller	cea1f80c1a	Merge pull request #5466 from owncloud/files-thumbnailloadingdelaystyle ... Fixed ugly white space while loading file thumbnail	2013-10-22 14:20:48 -07:00
Thomas Müller	e6aa7a8643	Merge pull request #5467 from owncloud/fixing-5063-master ... display the original file name - this will change in case of renames	2013-10-22 14:10:35 -07:00
Thomas Müller	9019ad550f	Merge branch 'master' into prevent_user_from_creating_or_renaming_to_an_existing_filename ... Conflicts: apps/files/js/filelist.js	2013-10-22 23:06:53 +02:00
Thomas Müller	ca3771f8fd	fixing js syntax error	2013-10-22 22:39:28 +02:00
Thomas Müller	bf46e0c317	fixing undefined variable $newname	2013-10-22 22:38:48 +02:00
Thomas Müller	0283589a19	adding PHPDoc comments	2013-10-22 22:38:05 +02:00
Jörn Friedrich Dreyer	45e6d96702	prevent user from creating or renaming sth. to an existing filename ... - show tooltip when violating naming constraints while typing - when target filename exists on server fallback to dialog to interrupt the users flow because something unexpected went wrong - fixes #5062 - also fixes some whitespace and codestyle issues in files js - uses css selector over filterAttr in touched js files	2013-10-22 18:11:03 +02:00
Vincent Petry	263f8bebfe	Added FileList.setViewerMode to hide controls ... Some files app embed themselves under the controls (like the text editor). The new method FileList.setViewerMode() makes it possible to properly show/hide the control buttons using the correct permissions. Apps using this approach must call setViewerMode(true) when starting and setViewerMode(false) upon closing to restore the controls. This is needed for #5284	2013-10-22 16:44:57 +02:00
Bjoern Schiessle	3d1d443529	remove debug output	2013-10-22 16:21:04 +02:00
Bjoern Schiessle	eb348b776c	set the init status to "NOT_INITIALIZED" if the encryption app gets enabled	2013-10-22 16:15:24 +02:00
Christian Berendt	506db6c63a	rewrite of OC\Files\Storage\Swift	2013-10-22 14:59:09 +02:00
Christian Berendt	452d0a20a6	renaming OC\Files\Storage\SWIFT to OC\Files\Storage\Swift	2013-10-22 14:22:03 +02:00
Thomas Müller	e23433f771	display the original file name - this will change in case of renames	2013-10-22 14:02:44 +02:00
Christian Berendt	e0bac3ec71	adapted existing test cases	2013-10-22 13:36:23 +02:00
Christian Berendt	f0d04f3ac6	adjustment of the configuration parameters	2013-10-22 13:34:24 +02:00
Christian Berendt	67779680a6	added stripped library php-opencloud (version 1.6.0)	2013-10-22 13:22:41 +02:00
Vincent Petry	3bb7cf939e	Fixed ugly white space while loading file thumbnail ... Preview images are now pre-loaded before being set on the file element. This fixes #5135 and prevents a white space to be displayed while the thumbnails is being loaded.	2013-10-22 12:08:05 +02:00
Thomas Müller	cadd71ec8a	Merge pull request #5455 from owncloud/fixing-2423-master ... introduce link_to_docs() and migrate links	2013-10-22 01:28:43 -07:00
Arthur Schiwon	76a195a0be	LDAP Wizard: l10n improvements	2013-10-21 23:15:21 +02:00
Vincent Petry	d1c27e08e5	Fixed empty content logic ... - Remove obsolete code that used another approach for hiding emptycontent - Fixed logic for the showing of the empty content message	2013-10-21 22:18:10 +02:00
Thomas Müller	148d2616e5	introduce link_to_docs() and migrate links	2013-10-21 21:29:45 +02:00
Vincent Petry	bd7cf436c6	Merge pull request #5441 from owncloud/files-sharewithlinkasnormaluserfix ... Fixed share with link checkbox missing as regular user	2013-10-21 11:46:01 -07:00
kondou	732e7db319	Fix mind-boggling emptycontent logic	2013-10-21 19:49:27 +02:00
Jenkins for ownCloud	a376407da3	[tx-robot] updated from transifex	2013-10-21 13:03:32 -04:00
kondou	7864a3bf07	Fix shared folder still showing fileheader	2013-10-21 17:59:51 +02:00
Vincent Petry	a1038c271c	Merge pull request #5424 from owncloud/sharing-directlink ... Added direct link in public share page	2013-10-21 08:26:51 -07:00
Vincent Petry	f8717bc260	Fixed share with link checkbox missing as regular user ... Instead of loading the app config setting "shareapi_allow_links" using a synchronous ajax call that fails when the user is not an admin, this fix puts the flag directly in the template so it doesn't need to be loaded afterwards. Fixes #5440	2013-10-21 11:29:40 +02:00
Jan-Christoph Borchardt	5ac4ec3a84	unbold the 'Direct link' label	2013-10-21 00:12:38 +03:00