Jörn Friedrich Dreyer
40c2f47cd9
add needUpgrade() check to addQueuedTask()
2014-01-17 19:50:37 +01:00
Vincent Petry
bc22799160
Fix array access syntax for older PHP
...
There was a syntax error when running tests in PHP 5.3.10.
2014-01-17 14:39:49 +01:00
Bjoern Schiessle
4c1510b729
updated description of the files encryption app
2014-01-17 12:56:58 +01:00
Vincent Petry
d44b98d3dd
Fix to not destroy draggable when no draggable was set
...
When a dir has no delete permission, the draggable isn't initialized on
files. This fix makes sure we don't try to destroy a draggable when it
wasn't inited in the first place.
Fixes #6254
Backport of 8135828
2014-01-16 17:50:07 +01:00
Frank Karlitschek
a4e842f19a
6.0.1 RC1
2014-01-16 17:09:54 +01:00
Volkan Gezer
aec0f06501
Fix untranslated text when deleting user
...
This should fix issue #6728
2014-01-16 12:23:34 +01:00
ben-denham
f9e4d0a5e2
updated the unit test for OCP\Share::unshareAll() to verify that shares by all users are removed for an item.
2014-01-16 12:14:53 +01:00
ben-denham
3093c63024
Unshare all will now delete all shares for the item, instead of only for a single owner.
2014-01-16 12:14:37 +01:00
Thomas Müller
b0edbd8ebd
Merge pull request #6783 from owncloud/backport-6530-stable6
...
Backport 6530 stable6
2014-01-15 11:01:47 -08:00
Vincent Petry
5dd20db05f
Fixed Dropbox/Google storage async save call
...
When clicking "Grant access", the settings for Dropbox/Google were saved
through a call that gets cancelled when redirecting to the grant page
(for example in Firefox)
This fix makes sure the "save settings" call finished before redirecting
to the grant page.
Fixes #6176
Backport of e13be94
2014-01-15 16:41:54 +01:00
Thomas Müller
0c140d5f6e
in order to work properly with encryption ocTransferId is added to the file path - questionable usage of magic string
2014-01-15 16:37:23 +01:00
Thomas Müller
49969825ad
Adding a random postfix to the part file.
2014-01-15 16:37:23 +01:00
Bjoern Schiessle
3b21499b34
extended test to also check the status messages
2014-01-15 16:10:31 +01:00
Bjoern Schiessle
3fde29ead4
keep response message
2014-01-15 16:10:22 +01:00
Bjoern Schiessle
afe35ca12d
call getFileInfo to enforce a file cache entry for the new version, fix #6286
2014-01-15 16:01:48 +01:00
Bjoern Schiessle
a83e37c799
remove old code
2014-01-15 15:59:04 +01:00
Bjoern Schiessle
3c7541e97c
don't try to encrypt/decrypt cache chunks or files in the trash bin
2014-01-15 15:58:56 +01:00
Bjoern Schiessle
3ec3ebb3db
copy files to owner trash recursively
2014-01-15 15:58:48 +01:00
Morris Jobke
3e71827bea
Merge pull request #6293 from owncloud/stable6-legacy-settings-popup
...
Stable6 legacy settings popup
2014-01-15 02:12:27 -08:00
Robin Appelman
6adac6a673
Use storage_mtime when determining if we can reuse cached data while scanning
...
Backport to stable6 of the following commits, in order:
- 203d5d041130427e4c80f16b898d
2014-01-15 10:36:32 +01:00
Vincent Petry
88dc71381f
Fix calculated folder size to use unencrypted size
...
The encrypted size was used when calculating folder sizes.
This fix now also sums up the unencrypted size and shows that one when
available.
Backport of 4faba49
2014-01-14 16:37:48 +01:00
icewind1991
c6ca9be406
Merge pull request #6612 from owncloud/user-no-change-displayname-stable
...
Backport: Re-add the config options to remove the ability for users to change their displayname
2014-01-14 07:13:21 -08:00
Bjoern Schiessle
7dddf59942
it is not an urgent error... a DEBUG message is enough at this point
2014-01-14 15:09:26 +01:00
Vincent Petry
8ef32821be
Fixed timezone issue with SMB storage
...
Now forcing smbclient to also run on UTC
Backport of 1eb5ebd
2014-01-14 15:04:41 +01:00
Thomas Müller
1e9f0409c3
Merge pull request #6408 from owncloud/ldap_fix_tls_detection
...
LDAP fix TLS detection
2014-01-14 05:01:08 -08:00
Andreas Fischer
bcec9cea78
Merge pull request #6756 from owncloud/remove-ru_RU-stable6
...
remove ru_RU - it's almost untranslated
* owncloud/remove-ru_RU-stable6:
remove ru_RU - it's almost untranslated
2014-01-14 00:45:55 +01:00
Björn Schießle
87cfbb3a2b
Merge pull request #6753 from owncloud/no_unshare_on_delete
...
don't unshare on delete
2014-01-13 07:48:22 -08:00
Thomas Müller
3b1396b538
remove ru_RU - it's almost untranslated
2014-01-13 16:44:03 +01:00
Carlos Cerrillo
ce1a1996f7
Fixing Issue #6301 on master branch
...
Added private var $certPath to store the user root cert
Move logic to determine the $certPath path to the constructor and modify to get the path from OC_User::getHome()
Add curl options to use the certificate to avoid certificate errors with self-signed certicates in the downdload/upload method so we don't get blank files
Only set SSL things when ```$this->secure``` is ```true```
Fix ```createCertificateBundle``` and ```getCertificates``` methods
from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the
path
Backport of 7c264c88feb245e2e3d8c06844c374
2014-01-13 16:38:30 +01:00
st3so
5f2e8f7723
fixing typo in redirection query string
...
Backport of a2cae551f3
2014-01-13 15:58:29 +01:00
Bjoern Schiessle
54cd174f61
don't unshare on delete
2014-01-13 15:25:59 +01:00
Vincent Petry
28be8496a9
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
Backport to stable6 of 1042733
2014-01-12 13:29:54 +01:00
Georg Ehrke
3ae7bfc298
fix preview for reshared file
2014-01-11 11:31:43 +01:00
Vincent Petry
1cbe1896e7
Prevent deleting storage root
...
Storage mount points are not deletable, so make sure that the unlink
operation and its hooks aren't run in such cases.
Note that some storages might recursively delete their contents when
calling unlink on their root. This fix prevents that as well.
Backport of f642ad3
2014-01-10 16:50:26 +01:00
Arthur Schiwon
ebe3872c64
Infowarning about 32bit
2014-01-09 17:00:35 +01:00
Arthur Schiwon
f1ea0bcafc
add tests for user counting
2014-01-09 17:00:28 +01:00
Arthur Schiwon
cf8fc2294e
if backends have the same class name, sum their users up instead of overwriting
2014-01-09 17:00:21 +01:00
Arthur Schiwon
1636c6dbd8
LDAP: add tests for countUsers
2014-01-09 17:00:14 +01:00
Arthur Schiwon
59ff8388ea
remove unnecessary line
2014-01-09 17:00:06 +01:00
Arthur Schiwon
1c58d8b226
LDAP: implement userCount action. This required to (finally) clean up and refactor the search method, which will have a positive performance impact on paged search.
2014-01-09 16:59:58 +01:00
Arthur Schiwon
0f58bd02c1
Add command line tool to show numbers of users and user directories
2014-01-09 16:59:47 +01:00
Arthur Schiwon
4b4901519d
Introduce user count action to user management
2014-01-09 16:59:39 +01:00
Vincent Petry
a711d4e39a
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.
Backport of 8eaa39f
2014-01-09 15:23:55 +01:00
Thomas Müller
52dc90d5fd
Merge pull request #6696 from owncloud/backport-6693-stable6
...
Backport 6693 stable6
2014-01-09 04:56:26 -08:00
Thomas Müller
9a1cbabdd6
rename user-id to loginname to stay consistent
2014-01-09 12:34:19 +01:00
Thomas Müller
596ab7552e
set login name within apache auth backend
2014-01-09 12:34:19 +01:00
Thomas Müller
ea23a09c05
fixing PHPDoc and use cameCase names
2014-01-09 12:34:19 +01:00
Arthur Schiwon
394bd17251
typo, grammar
2014-01-08 19:55:28 +01:00
Thomas Müller
627612c9e0
Merge pull request #6679 from owncloud/backport-6675-stable6
...
Backport 6675 stable6
2014-01-08 04:33:40 -08:00
Thomas Müller
c6fa2dd8e2
turn off mod_pagespeed
2014-01-08 12:19:30 +01:00
