server

Author	SHA1	Message	Date
Jenkins for ownCloud	1a1c5aa3c0	[tx-robot] updated from transifex	2014-07-03 01:56:24 -04:00
Volkan Gezer	bf08e3a85e	Merge pull request #9382 from owncloud/server2server-css fix lineheight of server2server share	2014-07-03 00:39:37 +02:00
Jan-Christoph Borchardt	0df04975b0	use same logo for mobile as for when logged in, fix #9360	2014-07-02 23:33:20 +02:00
Jan-Christoph Borchardt	560c530875	hide text of download button, only show icon	2014-07-02 23:21:06 +02:00
Volkan Gezer	586c4236fd	fix lineheight of server2server share	2014-07-02 21:46:52 +02:00
Vincent Petry	ed29e7d160	Merge pull request #9329 from owncloud/sharing_check_target don't move a share mount point into a different mount point	2014-07-02 21:01:03 +02:00
Vincent Petry	615d037d3e	Merge pull request #9364 from owncloud/sharing_rename_mount_points [sharing] rename mount point of children if parent was renamed	2014-07-02 18:48:07 +02:00
Vincent Petry	f4eb90e229	Merge pull request #9311 from owncloud/storage-not-available Handle storages not being available in webui and webdav	2014-07-02 18:15:58 +02:00
Bjoern Schiessle	ea31ab7b5c	rename mount point of children if parent was renamed	2014-07-02 15:39:38 +02:00
Morris Jobke	d2f3ff5c34	Merge pull request #9245 from owncloud/server2server-sharing-design-fixes drop unneeded code	2014-07-02 15:34:57 +02:00
Robin Appelman	edb67f9f4d	Remove invalid mounts from the active fs	2014-07-02 15:00:12 +02:00
Robin Appelman	0008db9995	Fix unit test	2014-07-02 14:39:45 +02:00
Morris Jobke	59629e688c	Merge pull request #9341 from owncloud/sharing-fileactions-fix Fix fileActionsReady event after deferred file actions update	2014-07-02 14:36:59 +02:00
Jenkins for ownCloud	9933b33166	[tx-robot] updated from transifex	2014-07-02 01:55:17 -04:00
Vincent Petry	025b71d068	Use fileActionsReady to re-render sharing icons Whenever file actions are modified, either by registering new actions or when appending a new page of entries, the sharing app is now notified so it can correctly refresh the sharing icon status. Additionally, the core's loadIcons() method is also used to load the existing shares and also refresh the sharing icons afterwards.	2014-07-01 21:32:04 +02:00
Bjoern Schiessle	bb935978fa	don't move a share mount point into a different mount point	2014-07-01 19:38:55 +02:00
Vincent Petry	fd68034357	Fixed remote share password param detection	2014-07-01 17:34:01 +02:00
Robin Appelman	8061a4ccc0	Remove external shares if the share is invalid	2014-07-01 14:58:07 +02:00
Robin Appelman	1c43081d38	Detect removed public shares	2014-07-01 14:36:06 +02:00
Jörn Friedrich Dreyer	abc521dbf7	add missing backticks	2014-07-01 12:29:30 +02:00
Jenkins for ownCloud	a878b42b42	[tx-robot] updated from transifex	2014-07-01 01:54:43 -04:00
Jörn Friedrich Dreyer	f35f14aa37	Merge pull request #9303 from owncloud/issue/8841 Do not strict compare item source id so the dropdown is closed correctly	2014-06-30 14:46:46 +02:00
Joas Schilling	5e4ac548bb	Use attr() instead of data() so the item ids work as intended Fix #8841	2014-06-30 14:21:27 +02:00
Bjoern Schiessle	372d58544f	no longer check if the external storage app is enabled, we use no the webdav implementation from core	2014-06-30 12:34:49 +02:00
Jenkins for ownCloud	589f68ebf6	[tx-robot] updated from transifex	2014-06-30 01:54:47 -04:00
Jenkins for ownCloud	ebf93448f2	[tx-robot] updated from transifex	2014-06-29 01:56:00 -04:00
Volkan Gezer	d918e5a68c	Merge pull request #9278 from owncloud/l10n-servershare-dialog fix server share dialog title	2014-06-28 14:44:37 +02:00
Morris Jobke	d5462fdb50	Merge pull request #9265 from owncloud/fix-whitespace fix trailing whitespace noted by Scrutinizer	2014-06-28 12:26:09 +02:00
Jenkins for ownCloud	26d0978993	[tx-robot] updated from transifex	2014-06-28 01:54:54 -04:00
Volkan Gezer	11788c9579	fix server share dialog title	2014-06-28 01:54:51 +02:00
icewind1991	1a3e698294	Merge pull request #9263 from owncloud/remote-share-update Better detecting of remote changes for external shares	2014-06-27 19:31:18 +02:00
Jan-Christoph Borchardt	b7cb4f5a63	fix trailing whitespace noted by Scrutinizer	2014-06-27 18:25:56 +02:00
Robin Appelman	1bb1504d24	Improve comment	2014-06-27 17:31:51 +02:00
Robin Appelman	6f5d5b9a30	Also check for updated permissions for webdav storages	2014-06-27 17:27:47 +02:00
Vincent Petry	13b7937381	Allow late registration of file actions in public page	2014-06-27 16:10:20 +02:00
Vincent Petry	586b3a9683	Sync file list with file actions Whenever file actions are registered later, now the file lists are automatically notified. Added FileActions.addUpdateListener() to be able to receive such notifications. This removes the need for apps to manually call FileActions.display() after registering new actions. This fixes issues with race conditions when file actions are registered after the file list was already rendered.	2014-06-27 13:41:01 +02:00
Thomas Müller	ef4057d382	remove pointless require - we should kill all require_once like that in our tests	2014-06-27 09:30:42 +02:00
Jenkins for ownCloud	36f771e9f0	[tx-robot] updated from transifex	2014-06-27 01:55:44 -04:00
Morris Jobke	d9aa8c9f0e	drop unneeded code	2014-06-27 00:30:14 +02:00
Vincent Petry	c6b89cc55a	Fix wording for remote shares in settings page	2014-06-26 19:35:57 +02:00
Björn Schießle	1822bba5e9	Merge pull request #9193 from owncloud/sharing_etag_propagation make sure that the etags get propagated correctly	2014-06-26 10:26:24 +02:00
Jenkins for ownCloud	a5154450cf	[tx-robot] updated from transifex	2014-06-26 01:54:40 -04:00
Vincent Petry	93a6792da7	Merge pull request #9205 from owncloud/remoteshare-fixurlpath Fix parsing of remote URL when mounting remote shares	2014-06-25 19:59:39 +02:00
Morris Jobke	a9d0e9a5d5	Merge pull request #9202 from owncloud/urlhashfix Do not clear URL hash when no external mount params given	2014-06-25 16:28:52 +02:00
Bjoern Schiessle	38ff8173ab	make sure that hooks are registered for the tests	2014-06-25 15:20:52 +02:00
Vincent Petry	d22559200c	Fix parsing of remote URL when mounting remote shares This fix allows for having the remote ownCloud instance live in a subpath like "http://example.com/basedir/subdir/owncloud". Such URLs are now parsed correctly. Added unit test for URL parsing.	2014-06-25 15:11:43 +02:00
icewind1991	c94c69aea1	Merge pull request #9189 from owncloud/sharing_fix_permissions Sharing fix permissions	2014-06-25 15:01:34 +02:00
Jenkins for ownCloud	b1116880f8	[tx-robot] updated from transifex	2014-06-25 06:33:53 -04:00
Vincent Petry	363f8f3205	Do not clear URL hash when no external mount params given Whenever external share parameters were passed through the URL hash, the URL hash will now be cleared. In other cases, the hash needs to be left alone because it is used as workaround for the lack of history API in IE8 / IE9 Removed getParamterByName() and use OC.Util.History.parseUrlQuery() that does the same, including replacing the "+" with spaces.	2014-06-25 12:24:46 +02:00
Bjoern Schiessle	a0b85fc5e4	make sure that during share and unshare the etags get propagated correctly	2014-06-25 12:11:56 +02:00
Bjoern Schiessle	3fc7357ade	add/update unit tests	2014-06-24 14:00:15 +02:00
Bjoern Schiessle	84d36df70b	make sure that we always return the correct permissions	2014-06-24 13:39:37 +02:00
Jenkins for ownCloud	6a4a474aa9	[tx-robot] updated from transifex	2014-06-24 01:54:39 -04:00
Vincent Petry	9b001ed903	Setup the external share manager in a hook To make sure the external shares are initialized in the right order and make sure the session is correctly initialized before, the external share manager is now set up in a filesystem setup hook.	2014-06-23 11:57:43 +02:00
Jenkins for ownCloud	2b4c2a7b14	[tx-robot] updated from transifex	2014-06-22 01:54:36 -04:00
Jenkins for ownCloud	da0e4b0af0	[tx-robot] updated from transifex	2014-06-21 01:54:37 -04:00
Morris Jobke	d5819a5ecd	Merge pull request #9108 from owncloud/uploadintofolderfix Fix many issues with drag and drop upload	2014-06-20 19:01:05 +02:00
Jenkins for ownCloud	ca96b9d3d5	[tx-robot] updated from transifex	2014-06-20 01:54:32 -04:00
Vincent Petry	9ef7410abe	Fixed uploading by drag and drop into folder	2014-06-19 16:14:10 +02:00
Jenkins for ownCloud	e1fd10f226	[tx-robot] updated from transifex	2014-06-19 01:55:38 -04:00
icewind1991	8d1cf79152	Merge pull request #8399 from owncloud/server-server-sharing Add server<->server sharing	2014-06-17 17:40:05 +02:00
Robin Appelman	07fdeba50b	Fix moving movablemount over webdav	2014-06-17 14:10:11 +02:00
Robin Appelman	2219087df6	organize js a bit better	2014-06-17 13:47:36 +02:00
Robin Appelman	f2ebac5c76	Better error handeling in testremote	2014-06-17 13:15:34 +02:00
Robin Appelman	361607c72d	testremote is for public access	2014-06-17 13:08:24 +02:00
Morris Jobke	e7365c9507	fix broken buttons for IE8-11	2014-06-17 11:45:55 +02:00
Morris Jobke	17685adb87	fixing layout issue - mostly alignment	2014-06-17 11:24:39 +02:00
Jenkins for ownCloud	ce179dcdcb	[tx-robot] updated from transifex	2014-06-17 01:55:43 -04:00
Robin Appelman	3ed4e5b26b	Prevent warning	2014-06-16 16:12:32 +02:00
Robin Appelman	9c2918a626	Fix setupFromToken when a password is set	2014-06-16 16:09:56 +02:00
Robin Appelman	0616eb4007	Fix multiple users having the same external share mountpoint	2014-06-16 15:57:01 +02:00
Robin Appelman	5b1b6572f7	Make testremote more robust	2014-06-16 13:21:00 +02:00
Robin Appelman	6e06e1da0e	Add route which went missing during rebase	2014-06-16 13:20:39 +02:00
Morris Jobke	4fbab3c12d	Merge pull request #9040 from owncloud/fix-xss Sanitize name of sharee	2014-06-16 13:13:28 +02:00
Robin Appelman	a469efb1f1	Add some safety checks	2014-06-16 12:42:28 +02:00
Vincent Petry	d21845557e	Merge pull request #9027 from owncloud/fix-password-saved-share-layout fix layout of password protected shares	2014-06-16 11:11:03 +02:00
Jenkins for ownCloud	ec5448bf7d	[tx-robot] updated from transifex	2014-06-16 01:54:35 -04:00
Lukas Reschke	1066f4ec9a	Sanitize name of sharee Fixes a XSS introduced with `271684dcfe`	2014-06-14 20:45:10 +02:00
Morris Jobke	06ec82fd68	Fix path	2014-06-14 15:26:27 +02:00
Robin Appelman	9670d3e98b	Always send a POST body	2014-06-14 10:22:38 +02:00
Robin Appelman	4bc8a2550d	Fix public share webdav permissions	2014-06-14 10:22:38 +02:00
Robin Appelman	49f9b7ea8e	fix modified date for external shares	2014-06-14 10:22:38 +02:00
Robin Appelman	455fbafb48	Fix undefined index error	2014-06-14 10:22:38 +02:00
Bjoern Schiessle	3bf7b54cd5	block server-to-server share if files_external is not activates, can be reverted once we moved to the webdav implementation in core	2014-06-14 10:22:38 +02:00
Bjoern Schiessle	84a651e46d	add settings to disable server to server sharing	2014-06-14 10:22:38 +02:00
Robin Appelman	e7b58ed2bd	Properly expose read only public shares as read only	2014-06-14 10:14:08 +02:00
Robin Appelman	87e311b996	Fix storage being passed to cache/watcher and scanner when using storage wrappers	2014-06-14 10:14:08 +02:00
Robin Appelman	decb51aee6	Fix deleting of external shares	2014-06-14 10:14:08 +02:00
Robin Appelman	c8c8106168	generate better storage ids	2014-06-14 10:14:08 +02:00
Robin Appelman	ce0aa7d4a8	Use the movable mount system for external shares	2014-06-14 10:14:08 +02:00
Robin Appelman	c61f759a8b	Fix check for shared files inside shares	2014-06-14 10:14:08 +02:00
Robin Appelman	2005c162bd	Fix prompting for password	2014-06-14 10:14:07 +02:00
Robin Appelman	64ced76beb	Save mountpoints relative to the user	2014-06-14 10:14:07 +02:00
Robin Appelman	43c56fcd07	Generate a unique name	2014-06-14 10:14:07 +02:00
Robin Appelman	e6f3850890	Update for changes in master	2014-06-14 10:14:07 +02:00
Bjoern Schiessle	961317d911	make sure to enable incognito mode when mounting a public link and update init status of the encryption app	2014-06-14 10:14:07 +02:00
Robin Appelman	87b0021e56	Scan the entire remote share at once by requesting the full file tree from the remote server	2014-06-14 10:14:07 +02:00
Robin Appelman	30f5b2bd7c	Improve detection of whether we're in the files app	2014-06-14 10:13:24 +02:00
Robin Appelman	a900c7aa94	Fix removing remote shares	2014-06-14 10:13:24 +02:00
Robin Appelman	1c149da52f	Support path lengths up to 4000 chars	2014-06-14 10:13:24 +02:00
Robin Appelman	c6a83b2f17	Fix exposing single files over webdav	2014-06-14 10:13:24 +02:00
Robin Appelman	cf5a72c103	Add interface for adding a public share to a different ownCloud instance	2014-06-14 10:13:24 +02:00
Robin Appelman	d7de35376d	Add interface for accpeting external shares	2014-06-14 10:13:23 +02:00
Robin Appelman	0156ef8166	Add coments to database and dont use sql keywords as table names	2014-06-14 10:10:38 +02:00
Robin Appelman	a44baaf8eb	add remote/add external shares to manager	2014-06-14 10:10:37 +02:00
Robin Appelman	65f3b2fad2	Add server<->server sharing backend	2014-06-14 10:10:37 +02:00
Jenkins for ownCloud	4a26219ecf	[tx-robot] updated from transifex	2014-06-14 01:55:24 -04:00
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
Jörn Friedrich Dreyer	72436b68bf	fix liskov substitution principle in admin mail template settings, fixes #8997	2014-06-12 12:38:34 +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
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	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
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
Jenkins for ownCloud	1f2722053f	[tx-robot] updated from transifex	2014-06-08 01:56:13 -04:00
Jenkins for ownCloud	e0446a1df5	[tx-robot] updated from transifex	2014-06-07 01:56:13 -04: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
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	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	1b0b977678	remove share mount	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	14ce44acc8	Move shared mount moving from the storage to the mount	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
Robin Appelman	690e0b5070	Dont overwrite OCA.Sharing	2014-06-05 12:52:08 +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
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
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
Thomas Müller	fc1d6f4c3c	fixes during test	2014-06-04 15:01:36 +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
Jan-Christoph Borchardt	6b2b903ea6	Merge pull request #8468 from owncloud/remove-infieldlabels Remove infieldlabels	2014-06-04 09:28:20 +02:00
Jenkins for ownCloud	f5c4754c2b	[tx-robot] updated from transifex	2014-06-04 01:57:48 -04: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
Jörn Friedrich Dreyer	b5a145b297	convert mail template editor to app framework for a restful api	2014-06-03 16:53:03 +02:00
Jan-Christoph Borchardt	4ef94ddd2e	infield label removal: remove last occurences of infield labels	2014-06-03 15:30:09 +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
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
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
Vincent Petry	0944565f60	More unit tests and fixes for share	2014-06-02 18:08:56 +02:00
Morris Jobke	57ef089aac	drop allowZIPdownload and maxZIPSize as options	2014-06-02 16:29:03 +02:00
Vincent Petry	d677e3860d	Added unit tests for share.js and share icon	2014-06-02 15:59:06 +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
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
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	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	d21b8108c8	Fixed navigation order	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	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
Robin Appelman	99d46af0b4	Use instanceOfStorage instead of instanceof	2014-05-29 13:52:58 +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
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
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
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
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
Bjoern Schiessle	3b279c9056	prevent default action when clicking on the share notification	2014-05-23 11:17:13 +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
Bjoern Schiessle	12338e0ef0	allow admin to disable sharing for specific groups of users	2014-05-22 10:43:44 +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
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
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
Robin McCorkell	e7aebc5c32	Fix whitespace issues	2014-05-16 22:23:36 +01:00
Robin McCorkell	6930ae22e4	Fix more missing or broken PHPDoc	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
Bjoern Schiessle	b6e14af861	allow admin to enforce passwords for public link shares	2014-05-16 17:41:09 +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
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
Thomas Müller	55fc693750	@breif -> @brief	2014-05-13 19:09:15 +01:00
Thomas Müller	e0dd69e4e6	remove legacy aka deprecated code: OC_FilesystemView	2014-05-12 16:30:39 +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	b6d76e9985	[tx-robot] updated from transifex	2014-05-11 01:57:00 -04: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	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
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	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
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	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	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
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
Bjoern Schiessle	33883a46f5	return the new name if a mount point was renamed	2014-04-30 20:29:21 +02:00
Bjoern Schiessle	20e4ad382b	get the correct owner path for part files	2014-04-30 12:49:16 +02:00
Thomas Müller	003049e8a6	remove file name from upper right button	2014-04-29 17:16:14 +02:00
Thomas Müller	df32254133	reintroduce download button on public shares	2014-04-29 15:28:35 +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
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	ac9e07c589	$RUNTIME_APPTYPES is no longer used - left over from pre OC4	2014-04-28 17:56:20 +02:00
Vincent Petry	688f6162da	Add sorting to files list, trashbin and public files	2014-04-28 17:42:04 +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
icewind1991	7ac7546b71	Merge pull request #8353 from owncloud/publicshare-webdav Expose public shares over webdav	2014-04-26 15:55:37 +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 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
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	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	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
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	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
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
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
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
Bart Visscher	999e74e834	Fix PHPdoc in apps/files_sharing using scrutinizer patch	2014-04-15 21:05:44 +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
Thomas Müller	07ea57465b	drop folder support on public shared folders	2014-04-11 14:54:13 +02:00
Jörn Friedrich Dreyer	9b0f289143	remove obsolete code	2014-04-09 12:09:28 +02:00
Jenkins for ownCloud	796f719548	[tx-robot] updated from transifex	2014-04-09 01:56:49 -04:00
Jenkins for ownCloud	e295d48fd4	[tx-robot] updated from transifex	2014-04-07 01:56:11 -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
Vincent Petry	3101663129	Removed redundant free space and upload limit in public page	2014-04-03 16:50:21 +02:00
Robin Appelman	7dafdfbe88	add tests for sharing files the users doesn't have access to	2014-04-03 13:14:34 +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
Jenkins for ownCloud	73dd5ff26c	[tx-robot] updated from transifex	2014-04-02 01:56:39 -04: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
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
Jenkins for ownCloud	7a4a836abe	[tx-robot] updated from transifex	2014-04-01 01:56:15 -04:00
Robin Appelman	0c2585f3ac	Improve phpdoc	2014-03-31 14:29:55 +02:00
Robin Appelman	fe78d963d9	Implement getPath for shared files	2014-03-28 15:26:15 +01:00
Vincent Petry	d0012e729a	Merge pull request #7879 from owncloud/sharing_cleanup_public_api sharing api cleanup, first step	2014-03-28 12:23:11 +01:00
Thomas Müller	e3b951f412	Merge pull request #7724 from owncloud/mobile [WIP] Mobile optimization for base layout and Files app	2014-03-28 10:27:15 +01:00
Jan-Christoph Borchardt	eeaefd84c3	change mobile breakpoint for shared view to 768px as well	2014-03-26 16:32:09 +01:00
Vincent Petry	cbfd16089b	Fixed share upgrade cleanup tests to use the correct ids	2014-03-26 09:29:28 +01:00
Thomas Müller	8958b9147b	adding ellipsis on file names to public file list as well	2014-03-26 00:14:38 +01:00
Thomas Müller	bbc2e37259	Merge pull request #7477 from owncloud/foldersize-reuse Allow re-using already known fileinfo when calculating folder sizes	2014-03-25 22:33:24 +01:00
Vincent Petry	ec9260647a	Fixed share updater unit test Now using \OC_DB::insertId() to retrieve the generated ids because Oracle ignores the passed values.	2014-03-25 20:18:58 +01:00
Bjoern Schiessle	31681a3a27	finally fix the paths for the OCS Share API	2014-03-25 17:52:45 +01:00
Bjoern Schiessle	3653a51af2	fix path creation for re-shares, issue #7662	2014-03-25 17:48:50 +01:00
Jenkins for ownCloud	abdc823bb6	[tx-robot] updated from transifex	2014-03-24 01:55:51 -04:00
Jenkins for ownCloud	7b1d52f5b9	[tx-robot] updated from transifex	2014-03-19 01:55:39 -04:00
Thomas Müller	756bbe8786	Merge pull request #7649 from owncloud/routing-public Move routing classes to an interface and expose it in the public api	2014-03-17 21:07:05 +01:00
Morris Jobke	7ffaf0d70a	Merge pull request #7734 from owncloud/icon-class-remove remove unneeded icon class	2014-03-16 10:24:57 +01:00
Jenkins for ownCloud	c89aa6d5fe	[tx-robot] updated from transifex	2014-03-16 03:13:21 -04:00
Jenkins for ownCloud	b2e929d580	[tx-robot] updated from transifex	2014-03-15 02:14:22 -04:00
Jan-Christoph Borchardt	55c630ea7d	remove unneeded icon class	2014-03-14 14:47:40 +01:00
Jenkins for ownCloud	4b802aa7cb	[tx-robot] updated from transifex	2014-03-13 17:12:37 -04:00
Bjoern Schiessle	9d32475260	finally fix the paths for the OCS Share API	2014-03-13 15:16:59 +01:00
Morris Jobke	206364cd1c	remove invalid shares with one SQL statement	2014-03-13 13:09:32 +01:00
Vincent Petry	02be15ce2f	Added backticks for Oracle in sharing updater unit test	2014-03-13 13:09:32 +01:00
Morris Jobke	4bb303cbd6	Clean up database before setup the database for testing	2014-03-13 13:09:32 +01:00
Morris Jobke	ec54bc7709	Refactor update script to class and add unit test	2014-03-13 13:09:32 +01:00
Jamie McClelland	d58fda7ff3	fix update to remove shares where file doesn't exist on postgres Without patch, breaks with: Failed to upgrade "files_sharing". Exception="SQLSTATE[22P02]: Invalid text representation: 7 ERROR: invalid input syntax for integer: "5,179"" See: https://github.com/owncloud/core/issues/5758 removing unnecessary cruft - no parameter is set, none to pass. https://github.com/owncloud/core/issues/5758 removing subquery, making more readable See: https://github.com/owncloud/core/pull/6016#issuecomment-29510979 parameters to sql calls should be arrays https://github.com/owncloud/core/pull/6016 boosting version to ensure fix gets executed properly escaping the sql select statement removing extraneous closing paren.	2014-03-13 13:09:31 +01:00
Jenkins for ownCloud	1295e54173	[tx-robot] updated from transifex	2014-03-13 01:55:50 -04:00
Jenkins for ownCloud	8320b8eb7a	[tx-robot] updated from transifex	2014-03-12 01:57:17 -04:00
Björn Schießle	03f40116e1	Merge pull request #7665 from owncloud/fix_ocs_share_api_paths Fix ocs share api paths	2014-03-11 16:55:52 +01:00
Robin Appelman	d55c7223a9	Merge branch 'master' into foldersize-reuse Conflicts: lib/private/files/cache/homecache.php	2014-03-11 13:04:20 +01:00
Bjoern Schiessle	a09df0083e	add 'received_from' info to the share, so that every share can have a different value	2014-03-11 12:59:37 +01:00
Bjoern Schiessle	36885dc64c	fix path creation for re-shares, issue #7662	2014-03-11 12:58:46 +01:00
Jenkins for ownCloud	b0ec38e202	[tx-robot] updated from transifex	2014-03-11 01:59:39 -04:00
Robin Appelman	8ab7d18a6a	Move the router classes to a namespace and expose it with a public interface	2014-03-10 14:04:58 +01:00
Bjoern Schiessle	9548670da7	we need the file_source to delete a share successfully	2014-03-10 11:35:54 +01:00
Thomas Müller	32b29c9d73	Merge branch 'master' into fix-7307 Conflicts: core/js/router.js settings/js/admin.js	2014-03-06 00:15:08 +01:00
Thomas Müller	1291303c5a	Replace OC.Router.generate() with OC.generateUrl()	2014-03-02 22:30:24 +01:00
Thomas Müller	15d1df055b	Merge branch 'master' into display-share-owner-master Conflicts: apps/files_sharing/lib/cache.php	2014-02-28 14:54:10 +01:00
Robin Appelman	da386aad59	Allow re-using already known fileinfo when calculating folder sizes	2014-02-28 14:23:07 +01:00
Thomas Müller	9e59e64c79	Merge pull request #7421 from owncloud/password-input disable autocomplete for shared link password input, fix #7419	2014-02-26 22:21:00 +01:00
Björn Schießle	b7385986ae	Merge pull request #7393 from owncloud/fix_path_in_sharing_results fix path in sharing results if it is a file in the Shared folder	2014-02-26 15:19:30 +01:00
Jan-Christoph Borchardt	6c5cc46380	disable autocomplete for shared link password input, fix #7419	2014-02-26 14:48:15 +01:00
Bjoern Schiessle	3be5e48b0c	only add "received_from" if a share was found	2014-02-26 12:52:35 +01:00
Bjoern Schiessle	e3f676e009	fix path in sharing results if it is a file in the Shared folder	2014-02-25 17:27:23 +01:00
Morris Jobke	5fb1374b0f	Merge pull request #7285 from owncloud/mimeicons-svg Show svg mime icons when no preview is available	2014-02-24 14:12:10 +01:00
Bjoern Schiessle	0c0e4fced5	fix test so that it doesn't depend on the array order	2014-02-21 13:37:47 +01:00
Bjoern Schiessle	6ca4d3bfde	fix usersPath and add unit tests	2014-02-21 13:37:46 +01:00
Morris Jobke	65843e2459	Improve jQuery element selector see https://github.com/owncloud/core/pull/7012/files#r9337198 http://24ways.org/2011/your-jquery-now-with-less-suck/	2014-02-20 18:24:43 +01:00
Thomas Müller	d0c8b310b9	uppercase text and fix dialog popup	2014-02-20 18:24:42 +01:00
Thomas Müller	179fbada32	show share owner within shared folders as well	2014-02-20 18:24:42 +01:00
Thomas Müller	2b84f5e0b9	remove duplicate selectors and declaration	2014-02-20 18:24:42 +01:00
Thomas Müller	271684dcfe	update share owner	2014-02-20 18:24:42 +01:00
Thomas Müller	7c68025010	adding share owner information to the file list	2014-02-20 18:24:42 +01:00
Robin Appelman	0624476aa1	Merge branch 'master' into mimeicons-svg	2014-02-20 16:55:18 +01:00
Robin Appelman	f33d35cd07	Fix svg icons for public shares and external/shared files	2014-02-19 15:08:05 +01:00
Vincent Petry	952584e9c7	Merge pull request #7195 from owncloud/files-selectall Do not send file list for select all on Download/delete	2014-02-19 14:33:24 +01:00
Scrutinizer Auto-Fixer	adaee6a5a1	Scrutinizer Auto-Fixes This patch was automatically generated as part of the following inspection: https://scrutinizer-ci.com/g/owncloud/core/inspections/cdfecc4e-a37e-4233-8025-f0d7252a8720 Enabled analysis tools: - PHP Analyzer - JSHint - PHP Copy/Paste Detector - PHP PDepend	2014-02-19 09:31:54 +01:00
Thomas Müller	c6f4f85e27	Merge branch 'master' into scrutinizer_documentation_patches Conflicts: lib/private/migration/content.php	2014-02-18 18:31:33 +01:00
Thomas Müller	1e84d6b14b	Merge pull request #7190 from owncloud/appconfig-legacy-apps Remove usage of legacy OC_Appconfig	2014-02-18 18:10:22 +01:00
Matthew Caron	aa1a50f5b3	Consolidate two sections, per code review. Issue #1648	2014-02-17 12:57:54 -05:00
Thomas Müller	9fac95c2ab	Merge branch 'master' into scrutinizer_documentation_patches Conflicts: lib/private/appconfig.php	2014-02-14 23:03:27 +01:00
Matthew Caron	2887fb1f48	Fit shared videos to viewer, just like images. Issue #1648	2014-02-14 16:09:51 -05:00
Vincent Petry	d7f4547717	Merge pull request #6726 from owncloud/fix_6630 don't urldecode get var, php does this automatically	2014-02-14 14:34:20 +01:00
Vincent Petry	d5397d813c	Do not send file list for select all on Download/delete - When all files are selected, do not send the whole file list - Download will trigger download for the parent folder, also works with root - Delete will send "allfiles" to the server that will find the file list or the passed directory by itself	2014-02-13 20:28:52 +01:00
Robin Appelman	181bbd4325	Remove usage of legacy OC_Appconfig	2014-02-13 16:28:49 +01:00
Bjoern Schiessle	a8943ad022	replace 'size' with 'unencrypted_size' if encryption is enabled	2014-02-07 12:53:13 +01:00
Jörn Friedrich Dreyer	2a6a9a8cef	polish documentation based on scrutinizer patches	2014-02-06 17:02:21 +01:00
Vincent Petry	aff1cafaca	Merge pull request #7089 from owncloud/sharing-searchbymime Fixed searchByMime in shared cache	2014-02-06 14:15:00 +01:00
Pellaeon Lin	946fccc0dd	Remove unused template variable assignment of files_sharing/template/public.php	2014-02-06 12:26:36 +08:00
Pellaeon Lin	8c56e21ced	Move template variable assignment to correct place	2014-02-06 12:06:16 +08:00
Vincent Petry	fa5ddc3e18	Fixed searchByMime in shared cache - searchByMime now correctly returns files recursively search through all the dirs - added unit test for searchByMime	2014-02-05 13:29:06 +01:00
Jan-Christoph Borchardt	0609f30d1c	Merge pull request #6235 from NCTU-NBA/pr-exceed_upload_limit_msg Change misleading message when file size exceeds upload limit	2014-02-04 08:04:19 -08:00
Vincent Petry	d49c7ad4fb	Fixed double file encoding for previews	2014-01-30 16:34:37 +01:00
Georg Ehrke	c5742520e1	don't urldecode get var, php does this automatically	2014-01-30 16:32:45 +01:00
Pellaeon Lin	099b71c712	Merge branch 'master' into pr-exceed_upload_limit_msg Conflicts: apps/files/templates/index.php apps/files_sharing/templates/public.php	2014-01-30 22:50:20 +08:00
Bjoern Schiessle	f9d9a62e58	remove needless element tag	2014-01-30 13:34:41 +01:00
Jan-Christoph Borchardt	271088a7a2	Merge pull request #6777 from owncloud/mobile-style Mobile style for public links: files, folders, picture sets	2014-01-29 09:17:02 -08:00
Jan-Christoph Borchardt	edea7781b7	make header scroll up for single shares, more view of content on small screens	2014-01-29 17:20:55 +01:00
Thomas Müller	7655728ddf	- adding class to header div: share-folder or share-file - for supported previews are shown with a size of 500px; icons with a size of 128px	2014-01-29 16:52:30 +01:00
Jan-Christoph Borchardt	5a869732d1	adjust file type icon placement for when no preview can be generated	2014-01-29 15:28:57 +01:00
Björn Schießle	609d5f2458	Merge pull request #6987 from owncloud/share_api_and_encryption [ocs share api] public upload is also possible with encryption enabled, since OC6	2014-01-29 02:50:25 -08:00
Jan-Christoph Borchardt	d310df505c	permanently show download action on mobile, only icon	2014-01-29 11:43:34 +01:00
Jan-Christoph Borchardt	8f81f007cd	fix horizontal scrollbar appearing when footer is too long, footer wraps now	2014-01-29 11:06:19 +01:00
Jan-Christoph Borchardt	13ed59c1cf	merge master into mobile-style	2014-01-29 10:55:44 +01:00
Morris Jobke	cf2c061f1f	Merge pull request #6929 from owncloud/sharing-fixfiledownloadlink Sharing fixfiledownloadlink	2014-01-29 00:39:14 -08:00
Bjoern Schiessle	cd4e044f66	public upload is also possible with encryption enabled, since OC6	2014-01-28 17:28:20 +01:00
Bjoern Schiessle	7f83f2a8f2	use more accurate error codes	2014-01-28 13:31:43 +01:00
Morris Jobke	0a1708ba11	Merge pull request #6912 from owncloud/replace-webroot-in-css Remove %webroot% from CSS	2014-01-27 04:11:15 -08:00
Jan-Christoph Borchardt	46745895ae	Merge pull request #5153 from owncloud/core-em-to-px Cleans up Core apps for relative(em) to absolute(px) styles.	2014-01-27 02:29:47 -08:00
Vincent Petry	c6695bbd76	Fixed download URL in public page - Refactored download URL building to make it overridable - Added download URL override in public page - Added JS unit tests for download URL - Added OC.redirect() method to facilitate unit testing	2014-01-24 13:38:39 +01:00
Thomas Müller	617aa3cf29	Instead of 'No preview available for ...' we simple display the mieme-type icon	2014-01-23 20:15:10 +01:00
Jan-Christoph Borchardt	799e744ad7	remove background and width from multiselect bar, fix Download button not showing on mobile	2014-01-23 15:35:30 +01:00
Jan-Christoph Borchardt	f0c9e8205f	remove %webroot from files_sharing app	2014-01-23 14:04:13 +01:00
Morris Jobke	4b7dfd34f8	fix conflicts and add missing closing tag	2014-01-23 13:51:51 +01:00
Thomas Müller	ade726ad32	focus link text only on click in the input field - closes #6817	2014-01-23 01:08:42 +01:00
Thomas Müller	f950ce82ae	Merge branch 'master' into mobile-style Conflicts: apps/files/js/files.js apps/files_sharing/css/public.css apps/files_sharing/js/public.js apps/files_sharing/templates/public.php	2014-01-23 00:39:11 +01:00
Bjoern Schiessle	eaed786eed	add path relative to the files folder of the currently logged in user to the output of getFolderContent()	2014-01-22 17:11:37 +01:00
Morris Jobke	cf6e79cda8	Merge pull request #6719 from tripflex/fix_pubup_progbar Fix public upload progress bar	2014-01-22 02:28:28 -08:00
Thomas Müller	9bab05fd45	Merge branch 'master' into fixing-gallery-password-protected-access-master	2014-01-21 19:36:20 +01:00
Thomas Müller	23a4d0d44e	OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error	2014-01-21 11:32:30 +01:00
Thomas Müller	9fd4cb1b66	adding password protection check to getShareByToken()	2014-01-21 10:42:47 +01:00
Thomas Müller	4ec6debe2b	remove unused variable	2014-01-20 17:27:03 +01:00
Robin Appelman	3d6d8d1bb6	Reuse the data retrieved from the cache in checkUpdate	2014-01-20 15:21:21 +01:00
Vincent Petry	f4c198b907	Fixed isPreviewAvailable warnings in log isPreviewAvailable wasn't always set as the files formatting code is slightly different than the one from the files app. Fixes #6423	2014-01-17 14:22:05 +01:00
Pellaeon Lin	4726a2021b	Add $freeSpace and $uploadLimit to files_sharing	2014-01-17 17:10:42 +08:00
raghunayyar	12e5d0f68d	Fixes typos, adds ; wherever not present.	2014-01-16 21:06:14 +05:30
Jan-Christoph Borchardt	d463edaf09	on mobile, show single shared image at full width without margin	2014-01-16 15:56:18 +01:00
Jan-Christoph Borchardt	5cdab5fff3	show publicly shared image on full width, without margin	2014-01-16 15:32:23 +01:00
Jan-Christoph Borchardt	c0590676a0	fix public share download button width	2014-01-16 15:28:39 +01:00
raghunayyar	775e08e0ee	Merge branch 'master' into core-em-to-px Conflicts: apps/files_sharing/css/public.css apps/user_ldap/css/settings.css core/css/multiselect.css core/css/share.css	2014-01-16 14:42:37 +05:30
Myles McNamara	62040fe2d2	change em to px	2014-01-15 17:06:48 -05:00
Robin Appelman	1462fba37c	use OC_Util::basename	2014-01-15 16:02:18 +01:00
Jan-Christoph Borchardt	3e7cf4110d	tweak color and position of username in public share	2014-01-15 15:49:42 +01:00
Jan-Christoph Borchardt	db837bf696	improvements to public files mobile view	2014-01-15 15:48:42 +01:00
Thomas Müller	50ae2ab14c	add download button on single file share page	2014-01-15 15:31:27 +01:00
Thomas Müller	b3a6683784	remove unused js code and css rules	2014-01-15 15:22:40 +01:00
Thomas Müller	807b885a0e	reuse file upload as used within files app - remove public upload button	2014-01-15 14:36:18 +01:00
Robin Appelman	d279ddd9a2	Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder	2014-01-15 13:36:14 +01:00
Jan-Christoph Borchardt	2bdd014f83	first mobile style rules, hide extra columns in files view and scroll header	2014-01-14 22:14:06 +01:00
Bjoern Schiessle	fa7f53e89d	it is not an urgent error... a DEBUG message is enough at this point	2014-01-14 13:38:41 +01:00
Andreas Fischer	cb071a9f35	Merge pull request #6755 from owncloud/remove-ru_RU-master remove ru_RU - it has bee removed from transifex * owncloud/remove-ru_RU-master: remove ru_RU - it has bee removed from transifex	2014-01-14 00:44:34 +01:00
Bjoern Schiessle	d1b47021f1	don't unshare on delete	2014-01-13 16:49:16 +01:00
Thomas Müller	92969052d7	remove ru_RU - it has bee removed from transifex	2014-01-13 16:41:10 +01:00
Myles McNamara	97be32e2e8	modify js to move upload wrapper, modify css to match core values	2014-01-10 14:07:20 -05:00
Myles McNamara	9ebffd6635	remove extra upload controls	2014-01-10 14:03:55 -05:00
Myles McNamara	0802b662be	fix upload button layout	2014-01-10 12:20:31 -05:00
Vincent Petry	1042733634	Fixed various file name escaping issues in core apps - Refactored file tr lookup into FileList.findFileEl that uses filterAttr to avoid escaping issues in jQuery selectors - Fixed versions and sharing app to properly escape file names in attributes	2014-01-10 15:02:26 +01:00
Vincent Petry	8eaa39f4e2	Removed special handling of part files in shared storage rename This fixes the issue introduced by the transfer id which itself wasn't taken into account by the shortcut code for part file in the shared storage class.	2014-01-08 18:43:20 +01:00
Jenkins for ownCloud	6be2dee5bc	[tx-robot] updated from transifex	2014-01-08 01:55:41 -05:00
Jenkins for ownCloud	d2f2645a6a	[tx-robot] updated from transifex	2014-01-07 01:56:11 -05:00
Jenkins for ownCloud	e4616199df	[tx-robot] updated from transifex	2014-01-05 01:55:53 -05:00
Jenkins for ownCloud	095f9b8ee0	[tx-robot] updated from transifex	2014-01-02 01:56:21 -05:00
Thomas Müller	6523960de9	Merge pull request #6554 from owncloud/fix_5982 fix preview for reshared file	2013-12-24 04:03:20 -08:00
Jenkins for ownCloud	dbbd99db09	[tx-robot] updated from transifex	2013-12-24 01:55:40 -05:00
Georg Ehrke	c90e3e4f5b	fix preview for reshared file	2013-12-22 20:27:38 +01:00
Jenkins for ownCloud	f60ecfc7fd	[tx-robot] updated from transifex	2013-12-22 01:56:05 -05:00
Vincent Petry	963ee31efb	Removed numRows usage from encryption app numRows on Oracle always seem to return 0. This fix removes numRows usage from the encryption and sharing app. This fixes unit tests and potentially the encryption app itself (migration status) when running on Oracle	2013-12-19 15:51:24 +01:00
Jan-Christoph Borchardt	ee2ecbe543	Merge pull request #6366 from owncloud/fix-6335 Bump the footer down 20px to avoid overlap.	2013-12-17 14:59:24 -08:00
Jenkins for ownCloud	6488ff2c75	[tx-robot] updated from transifex	2013-12-17 16:43:17 -05:00
ringmaster	e2197c7108	Bump the footer down 20px to avoid overlap. Fixes #6335.	2013-12-12 13:06:57 -05: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	079d20a80e	[tx-robot] updated from transifex	2013-12-07 22:28:29 -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
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	1b18c5a047	[tx-robot] updated from transifex	2013-11-29 14:10:40 -05: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
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
Bjoern Schiessle	aee7781f22	fix public preview creation if a user ios logged in	2013-11-27 18:44:01 +01: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	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
Jenkins for ownCloud	fb7aa2f014	[tx-robot] updated from transifex	2013-11-26 10:47:07 -05:00
Jenkins for ownCloud	ba0e09adce	[tx-robot] updated from transifex	2013-11-24 00:14:51 -05:00
Bjoern Schiessle	9d16353e09	disable trahs in files_sharing/public.php	2013-11-21 12:06:35 +01:00
Bjoern Schiessle	c9646ddc4c	fix undefined index errors if public share view	2013-11-21 12:03:27 +01:00
Bjoern Schiessle	b27fc42e1f	public upload now also works with encryption enabled	2013-11-21 00:23:38 +01:00
Jenkins for ownCloud	c3746e866a	[tx-robot] updated from transifex	2013-11-15 22:56:31 -05: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
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
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
Vincent Petry	da126f1692	Fixed unit tests for files sharing watcher	2013-11-06 09:39:52 +01: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	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
Thomas Müller	a7cb16aab1	use ===	2013-11-04 21:23:10 +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	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
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	e1e4c7c214	Merge branch 'master' into fix_file_cache_updater_master	2013-10-29 17:47:33 +01:00
Morris Jobke	404e9c0053	fix style of public share page	2013-10-29 16:08:11 +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
Vincent Petry	e62ca4ea4f	Append file etag to preview URLs Fixes #5534	2013-10-28 14:14:55 +01:00
Jenkins for ownCloud	119ecc6f34	[tx-robot] updated from transifex	2013-10-27 02:32:11 -04:00
Thomas Müller	f91a4c89ca	adding storage_mtime handling to SharedCache	2013-10-25 12:39:21 +02: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
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

... 8 9 10 11 12 ...

1865 commits