Commit Graph

6505 Commits

Author SHA1 Message Date
Björn Schießle 4336d42ab0 Merge pull request #5233 from owncloud/enc_filter_users
only encrypt file to users with encryption keys
2013-10-11 01:48:02 -07:00
Jenkins for ownCloud 44a5b0bad0 [tx-robot] updated from transifex 2013-10-10 22:30:58 -04:00
Bjoern Schiessle 909af2b62e don't cache if the encryption is enabled, this can lead to problems during unit testing 2013-10-10 15:02:52 +02:00
Morris Jobke e276ffedd3 Merge pull request #5257 from owncloud/files-ie8-regularfileactionsbroken
Fixed files view regular file actions in IE8
2013-10-10 05:14:09 -07:00
Morris Jobke cf554fd804 Merge pull request #5182 from owncloud/fix-sharring-with-password-screen
Fix password screen for public shares
2013-10-10 04:49:47 -07:00
blizzz 666e52a46b Merge pull request #5114 from owncloud/ldap_uuid_attr_groups
LDAP: allow different UUID attributes for groups and users
2013-10-10 03:27:28 -07:00
Vincent Petry bf00ccd1d6 Fixed files view regular file actions in IE8
Fixes #5256

A missing closing span broken the container in IE8 which prevented the
file actions to be appended properly.
2013-10-10 12:21:02 +02:00
VicDeo 1cb47bf777 Merge pull request #5221 from owncloud/fixing-5217-master
fixing php 5.3 compatibility
2013-10-10 01:55:18 -07:00
Bjoern Schiessle a1719deabe make sure that we are logged in ad user1 while performing the tests 2013-10-10 10:47:35 +02:00
Vincent Petry 3a3819b303 Merge pull request #5134 from owncloud/trashbin-homeiconbroken
Do not call changeDirectory() when no dir set on breadcrumb
2013-10-09 09:01:43 -07:00
Björn Schießle 223adc3167 Merge pull request #5230 from owncloud/trashbin_fixes
Trashbin fixes
2013-10-09 08:27:54 -07:00
Bjoern Schiessle 7ab4fef7a9 update file summary after group delete/restore 2013-10-09 16:17:43 +02:00
Bjoern Schiessle 38e5da05af only encrypt file to users with encryption keys 2013-10-09 15:56:21 +02:00
Bjoern Schiessle 46bce8e540 fix checkbox 2013-10-09 13:15:53 +02:00
Bjoern Schiessle 51cfdb32b1 fix indention 2013-10-09 12:43:56 +02:00
Bjoern Schiessle 31a91ef892 fix group delete/restore 2013-10-09 12:35:15 +02:00
Thomas Müller 9637ca3ae8 Merge pull request #5070 from owncloud/smb-streamwrapper-fixes
Various fixes for the streamwrapper based SMB backend
2013-10-09 03:05:51 -07:00
Bjoern Schiessle 9e3d28871e fix delete/restore individual files 2013-10-09 12:01:25 +02:00
Bjoern Schiessle 4404963918 fix trashbin layout 2013-10-09 11:11:55 +02:00
Thomas Müller 8a06f2e128 php 5.3 compatibility for Test_Files_Sharing_Api 2013-10-08 23:05:19 +02:00
Vincent Petry cddb85c588 Added filesApp flag as input field for files app detection
Since the files app can be reached under multiple URLs, either root,
files.php or public.php, a flag has been added to the DOM to help apps
(like file viewers) to detect whether they are currently in the files
app.
2013-10-08 17:19:58 +02:00
Morris Jobke 6284ab31de fix escaping 2013-10-08 16:00:26 +02:00
Bjoern Schiessle 68e1dd1f23 make sure that we only remove file/folder shares 2013-10-08 16:00:18 +02:00
Jenkins for ownCloud 209392587f [tx-robot] updated from transifex 2013-10-08 07:24:19 -04:00
VicDeo 372a73d43a Merge pull request #5184 from owncloud/fix-trash-bin-button
Fix trash bin button
2013-10-07 10:58:47 -07:00
Jenkins for ownCloud c655eec3d1 [tx-robot] updated from transifex 2013-10-07 12:21:38 -04:00
Morris Jobke 980fc9cc7e Fix trash bin button 2013-10-07 18:15:23 +02:00
Morris Jobke 4af220d09e Fix password screen for public shares
* Works in IE8, 9, 10, Firefox 24 and Chromium 30
 * Credits to Julian Müller @Julian1998
2013-10-07 17:38:27 +02:00
Vincent Petry a3d0e29aa5 Merge pull request #5178 from owncloud/sharing-ispublicflagintemplate
Added isPublic flag in files_sharing template
2013-10-07 08:23:55 -07:00
VicDeo d8b7e42fc1 Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
File conflicts dialog fixes
2013-10-07 08:19:40 -07:00
Vincent Petry 6a36d7fa86 Added isPublic flag in files_sharing template
To make it possible for apps to find out whether they are running in
public mode, the flag "isPublic" will now be present in the DOM.

This is required to disable the editor app in public mode to fix #5059
2013-10-07 16:59:57 +02:00
Morris Jobke 193e815133 Merge pull request #5165 from owncloud/files-dropontobreadcrumbfix
Fix breadcrumb to reinit dnd after ajax nav #5064
2013-10-07 05:01:02 -07:00
Jörn Friedrich Dreyer 4ccbace68d remove double uri encoding 2013-10-07 11:15:58 +02:00
Jörn Friedrich Dreyer 0683372200 canceling individual uploads is currently impossible because there is no placeholder 2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer 3be8e3f8d3 remove obsolete comment 2013-10-07 11:14:11 +02:00
Jörn Friedrich Dreyer 8899543b7f use !== comparison 2013-10-07 11:14:10 +02:00
Vincent Petry 6a4563f203 Fix breadcrumb to reinit dnd after ajax nav #5064
Now correctly reinitializing the breadcrumb drop zone after ajax
navigation.

This also fixes dropping onto the "files" app icon.
2013-10-07 11:07:33 +02:00
Björn Schießle 981608cf6b Merge pull request #5129 from owncloud/remove_deleted_shares_from_db
remove deleted files from oc_share
2013-10-07 02:07:11 -07:00
Bjoern Schiessle 288f01bf62 catch exception if db query execution fails 2013-10-07 11:06:24 +02:00
Bjoern Schiessle 4f67b7a6c3 Merge branch 'master' into remove_deleted_shares_from_db 2013-10-07 11:00:56 +02:00
Bjoern Schiessle 0346167bb2 clean up oc_share table from files which are no longer exists 2013-10-07 10:59:09 +02:00
Frank Karlitschek 46fdb449a4 Merge pull request #4662 from owncloud/fix-4129
Fix 4129
2013-10-06 23:42:44 -07:00
Jenkins for ownCloud 3613e79e10 [tx-robot] updated from transifex 2013-10-06 19:16:10 -04:00
Lennart Rosam 5470700c9a Update file to meet coding standarts 2013-10-07 01:08:39 +02:00
Lennart Rosam 72ad309920 Actually test the connection 2013-10-07 01:08:38 +02:00
Lennart Rosam b9a948b597 Fixes #4129 2013-10-07 01:08:38 +02:00
Morris Jobke e1e16ec3b0 Merge pull request #5088 from owncloud/fix_trashbin_button
trash bin button needs to be an input field
2013-10-06 14:51:08 -07:00
Jan-Christoph Borchardt 2b521327c0 more elegant style for Personal and Admin settings 2013-10-05 11:23:49 +02:00
Morris Jobke cc1e69c190 Merge pull request #5136 from owncloud/design-fixes
Design fixes
2013-10-04 14:56:09 -07:00
Morris Jobke a927c145be Merge pull request #5102 from owncloud/input-simplify
Input simplify
2013-10-04 10:40:32 -07:00