8758 commits

Author	SHA1	Message	Date
Morris Jobke	fc9787ed64	fix layout of password protected shares ... * add password icon * fix upshifted arrow button - fixes #9024	2014-06-13 16:38:42 +02:00
Jörn Friedrich Dreyer	42bf466fa1	move mail template editor from core to standalone templateeditor repo	2014-06-13 12:00:23 +02:00
Jörn Friedrich Dreyer	7e8784c075	access admin settings result message correctly	2014-06-13 11:59:14 +02:00
Morris Jobke	b91db84050	Merge pull request #8714 from owncloud/minor-fixes ... fix some minor issues	2014-06-13 08:30:57 +02:00
Jenkins for ownCloud	083cf63cc2	[tx-robot] updated from transifex	2014-06-13 01:54:32 -04:00
Volkan Gezer	cea2c77fd2	fix some minor issues	2014-06-13 00:16:36 +02:00
Volkan Gezer	565f0b281c	some strings to localize external mount api responses. fix #8094	2014-06-12 20:31:07 +02:00
Jörn Friedrich Dreyer	72436b68bf	fix liskov substitution principle in admin mail template settings, fixes #8997	2014-06-12 12:38:34 +02:00
Jenkins for ownCloud	55b5ddd735	[tx-robot] updated from transifex	2014-06-12 01:54:34 -04:00
Vincent Petry	452b45ed1d	Merge pull request #8986 from owncloud/disable_tests ... disable failing tests	2014-06-11 18:34:35 +02:00
Vincent Petry	75a53b3c49	Merge pull request #8901 from owncloud/permissions-update-cache ... Save the permissions in the filecache if it's not saved yet	2014-06-11 18:28:55 +02:00
Bjoern Schiessle	4cef7f9d4b	disable failing tests	2014-06-11 17:21:57 +02:00
Vincent Petry	491c96eaa9	Merge pull request #8966 from owncloud/fix_failing_tests_on_master ... Fix failing tests on master	2014-06-11 10:05:38 +02:00
Jenkins for ownCloud	f769c52522	[tx-robot] updated from transifex	2014-06-11 01:55:07 -04:00
Bjoern Schiessle	f4a183e753	wwe no longer have a versions table	2014-06-10 14:47:32 +02:00
Bjoern Schiessle	1d9b4aadbf	no need to prepare a statement twice	2014-06-10 14:46:47 +02:00
Jenkins for ownCloud	6546b589ce	[tx-robot] updated from transifex	2014-06-10 01:54:54 -04:00
jbtbnl	b2c86b7a07	Merge pull request #8928 from owncloud/too-long-filename-fix-v2 ... Ellipcises too long filenames	2014-06-09 13:09:18 +02:00
Robin Appelman	a978607011	Use &=	2014-06-09 12:47:00 +02:00
Thomas Müller	961e4e5c7c	adjust unit test assert values	2014-06-09 12:44:40 +02:00
Thomas Müller	aa38bd2b31	adding PHPDoc	2014-06-09 12:34:35 +02:00
Jenkins for ownCloud	e5c47a5e30	[tx-robot] updated from transifex	2014-06-09 01:54:32 -04:00
Morris Jobke	e3429b63a2	improve ellipsis of filename for different screen sizes	2014-06-08 17:48:53 +02:00
raghunayyar	f3a605230a	@jancborchardt's commit for cross browser compatibility of extension.	2014-06-08 15:06:01 +05:30
Jenkins for ownCloud	1f2722053f	[tx-robot] updated from transifex	2014-06-08 01:56:13 -04:00
raghunayyar	09206f8a49	Adds class name to span element inside filename.	2014-06-07 23:54:21 +05:30
raghunayyar	d71bb7dbe4	Adds multiple media queries for filename.	2014-06-07 14:23:49 +05:30
Jenkins for ownCloud	e0446a1df5	[tx-robot] updated from transifex	2014-06-07 01:56:13 -04:00
Vincent Petry	506f7adb12	Merge pull request #8925 from owncloud/extstorage-sidebar ... Added external storage list in files app	2014-06-06 18:59:37 +02:00
Thomas Müller	647dcce514	Merge pull request #8253 from owncloud/pk-on-all-tables-master ... Primary keys on all tables master	2014-06-06 16:40:11 +02:00
Vincent Petry	e39e6a5584	Fixed delete button CSS in ext storage list	2014-06-06 15:33:33 +02:00
Vincent Petry	d3d0035a9a	Use actual file path on rename/delete ... When renaming or deleting a file that is in a subdirectory, performing the action from the sharing overview or another file list view, the actual directory of the file must be used instead of the current directory.	2014-06-06 15:17:55 +02:00
Vincent Petry	710d017eec	Added more columns to ext storage list ... Now using system mount and personal mount calls to get the relevant mount points including backend information.	2014-06-06 15:06:26 +02:00
Vincent Petry	a47ef52ae2	Fixed ext storage list sorting	2014-06-06 15:06:26 +02:00
Vincent Petry	01c2c3107a	Added external storage list in files app	2014-06-06 15:06:26 +02:00
Jan-Christoph Borchardt	933c05566e	Merge pull request #8922 from owncloud/design-controls-transparency ... Bugfixes for mobile	2014-06-06 14:52:55 +02:00
Jan-Christoph Borchardt	1a519b851d	Merge pull request #8923 from owncloud/app-settings-input ... app settings: display input fields at full width	2014-06-06 14:52:23 +02:00
raghunayyar	1d1f958bea	Ellipcises too long filenames	2014-06-06 17:30:18 +05:30
Thomas Müller	fe8bae31dc	adding PK to table encryption ... adding auto increment/PK to table files_trash adding PK to table ldap_user_mapping and ldap_group_members adding PK to table ldap_group_mapping truncate permissions table to allow smooth creation of primary key adding unit test for creating an auto increment column on a table which already contains data remove unneeded table files_trashsizes fix unit test no need to truncate *PREFIX*permissions On Oracle adding auto increment columns is not working out of the box - Oracle migrations are to be done manually	2014-06-06 13:33:56 +02:00
Vincent Petry	5cebb6fb9b	Merge pull request #4553 from owncloud/update_search_classes ... Update search classes	2014-06-06 13:24:16 +02:00
Jan-Christoph Borchardt	08b5f787cc	app settings: display input fields at full width	2014-06-06 13:01:24 +02:00
Jörn Friedrich Dreyer	7af67eb630	increase version number of files and migration trigger	2014-06-06 12:28:36 +02:00
Jan-Christoph Borchardt	23c83c076c	unify controls bar, remove duplicate from user management	2014-06-06 12:22:09 +02:00
Jörn Friedrich Dreyer	a59b5249d3	add more and fix office mimetypes, migrate wrong mimetypes	2014-06-06 12:00:25 +02:00
icewind1991	c47d4ebbac	Merge pull request #8666 from owncloud/mount-remove ... Support for (re)moving mountpoints	2014-06-06 11:57:43 +02:00
Thomas Müller	289accc31b	Merge pull request #8159 from owncloud/mobile-sidebar-swipe ... Mobile sidebar swipe	2014-06-06 11:27:04 +02:00
Jörn Friedrich Dreyer	2801f0f222	use non static access to search	2014-06-06 11:02:05 +02:00
Vincent Petry	b2bae9313d	Fixed viewer mode for sidebar swipe	2014-06-06 10:04:28 +02:00
Bjoern Schiessle	0b2ae314c7	check if permissions exists	2014-06-06 09:56:02 +02:00
Robin Appelman	60ea4388ed	Limit permissions to share permissions	2014-06-06 09:56:02 +02:00
Bjoern Schiessle	86d7371d0c	fix unshareFromSelf()	2014-06-06 09:56:02 +02:00
Bjoern Schiessle	09970e1816	update unit tests and make sure that we return the right permissions for files within a shared folder and for the shared folder itself	2014-06-06 09:56:02 +02:00
Bjoern Schiessle	574de2d91b	the mount point always have delete permissions to allow unmount	2014-06-06 09:56:01 +02:00
Bjoern Schiessle	ca6631a710	add some tests	2014-06-06 09:56:01 +02:00
Bjoern Schiessle	ad5d8d7980	nake sure ti create new db entry when user renames a group share	2014-06-06 09:56:01 +02:00
Robin Appelman	ea07f0a18e	Fix unit test	2014-06-06 09:56:01 +02:00
Robin Appelman	28615cca9c	Fix unit tests	2014-06-06 09:56:01 +02:00
Bjoern Schiessle	a5752a8463	fix db query	2014-06-06 09:56:01 +02:00
Robin Appelman	42a362f249	Fix phpdoc and comments	2014-06-06 09:56:01 +02:00
Bjoern Schiessle	501f98f084	update share API tests, file shares never have delete permissions	2014-06-06 09:56:00 +02:00
Bjoern Schiessle	9a48e87253	make sure that we have a path relative to data/user/files to work with	2014-06-06 09:56:00 +02:00
Bjoern Schiessle	0ce07bb6c4	update mount point if file_target changed	2014-06-06 09:56:00 +02:00
Bjoern Schiessle	844b1e3fc6	add additional unit tests	2014-06-06 09:56:00 +02:00
Bjoern Schiessle	cf5eb0fef5	remove unused variable	2014-06-06 09:56:00 +02:00
Bjoern Schiessle	24f3f6823e	get unique_name value directly from the share array	2014-06-06 09:56:00 +02:00
Bjoern Schiessle	5132ae5e69	fix mount point move up if the parent no longer exists	2014-06-06 09:56:00 +02:00
Bjoern Schiessle	884b9a0ecf	bring back updateFileTarget() got lost during last rebase	2014-06-06 09:56:00 +02:00
Bjoern Schiessle	329bfd81c3	remove encryption keys if user unshares a file	2014-06-06 09:55:59 +02:00
Bjoern Schiessle	1b0b977678	remove share mount	2014-06-06 09:55:59 +02:00
Robin Appelman	dea5219244	Fix folder name for storage root	2014-06-06 09:55:59 +02:00
Bjoern Schiessle	bf5e9357fc	don't allow to share single files with delete permissions, user should only be possible to unshare a single file but never to delete it	2014-06-06 09:55:59 +02:00
Robin Appelman	a66c2e6a47	Fix the removeMount for personal mounts	2014-06-06 09:55:59 +02:00
Robin Appelman	14ce44acc8	Move shared mount moving from the storage to the mount	2014-06-06 09:55:59 +02:00
Robin Appelman	cabe2873c4	Make personal external mount points (re)movable from the files app	2014-06-06 09:55:59 +02:00
Jenkins for ownCloud	ca739a59f0	[tx-robot] updated from transifex	2014-06-06 01:57:10 -04:00
Jan-Christoph Borchardt	9063a25bb4	slightly widen sidebar to 250px, works better with apps and on mobile	2014-06-05 21:19:28 +02:00
Jörn Friedrich Dreyer	9b63f945e3	decode filename for scrollto	2014-06-05 19:23:44 +02:00
Jan-Christoph Borchardt	990405d6ee	fix position of sidebar toggle, fix Files controls position problems	2014-06-05 17:21:49 +02:00
Thomas Müller	e9011a8c55	adding unit tests for encryption data migration	2014-06-05 16:54:04 +02:00
Bjoern Schiessle	eb29b2984c	use oc_preferences instead of oc_encryption to store encyption settings	2014-06-05 16:54:04 +02:00
Arthur Schiwon	928945ec7e	fix typo in var name	2014-06-05 16:16:08 +02:00
Jan-Christoph Borchardt	dca5a03f8b	fix files multiselect bar now that the app list is gone	2014-06-05 13:23:08 +02:00
Thomas Müller	e34b51124b	Merge pull request #8894 from owncloud/public-share-js-overwrite ... Dont overwrite OCA.Sharing	2014-06-05 13:04:30 +02:00
Thomas Müller	f955209a5a	Merge pull request #8890 from owncloud/cleanup-trashsizes-table-master ... table files_trashsizes was still used in some locations -> removed	2014-06-05 13:00:50 +02:00
Robin Appelman	690e0b5070	Dont overwrite OCA.Sharing	2014-06-05 12:52:08 +02:00
Thomas Müller	d0eb8f8668	Merge pull request #8880 from owncloud/webdav-read-permissions ... Use the permissions exposed by ownCloud for webdav external storages	2014-06-05 11:38:02 +02:00
Bernhard Posselt	844c6c3328	use slide toggle for files app	2014-06-05 11:26:24 +02:00
Vincent Petry	e0c4e960d9	Merge pull request #8861 from owncloud/share-overview-linklist ... Added Shared with link sidebar section in files app	2014-06-05 10:59:54 +02:00
Thomas Müller	1c20c72efe	Merge pull request #8620 from owncloud/design-navigation-two ... Toggle app navigation not only on mobile, but on desktop as well	2014-06-05 10:53:22 +02:00
Thomas Müller	6fcd135d0e	table files_trashsizes was still used in some locations -> removed	2014-06-05 10:44:32 +02:00
icewind1991	09cc7c2d44	Merge pull request #8862 from owncloud/share-overview-fixmimetype ... Fix mime type returning for shared with others files	2014-06-05 10:29:03 +02:00
Thomas Müller	ff3ded6cb2	Merge pull request #8852 from owncloud/kill-permissions-master ... Kill permissions table	2014-06-05 10:05:05 +02:00
Thomas Müller	da3974bcb2	- drop permissions table and related code ... - the file/folder's permission is now stored in the file cache - BackGroundWatcher has been removed - this has meanwhile be replaced by occ files:scan which can be executed in a cron jobs - increase version to trigger database migration	2014-06-05 08:22:01 +02:00
Jenkins for ownCloud	cb61d8a226	[tx-robot] updated from transifex	2014-06-05 01:57:20 -04:00
Thomas Müller	c044ff99ce	Merge pull request #8724 from owncloud/update-sabre-2.0 ... Update SabreDAV to 1.8.10	2014-06-04 23:05:34 +02:00
Morris Jobke	7a20d22daa	Merge pull request #8824 from owncloud/mail_template_editing_in_webui ... minimal mail template editor for administrators	2014-06-04 18:44:44 +02:00
Robin Appelman	9eb177e8bc	Use the permissions exposed by ownCloud for webdav external storages	2014-06-04 18:19:52 +02:00
Thomas Müller	a2db53b928	Merge pull request #8471 from owncloud/versioning_no_longer_track_the_size ... [versioning] let the file cache track the size of the versions	2014-06-04 18:19:48 +02:00
Morris Jobke	ca43fba513	Merge pull request #8791 from owncloud/share-overview-sharewithstatus ... Update share action text to display owner/recipients	2014-06-04 17:04:30 +02:00
Jan-Christoph Borchardt	411e6525b1	remove obsolete position rule from files app	2014-06-04 16:50:55 +02:00
Thomas Müller	fc1d6f4c3c	fixes during test	2014-06-04 15:01:36 +02:00
Jan-Christoph Borchardt	e2e05c4798	adjust controls bar position for removed nav bar	2014-06-04 14:29:46 +02:00
Thomas Müller	76e04027bc	Upgrade SabreDAV to 1.8.10 ... Updating SabreDAV namespaces	2014-06-04 12:22:23 +02:00
Vincent Petry	816db7aef1	Fixed wording to "Shared by link"	2014-06-04 11:32:30 +02:00
Vincent Petry	c88509902e	Fix mime type returning for "shared with others" files ... Use "path" instead of "file_target", as the latter is not always set / reliable.	2014-06-04 11:26:03 +02:00
Vincent Petry	b3fdda1751	Added "Shared with link" sidebar section in files app ... Added section to only show link shares. Please note that the filtering is currently done on the client side which might not be the most efficient way of doing it.	2014-06-04 11:10:11 +02:00
Vincent Petry	af6a65cbf3	Do not update action icon recipients for file list ... Since the files app doesn't have the recipient information on load it cannot initially render the recipients in the action icons. For this reason the action icon will not be updated with the recipients after changing the shares, for consistency.	2014-06-04 10:48:01 +02:00
Vincent Petry	07f1b263c9	Use recipient display names when updating shares in the UI ... Since OC.Share didn't have any array containing the list of shares for the current file, OC.Share.currentShares has been introduced to contain the full share item structure instead of the reduced one OC.Share.itemShares. The event "sharesChanged" is now passing OC.Share.currentShares, which itself includes the display name to be displayed for the recipients in the action icon.	2014-06-04 10:37:04 +02:00
Thomas Müller	4ab77f90d2	Merge pull request #8662 from owncloud/f-lock ... f-lock	2014-06-04 10:26:02 +02:00
Thomas Müller	9e31118675	Merge pull request #8842 from owncloud/ldap_cli_methods ... command line tools to see, modify and test existing LDAP configurations	2014-06-04 09:37:04 +02:00
Thomas Müller	86623358f0	Merge pull request #8849 from owncloud/trash_expire_fix ... get files in trash from file cache	2014-06-04 09:36:40 +02:00
Thomas Müller	9f3fcf036c	fixing typo	2014-06-04 09:36:27 +02:00
Jan-Christoph Borchardt	6b2b903ea6	Merge pull request #8468 from owncloud/remove-infieldlabels ... Remove infieldlabels	2014-06-04 09:28:20 +02:00
Thomas Müller	917f389747	workaround to get the unit test going	2014-06-04 08:21:28 +02:00
Jenkins for ownCloud	f5c4754c2b	[tx-robot] updated from transifex	2014-06-04 01:57:48 -04:00
Bjoern Schiessle	2c8288d8f9	get the storage from the view	2014-06-04 07:55:46 +02:00
Bjoern Schiessle	3a698bce6e	don't ask for fileInfo if we already have one	2014-06-04 07:55:45 +02:00
Bjoern Schiessle	e6712bc12e	make sure to close the stream at the end of each test	2014-06-04 07:55:45 +02:00
ringmaster	dc1e3620d2	Continued flock work.	2014-06-04 07:55:44 +02:00
ringmaster	5365ae416e	flock changes. Work in progress.	2014-06-04 07:55:44 +02:00
Thomas Müller	6764d5b122	Merge pull request #8698 from owncloud/sharing_improve_permissions ... get permissions directly from share storage to avoid additional db calls	2014-06-03 19:13:51 +02:00
Thomas Müller	70ae7fa091	Fix casing and PHPDoc	2014-06-03 19:10:18 +02:00
blizzz	21d1e5eccc	Merge pull request #7930 from owncloud/fix_7785_master ... LDAP: put out fetching of user meta data into a fully tested class of it...	2014-06-03 19:09:33 +02:00
Thomas Müller	8ee15025f0	Fix merge conflict	2014-06-03 19:05:21 +02:00
Jörn Friedrich Dreyer	b5a145b297	convert mail template editor to app framework for a restful api	2014-06-03 16:53:03 +02:00
Morris Jobke	f87a91fa00	Merge pull request #8837 from owncloud/issue/8720 ... Fix cursor and background of app navigation	2014-06-03 16:46:04 +02:00
Bjoern Schiessle	05cf34ea1f	get files in trash from file cache	2014-06-03 16:45:11 +02:00
Thomas Müller	cfc1d5623e	Merge pull request #8840 from owncloud/share_settings ... by default don't show option to send mail notifications for shares	2014-06-03 16:42:44 +02:00
Jan-Christoph Borchardt	4ef94ddd2e	infield label removal: remove last occurences of infield labels	2014-06-03 15:30:09 +02:00
Jan-Christoph Borchardt	69e5d5b8c0	remove specific sidebar size from Files app	2014-06-03 13:24:44 +02:00
Arthur Schiwon	e962999896	get rid of @read in PHP doc after rebase	2014-06-03 13:01:14 +02:00
Arthur Schiwon	ba82d80f32	adjust group tests	2014-06-03 12:59:11 +02:00
Arthur Schiwon	3fed96af0e	clean up	2014-06-03 12:59:11 +02:00
Arthur Schiwon	f9a9085faf	class descriptions	2014-06-03 12:59:10 +02:00
Arthur Schiwon	5336e9a156	newlines	2014-06-03 12:59:10 +02:00
Arthur Schiwon	d52fbd7e55	adjust test to changed convention in storing quota	2014-06-03 12:59:10 +02:00
Arthur Schiwon	342e1fd3bf	port of PR #8038	2014-06-03 12:59:10 +02:00
Arthur Schiwon	11f7823e1b	precaution: lowercase string for comparison	2014-06-03 12:59:10 +02:00
Arthur Schiwon	e07ebdd7d0	adjust user backend test	2014-06-03 12:59:10 +02:00
Arthur Schiwon	e32fa3de4a	fix parameter order	2014-06-03 12:59:10 +02:00
Arthur Schiwon	b0d1b2557c	adjust Access test	2014-06-03 12:59:09 +02:00
Arthur Schiwon	6d64d7ec3f	LDAP: put out fetching of user meta data into a fully tested class of its own and update them (mail, quota, etc.) directly after mapping. Fixes #7785 properly on master	2014-06-03 12:59:09 +02:00
Arthur Schiwon	75d320cc91	fix description texts	2014-06-03 12:36:42 +02:00
Arthur Schiwon	4bfb162558	command line tools to see, modify and test existing LDAP configurations	2014-06-03 12:35:18 +02:00
Thomas Müller	d3e830e938	Merge pull request #8729 from owncloud/add-phpseclib-master ... use phpseclib from 3rdparty	2014-06-03 12:19:04 +02:00
Thomas Müller	17cbfc714a	use phpseclib from 3rdparty ... rename class Crypt_Blowfish to Legacy_Crypt_Blowfish	2014-06-03 12:18:30 +02:00
Joas Schilling	1d0ac9a2c5	Fix tests	2014-06-03 11:45:53 +02:00
Bjoern Schiessle	8e583f55dc	set "allow users to send mail notification for shared files default" setting to "no" now that we have the activity app	2014-06-03 11:29:28 +02:00
Vincent Petry	1297b2b883	Multiple fixes to sharing overview ... - scrolling to next page now correctly renders share icons - reshareing/unsharing a reshare will now still keep "Shared by" label	2014-06-03 11:04:57 +02:00
Joas Schilling	74e2a4b154	Use active instead of hover for active sidebar option ... Fix #8720	2014-06-03 09:57:18 +02:00
Joas Schilling	74c647bb6a	Do not overwrite cursor in sidebar	2014-06-03 09:55:50 +02:00
Morris Jobke	7ad7f59162	fix empty file handling option	2014-06-03 09:38:19 +02:00
Jan-Christoph Borchardt	6270902650	Merge pull request #8821 from owncloud/kill-zip-download-restriction ... drop allowZIPdownload and maxZIPSize as options	2014-06-03 01:47:40 +02:00
Frank Karlitschek	f12a5248a3	Merge pull request #8820 from owncloud/design-details ... Design details	2014-06-02 21:26:43 +02:00
Bjoern Schiessle	916f859377	check if it is a share storage	2014-06-02 20:39:20 +02:00
Thomas Müller	2a10e78c58	no need to empty array in a special way	2014-06-02 20:17:40 +02:00
Bjoern Schiessle	e0a5f3b570	get permissions directly from share storage to avoid additional db calls	2014-06-02 20:17:40 +02:00
Jörn Friedrich Dreyer	37afab87b5	minimal mail template editor for administrators, refs #7177	2014-06-02 19:22:58 +02:00
Thomas Müller	2bb902d028	use OC_DB::dropTable()	2014-06-02 18:57:53 +02:00
Bjoern Schiessle	a7f6a051ad	return size '0' if the trashbin folder doesn't exists yet	2014-06-02 18:56:04 +02:00
Bjoern Schiessle	7ad0fee0b5	let file cache handle the versions size	2014-06-02 18:55:13 +02:00
Vincent Petry	640fbc016d	Now using shareOwner for the share owner ... Makes it consistent with the regular file list fileData	2014-06-02 18:52:31 +02:00
Morris Jobke	da090099f4	fix unit tests	2014-06-02 18:39:52 +02:00
Morris Jobke	9a67986473	add OCP\Config:deleteSystemValue	2014-06-02 18:31:43 +02:00
Morris Jobke	390d8e53b4	Merge pull request #8676 from owncloud/encryption_improvements ... cleanup encryption code, improved return codes	2014-06-02 18:28:18 +02:00
Vincent Petry	0944565f60	More unit tests and fixes for share	2014-06-02 18:08:56 +02:00
Morris Jobke	dd8b7b7af8	Merge pull request #8613 from owncloud/filesize-alignment ... Improve aligment of file size	2014-06-02 17:37:53 +02:00
Jan-Christoph Borchardt	cd61fb06eb	move Deleted Files to bottom of sidebar	2014-06-02 17:33:42 +02:00
Morris Jobke	bdfad3440c	fix success status symbol to a circle	2014-06-02 17:25:08 +02:00
Morris Jobke	079b709f28	bump version	2014-06-02 16:47:15 +02:00
Morris Jobke	57ef089aac	drop allowZIPdownload and maxZIPSize as options	2014-06-02 16:29:03 +02:00
Jan-Christoph Borchardt	3b4004f9e5	more subtle hover effect on sortable column, text instead of background	2014-06-02 16:23:22 +02:00
Vincent Petry	d677e3860d	Added unit tests for share.js and share icon	2014-06-02 15:59:06 +02:00
Jan-Christoph Borchardt	a447caf8d3	fix misalignment of modified dates, shift to right	2014-06-02 15:55:49 +02:00
Frank Karlitschek	51602f67e0	Merge pull request #8712 from owncloud/l10n-fully-translatable-webdav ... fully translatable user_webdav	2014-06-02 15:53:18 +02:00
Jan-Christoph Borchardt	708758f34e	remove unused table sizing CSS	2014-06-02 15:52:57 +02:00
Morris Jobke	5d457dafc1	display "<1 kB" for really small files ... * added parameters for humanFileSize to trigger that behaviour * add unit tests for that	2014-06-02 15:33:09 +02:00
Bjoern Schiessle	b16b17f920	ceanup encryption code, improved return codes	2014-06-02 13:15:11 +02:00
Vincent Petry	7961d4a87e	Update share action text to display owner/recipients ... - when a share was changed, update the share action text - added file data attribute "data-share-recipients"	2014-06-02 12:12:57 +02:00
Arthur Schiwon	f0e69b2b99	Port LDAP: fix filter can be reset and broken after upgrade from OC 5 #8579 ... LDAP: set filter mode to raw, so filters will not be changed and broken after upgrade from oc5, when visiting the LDAP settings and opening filter tabs get the correct version number for compare -.- bump version and don't overwrite values on next update if not necessary simpler and better readable assignment	2014-06-02 12:08:01 +02:00
Jenkins for ownCloud	d39216c5e7	[tx-robot] updated from transifex	2014-06-02 01:54:37 -04:00
Jenkins for ownCloud	36b0c599f5	[tx-robot] updated from transifex	2014-06-01 01:55:19 -04:00
Jenkins for ownCloud	cff9440a37	[tx-robot] updated from transifex	2014-05-31 01:55:46 -04:00
Thomas Müller	5dd3e34f57	Merge pull request #8444 from owncloud/cleanup-list-code ... Cleanup code of files_sharing/ajax/ a little bit	2014-05-30 22:40:28 +02:00
Lukas Reschke	b7f163a701	Merge pull request #8695 from owncloud/jserrorfixes ... Fixed undefined object error that appears after a delay	2014-05-30 17:20:09 +02:00
Vincent Petry	c8a19adc3a	Merge pull request #8779 from owncloud/sel-webdav-onclick ... select webdav address on click	2014-05-30 17:18:54 +02:00
Lukas Reschke	756b158230	Merge pull request #8663 from owncloud/files-dndissue ... Fixed drag and drop from external files, added tests	2014-05-30 16:28:20 +02:00
Volkan Gezer	d7e63d8fab	select webdav address on click	2014-05-30 15:39:25 +02:00
icewind1991	2ba5701b1a	Merge pull request #8778 from owncloud/storage-instanceof ... Add storage->instanceOfStorage() to handle instanceof with storage wrappers	2014-05-30 14:58:59 +02:00
Vincent Petry	7fac2b62e9	Fixed warning when file_target is not set ... In some cases (like in the unit tests) "file_target" is not set yet whenever the target file system hasn't been mounted yet.	2014-05-30 12:35:04 +02:00
Vincent Petry	5e4e773446	Removed "Share with" column	2014-05-30 10:06:30 +02:00
Vincent Petry	e084183d1e	Added owner display name in action	2014-05-30 10:06:29 +02:00
Vincent Petry	1d9129eac3	Sharing overview fixes and unit tests ... - Fixed renaming and fileActionsReady event - Added unit tests for shares list - Fixed public page with defer - Fixed file actions in sharing overview - Fixed sharing counterpart list (10 entries max) - Fixed file path attribute to be used in download action - Fix sharing list headers - OC.Share icons now operate on fileList instance - Fix OC.Share.updateIcon when more than one list in DOM	2014-05-30 10:06:29 +02:00
Vincent Petry	6fbf4d8548	Fix table header colors ... Table headers should be 999 even when using links (introduced by the sorting feature) When selecting with checkboxes, they must appear black.	2014-05-30 10:06:29 +02:00
Vincent Petry	0879a63320	Mimetype for sharing overview	2014-05-30 10:06:29 +02:00
Vincent Petry	ef59c69dc8	Distinguish legacy file actions from regular file actions ... Legacy file actions are registered by legacy apps through window.FileActions.register(). These actions can only be used by the main file list ("all files") because legacy apps can only deal with a single list / container. New file actions of compatible apps must be registered through OCA.Files.fileActions. These will be used for other lists like the sharing overview. Fixed versions and sharing actions to use OCA.Files.fileActions, which makes them available in the sharing overview list.	2014-05-30 10:06:29 +02:00
Vincent Petry	fa32243d84	Small fixes to sharing overview ... - Removed file size from file summary in sharing overview - Fixed document title - Fixed empty content text for shared overview	2014-05-30 10:06:29 +02:00
Vincent Petry	06e53b359a	Added "dir" in file actions handler context and fixed versions ... Added "dir" in file actions handler context so that handlers can know what the path of the file was without having to look it up from the file list. Fixed versions app to use the context.dir instead of the old $('#dir') element. This makes the versions popup work in the sharing overview.	2014-05-30 10:06:29 +02:00
Vincent Petry	d21b8108c8	Fixed navigation order	2014-05-30 10:06:29 +02:00
Vincent Petry	89ff2857fc	Add unit tests for fileActionsReady	2014-05-30 10:06:29 +02:00
Vincent Petry	8bdce6698c	Added unit test for file action context argument	2014-05-30 10:06:29 +02:00
Vincent Petry	0f105ec747	Removed selection checkboxes	2014-05-30 10:06:29 +02:00
Vincent Petry	85648def56	Fixed sharing permissions	2014-05-30 10:06:29 +02:00
Vincent Petry	60bcdc550e	Fixed file actions for sharing views ... FileActions can now be clone to be use for separate file list views without having the side-effect of affecting the main file list view. Added "Open" action in sharing overview file lists to redirect to the regular file list when clicking on a folder.	2014-05-30 10:06:29 +02:00
Vincent Petry	279ede33af	Improved FileActions with context ... A context hash is now passed to file action handlers which makes it possible to have file list specific file actions.	2014-05-30 10:06:29 +02:00
Vincent Petry	9baf47c2b4	Group shares by type	2014-05-30 10:06:29 +02:00
Vincent Petry	6ebc436505	Added sharing overview page (WIP) ... - added sharing overview entries in the sidebar - use OCS Share API to get the list of files	2014-05-30 10:06:29 +02:00
Bjoern Schiessle	dbbb6c5945	extend OCS Share API to allow the user to ask for files shared with him	2014-05-30 10:06:28 +02:00
Jenkins for ownCloud	929882a32a	[tx-robot] updated from transifex	2014-05-30 01:55:11 -04:00
Lukas Reschke	b14564480e	Merge pull request #8773 from owncloud/l10n-tipsy-delete ... show delete hint text on hovering trash	2014-05-29 21:30:50 +02:00
Robin McCorkell	32a50563d3	Merge pull request #8771 from owncloud/enc_get_mount_from_mountmanager ... get mount point from mount manager	2014-05-29 17:52:28 +01:00
Robin Appelman	99d46af0b4	Use instanceOfStorage instead of instanceof	2014-05-29 13:52:58 +02:00
Jenkins for ownCloud	368006c7af	[tx-robot] updated from transifex	2014-05-29 01:54:40 -04:00
Volkan Gezer	b713f15b99	document always links to the current version of OC	2014-05-29 01:30:24 +02:00
Volkan Gezer	43c6ece31a	fully translatable user_webdav	2014-05-29 00:23:23 +02:00
Volkan Gezer	f7cc07ba41	show delete hint text on hovering trash	2014-05-28 20:27:28 +02:00
Bjoern Schiessle	9ed5083efd	get mount point from mount manager	2014-05-28 17:28:31 +02:00
Jenkins for ownCloud	80641cae72	[tx-robot] updated from transifex	2014-05-28 01:56:09 -04:00
Thomas Müller	4e2cdb2f8a	Merge pull request #8713 from owncloud/typo-files-encr ... fix grammar	2014-05-27 23:03:32 +02:00
Volkan Gezer	8eee8e76d1	forgotten infobox messages translations	2014-05-27 16:39:22 +02:00
Vincent Petry	a9661962fe	Merge pull request #8736 from owncloud/appinfo-newrequirefields ... App info new fields "requiremin" and "requiremax"	2014-05-27 14:28:47 +02:00
Vincent Petry	d38f867055	Merge pull request #8721 from owncloud/sharing_don_lose_filesize ... don't lose file size during rename	2014-05-27 12:25:55 +02:00
Vincent Petry	c64e920b4d	Adjust core apps to use "requiremin" instead of "require" ... Also added a few missing authors.	2014-05-27 11:54:44 +02:00
Vincent Petry	a79f3fd1c0	Merge pull request #8728 from owncloud/sharing_fix_reshare ... allow resharing of files with only share permissions	2014-05-27 09:02:52 +02:00
Jenkins for ownCloud	a756666585	[tx-robot] updated from transifex	2014-05-27 01:54:54 -04:00
Bjoern Schiessle	36f63ea990	allow resharing of files with only share permissions	2014-05-26 20:32:24 +02:00
Bjoern Schiessle	95bd7fee9c	don't lose file size during rename	2014-05-26 14:11:33 +02:00
Jenkins for ownCloud	790c0e8e7c	[tx-robot] updated from transifex	2014-05-26 01:55:36 -04:00
Volkan Gezer	59125cb796	fix grammar	2014-05-25 20:42:52 +02:00
Volkan Gezer	f880734827	make user_ldap fully translatable	2014-05-25 14:41:59 +02:00
Thomas Müller	3348019bfa	Merge pull request #8705 from wakeup/master ... fix typo	2014-05-25 11:00:34 +02:00
Jenkins for ownCloud	3029029afd	[tx-robot] updated from transifex	2014-05-25 01:54:35 -04:00
Volkan Gezer	426f492f57	fix typo ... Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/) on transifex	2014-05-24 14:36:10 +02:00
Lukas Reschke	1b215b0131	Merge pull request #8688 from owncloud/public-image-positioning ... Show less whitespace above publicly shared images	2014-05-24 12:49:12 +02:00
Jenkins for ownCloud	2afdd1bf1a	[tx-robot] updated from transifex	2014-05-24 01:55:34 -04:00
Björn Schießle	864cd2455c	Merge pull request #8699 from owncloud/sharing_improvements ... fix share label creation	2014-05-23 20:53:32 +02:00
Bjoern Schiessle	ff4bb3a9e6	fix share label creation	2014-05-23 16:21:15 +02:00
Vincent Petry	caf283615d	Fixed undefined object error that appears after a delay ... Now binding properly with the file list instance object.	2014-05-23 16:13:35 +02:00
Jan-Christoph Borchardt	7be0ce6ada	remove noise texture from interface (not necessary, and blurry on high-res)	2014-05-23 14:15:36 +02:00
Robin Appelman	10c1fc8d24	Show less whitespace above publicly shared images	2014-05-23 13:36:16 +02:00
Björn Schießle	71e1d919de	Merge pull request #8675 from owncloud/sharing-improvements ... Sharing improvements	2014-05-23 06:41:34 -04:00
Vincent Petry	0b0e038b8b	Merge pull request #8671 from owncloud/log-upload-errors ... php upload errors are written to log	2014-05-23 11:33:14 +02:00
Bjoern Schiessle	3b279c9056	prevent default action when clicking on the share notification	2014-05-23 11:17:13 +02:00
Thomas Müller	6ffb139a46	Merge pull request #8658 from realriot/master ... Changed access mode for Dropbox to 'auto'	2014-05-23 10:14:09 +02:00
Robin Appelman	157b139b57	Dont scale up the preview for publicly shared images	2014-05-22 16:45:51 +02:00
Bjoern Schiessle	11aa2cf74b	always check for unique filename, if a file gets added from outside the mount ... point should be adjusted to ne unique again	2014-05-22 14:31:22 +02:00
Bjoern Schiessle	1166d62d9b	fileList needs be be declared before the if-statement	2014-05-22 14:31:16 +02:00
Björn Schießle	050df76830	Merge pull request #8599 from owncloud/sharing_disable_for_groups ... allow admin to disable sharing for specific groups of users	2014-05-22 08:19:27 -04:00
Thomas Müller	201cc59fe0	php upload errors are written to log	2014-05-22 12:20:27 +02:00
Vincent Petry	d6e1643a0e	Fix dropping files below the table	2014-05-22 11:16:42 +02:00
Bjoern Schiessle	12338e0ef0	allow admin to disable sharing for specific groups of users	2014-05-22 10:43:44 +02:00
Robin McCorkell	856c48bc25	Use default priority of 100 if backend default is not set	2014-05-21 22:31:18 +01:00
Robin McCorkell	da03ef25d9	Add priority overriding comments	2014-05-21 22:29:16 +01:00
Robin McCorkell	0a8a319915	Fix priority merging logic and add unit test	2014-05-21 22:18:22 +01:00
Robin McCorkell	eae45dca71	Add unit tests	2014-05-21 22:18:22 +01:00
Robin McCorkell	2254678a0c	Use constants for priority type and add comments	2014-05-21 22:17:21 +01:00
Robin McCorkell	a0ccb060fa	Use more strict type comparisons	2014-05-21 22:17:21 +01:00
Robin McCorkell	e4d3ee7866	Preserve priority if already set	2014-05-21 22:17:21 +01:00
Robin McCorkell	9151d72507	Treat 'all users' as 'global' ... A mount applicable to all users is as good a definition of global as can be	2014-05-21 22:17:21 +01:00
Robin McCorkell	05642733a3	Add storage priority support ... Each storage backend has a default priority, assigned to any system mounts created in ownCloud. mount.json can be manually modified to change these priorities. The priority order is as follows: * Personal * User * Group * Global Within each mount type, the mount with the highest priority is active. The storage backend defaults were chosen to be the following: * Local - 150 * Remote storage - 100 * SMB / CIFS with OC login - 90	2014-05-21 22:17:21 +01:00
Björn Schießle	14a953fbe0	Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible ... [sharing] move the mount point up if the parent folder no longer exists	2014-05-21 14:07:49 -04:00
Vincent Petry	542b395858	Fixed drag and drop from external files, added tests ... - Fixed detection whether the drop zone is inside the currently visible table - Now dragging outside the table does nothing instead of uploading, because the user might drop on the sidebar - Added unit tests for the drop handler	2014-05-21 17:38:09 +02:00
Bjoern Schiessle	5f403f3e92	move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists	2014-05-21 13:19:17 +02:00
Björn Schießle	88d26aac7b	Merge pull request #8612 from owncloud/share-updateshareiconsafterrename ... [master] Fixed issues with renaming	2014-05-21 06:27:07 -04:00
Björn Schießle	319942bccb	Merge pull request #8646 from owncloud/publicshare-fixes ... [master] Fixed for public link page	2014-05-21 05:41:35 -04:00
Vincent Petry	9b23a210c9	Merge pull request #8637 from owncloud/enc_improved_error_handling ... [encryption] improved error handling during password change	2014-05-21 09:57:45 +02:00
Sascha Schmidt	4b2888cd9a	Changed access mode for Dropbox to 'auto'	2014-05-21 09:40:03 +02:00
Vincent Petry	7d98bcf9a2	Fixed JS issues in public page ... - fixed subdir detection when uploading into subdir - add class detection before overriding to avoid JS errors	2014-05-20 13:37:58 +02:00
Vincent Petry	160a2bc36f	Fixed download URL in public page	2014-05-20 13:24:52 +02:00
Jenkins for ownCloud	40fc1d5b4b	[tx-robot] updated from transifex	2014-05-20 01:54:53 -04:00
Thomas Müller	51a6764f31	Merge branch 'master' into cleanup-list-code ... Conflicts: apps/files_sharing/ajax/list.php	2014-05-19 20:52:25 +02:00
Morris Jobke	dc36d30953	Remove all occurences of @brief and @returns from PHPDoc ... * test case added to avoid adding them later	2014-05-19 17:50:53 +02:00
Thomas Müller	95741f3936	Merge pull request #8435 from owncloud/fix-8322-master ... Expose permission via WebDAV	2014-05-19 16:52:03 +02:00
Bjoern Schiessle	d9f715bdad	only start migration if the encryption was initialized; allow to overwrite keys if no files exists	2014-05-19 15:53:50 +02:00
Andreas Fischer	6c4b650524	Merge pull request #8585 from owncloud/phpdoc-improvements-apps ... PHPDoc improvements /apps * owncloud/phpdoc-improvements-apps: Fix whitespace issues Reduce double-space with single-space. Remove spaces around | operator in doc block. Fix more missing or broken PHPDoc PHPDoc fixes for user_ldap Fix PHPDoc in /apps	2014-05-19 14:08:42 +02:00
Jenkins for ownCloud	d52252998a	[tx-robot] updated from transifex	2014-05-19 01:54:46 -04:00
Jenkins for ownCloud	a7509e5fd9	[tx-robot] updated from transifex	2014-05-18 01:55:01 -04:00
Jenkins for ownCloud	a1b356c7b6	[tx-robot] updated from transifex	2014-05-17 01:57:38 -04:00
Robin McCorkell	e7aebc5c32	Fix whitespace issues	2014-05-16 22:23:36 +01:00
Andreas Fischer	5b1ffd7611	Reduce double-space with single-space.	2014-05-16 22:21:57 +01:00
Andreas Fischer	e04d956cac	Remove spaces around | operator in doc block.	2014-05-16 22:21:57 +01:00
Robin McCorkell	6930ae22e4	Fix more missing or broken PHPDoc	2014-05-16 22:21:57 +01:00
Robin McCorkell	a17f9111a0	PHPDoc fixes for user_ldap	2014-05-16 22:21:57 +01:00
Robin McCorkell	c4f1de63a8	Fix PHPDoc in /apps	2014-05-16 22:21:57 +01:00
Björn Schießle	42b99b6d0f	Merge pull request #8555 from owncloud/sharing_default_expire_only_public_links ... use default expire date only for link shares	2014-05-16 14:57:11 -04:00
Björn Schießle	b52cb8f557	Merge pull request #8604 from owncloud/sharing_encforce_password ... allow admin to enforce passwords for public link shares	2014-05-16 12:23:01 -04:00
Bjoern Schiessle	7a48f24459	use default expire date only for link shares	2014-05-16 18:12:13 +02:00
Vincent Petry	5a0281add8	Fixed issues with renaming ... - summary is now untouched on rename instead of bogus incrementation - fixes "Share" status icon by only triggring "fileActionsReady" once - row is now reinserted even when rename is cancelled, this removes the hacky/buggy code that tried to rename the element back - added unit tests to cover the fixed cases	2014-05-16 17:42:38 +02:00
Bjoern Schiessle	b6e14af861	allow admin to enforce passwords for public link shares	2014-05-16 17:41:09 +02:00
Vincent Petry	d5f60a8eb0	Merge pull request #8610 from owncloud/ie8-filesdndbug ... Fix drag and drop in IE8	2014-05-16 17:27:50 +02:00
Vincent Petry	1fb0d5412c	Merge pull request #6260 from owncloud/jan-navigation-filesidebar ... Files app navigation sidebar	2014-05-16 13:00:35 +02:00
Vincent Petry	f3d421d24b	Fix drag and drop in IE8 ... For some reason IE8 didn't like the sort function, so using the one from underscore instead.	2014-05-16 11:25:36 +02:00
Jenkins for ownCloud	43d6650d19	[tx-robot] updated from transifex	2014-05-16 01:55:55 -04:00
Vincent Petry	6fd084243b	Fixed many issues, clean up ... - fixed upload and storage statistics - fixed infinite scroll to use the correct contain for scroll detection - fixed unit test that sometimes fail for rename case - controls are now sticky again - fixed selection overlay to be aligned with the table - fixed "select all" checkbox that had id conflicts - fixed public page - fixed global actions permissions detection - fix when URL contains an invalid view id - viewer mode now hides the sidebar (ex: text editor) - added unit tests for trashbin - clean up storage info in template (most is retrieved via ajax call now)	2014-05-15 17:51:04 +02:00
Vincent Petry	9d38e3602b	Namespacing for FileList, FileActions and trashbin app ... - FileList is now an instantiable class - FileActions is now in namespace - added App class for trashbin app - moved trashbin overrides into classes extending FileList - replaced many static calls with "this." or "self." to make the classes reusable/extendable - new URL parameter "view" to specify which view is shown, for example "files" or "trashbin" - added OC.Util.History utility class in core for handling history - moved URL handling/routing to OCA.Files.App - popstate will correctly update the current view and notify the view of the URL change so it can update the current dir - added JS unitt tests for the trashbin app - fixed public app to work with the new namespaces	2014-05-15 17:51:04 +02:00
Vincent Petry	fb10bf4048	Files app navigation can now switch ... - added new OCA.Files namespace for files classes - the sidebar can now switch between views/containers - the trashbin renders in its own container but currently doesn't work due to overrides - added app.js as entry point for JS code (ideally all other files should only contain classes and not trigger anything)	2014-05-15 17:51:04 +02:00
Vincent Petry	88ebb15f1d	Added navigation manager in files app for the sidebar ... Apps can now register navigation items into the sidebar of the files app. For every sidebar item there is a container. The container's content is rendered based on the script name given at registration time.	2014-05-15 17:51:04 +02:00
Vincent Petry	9ccb3279dd	Added app navigation for files app ... - Added links to trashbin and shared dir - Moved "WebDAV" settings block to the app nav's settings section - Added sidebar support in trashbin app as well	2014-05-15 17:51:04 +02:00
Vincent Petry	818c77684d	Fixed trashbin to use correct class ... It seems that \OC_Filesystemview has been removed. Now using the correct class \OC\Files\View()	2014-05-15 15:21:27 +02:00
Robin McCorkell	a0f309bbd8	Merge pull request #8589 from fibsifan/files_external_sftp_port ... rename URL-fields to Host for SFTP/FTP and SMB external Storage backends	2014-05-15 13:22:22 +01:00
fibsifan	06c084cc3c	changing label "URL" to "Host"	2014-05-15 14:09:10 +02:00
Jenkins for ownCloud	d9d684197a	[tx-robot] updated from transifex	2014-05-15 01:55:53 -04:00
jbtbnl	c98edf18cc	Merge pull request #8584 from Bagera/master ... avoid row resize on filename edit	2014-05-14 10:05:59 +02:00
Bagera	7b39704c61	Set row height in files table ... Sets row height to avoid resize when name is edited	2014-05-14 08:32:48 +02:00
Jenkins for ownCloud	c9df98abae	[tx-robot] updated from transifex	2014-05-14 01:55:31 -04:00
Lukas Reschke	166f2af5d8	Merge pull request #8582 from owncloud/remove-outdated-update-sc ... We do not support updates from 4.5 > 7.0 or even 3.0 > 7.0	2014-05-14 00:28:05 +02:00
Thomas Müller	58857b8df5	@returns -> @return	2014-05-13 19:09:15 +01:00
Thomas Müller	55fc693750	@breif -> @brief	2014-05-13 19:09:15 +01:00
Bagera	5757d02b76	fixes #7949 ... Sets height to form to avoid resizing when filename link is not shown	2014-05-13 20:02:22 +02:00
Lukas Reschke	2d1296bb03	We do not support updates from 4.5 > 7.0	2014-05-13 18:54:43 +02:00
Björn Schießle	b8de1e5d71	Merge pull request #8398 from owncloud/enc_backup_keys ... backup the encryption key after the encryption was disabled	2014-05-13 09:25:16 -04:00
Bjoern Schiessle	a9ac11718e	backup the encryption key after the encryption was disabled so that the user ... can restore them if needed	2014-05-13 12:35:25 +02:00
Robin McCorkell	08a8a409d6	Extract mount point merging logic into separate function	2014-05-13 00:14:30 +01:00
Thomas Müller	408189b7e4	Merge pull request #8556 from owncloud/kill-legacy-code-master ... Kill legacy code master	2014-05-12 20:55:24 +02:00
Lukas Reschke	aea44ee0d5	Merge pull request #8538 from owncloud/make-my-ide-less-complain-about-ldap ... Use proper PHPDoc and variable names in the LDAP lib	2014-05-12 19:31:43 +02:00
Lukas Reschke	cd7fc5cb80	Use array as type	2014-05-12 19:31:21 +02:00
Thomas Müller	e0dd69e4e6	remove legacy aka deprecated code: OC_FilesystemView	2014-05-12 16:30:39 +02:00
Thomas Müller	33987eea83	remove legacy aka deprecated code: OC_Cache	2014-05-12 16:23:33 +02:00
Thomas Müller	4dd1a49a68	remove legacy aka deprecated code: OC_Filesystem	2014-05-12 16:20:07 +02:00
Vincent Petry	9a9665f361	Merge pull request #8041 from owncloud/files-sortcolumns ... File list sorting by clicking on column headers	2014-05-12 12:50:27 +02:00
Jenkins for ownCloud	f4e8de3cbb	[tx-robot] updated from transifex	2014-05-12 01:55:44 -04:00
Lukas Reschke	2ae1be762c	That's bool and not always true	2014-05-11 16:29:59 +02:00
Lukas Reschke	57640742af	Use WizardResult|false instead of mixed	2014-05-11 16:28:50 +02:00
Lukas Reschke	416f8b186d	Use @return instead of @returns	2014-05-11 16:27:18 +02:00
Lukas Reschke	60f6d82dcd	$owner is not defined here ... Fixes https://github.com/owncloud/core/issues/8539	2014-05-11 15:34:54 +02:00
Lukas Reschke	cd3ed01483	Fix Typo ... I guess that should be `default` and not `defautl`, wondering how this ever worked.	2014-05-11 15:24:42 +02:00
Lukas Reschke	fc8be5abc3	Use proper PHPDoc and variable names in the LDAP lib ... My IDE was so sad about this that it marked the whole file in red and yellow and forced me to fix this.	2014-05-11 15:17:27 +02:00
Jenkins for ownCloud	b6d76e9985	[tx-robot] updated from transifex	2014-05-11 01:57:00 -04:00
Lukas Reschke	0cc7d84e16	Merge pull request #8520 from owncloud/jslint_polishing_in_file_upload ... polish jslint for files-upload.js	2014-05-10 22:43:50 +02:00
Jenkins for ownCloud	05ea8c8a10	[tx-robot] updated from transifex	2014-05-10 01:55:50 -04:00
Jörn Friedrich Dreyer	f0f059576e	polish jslint for files-upload.js	2014-05-09 15:22:11 +02:00
Jenkins for ownCloud	9919ec48df	[tx-robot] updated from transifex	2014-05-09 01:55:42 -04:00
Vincent Petry	6e7c274d2e	Merge pull request #8499 from owncloud/shareextstoragemountpointfix ... Fix sharing of ext storage mount points	2014-05-08 22:35:01 +02:00
Vincent Petry	af2b7634ee	Merge pull request #8293 from owncloud/files_external_fix_readData ... Fix issue with personal mount points and sharing	2014-05-08 11:01:54 +02:00
Vincent Petry	f73a168694	Added unit test for sharing ext storage mount points	2014-05-08 11:00:19 +02:00
Vincent Petry	28f0e6307f	Fix sharing of ext storage mount points ... When sharing an ext storage mount point, it will now use the name of the mount point instead of an empty string for the target path.	2014-05-08 10:03:07 +02:00
Vincent Petry	390549c286	Merge pull request #8221 from owncloud/type-hinting-sharing ... Type hinting fixes for sharing	2014-05-08 09:30:50 +02:00
Jenkins for ownCloud	4da6645a94	[tx-robot] updated from transifex	2014-05-08 01:55:39 -04:00
Bjoern Schiessle	f85e968883	Merge branch 'sharing_cleanup' of github.com:owncloud/core into sharing_cleanup	2014-05-07 17:57:32 +02:00
Bjoern Schiessle	d3f957c21e	remove error_log output	2014-05-07 17:56:52 +02:00
Joas Schilling	dbb93074b3	Fix endless loop on windows servers ... Directory seperator is \ on windows However we can just check for path != dirname(path) because that is the same for '' (empty string), '.' and DIRECTORY_SEPARATOR on all OS	2014-05-07 17:38:29 +02:00
Bjoern Schiessle	31bf2d4b33	we can take the permission directly from the share, no need to call the share api first	2014-05-07 16:49:07 +02:00
Bjoern Schiessle	799d8ca381	check if we have a fileinfo	2014-05-07 11:47:52 +02:00
Bjoern Schiessle	bee48f851e	ignore part files	2014-05-07 11:47:27 +02:00
Jenkins for ownCloud	283b483100	[tx-robot] updated from transifex	2014-05-07 01:55:48 -04:00
Thomas Müller	45f8d2d3ff	Merge pull request #8456 from owncloud/extstorage-unittestssuite ... Added ext storage app in autotest unit test run	2014-05-05 19:48:35 +02:00
Vincent Petry	0c8ae6eb66	Added ext storage app in autotest unit test run ... To make sure that the dynamic mount config and config classes from external storages are tested, these are now added into the autotest.sh test run by enabling the app.	2014-05-05 15:03:10 +02:00
Vincent Petry	1a454f61ed	Merge pull request #8386 from owncloud/fix_6946_master ... Fix 6946 master	2014-05-05 14:08:45 +02:00
Thomas Müller	341fcdc37a	Merge pull request #8407 from owncloud/scale-pics-on-public-sharing-master ... Images on public sharing get downscaled to increase use experience - thi...	2014-05-05 10:12:40 +02:00
Jenkins for ownCloud	51d1e6c8b1	[tx-robot] updated from transifex	2014-05-05 01:55:47 -04:00
Lukas Reschke	2c483fdca2	Add missing \	2014-05-04 15:52:25 +02:00
Lukas Reschke	0b7d9e2668	Cleanup code a little bit ... - Use OCP\Response constants instead of the HTTP error code - Use checkAppEnabled() instead of OC_App::isEnabled with an if statement - Remove uneeded variable $baseURL - Rename $isvalid to $isValid	2014-05-04 15:51:08 +02:00
Jenkins for ownCloud	9385b97b5f	[tx-robot] updated from transifex	2014-05-04 01:56:15 -04:00
Jenkins for ownCloud	cf20de185c	[tx-robot] updated from transifex	2014-05-03 01:56:11 -04:00
Thomas Müller	95fe55f9e7	fix broken unit test	2014-05-02 20:35:03 +02:00
Vincent Petry	9e18be6422	Merge pull request #8377 from youngguns-nl/issue_8376 ... RecursiveDirectoryIterator does not work on NFS	2014-05-02 18:45:09 +02:00
Thomas Müller	d163441f3e	load image via javascript and use $(document).width() to determine the proper side of the image to be returned	2014-05-02 18:36:58 +02:00
Thomas Müller	c92c577b5e	- Introduce isShared() and isMounted() on FileInfo class ... - Reuse these methods on determineIcon() - Generate permission string for the desktop client - expose {http://owncloud.org/ns}permissions as additional WebDAV property containing the permission string	2014-05-02 17:37:16 +02:00
Thomas Müller	20893cc3b3	Images on public sharing get downscaled to increase use experience - this will speed up loading time ... - adding keep aspect to core/ajax/preview.php - remove duplicate method Preview::show() - no more hard coded mimetype of preview - remove .png from the preview urls - keep old route preview.png for backwards compatibility - aspect preserving previews are now cached	2014-05-02 17:02:57 +02:00
Thomas Müller	49d9631eee	Merge pull request #8400 from owncloud/download-button-public-folder ... reintroduce download button on public shares	2014-05-02 16:59:09 +02:00
Thomas Müller	6e75b37d04	disable download button if zip download is disabled	2014-05-02 15:53:46 +02:00
Jan-Christoph Borchardt	899c7c0443	fix position and look of public download button	2014-05-02 15:26:21 +02:00
Jenkins for ownCloud	6519b9672a	[tx-robot] updated from transifex	2014-05-02 01:55:53 -04:00
Björn Schießle	bf681713c8	Merge pull request #8415 from owncloud/sharing_fix_rename ... [sharing] return the new name if a mount point was renamed	2014-05-01 14:58:29 -04:00
Jenkins for ownCloud	17f5a18922	[tx-robot] updated from transifex	2014-05-01 01:56:01 -04:00
Bjoern Schiessle	33883a46f5	return the new name if a mount point was renamed	2014-04-30 20:29:21 +02:00
Lukas Reschke	9ee88104e9	Merge pull request #8412 from owncloud/sharing_fix_part_file_rename ... [sharing] fix rename of part files	2014-04-30 17:52:29 +02:00
Thomas Müller	38989c3458	Merge pull request #8404 from owncloud/fix-checkboxes ... Fixed too generic checkbox and link selectors	2014-04-30 14:51:29 +02:00
Morris Jobke	dca2d9311a	Merge pull request #8408 from owncloud/delete-spinner ... Show spinner for all files when deleting all	2014-04-30 14:51:02 +02:00
Bjoern Schiessle	20e4ad382b	get the correct owner path for part files	2014-04-30 12:49:16 +02:00
Bjoern Schiessle	57b671ebec	only update the values which really changed	2014-04-30 12:48:16 +02:00
Jenkins for ownCloud	654a6e6c6a	[tx-robot] updated from transifex	2014-04-30 01:57:53 -04:00
Vincent Petry	61db16321f	Clear selection on reload (when changing sort)	2014-04-29 18:49:11 +02:00
Vincent Petry	10bc67bef9	Show spinner for all files when deleting all	2014-04-29 17:59:30 +02:00
Thomas Müller	003049e8a6	remove file name from upper right button	2014-04-29 17:16:14 +02:00
Vincent Petry	2f58e798ec	Fixed too generic checkbox and link selectors ... It turns out that the sharing dropdown is embedded into the table row for some reason. This fix makes use of a more specific selector for the checkboxes and file name links to make sure it doesn't spill into any other potential elements like the sharing dialog.	2014-04-29 16:28:43 +02:00
Thomas Müller	df32254133	reintroduce download button on public shares	2014-04-29 15:28:35 +02:00
Sjors van der Pluijm	49822dfcdb	refs #8376; spaces=>tabs	2014-04-29 14:59:47 +02:00
Vincent Petry	6b02126dc1	Merge pull request #8382 from owncloud/enc_fix_decrypt_all ... fix shouldEncrypt() method and improved decryptAll() unit tests	2014-04-29 12:15:11 +02:00
icewind1991	b95aa43a5d	Merge pull request #8285 from owncloud/better_getmountby_handling ... Handle return values better from Filesystem::getMountBy*	2014-04-29 11:22:11 +02:00
Jenkins for ownCloud	b4a5093da8	[tx-robot] updated from transifex	2014-04-29 01:56:49 -04:00
Sjors van der Pluijm	54f482ff9c	refs #8376; added comment and applied patch on other files	2014-04-28 19:32:25 +02:00
Thomas Müller	535302b25e	typos, indentation and remove of unused code	2014-04-28 17:59:50 +02:00
Bart Visscher	66b1ad0a9b	Merge branch 'master' into type-hinting-sharing ... Conflicts: apps/files_sharing/lib/share/file.php apps/files_sharing/tests/api.php lib/private/share/share.php	2014-04-28 17:59:41 +02:00
Thomas Müller	05dc265ea2	html input tag has no closing tag	2014-04-28 17:58:23 +02:00
Thomas Müller	ac9e07c589	$RUNTIME_APPTYPES is no longer used - left over from pre OC4	2014-04-28 17:56:20 +02:00
Vincent Petry	af22e7ec95	Added unit test in files app for sort function in helper class ... Added unit test for the Helper class in the files app that tests the different sort orders.	2014-04-28 17:42:04 +02:00
Vincent Petry	c0e5975ab6	Set default sort of trashbin to timestamp descending	2014-04-28 17:42:04 +02:00
Vincent Petry	688f6162da	Add sorting to files list, trashbin and public files	2014-04-28 17:42:04 +02:00
Thomas Müller	bf61d841a2	typos, naming, remove unused code, identation	2014-04-28 16:51:57 +02:00
Vincent Petry	f99f451026	Fixed drag and drop into folder and onto breadcrumb ... Fixed drag and drop code to use FileList.getSelectedFiles() instead of the visible DOM elements.	2014-04-28 14:55:01 +02:00
Vincent Petry	a15b68c10f	Fixed selection summary calculation issue	2014-04-28 14:55:01 +02:00
Vincent Petry	c29e8b0bae	Cleanup of event handlers ... Now using _.bind() for event handlers so we can use "this" which is more readable than a static access to FileList.	2014-04-28 14:55:01 +02:00
Vincent Petry	3c006a5a4d	Cleanup and fix trashbin "clear all files" operation	2014-04-28 14:55:01 +02:00
Vincent Petry	3159c2ee64	Fixed drag shadow file sorting	2014-04-28 14:55:01 +02:00
Vincent Petry	fd982df6ae	Fixed selection to be based on FileList.files ... The file selection is now based on the internal model array FileList.files instead of the visible checkboxes. This makes it possible to virtually select files that haven't been rendered yet (select all, then deselect a visible one) Added more unit tests for selection (with shift and ctrl as well)	2014-04-28 14:55:01 +02:00
Vincent Petry	a952d80ad9	Fix trashbin previews and "delete selected"	2014-04-28 14:55:01 +02:00
Vincent Petry	8909b574fa	Make sure there are always enough elements visible on the page	2014-04-28 14:55:01 +02:00
Vincent Petry	2883f231d0	Fixed insertion of files ... Removed "insert" flag, inserting is by default for FileList.add(). Added "animate" flag to FileList.add(). Added logic to correctly detect when to insert/append elements whenever the insertion point is visible or not. Fixed "render next page" logic to work correctly when many pages of files have been added.	2014-04-28 14:55:01 +02:00
Vincent Petry	f6586f6bdf	Fixed file sorting to work with scrolling ... The FileList.files model is now updated with file operations. Adding files to the list will add to the model first, then to the DOM. If the insertion point isn't visible yet, the file won't be added to the DOM until the user scrolls down. Updated unit tests to include checking for the correct insertion point.	2014-04-28 14:55:00 +02:00
Vincent Petry	9c2fbea6a4	Fix file selection for infinite scrolling ... - moved file selection code to FileList - fix selection summary when all files are selected - nextPage now auto-selects files if "select all" checkbox is checked - fixed trashbin to use the same selection logic as FileList	2014-04-28 14:55:00 +02:00
Vincent Petry	9f62059efa	Fix file summary to use the whole file list ... - moved the summary code into a new class FileSummary - FileSummary is calculated only once, then updated with add/remove - added new OC.Util namespace for JS utility functions	2014-04-28 14:49:39 +02:00
Bjoern Schiessle	73a2d87ab4	fix shouldEncrypt() method and improved decryptAll() unit tests	2014-04-28 14:49:19 +02:00
Vincent Petry	efdf0c4df0	Added infinite scrolling (in-memory list)	2014-04-28 14:34:28 +02:00
Arthur Schiwon	45e42c25de	Group Database backend must not gather user details itself but ask user ... backends. This is a port to master from PR #7745 remove OC_GROUP_BACKEND_GET_DISPLAYNAME option for group backends Conflicts: lib/private/group/backend.php LDAP: getDisplayNamesInGroup is not an option for group backends anymore Conflicts: apps/user_ldap/group_ldap.php apps/user_ldap/group_proxy.php clean up group backends Conflicts: lib/private/group/database.php remove now unnecessary test implement getDisplayNames in group manager adjust user manager tests test for group manager's displayNamesInGroup trim must not be used in empty in PHP < 5.5 keep the constant to not provoke PHP warnings Conflicts: lib/private/group/backend.php	2014-04-28 13:49:56 +02:00
Thomas Müller	9128900c56	drop files_irods from apps_external	2014-04-28 12:39:28 +02:00
Thomas Müller	727e3e2359	Merge pull request #8327 from owncloud/l10n-files_external-fields ... Add translatable mount configs	2014-04-28 08:52:50 +02:00
Jenkins for ownCloud	642f57c1d5	[tx-robot] updated from transifex	2014-04-28 01:56:24 -04:00
Jenkins for ownCloud	8e5c9eea3a	[tx-robot] updated from transifex	2014-04-27 01:54:54 -04:00
Volkan Gezer	6de6f68ae2	fix single quote sanitization	2014-04-26 18:58:01 +02:00
icewind1991	7ac7546b71	Merge pull request #8353 from owncloud/publicshare-webdav ... Expose public shares over webdav	2014-04-26 15:55:37 +02:00
Jenkins for ownCloud	c591cf0836	[tx-robot] updated from transifex	2014-04-26 01:55:32 -04:00
Morris Jobke	ace0293bd1	fix layout of external storage config table	2014-04-25 16:34:48 +02:00
icewind1991	7599fa94ce	Merge pull request #8350 from owncloud/share-search-mime ... fix search by mime for shared single files	2014-04-25 15:54:36 +02:00
Robin Appelman	b176708505	Expose public shares over webdav	2014-04-25 14:45:18 +02:00
Robin Appelman	b42418246f	Also fixed the returned internal path when getting the root shared item by id	2014-04-25 14:04:22 +02:00
Robin Appelman	c53c4b9791	fix search by mime for shared single files	2014-04-25 12:28:10 +02:00
Robin Appelman	6c20a014ea	merge master into webdav-injection	2014-04-25 11:47:06 +02:00
Robin McCorkell	77e3d067f0	Better handle return values from Filesystem::getMountBy* ... getMountByStorageId and getMountByNumericId return an empty array on error, which should be detected to avoid possible errors. This commit also adds in some new logging points and throws to aid debugging	2014-04-25 09:50:34 +01:00
Jenkins for ownCloud	3fc809dfd8	[tx-robot] updated from transifex	2014-04-25 01:56:28 -04:00
Björn Schießle	f520305848	Merge pull request #8026 from owncloud/remove_shared_folder ... remove the "Shared" folder	2014-04-24 18:45:45 +02:00
Jenkins for ownCloud	435672feaa	[tx-robot] updated from transifex	2014-04-24 01:55:33 -04:00
Volkan Gezer	da61acd1e2	Add translatable mount configs ... Will close #8070	2014-04-23 17:58:14 +02:00
blizzz	645ecb7644	Merge pull request #6297 from leo-b/fix_ldap_errors ... only check ldap_errno if an ldap_* function actually fails	2014-04-23 16:26:43 +02:00
Thomas Müller	3aee23ee2b	Merge pull request #8233 from owncloud/fix-newdialog-ie ... fix shift of icons in 'New' menu in IE8/9, fix #7987	2014-04-23 16:17:24 +02:00
Robin McCorkell	c2f7848aeb	Adjust renaming of directories, fixes #8280 ... Directories will not be considered to have an extension, even if a dot is found. Stop Scrutinizer being annoyed But the spaced version looked good! Stop jsHint being annoyed These code quality tools are really pestering	2014-04-23 16:04:01 +02:00
Bjoern Schiessle	7ef8f6d352	always allow to rename the share mount point	2014-04-23 12:54:26 +02:00
Bjoern Schiessle	b102222fed	split-up the update script and add unit tests for it	2014-04-23 12:54:26 +02:00
Bjoern Schiessle	93469ca468	make it possible to move files out of a shared mount point	2014-04-23 12:54:26 +02:00
Thomas Müller	dd1e47b3b8	typos, use, unused and return fixed	2014-04-23 12:54:26 +02:00
Robin Appelman	2049bedcaf	Dont throw an error when a storage isn't found for shared cache	2014-04-23 12:54:26 +02:00
Bjoern Schiessle	fb88aba8f4	some fixes to make the gallery work, this made it necessary to adjust some tests and the encryption code	2014-04-23 12:54:26 +02:00
Bjoern Schiessle	d468cdacf2	add unit tests which got lost during rebase	2014-04-23 12:54:26 +02:00
Bjoern Schiessle	652d417a58	we don't allow to share a folder if it contains a share mount point	2014-04-23 12:54:26 +02:00
Bjoern Schiessle	b712393e72	fix etag propagation	2014-04-23 12:54:26 +02:00
Bjoern Schiessle	aae22b2d6a	update script, create Shared folder and adjust target path for the shares	2014-04-23 12:54:26 +02:00
Bjoern Schiessle	bffcbac7a7	allow to rename group share mount points	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	3f6e9e0102	cleanup the shared storage, always keep the whole share resource	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	22e0a4b9a8	external storages: allow to mount a folder called "Shared", it is no longer a reserved name	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	c9bd2f7a6c	also fetch the etag from file cache	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	d4085d8148	make sure that path is not 'false'	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	33cdd93890	fix deleting of shared files	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	bfabd247f4	fix updating of shared files	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	a86d97295e	fix encryption tests after the removal of the shared folder	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	ed981294f1	fix share api tests	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	27c5a978f9	we no longer need to handle the Shared folder different from any other folder	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	83d6810725	don't overwrite shared folder icon	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	4967435237	show "shared by ..." for share mount point	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	6b19482f3e	generate unique target name	2014-04-23 12:54:25 +02:00
Bjoern Schiessle	6d87dacad4	fix getMimeType call, we always need to check the source path	2014-04-23 12:54:24 +02:00
Bjoern Schiessle	a02fb3722b	user should be able to rename/delete shared files if the owner allowed it	2014-04-23 12:54:24 +02:00
Bjoern Schiessle	b02b6d3c23	no exception for the root of the mount point (formerly Shared/), just get the file cache information from the cache	2014-04-23 12:54:24 +02:00
Bjoern Schiessle	c377893f0e	make sure that we have the right permissions for the mount points	2014-04-23 12:54:24 +02:00
Bjoern Schiessle	a27db9e4ca	first steps to remove the shared folder: ... - mount shares to the root folder instead of "Shared/" - navigate in shared folder and sub-folders - show previews - show correct file permissions - download/edit files	2014-04-23 12:54:24 +02:00
blizzz	97f21712cd	Merge pull request #8164 from owncloud/fix-6651 ... LDAP: fix random resets of filter	2014-04-23 11:09:35 +02:00
Thomas Müller	e0cac32442	fixing some JSHint warnings	2014-04-23 10:08:14 +02:00
Jenkins for ownCloud	3f453d1641	[tx-robot] updated from transifex	2014-04-23 01:56:35 -04:00
Arthur Schiwon	c1c2f2c49e	add additional comments, PHPdoc and check whether it's really applicable	2014-04-22 18:36:43 +02:00
Arthur Schiwon	1c71d5c444	LDAP: cache display names immediately on retrieval, saves tens of unecessary queries to LDAP server in the share dialog for example	2014-04-22 18:36:37 +02:00
Robin Appelman	b42ce6c30a	Prevent error if previously cached data doesn't have an etag	2014-04-22 15:24:38 +02:00
Robin Appelman	3821a09689	merge master into webdav-injection	2014-04-22 12:25:49 +02:00
Raghu Nayyar	d56072cf2e	Merge pull request #8255 from owncloud/fix-public-download-button ... keep long file names in one line to not overflow download button on mobile	2014-04-22 15:44:29 +05:30
Thomas Müller	54873c7aae	Merge pull request #8247 from owncloud/l10n-files_trasbin-fix ... Fix localization issues of files_trashbin	2014-04-22 11:34:49 +02:00
Thomas Müller	5049664285	Merge pull request #8239 from owncloud/directlink-overflow ... add max-width to directLink input to prevent overflow	2014-04-22 11:23:10 +02:00
Jörn Friedrich Dreyer	4d9ff49f61	Merge pull request #8283 from owncloud/translatable-max-in-upload ... make max. text translatable	2014-04-22 10:23:08 +02:00
Jenkins for ownCloud	a9b4fba528	[tx-robot] updated from transifex	2014-04-22 01:54:58 -04:00
Robin McCorkell	abfd7ecb72	Permit personal mount points to be used for sharing ... An issue existed where `readData` used `OCP\User::getUser()` to get the user for personal mount points, which worked in all situations apart from when a personal mount point was used for sharing, so the return from `getUser()` is not the user that owns the share. As such, any personal mount points would not work correctly when shared. `readData` and `writeData` have been changed from using a `$isPersonal` boolean to using a `$user` string|null. `$isPersonal = false` can now be written as `$user = NULL` (or left out in the case of `readData`), and `$isPersonal = true` can be written as `$user = OCP\User::getUser()`.	2014-04-21 21:42:35 +01:00
Jenkins for ownCloud	4fe5ca1908	[tx-robot] updated from transifex	2014-04-21 01:56:06 -04:00
Volkan Gezer	1aa7774178	make max. text translatable	2014-04-21 02:41:33 +02:00
Andreas Fischer	93ed6a695e	Merge pull request #8169 from owncloud/change-to-show ... Change from showHTML to show * owncloud/change-to-show: Change from showHTML to show	2014-04-20 15:53:33 +02:00
Jenkins for ownCloud	1abd9c1305	[tx-robot] updated from transifex	2014-04-19 01:56:06 -04:00
Volkan Gezer	f434c3a213	Fix localization issues of files_trashbin	2014-04-17 21:10:21 +02:00
blizzz	36c8dec10a	Merge pull request #8220 from owncloud/type-hinting-ldap ... Fix PHPdoc in user_ldap	2014-04-17 18:15:40 +02:00
Jan-Christoph Borchardt	d82a31d121	keep long file names in one line to not overflow download button on mobile	2014-04-17 17:11:28 +02:00
Morris Jobke	0b4431216d	Merge pull request #8236 from owncloud/header-right-fix ... remove duplication of header and 'header-right' element, also ellipsize when too wide	2014-04-17 15:18:40 +02:00
Robin McCorkell	13b463cc17	Merge pull request #8189 from Xenopathic/misc_fixes ... Various fixes	2014-04-17 11:56:51 +01:00
Jenkins for ownCloud	a7d7ca2fb3	[tx-robot] updated from transifex	2014-04-17 01:56:06 -04:00
Bart Visscher	81751cb616	Add missing param hint	2014-04-16 17:54:10 +02:00
Jan-Christoph Borchardt	9434ed44f8	add max-width to directLink input to prevent overflow	2014-04-16 16:43:35 +02:00
Jan-Christoph Borchardt	9c6f8e59ae	fix header code duplication, code style fixes	2014-04-16 16:26:41 +02:00
Jan-Christoph Borchardt	547ddf7775	remove duplication of 'header-right' element, also make it overflow when too wide	2014-04-16 15:53:38 +02:00
Jan-Christoph Borchardt	924aee718c	fix shift of icons in 'New' menu in IE8/9, fix #7987	2014-04-16 14:58:27 +02:00
blizzz	f6551d214f	Merge pull request #7815 from owncloud/ldap_fix_usercount_master ... correct LDAP user count on setup with many users (occ user:report)	2014-04-16 10:36:19 +02:00
Jenkins for ownCloud	23f2c48a43	[tx-robot] updated from transifex	2014-04-16 01:57:34 -04:00
Thomas Müller	8bc7174bdc	Merge pull request #8104 from owncloud/lukepolo-master ... Added the ability to Drag and Drop folders [chrome]	2014-04-15 21:39:32 +02:00
Thomas Müller	83e8981e24	add link to further discussion about that folder check	2014-04-15 21:39:13 +02:00
Bart Visscher	bad41c05b8	Fix PHPdoc in user_ldap ... using scrutinizer patch	2014-04-15 21:05:49 +02:00
Bart Visscher	999e74e834	Fix PHPdoc in apps/files_sharing ... using scrutinizer patch	2014-04-15 21:05:44 +02:00
Robin Appelman	c82adb8c5d	merge master into webdav-injection	2014-04-15 20:03:00 +02:00
Björn Schießle	2dbb2db7e0	Merge pull request #7780 from owncloud/share-file-exists ... Verify that a file exists before we share it	2014-04-15 11:23:17 +02:00
Lukas Reschke	340089f270	Merge pull request #8059 from owncloud/countUsersInGroup ... add optional countUsersInGroup method to group backends	2014-04-14 20:45:12 +02:00
Jenkins for ownCloud	2a2aabbdaf	[tx-robot] updated from transifex	2014-04-14 01:55:09 -04:00
Robin McCorkell	8bb003868c	Fix user_ldap default setting value	2014-04-13 16:49:23 +01:00
Robin McCorkell	869e7a51f0	Prevent error in files_trashbin ... `glob` can return FALSE when the directory is empty, instead of an empty array, causing an error at `foreach`. "Note: On some systems it is impossible to distinguish between empty match and an error." See http://www.php.net/manual/en/function.glob.php -> Return Values	2014-04-13 14:51:33 +01:00
Robin McCorkell	fa8814902e	Adjust logic for deciding if trashbin empty ... Any error in opening the trashbin directory returns 'true' for isEmpty. An error is prevented by checking if the directory exists before trying to open it.	2014-04-13 13:49:04 +01:00
Lukas Reschke	2454759af7	Check whether the user has permissions to add personal storage backends	2014-04-13 11:01:50 +02:00
Jenkins for ownCloud	982d2bcc5b	[tx-robot] updated from transifex	2014-04-13 01:55:12 -04:00
Jenkins for ownCloud	329b8f3e99	[tx-robot] updated from transifex	2014-04-12 01:56:11 -04:00
Lukas Reschke	6343391e58	Change from showHTML to show ... There is no need to use `showHTML` here.	2014-04-11 20:38:27 +02:00
Lukas Reschke	e704bc2bf0	Merge pull request #7807 from sarciszewski/patch-1 ... Update crypt.php	2014-04-11 19:19:02 +02:00
Björn Schießle	10dc1de644	Merge pull request #8069 from owncloud/fix-localization-issues-with-file-encrypt-app ... Fix some localization issues with file encryption/decryption strings	2014-04-11 17:22:13 +02:00
Volkan Gezer	d67cba973e	Typo fix.	2014-04-11 15:23:43 +02:00
Thomas Müller	07ea57465b	drop folder support on public shared folders	2014-04-11 14:54:13 +02:00
Arthur Schiwon	1c57ffa16f	Give hint when composing filter failed	2014-04-11 14:08:12 +02:00
Arthur Schiwon	e28227ecdc	fix comparison in determineMode, fixes problems with restoring the filter mode (assisted or manually) on page refresh	2014-04-11 13:56:06 +02:00
Arthur Schiwon	6f1e9f8920	Merge branch 'ldap-filter-reset-fix' of github.com:ben-denham/core into fix-6651	2014-04-11 13:48:45 +02:00
Jenkins for ownCloud	36107e1bad	[tx-robot] updated from transifex	2014-04-11 01:55:15 -04:00
Lukas Reschke	d229856fc5	Merge pull request #8076 from owncloud/enable-dav-browser ... Re-enable the sabredav browser plugin to fix sync client setup	2014-04-10 21:47:03 +02:00
Thomas Müller	0edacf372c	fix single file upload in firefox	2014-04-10 18:07:36 +02:00
Jenkins for ownCloud	7c072510d3	[tx-robot] updated from transifex	2014-04-10 01:55:39 -04:00
Thomas Müller	e8be2ac554	In cases folder drag and drop is not supported a proper message is displayed	2014-04-09 23:32:12 +02:00
Thomas Müller	2fc9e27ced	use FileList.findFileEl	2014-04-09 22:16:41 +02:00
Thomas Müller	d2961dcf11	Merge branch 'master' into lukepolo-master ... Conflicts: apps/files/js/filelist.js	2014-04-09 22:00:25 +02:00
Morris Jobke	d8f56e3c00	Merge pull request #8049 from owncloud/filepickersvg ... Fix file picker SVG issues	2014-04-09 15:05:40 +02:00
Vincent Petry	b19671d204	Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_js ... remove obsolete code	2014-04-09 14:50:15 +02:00
blizzz	9feebeaf40	Merge pull request #7837 from owncloud/fix_7530 ... LDAP: fix determining objectclasses takes long	2014-04-09 12:27:17 +02:00
Arthur Schiwon	dbebf6bb5e	add comment to clearify when a skip in the foreach happens	2014-04-09 12:25:48 +02:00
Jörn Friedrich Dreyer	9b0f289143	remove obsolete code	2014-04-09 12:09:28 +02:00
Arthur Schiwon	ee3368d2ad	replace hardcoded limit of 400 with user controlled ldapPagingSize value	2014-04-09 11:38:51 +02:00
Arthur Schiwon	2e5adadad7	Put inner loop into own method, let's see whether it makes scrutinizer happier	2014-04-09 11:31:56 +02:00
Arthur Schiwon	bdc418d1f9	var count is assigned in the inner loop so it must be checked inside there to be properly used as part of the exit condition of the outer loop	2014-04-09 11:31:56 +02:00
Arthur Schiwon	43402c56dd	initialize variable	2014-04-09 11:31:56 +02:00
Arthur Schiwon	40f9875f11	LDAP: fix user report i.e. count for LDAP servers with really many users	2014-04-09 11:31:56 +02:00
Arthur Schiwon	8bb27551bd	LDAP: make sure cache key for paged result cookie matches when limit or offset is null or 0	2014-04-09 11:31:56 +02:00
Jenkins for ownCloud	796f719548	[tx-robot] updated from transifex	2014-04-09 01:56:49 -04:00
Vincent Petry	35ab6fe5a9	Disable sharing in trashbin app	2014-04-08 17:13:59 +02:00
Arthur Schiwon	2407321625	add tests for LDAP	2014-04-08 12:57:06 +02:00
Arthur Schiwon	142fc5f3af	fix return value when a search string was passed to return integer instead of array	2014-04-08 12:53:59 +02:00
Arthur Schiwon	96cb75f5cf	implement countUsersInGroup in LDAP group backend	2014-04-08 12:04:38 +02:00
Thomas Müller	411a810ebe	Merge pull request #8032 from owncloud/fs-backend-registration ... Files External: allow dynamic backend registration	2014-04-08 11:27:02 +02:00
Jenkins for ownCloud	4ad4b9768c	[tx-robot] updated from transifex	2014-04-08 01:57:51 -04:00
Thomas Müller	68b7822cf5	js style fixes according to our jshintrc rules	2014-04-07 23:45:35 +02:00
Thomas Müller	d15a4719d2	fix folder upload in js	2014-04-07 23:04:08 +02:00
Thomas Müller	971a311fee	adding parentId to file info array	2014-04-07 23:03:19 +02:00
Thomas Müller	6d373e97c3	remove unused exit()	2014-04-07 23:02:49 +02:00
Thomas Müller	3587c88fe9	Merge branch 'master' of https://github.com/lukepolo/core-1 into lukepolo-master ... Conflicts: apps/files/js/file-upload.js	2014-04-07 22:28:16 +02:00
Thomas Müller	3ac009c2b4	unit tests for dynamic backend registration	2014-04-07 20:18:57 +02:00
Thomas Müller	21a54ba50f	Merge pull request #8086 from owncloud/fix_copy_conflict_translations_in_js ... Fix copy conflict dialog translation	2014-04-07 14:38:00 +02:00
blizzz	3c9f588449	Merge pull request #6221 from leo-b/ldap_get_all_groups ... fix updateGroups background job for ldap servers with > 1000 groups	2014-04-07 13:00:32 +02:00
Jörn Friedrich Dreyer	c90b0ac00b	Fix copy conflict dialog translation	2014-04-07 11:46:47 +02:00
Jenkins for ownCloud	e295d48fd4	[tx-robot] updated from transifex	2014-04-07 01:56:11 -04:00
Robin Appelman	593977f016	Re-enable the sabredav browser plugin	2014-04-06 14:49:39 +02:00
Jenkins for ownCloud	a9d49de465	[tx-robot] updated from transifex	2014-04-06 01:56:11 -04:00
Volkan Gezer	286323f7a4	Fix some localization issues with file encryption/decription strings	2014-04-05 19:28:53 +02:00
Robin Appelman	01d93f81f6	Show higher resolution previews for high dpi screens	2014-04-04 17:10:46 +02:00
Vincent Petry	a4eafca77f	Moved code to replace svg with png to OC.Util ... - Moved code that replaces the "svg" extension for the given file to core as OC.Util.replaceSVGIcon. - Added unit test for OC.Util.replaceSVGIcon - Moved "replaceSVG" to OC.Util.replaceSVG and deprecated the global "replaceSVG" function. - Added alias for SVGSupport() as OC.Util.hasSVGSupport() (for now)	2014-04-04 11:34:26 +02:00
Vincent Petry	8a10c44eb3	Merge pull request #8015 from owncloud/storageinfo-reuse ... Allow reusing FileInfo for getStorageInfo	2014-04-04 10:18:02 +02:00
Jenkins for ownCloud	0805f678cc	[tx-robot] updated from transifex	2014-04-04 01:57:01 -04:00
Morris Jobke	bf7624fb25	Merge pull request #6968 from owncloud/files-ajaxload ... Ajaxify files list for files + trashbin + public page	2014-04-03 22:02:05 +02:00
Thomas Müller	e3b9a86184	remove duplicate method checkDependencies()	2014-04-03 17:17:44 +02:00
Thomas Müller	c6976d89a6	use command -v to detect if smbclient exists	2014-04-03 17:09:40 +02:00
Vincent Petry	d1e78d7a6b	Correctly set svg for crumb divider	2014-04-03 17:08:06 +02:00
Thomas Müller	14a5381977	Merge branch 'master' into fs-backend-registration ... Conflicts: apps/files_external/templates/settings.php	2014-04-03 17:04:16 +02:00
Vincent Petry	7c9537f33a	Fixed dirInfo check for non existing dir in files ajax call	2014-04-03 17:04:13 +02:00
Thomas Müller	c0ebc1dfb1	Update backends and their configurations	2014-04-03 16:57:26 +02:00
Vincent Petry	3101663129	Removed redundant free space and upload limit in public page	2014-04-03 16:50:21 +02:00
Philipp Kapfer	730bca98b4	Moved dependency checks to end of class files ... Dependency messages now appear below the configuration options instead of above Reworked dependency check method to support consolidated messages for multiple backends Conflicts: apps/files_external/lib/google.php apps/files_external/lib/swift.php apps/files_external/templates/settings.php	2014-04-03 16:46:22 +02:00
Philipp Kapfer	ff9a4a6d91	Added cURL dependency for Amazon S3, Dropbox and SWIFT ... Conflicts: apps/files_external/lib/amazons3.php apps/files_external/lib/swift.php	2014-04-03 16:38:43 +02:00
Vincent Petry	e2969062ca	Merge pull request #7969 from Xenopathic/files_external_fix ... Fix error log spam	2014-04-03 16:31:58 +02:00
Philipp Kapfer	46379113a1	Changed dependency check messages from warnings to notes ... Added check for duplicate dependency check messages to display only the first	2014-04-03 16:31:54 +02:00
Philipp Kapfer	8ca897df76	Added cURL dependency check to Google Drive and WebDAV backend ... Added check for backend's checkDependencies method to OC_Mount_Config::getBackends() when backend is configured to have some instead of blindly calling it and crashing Conflicts: apps/files_external/lib/config.php apps/files_external/lib/google.php	2014-04-03 16:30:48 +02:00
Philipp Kapfer	f7da4280ca	Modified app to dynamically register backends instead of hard-coding them ... Moved dependency check to the individual backends instead of the config Conflicts: apps/files_external/appinfo/app.php apps/files_external/lib/config.php	2014-04-03 16:21:52 +02:00
Thomas Müller	a2efdb8722	Merge pull request #7970 from owncloud/webdav-upload-hash ... Fix uploading files containing a # in the path for webdav	2014-04-03 16:09:44 +02:00
Robin McCorkell	eaad6a4e27	Fix error log spam ... Regression from e002b7242c	2014-04-03 13:43:02 +01:00
Robin Appelman	7dafdfbe88	add tests for sharing files the users doesn't have access to	2014-04-03 13:14:34 +02:00
Jenkins for ownCloud	54783550e8	[tx-robot] updated from transifex	2014-04-03 01:56:12 -04:00
icewind1991	6d378515f8	Merge pull request #8014 from owncloud/uploadsize-reuse ... Reuse known free space in the files app	2014-04-02 18:40:34 +02:00
Vincent Petry	a6de5efbab	Merge pull request #7978 from owncloud/enc_cleanup ... there is no need to re-calculate the shares after a touch	2014-04-02 18:23:33 +02:00
Robin Appelman	da5541ac02	Allow reusing FileInfo for getStorageInfo	2014-04-02 17:10:57 +02:00
Robin Appelman	1e6a79e244	Reuse known free space in the files app	2014-04-02 16:53:45 +02:00
Vincent Petry	0be9de5df5	Files, trashbin, public apps use ajax/JSON for the file list ... Files app: - removed file list template, now rendering list from JSON response - FileList.addFile/addDir is now FileList.add() and takes a JS map with all required arguments instead of having a long number of function arguments - added unit tests for many FileList operations - fixed newfile.php, newfolder.php and rename.php to return the file's full JSON on success - removed obsolete/unused undo code - removed download_url / loading options, now using Files.getDownloadUrl() for that - server side now uses Helper::getFileInfo() to prepare file JSON response - previews are now client-side only Breadcrumbs are now JS only: - Added BreadCrumb class to handle breadcrumb rendering and events - Added unit test for BreadCrumb class - Moved all relevant JS functions to the BreadCrumb class Public page now uses ajax to load the file list: - Added Helper class in sharing app to make it easier to authenticate and retrieve the file's real path - Added ajax/list.php to retrieve the file list - Fixed FileActions and FileList to work with the ajax list Core: - Fixed file picker dialog to use the same list format as files app	2014-04-02 15:33:47 +02:00
Vincent Petry	b616cc1f2d	Merge pull request #8003 from owncloud/extstorage-sftp-upgradephpseclib ... Upgraded phpseclib to version 0.3.6 (SFTP ext storage)	2014-04-02 14:10:09 +02:00
Morris Jobke	1782dcbb50	Merge pull request #7977 from owncloud/fix_enc_if_sharing_is_disabled ... always encrypt files to owner	2014-04-02 13:20:51 +02:00
Vincent Petry	3f9beb8c6b	Upgraded phpseclib to version 0.3.6	2014-04-02 12:31:59 +02:00
Jenkins for ownCloud	73dd5ff26c	[tx-robot] updated from transifex	2014-04-02 01:56:39 -04:00
Thomas Müller	d762e25cc5	Merge pull request #7989 from owncloud/files-deletefileregressionfix ... Fixed broken delete file action	2014-04-01 22:54:05 +02:00
Vincent Petry	d811026ec9	Merge pull request #7935 from owncloud/getpath-shared ... Make getPath work for shared files	2014-04-01 21:59:09 +02:00
Bart Visscher	630b5b648f	Merge pull request #7997 from owncloud/correct-remember-trashbin-state ... Correct the remembering of the trashbin app state in encryption test	2014-04-01 21:23:53 +02:00
Bart Visscher	f37a76c396	Remember before change works better	2014-04-01 19:46:46 +02:00
Vincent Petry	0e93c3fd9a	Merge pull request #7986 from owncloud/files-fixredirectwhendirnotexists ... Fix dirInfo check when dir does not exist	2014-04-01 16:51:30 +02:00
Morris Jobke	017d7953d7	Merge pull request #7984 from owncloud/wording-applicable2 ... External Storage: change confusing 'applicable' to 'available for', default to »All Users«	2014-04-01 16:44:31 +02:00
Vincent Petry	aaa8d6ec02	Fixed broken delete file action	2014-04-01 16:09:48 +02:00
Vincent Petry	0bede65947	Fix dirInfo check when dir does not exist	2014-04-01 15:15:03 +02:00
Vincent Petry	27eff1ac30	Merge pull request #7293 from owncloud/update-shares-postgres ... fix update to remove shares where file doesn't exist on postgres	2014-04-01 14:56:37 +02:00
Jan-Christoph Borchardt	acfb3cfff5	external storage: set storages to be available for All Users by default	2014-04-01 14:31:22 +02:00
Jan-Christoph Borchardt	0a112de676	external storage: change confusing 'applicable' to 'available for'	2014-04-01 14:26:06 +02:00
Björn Schießle	c45793033d	Merge pull request #7912 from owncloud/enc_move_checks_to_pre_hook ... move check if a file should be encrypted to the pre hook	2014-04-01 13:56:46 +02:00
Vincent Petry	5807681c09	Merge pull request #7975 from owncloud/fix-7973-master-2 ... remove pl_PL - fixes #7973	2014-04-01 12:38:47 +02:00
Vincent Petry	18acfa8bb3	Merge pull request #7915 from owncloud/replace-personalblock ... Replace personalblock with .section	2014-04-01 11:20:16 +02:00
Jenkins for ownCloud	7a4a836abe	[tx-robot] updated from transifex	2014-04-01 01:56:15 -04:00
Bjoern Schiessle	c578ab68fe	there is no need to re-calculate the shares after a touch	2014-03-31 18:24:53 +02:00
Bjoern Schiessle	8e34812393	always encrypt files to owner	2014-03-31 18:19:48 +02:00
Thomas Müller	fe2c6f4e6d	remove pl_PL - fixes #7973	2014-03-31 18:03:42 +02:00
Robin Appelman	76c63a5760	Fix uploading files containing a # in the path for webdav	2014-03-31 17:00:32 +02:00
Bjoern Schiessle	aa867ad647	don't call getFileInfo() to avoid to open the same file twice	2014-03-31 15:29:16 +02:00
Bjoern Schiessle	8ebb1f15d3	move check if a file should be encrypted to the pre hook	2014-03-31 15:29:16 +02:00
Robin Appelman	0c2585f3ac	Improve phpdoc	2014-03-31 14:29:55 +02:00
Jan-Christoph Borchardt	2be2a5d2c5	external storage: fix merge conflict, indentation	2014-03-31 13:12:04 +02:00
Jan-Christoph Borchardt	6ac85480f7	replace last personalblock fieldset within files_external	2014-03-31 13:00:46 +02:00
Jenkins for ownCloud	bfb0b9a044	[tx-robot] updated from transifex	2014-03-30 01:55:42 -04:00