c32c5979d8
Merge branch 'master' into versioning_preview_shared
2013-10-11 17:00:21 +02:00
5c664704a3
Merge pull request #5261 from owncloud/versioning_no_glob
...
versioning: don't use glob() and getLocalFile()
2013-10-11 07:57:14 -07:00
9a15aa8ee9
Merge pull request #5298 from owncloud/enc_fix_setting_dialog_headlines
...
fix setting dialog headlines for the encryption app
2013-10-11 07:15:58 -07:00
57beef1e36
fix setting dialog headlines for the encryption app
2013-10-11 15:56:08 +02:00
034968c612
Merge pull request #5292 from owncloud/enc_block_file_access_if_key_is_missing
...
encryption: block file access if share keys are missing
2013-10-11 06:37:53 -07:00
3ee7711284
fix another typo
2013-10-11 15:26:30 +02:00
2d79a79202
change error code to 403
2013-10-11 15:24:49 +02:00
83c78bc7a8
fix typo in error message and change error code to 403
2013-10-11 15:23:12 +02:00
2b2a548610
Fixed IE8 misaligned date
...
Removed display: block to let the element be displayed inline and let
itself aligned by vertical-align: middle of the parent
This works in IE8 and other browsers.
Fixes #5288
2013-10-11 14:23:37 +02:00
39d710e737
block file access if share keys are missing
2013-10-11 14:20:46 +02:00
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
a0de5dd325
some small fixes
2013-10-11 10:34:34 +02:00
44a5b0bad0
[tx-robot] updated from transifex
2013-10-10 22:30:58 -04:00
f4e86045de
make files versions root a class constant
2013-10-10 20:09:38 +02:00
87cccb2e32
some small changes/fixes
2013-10-10 20:06:42 +02:00
4c2e3919de
make previews work for shared files in the versions drop-down
2013-10-10 17:23:27 +02:00
92009c5d8e
fix getVersions() for sub directories
2013-10-10 16:58:11 +02:00
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
bb3b38947d
add missing preview link
2013-10-10 14:57:25 +02:00
e56947255e
don't use glob() and getLocalFile(), this can lead to problems on windows servers
2013-10-10 14:43:40 +02:00
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
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
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
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
1cb47bf777
Merge pull request #5221 from owncloud/fixing-5217-master
...
fixing php 5.3 compatibility
2013-10-10 01:55:18 -07:00
a1719deabe
make sure that we are logged in ad user1 while performing the tests
2013-10-10 10:47:35 +02:00
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
223adc3167
Merge pull request #5230 from owncloud/trashbin_fixes
...
Trashbin fixes
2013-10-09 08:27:54 -07:00
7ab4fef7a9
update file summary after group delete/restore
2013-10-09 16:17:43 +02:00
38e5da05af
only encrypt file to users with encryption keys
2013-10-09 15:56:21 +02:00
46bce8e540
fix checkbox
2013-10-09 13:15:53 +02:00
51cfdb32b1
fix indention
2013-10-09 12:43:56 +02:00
31a91ef892
fix group delete/restore
2013-10-09 12:35:15 +02:00
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
9e3d28871e
fix delete/restore individual files
2013-10-09 12:01:25 +02:00
4404963918
fix trashbin layout
2013-10-09 11:11:55 +02:00
8a06f2e128
php 5.3 compatibility for Test_Files_Sharing_Api
2013-10-08 23:05:19 +02:00
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
6284ab31de
fix escaping
2013-10-08 16:00:26 +02:00
68e1dd1f23
make sure that we only remove file/folder shares
2013-10-08 16:00:18 +02:00
209392587f
[tx-robot] updated from transifex
2013-10-08 07:24:19 -04:00
372a73d43a
Merge pull request #5184 from owncloud/fix-trash-bin-button
...
Fix trash bin button
2013-10-07 10:58:47 -07:00
c655eec3d1
[tx-robot] updated from transifex
2013-10-07 12:21:38 -04:00
980fc9cc7e
Fix trash bin button
2013-10-07 18:15:23 +02:00
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
a3d0e29aa5
Merge pull request #5178 from owncloud/sharing-ispublicflagintemplate
...
Added isPublic flag in files_sharing template
2013-10-07 08:23:55 -07:00
d8b7e42fc1
Merge pull request #4921 from owncloud/file_conflicts_dialog_fixes
...
File conflicts dialog fixes
2013-10-07 08:19:40 -07:00
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
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
4ccbace68d
remove double uri encoding
2013-10-07 11:15:58 +02:00
Bjoern Schiessle
Björn Schießle
Vincent Petry
Jenkins for ownCloud
Morris Jobke
blizzz
VicDeo
Jörn Friedrich Dreyer