73a2d87ab4
fix shouldEncrypt() method and improved decryptAll() unit tests
2014-04-28 14:49:19 +02:00
efdf0c4df0
Added infinite scrolling (in-memory list)
2014-04-28 14:34:28 +02:00
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
9128900c56
drop files_irods from apps_external
2014-04-28 12:39:28 +02:00
727e3e2359
Merge pull request #8327 from owncloud/l10n-files_external-fields
...
Add translatable mount configs
2014-04-28 08:52:50 +02:00
642f57c1d5
[tx-robot] updated from transifex
2014-04-28 01:56:24 -04:00
8e5c9eea3a
[tx-robot] updated from transifex
2014-04-27 01:54:54 -04:00
6de6f68ae2
fix single quote sanitization
2014-04-26 18:58:01 +02:00
7ac7546b71
Merge pull request #8353 from owncloud/publicshare-webdav
...
Expose public shares over webdav
2014-04-26 15:55:37 +02:00
c591cf0836
[tx-robot] updated from transifex
2014-04-26 01:55:32 -04:00
ace0293bd1
fix layout of external storage config table
2014-04-25 16:34:48 +02:00
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
b176708505
Expose public shares over webdav
2014-04-25 14:45:18 +02:00
b42418246f
Also fixed the returned internal path when getting the root shared item by id
2014-04-25 14:04:22 +02:00
c53c4b9791
fix search by mime for shared single files
2014-04-25 12:28:10 +02:00
6c20a014ea
merge master into webdav-injection
2014-04-25 11:47:06 +02:00
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
3fc809dfd8
[tx-robot] updated from transifex
2014-04-25 01:56:28 -04:00
f520305848
Merge pull request #8026 from owncloud/remove_shared_folder
...
remove the "Shared" folder
2014-04-24 18:45:45 +02:00
435672feaa
[tx-robot] updated from transifex
2014-04-24 01:55:33 -04:00
da61acd1e2
Add translatable mount configs
...
Will close #8070
2014-04-23 17:58:14 +02:00
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
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
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
7ef8f6d352
always allow to rename the share mount point
2014-04-23 12:54:26 +02:00
b102222fed
split-up the update script and add unit tests for it
2014-04-23 12:54:26 +02:00
93469ca468
make it possible to move files out of a shared mount point
2014-04-23 12:54:26 +02:00
dd1e47b3b8
typos, use, unused and return fixed
2014-04-23 12:54:26 +02:00
2049bedcaf
Dont throw an error when a storage isn't found for shared cache
2014-04-23 12:54:26 +02:00
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
d468cdacf2
add unit tests which got lost during rebase
2014-04-23 12:54:26 +02:00
652d417a58
we don't allow to share a folder if it contains a share mount point
2014-04-23 12:54:26 +02:00
b712393e72
fix etag propagation
2014-04-23 12:54:26 +02:00
aae22b2d6a
update script, create Shared folder and adjust target path for the shares
2014-04-23 12:54:26 +02:00
bffcbac7a7
allow to rename group share mount points
2014-04-23 12:54:25 +02:00
3f6e9e0102
cleanup the shared storage, always keep the whole share resource
2014-04-23 12:54:25 +02:00
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
c9bd2f7a6c
also fetch the etag from file cache
2014-04-23 12:54:25 +02:00
d4085d8148
make sure that path is not 'false'
2014-04-23 12:54:25 +02:00
33cdd93890
fix deleting of shared files
2014-04-23 12:54:25 +02:00
bfabd247f4
fix updating of shared files
2014-04-23 12:54:25 +02:00
a86d97295e
fix encryption tests after the removal of the shared folder
2014-04-23 12:54:25 +02:00
ed981294f1
fix share api tests
2014-04-23 12:54:25 +02:00
27c5a978f9
we no longer need to handle the Shared folder different from any other folder
2014-04-23 12:54:25 +02:00
83d6810725
don't overwrite shared folder icon
2014-04-23 12:54:25 +02:00
4967435237
show "shared by ..." for share mount point
2014-04-23 12:54:25 +02:00
6b19482f3e
generate unique target name
2014-04-23 12:54:25 +02:00
6d87dacad4
fix getMimeType call, we always need to check the source path
2014-04-23 12:54:24 +02:00
a02fb3722b
user should be able to rename/delete shared files if the owner allowed it
2014-04-23 12:54:24 +02:00
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
c377893f0e
make sure that we have the right permissions for the mount points
2014-04-23 12:54:24 +02:00
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
97f21712cd
Merge pull request #8164 from owncloud/fix-6651
...
LDAP: fix random resets of filter
2014-04-23 11:09:35 +02:00
e0cac32442
fixing some JSHint warnings
2014-04-23 10:08:14 +02:00
3f453d1641
[tx-robot] updated from transifex
2014-04-23 01:56:35 -04:00
c1c2f2c49e
add additional comments, PHPdoc and check whether it's really applicable
2014-04-22 18:36:43 +02:00
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
b42ce6c30a
Prevent error if previously cached data doesn't have an etag
2014-04-22 15:24:38 +02:00
3821a09689
merge master into webdav-injection
2014-04-22 12:25:49 +02:00
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
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
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
4d9ff49f61
Merge pull request #8283 from owncloud/translatable-max-in-upload
...
make max. text translatable
2014-04-22 10:23:08 +02:00
a9b4fba528
[tx-robot] updated from transifex
2014-04-22 01:54:58 -04:00
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
4fe5ca1908
[tx-robot] updated from transifex
2014-04-21 01:56:06 -04:00
1aa7774178
make max. text translatable
2014-04-21 02:41:33 +02:00
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
1abd9c1305
[tx-robot] updated from transifex
2014-04-19 01:56:06 -04:00
f434c3a213
Fix localization issues of files_trashbin
2014-04-17 21:10:21 +02:00
36c8dec10a
Merge pull request #8220 from owncloud/type-hinting-ldap
...
Fix PHPdoc in user_ldap
2014-04-17 18:15:40 +02:00
d82a31d121
keep long file names in one line to not overflow download button on mobile
2014-04-17 17:11:28 +02:00
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
13b463cc17
Merge pull request #8189 from Xenopathic/misc_fixes
...
Various fixes
2014-04-17 11:56:51 +01:00
a7d7ca2fb3
[tx-robot] updated from transifex
2014-04-17 01:56:06 -04:00
81751cb616
Add missing param hint
2014-04-16 17:54:10 +02:00
9434ed44f8
add max-width to directLink input to prevent overflow
2014-04-16 16:43:35 +02:00
9c6f8e59ae
fix header code duplication, code style fixes
2014-04-16 16:26:41 +02:00
547ddf7775
remove duplication of 'header-right' element, also make it overflow when too wide
2014-04-16 15:53:38 +02:00
924aee718c
fix shift of icons in 'New' menu in IE8/9, fix #7987
2014-04-16 14:58:27 +02:00
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
23f2c48a43
[tx-robot] updated from transifex
2014-04-16 01:57:34 -04:00
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
83e8981e24
add link to further discussion about that folder check
2014-04-15 21:39:13 +02:00
bad41c05b8
Fix PHPdoc in user_ldap
...
using scrutinizer patch
2014-04-15 21:05:49 +02:00
999e74e834
Fix PHPdoc in apps/files_sharing
...
using scrutinizer patch
2014-04-15 21:05:44 +02:00
c82adb8c5d
merge master into webdav-injection
2014-04-15 20:03:00 +02:00
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
340089f270
Merge pull request #8059 from owncloud/countUsersInGroup
...
add optional countUsersInGroup method to group backends
2014-04-14 20:45:12 +02:00
2a2aabbdaf
[tx-robot] updated from transifex
2014-04-14 01:55:09 -04:00
8bb003868c
Fix user_ldap default setting value
2014-04-13 16:49:23 +01:00
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
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
2454759af7
Check whether the user has permissions to add personal storage backends
2014-04-13 11:01:50 +02:00
982d2bcc5b
[tx-robot] updated from transifex
2014-04-13 01:55:12 -04:00
329b8f3e99
[tx-robot] updated from transifex
2014-04-12 01:56:11 -04:00
6343391e58
Change from showHTML to show
...
There is no need to use `showHTML` here.
2014-04-11 20:38:27 +02:00
e704bc2bf0
Merge pull request #7807 from sarciszewski/patch-1
...
Update crypt.php
2014-04-11 19:19:02 +02:00
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
d67cba973e
Typo fix.
2014-04-11 15:23:43 +02:00
07ea57465b
drop folder support on public shared folders
2014-04-11 14:54:13 +02:00
1c57ffa16f
Give hint when composing filter failed
2014-04-11 14:08:12 +02:00
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
6f1e9f8920
Merge branch 'ldap-filter-reset-fix' of github.com:ben-denham/core into fix-6651
2014-04-11 13:48:45 +02:00
36107e1bad
[tx-robot] updated from transifex
2014-04-11 01:55:15 -04:00
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
0edacf372c
fix single file upload in firefox
2014-04-10 18:07:36 +02:00
7c072510d3
[tx-robot] updated from transifex
2014-04-10 01:55:39 -04:00
e8be2ac554
In cases folder drag and drop is not supported a proper message is displayed
2014-04-09 23:32:12 +02:00
2fc9e27ced
use FileList.findFileEl
2014-04-09 22:16:41 +02:00
d2961dcf11
Merge branch 'master' into lukepolo-master
...
Conflicts:
apps/files/js/filelist.js
2014-04-09 22:00:25 +02:00
d8f56e3c00
Merge pull request #8049 from owncloud/filepickersvg
...
Fix file picker SVG issues
2014-04-09 15:05:40 +02:00
b19671d204
Merge pull request #8126 from owncloud/remove_obsolete_code_in_sharing_js
...
remove obsolete code
2014-04-09 14:50:15 +02:00
9feebeaf40
Merge pull request #7837 from owncloud/fix_7530
...
LDAP: fix determining objectclasses takes long
2014-04-09 12:27:17 +02:00
dbebf6bb5e
add comment to clearify when a skip in the foreach happens
2014-04-09 12:25:48 +02:00
9b0f289143
remove obsolete code
2014-04-09 12:09:28 +02:00
ee3368d2ad
replace hardcoded limit of 400 with user controlled ldapPagingSize value
2014-04-09 11:38:51 +02:00
2e5adadad7
Put inner loop into own method, let's see whether it makes scrutinizer happier
2014-04-09 11:31:56 +02:00
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
43402c56dd
initialize variable
2014-04-09 11:31:56 +02:00
40f9875f11
LDAP: fix user report i.e. count for LDAP servers with really many users
2014-04-09 11:31:56 +02:00
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
796f719548
[tx-robot] updated from transifex
2014-04-09 01:56:49 -04:00
35ab6fe5a9
Disable sharing in trashbin app
2014-04-08 17:13:59 +02:00
2407321625
add tests for LDAP
2014-04-08 12:57:06 +02:00
142fc5f3af
fix return value when a search string was passed to return integer instead of array
2014-04-08 12:53:59 +02:00
96cb75f5cf
implement countUsersInGroup in LDAP group backend
2014-04-08 12:04:38 +02:00
411a810ebe
Merge pull request #8032 from owncloud/fs-backend-registration
...
Files External: allow dynamic backend registration
2014-04-08 11:27:02 +02:00
4ad4b9768c
[tx-robot] updated from transifex
2014-04-08 01:57:51 -04:00
68b7822cf5
js style fixes according to our jshintrc rules
2014-04-07 23:45:35 +02:00
d15a4719d2
fix folder upload in js
2014-04-07 23:04:08 +02:00
971a311fee
adding parentId to file info array
2014-04-07 23:03:19 +02:00
6d373e97c3
remove unused exit()
2014-04-07 23:02:49 +02:00
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
3ac009c2b4
unit tests for dynamic backend registration
2014-04-07 20:18:57 +02:00
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
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
c90b0ac00b
Fix copy conflict dialog translation
2014-04-07 11:46:47 +02:00
e295d48fd4
[tx-robot] updated from transifex
2014-04-07 01:56:11 -04:00
593977f016
Re-enable the sabredav browser plugin
2014-04-06 14:49:39 +02:00
a9d49de465
[tx-robot] updated from transifex
2014-04-06 01:56:11 -04:00
286323f7a4
Fix some localization issues with file encryption/decription strings
2014-04-05 19:28:53 +02:00
01d93f81f6
Show higher resolution previews for high dpi screens
2014-04-04 17:10:46 +02:00
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
8a10c44eb3
Merge pull request #8015 from owncloud/storageinfo-reuse
...
Allow reusing FileInfo for getStorageInfo
2014-04-04 10:18:02 +02:00
0805f678cc
[tx-robot] updated from transifex
2014-04-04 01:57:01 -04:00
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
e3b9a86184
remove duplicate method checkDependencies()
2014-04-03 17:17:44 +02:00
c6976d89a6
use command -v to detect if smbclient exists
2014-04-03 17:09:40 +02:00
d1e78d7a6b
Correctly set svg for crumb divider
2014-04-03 17:08:06 +02:00
14a5381977
Merge branch 'master' into fs-backend-registration
...
Conflicts:
apps/files_external/templates/settings.php
2014-04-03 17:04:16 +02:00
7c9537f33a
Fixed dirInfo check for non existing dir in files ajax call
2014-04-03 17:04:13 +02:00
c0ebc1dfb1
Update backends and their configurations
2014-04-03 16:57:26 +02:00
3101663129
Removed redundant free space and upload limit in public page
2014-04-03 16:50:21 +02:00
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
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
e2969062ca
Merge pull request #7969 from Xenopathic/files_external_fix
...
Fix error log spam
2014-04-03 16:31:58 +02:00
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
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
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
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
eaad6a4e27
Fix error log spam
...
Regression from e002b7242c
2014-04-03 13:43:02 +01:00
7dafdfbe88
add tests for sharing files the users doesn't have access to
2014-04-03 13:14:34 +02:00
54783550e8
[tx-robot] updated from transifex
2014-04-03 01:56:12 -04:00
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
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
da5541ac02
Allow reusing FileInfo for getStorageInfo
2014-04-02 17:10:57 +02:00
1e6a79e244
Reuse known free space in the files app
2014-04-02 16:53:45 +02:00
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
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
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
3f9beb8c6b
Upgraded phpseclib to version 0.3.6
2014-04-02 12:31:59 +02:00
73dd5ff26c
[tx-robot] updated from transifex
2014-04-02 01:56:39 -04:00
d762e25cc5
Merge pull request #7989 from owncloud/files-deletefileregressionfix
...
Fixed broken delete file action
2014-04-01 22:54:05 +02:00
d811026ec9
Merge pull request #7935 from owncloud/getpath-shared
...
Make getPath work for shared files
2014-04-01 21:59:09 +02:00
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
f37a76c396
Remember before change works better
2014-04-01 19:46:46 +02:00
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
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
aaa8d6ec02
Fixed broken delete file action
2014-04-01 16:09:48 +02:00
0bede65947
Fix dirInfo check when dir does not exist
2014-04-01 15:15:03 +02:00
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
acfb3cfff5
external storage: set storages to be available for All Users by default
2014-04-01 14:31:22 +02:00
0a112de676
external storage: change confusing 'applicable' to 'available for'
2014-04-01 14:26:06 +02:00
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
5807681c09
Merge pull request #7975 from owncloud/fix-7973-master-2
...
remove pl_PL - fixes #7973
2014-04-01 12:38:47 +02:00
18acfa8bb3
Merge pull request #7915 from owncloud/replace-personalblock
...
Replace personalblock with .section
2014-04-01 11:20:16 +02:00
7a4a836abe
[tx-robot] updated from transifex
2014-04-01 01:56:15 -04:00
c578ab68fe
there is no need to re-calculate the shares after a touch
2014-03-31 18:24:53 +02:00
8e34812393
always encrypt files to owner
2014-03-31 18:19:48 +02:00
fe2c6f4e6d
remove pl_PL - fixes #7973
2014-03-31 18:03:42 +02:00
76c63a5760
Fix uploading files containing a # in the path for webdav
2014-03-31 17:00:32 +02:00
aa867ad647
don't call getFileInfo() to avoid to open the same file twice
2014-03-31 15:29:16 +02:00
8ebb1f15d3
move check if a file should be encrypted to the pre hook
2014-03-31 15:29:16 +02:00
0c2585f3ac
Improve phpdoc
2014-03-31 14:29:55 +02:00
2be2a5d2c5
external storage: fix merge conflict, indentation
2014-03-31 13:12:04 +02:00
6ac85480f7
replace last personalblock fieldset within files_external
2014-03-31 13:00:46 +02:00
bfb0b9a044
[tx-robot] updated from transifex
2014-03-30 01:55:42 -04:00
fe78d963d9
Implement getPath for shared files
2014-03-28 15:26:15 +01:00
7adb5ae2c5
Merge pull request #7929 from owncloud/enc_dont_write_file_if_enc_fails
...
don't write file if opening a stream to encrypt the data fails
2014-03-28 14:59:05 +01:00
b158939283
adapt description of paging size configuration
2014-03-28 14:20:01 +01:00
0d9d70b51c
change default ldap paging size to 500
2014-03-28 14:02:19 +01:00
d0012e729a
Merge pull request #7879 from owncloud/sharing_cleanup_public_api
...
sharing api cleanup, first step
2014-03-28 12:23:11 +01:00
b9100bc2de
don't write file if opening a stream to encrypt the data fails
2014-03-28 12:02:49 +01:00
0757f87dba
Merge pull request #7872 from owncloud/trash-disablestoragestats
...
Do not retrieve storage stats for trash bin
2014-03-28 11:22:19 +01:00
f3d6b2f3e9
Do not retrieve storage stats for trash bin
2014-03-28 11:21:33 +01:00
e806b6d9a0
Merge pull request #7842 from Xenopathic/files_external_config_optional
...
Enable the use of 'optional' on password fields for mount configuration
2014-03-28 10:02:28 +00:00
5fa8f7cf12
Merge pull request #7107 from owncloud/load-apps-proper-master
...
Load apps proper master
2014-03-28 10:33:55 +01:00
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
ccc55f40e6
[tx-robot] updated from transifex
2014-03-28 01:55:47 -04:00
d2e5dd2a15
Merge pull request #7913 from owncloud/fix-logo
...
fix SVG replacement for logo so it works in IE8, fix #7866
2014-03-28 02:29:35 +01:00
6a8e93ffa6
fix breadcrumbs for IE8
2014-03-27 23:53:19 +01:00
531f3cf1a8
Merge pull request #7911 from owncloud/ext-fixswifttouchoperation
...
Fix swift touch operation
2014-03-27 18:10:45 +01:00
25326b89da
replace personalblock fieldset with section class in core user_ apps
2014-03-27 17:00:47 +01:00
6de572c6e6
replace personalblock fieldset with section class in files apps
2014-03-27 17:00:47 +01:00
832d3c954e
enable SVG->PNG fallback for 'New' menu
2014-03-27 14:48:54 +01:00
f88b24d532
enable SVG->PNG fallback for newly uploaded files and folders
2014-03-27 14:48:35 +01:00
2a08e35d72
Fix swift touch operation
...
The touch() operation now uses "UpdateMetadata()" instead of "Update()"
which doesn't clear the object's contents.
This fixes syncing, as the sync client needs to use touch to update the
object's mtime.
2014-03-27 12:34:30 +01:00
1f6259d9c2
Merge pull request #7875 from Xenopathic/files_external_smb_auto
...
SMB/CIFS mounts using ownCloud login, fixes #7843
2014-03-27 12:18:51 +01:00
1469ce7b38
Merge pull request #7898 from owncloud/ext-swiftmtime
...
Fixed mtime reading from OpenStack API
2014-03-27 09:31:37 +01:00
ed0cba0ff4
[tx-robot] updated from transifex
2014-03-27 01:56:30 -04:00
fa00a18677
Fixed mtime reading from OpenStack API
...
The API seems to return floating point values, which prevents
the hasUpdated() check to work and causes the scanner to rescan
everything every time.
2014-03-26 17:20:40 +01:00
50dba97bde
Miscellaneous text fixes for core apps
2014-03-26 15:43:03 +00:00
eeaefd84c3
change mobile breakpoint for shared view to 768px as well
2014-03-26 16:32:09 +01:00
a1dca821f9
Use braces on single line if statements
2014-03-26 15:11:09 +00:00
cd5ebac7c4
Fix error in $isPersonal setting
2014-03-26 14:37:29 +00:00
b077528087
Perform proper checking for share availability
...
To check for shares, the code attempts to connect anonymously to the share.
In most cases this will fail with NT_STATUS_ACCESS_DENIED, so the regex array
used for parsing the output of smbclient in smb4php has been overridden to
treat such output as success.
The 'test' method for storage classes can now take a single parameter,
$isPersonal, which allows the storage to adjust the tests performed based on
if they are being configured as personal shares or as system shares.
2014-03-26 14:36:45 +00:00
cac4aaa8c4
Rename SMB_Auto to SMB_OC and change visible name
...
SMB_Auto is now SMB_OC, and the name has been changed from
"SMB / CIFS Auto" to "SMB / CIFS using OC login"
2014-03-26 14:35:07 +00:00
86aa6104e6
Revoke sharable permission on automatic SMB shares
...
Shares authenticated with user credentials (aka not hard coded) cannot be
accessed by other users, breaking sharing. This change completely revokes
sharing for such shares
2014-03-26 14:35:07 +00:00
3445c062ec
Use loginname instead of display name
...
getDisplayName would return the display name of the user, not great if it is a
canonical string. The uid passed back from 'login' is the UUID of the user, so
also not suitable. The login name from the session is the username the user
used to log in to ownCloud in the first place, which is what is needed.
2014-03-26 14:35:07 +00:00
ba63e46b5e
SMB/CIFS mount using OwnCloud logon credentials
...
Selecting 'SMB/CIFS Auto' in the mounts configuration allows an SMB/CIFS
mount to be configured that uses the credentials of the user logging in to
authenticate to the server.
Optionally, the username can be used as the share name, permitting home shares
to be dynamically mounted.
2014-03-26 14:35:07 +00:00
b656c68ede
Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig
...
Fix merging of external storage configurations
2014-03-26 14:30:35 +01:00
371a924c92
merge master into webdav-injection
2014-03-26 14:26:07 +01:00
e002b7242c
Fix merging of external storage configurations
...
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.
Fixed merging logic to make sure that class, mount point and options are
the same before merging them.
Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
2014-03-26 12:41:25 +01:00
8d95c0d013
Pretty print mount.json when possible
2014-03-26 11:32:03 +01:00
cbfd16089b
Fixed share upgrade cleanup tests to use the correct ids
2014-03-26 09:29:28 +01:00
75d8de378c
[tx-robot] updated from transifex
2014-03-26 01:56:21 -04:00
8958b9147b
adding ellipsis on file names to public file list as well
2014-03-26 00:14:38 +01:00
d0f84e936f
adding proper notification area for multi line messages
2014-03-26 00:04:11 +01:00
e6392163a4
adding ellipsis on file names
2014-03-25 23:40:40 +01:00
1ae10b9da3
Merge pull request #7420 from owncloud/cachehooks-first
...
Manually triger the filecache update hooks before any other hook
2014-03-25 22:41:09 +01:00
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
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
5111fad006
Merge pull request #7689 from owncloud/last_cron_log
...
Log last cron execution
2014-03-25 19:17:36 +01:00
31681a3a27
finally fix the paths for the OCS Share API
2014-03-25 17:52:45 +01:00
3653a51af2
fix path creation for re-shares, issue #7662
2014-03-25 17:48:50 +01:00
f9279ac77a
killing some more calls to OC_App::loadApps(); - because we load all apps in handleRequest()
2014-03-25 17:42:41 +01:00
e72b2e6e3b
Fix public upload to not close session when encryption is on
...
The encryption app needs to create keys when uploading files, so the
session needs to be kept open in such case.
2014-03-24 17:34:37 +01:00
690c31ec20
Insert missing brace
2014-03-24 13:27:46 +00:00
09cc020535
Update crypt.php
...
Use a 256-bit random value
2014-03-24 08:57:33 -04:00
d87001a093
Merge pull request #7768 from owncloud/trashempty-nocache
...
Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache
2014-03-24 13:34:30 +01:00
6b66b42f6e
catch the case where files_trashbin/files doesn't exist
2014-03-24 12:33:44 +01:00
abdc823bb6
[tx-robot] updated from transifex
2014-03-24 01:55:51 -04:00
0245e64cec
[tx-robot] updated from transifex
2014-03-22 01:56:09 -04:00
e6b4d28229
Move success/error squircles to settings
2014-03-21 20:27:22 +01:00
905aabf5d4
mobile: document min-width value
2014-03-21 16:43:40 +01:00
f2566e649f
mobile: adjust break to 768, also fix min-widths
2014-03-21 16:36:45 +01:00
422ccf4cdb
add test for cloning and keeping configuration seperate
2014-03-21 15:31:30 +01:00
86d479cb28
Use array_key_exists instead of isset, because the latter returns false if the assigned value is null
2014-03-21 15:29:49 +01:00
c6aefada71
do not show Deleted Files on mobile, not optimized yet and button too long
2014-03-21 15:29:37 +01:00
055a09e487
On clone create a new instance of the Configuration
...
To avide effects on the original instance of Connection when the clone
is modified, for instance on authentication checks.
2014-03-21 15:27:51 +01:00
c4e7d7989a
Enable the use of 'optional' on password fields (JavaScript part)
...
See ed0c10a10b
2014-03-21 13:51:45 +00:00
40c20b2eeb
mobile: remove shift for multiselect bar to account for missing navigation
2014-03-21 14:34:05 +01:00
6ff96b34ad
Merge branch 'master' into load-apps-proper-master
...
Conflicts:
apps/files/ajax/rawlist.php
cron.php
ocs/v1.php
2014-03-21 14:05:08 +01:00
37af74efb3
Merge pull request #7655 from owncloud/shared-unencryptedsize
...
Fixed warning when browsing Shared folder
2014-03-21 12:28:27 +01:00
3f95f9325f
Merge pull request #7823 from owncloud/fix_7796
...
Add FreeIPA UUID compatibility, fixes #7796
2014-03-21 11:27:18 +01:00
4230983e69
define var
2014-03-21 10:10:49 +01:00
6f605ecd67
make tests work on systems without php5_ldap
2014-03-21 10:08:17 +01:00
bcf388d3c5
[tx-robot] updated from transifex
2014-03-21 01:55:35 -04:00
3d2ab76347
add tests for cumulativeSearchOnAttribute
2014-03-21 00:17:51 +01:00
a085d7715f
fix potential infinite loop when the DN of the first entry was already read.
2014-03-20 22:59:41 +01:00
561d699ca6
Use the LDAP wrapper for checking resources, needs for proper testing
2014-03-20 22:58:57 +01:00
bd881348e8
Fix wildcard handling and check even less DNs per filter, enough will be looked at anyway
2014-03-20 22:57:50 +01:00
7c3da27bf6
Fix duplicate ipauniqueid
2014-03-20 20:38:06 +00:00
7a0eccfc63
Correct field modifier checking
...
Existing code checks for the existence of a modifier ('&', '!', '#', '*')
anywhere in the field name, but strips the first character regardless. This
change makes it so that only modifiers at the beginning of the string are
counted.
2014-03-20 18:28:42 +00:00
ed0c10a10b
Enable the use of 'optional' on password fields
...
The logic has been changed, in that 'class="optional"' is applied to both
password and text types if the field begins with the optional market, '&'.
2014-03-20 18:27:40 +00:00
2c561c9c50
Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords
...
Obfuscate passwords in ext storage config
2014-03-20 16:31:12 +01:00
d95fde3924
Removed comment
2014-03-20 15:24:05 +01:00
057c2638e4
LDAP Wizard: when determining objectclasses, we realy do not need to look at every entry. Fixes #7530
2014-03-20 13:58:08 +01:00
5747e0e3f9
remove executable flag for file-upload.js
2014-03-20 13:26:21 +01:00
95a13e2690
Merge pull request #7814 from oskholl/master
...
Fix: 'Upload button tooltip doesn't disappear'
2014-03-20 13:25:21 +01:00
1e4e0cfcd5
Lazy load phpseclib in ext storage config
2014-03-20 13:21:34 +01:00
cf23defa52
Fix typo in mount loading
2014-03-20 12:52:09 +01:00
8a81df0f2c
Merge pull request #7651 from owncloud/close-session-faster-master
...
Close session faster
2014-03-20 11:07:21 +01:00
3aa8647634
[tx-robot] updated from transifex
2014-03-20 01:56:42 -04:00
90839b784f
Comment moved to prevent 'Line is too long' warning.
2014-03-19 23:05:03 +01:00
fa28c089fa
Fix: 'Upload button tooltip doesn't disappear'
...
Fixes issue #7461 . Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM.
2014-03-19 22:09:09 +01:00
ca595611f5
Add FreeIPA UUID compatibility, fixes #7796
...
Ability to use ipauniqueid for the UUID of a user
2014-03-19 20:30:24 +00:00
36da3bc359
Update crypt.php
...
A 1024 kilobyte key would be obnoxiously slow to operate on. I'm assuming you meant 1024-bit?
Also, 183 bytes = 1464 bits.
Here's a safe alternative: 2048 bits, with comment-code sanity
2014-03-19 13:31:51 -04:00
9116c39a82
Fixed ext storage password field order issue
...
The old password field is now preserved in the JSON structure to make
sure that the order is preserved.
This is a quick fix until the UI is fixed to not rely on the PHP array
key order.
2014-03-19 17:56:36 +01:00
5b6c36347b
Fixed ext storage unit test for groups
...
Now creating real users and groups for testing external storage mounts
2014-03-19 17:55:34 +01:00
8e0a5ed5df
Added tests to check mount point list for a target user
2014-03-19 15:21:54 +01:00
214357ca68
Improve sorting performance of large lists of files
2014-03-19 13:53:59 +01:00
4cb53f77b2
Moved external storage mounting code to files_external app
...
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the
post_initMountPoints hook
2014-03-19 12:45:38 +01:00
c216c4777b
Merge branch 'master' into close-session-faster-master
...
Conflicts:
apps/files/ajax/upgrade.php
2014-03-19 11:44:21 +01:00
80180bea32
Added IV for ext storage password encryption
2014-03-19 11:42:22 +01:00
33e96597d1
Merge pull request #7790 from owncloud/fix/7788
...
drop file cache migration OC5 -> OC6
2014-03-19 11:29:50 +01:00
40a70ecf79
Added password obfuscation for external storage config
...
Added obfuscation for all "password" options from external storages.
Added unit tests for reading/writing the configuration.
2014-03-19 10:52:22 +01:00
e0dada704c
Added ext storage unit tests for writing then reload the mount config
2014-03-19 10:52:22 +01:00
ff5b79edeb
Merge pull request #7792 from owncloud/extstorage-fixpersonalstorage
...
Fix validation of allowed personal backend
2014-03-19 10:00:12 +01:00
7b1d52f5b9
[tx-robot] updated from transifex
2014-03-19 01:55:39 -04:00
340cd2734b
Merge pull request #7766 from Xenopathic/master
...
Fix smb4php to work with home shares
2014-03-18 19:42:04 +00:00
1f79f368ef
Added unit tests for when adding ext storage mount points
...
- test config was written correctly (global and local)
- test that personal mount points can be added for allowed backends
- test that personal mount points cannot be added for disallowed backends
- added $skipTest flag to make it possible add mount points without
doing an actual check/connection (note: this is necessary because the
static class OC_Mount_Config cannot be mocked)
2014-03-18 18:29:08 +01:00
76961ce072
fixing javascript error where $(Files.breadcrumbs[1]).get(0) returns undefined - happens on resize to a very small width
2014-03-18 17:59:21 +01:00
8ababef4cd
Fix validation of allowed personal backend
2014-03-18 17:54:14 +01:00
6b9ae27b90
drop file cache migration OC5 -> OC6
2014-03-18 17:14:38 +01:00
285fc5ba96
mobile: change CSS order so rename and versions are hidden
2014-03-18 11:50:08 +01:00
153eadd753
Merge branch 'master' into close-session-faster-master
2014-03-17 21:57:48 +01:00
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
ea8705bac8
additional class is added to the file actions called e.g. 'action-share', 'action-rename'
...
in order to allow proper translations of the action's display name an additional parameter has been added to the register function
2014-03-17 20:15:10 +01:00
38b1529c2a
More robust way to check if the folder is empty
2014-03-17 17:03:32 +01:00
332c14a878
Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache
2014-03-17 16:35:08 +01:00
792d0d3314
Fix smb4php to work with home shares
...
Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server.
2014-03-17 15:03:25 +00:00
8a24e1eb96
clearify the use-case of this app
2014-03-17 12:29:17 +01:00
7ffaf0d70a
Merge pull request #7734 from owncloud/icon-class-remove
...
remove unneeded icon class
2014-03-16 10:24:57 +01:00
c89aa6d5fe
[tx-robot] updated from transifex
2014-03-16 03:13:21 -04:00
b2e929d580
[tx-robot] updated from transifex
2014-03-15 02:14:22 -04:00
bbbbb033f3
in case of phpunit executions calling header() and exit() is too bad
2014-03-14 18:20:33 +01:00
55c630ea7d
remove unneeded icon class
2014-03-14 14:47:40 +01:00
ec67d7e635
mobile: first mobile fixes for Files. We still need to hide Rename and Versions
2014-03-14 09:16:53 +01:00
4b802aa7cb
[tx-robot] updated from transifex
2014-03-13 17:12:37 -04:00
8a8a32cf43
Changed conditions in user_ldap's ldapFilter.js to use ===, fixed indentation.
2014-03-14 09:17:39 +13:00
b2757e621c
Merge pull request #7686 from owncloud/ocs_fix_paths
...
finally fix the paths for the OCS Share API
2014-03-13 20:27:07 +01:00
eabeedb306
Merge branch 'master' into cachehooks-first
2014-03-13 15:22:00 +01:00
9d32475260
finally fix the paths for the OCS Share API
2014-03-13 15:16:59 +01:00
206364cd1c
remove invalid shares with one SQL statement
2014-03-13 13:09:32 +01:00
02be15ce2f
Added backticks for Oracle in sharing updater unit test
2014-03-13 13:09:32 +01:00
4bb303cbd6
Clean up database before setup the database for testing
2014-03-13 13:09:32 +01:00
ec54bc7709
Refactor update script to class and add unit test
2014-03-13 13:09:32 +01:00
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
9fa9c791eb
Merge pull request #7671 from fpiraneo/patch-1
...
Update index.php
2014-03-13 13:04:30 +01:00
c76d952dac
make getGroupsChunk() protected instead of private
2014-03-13 10:57:19 +01:00
7f8b04d3e0
adapt coding style
2014-03-13 09:33:07 +01:00
1295e54173
[tx-robot] updated from transifex
2014-03-13 01:55:50 -04:00
b506de6f08
Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-master
...
remove Sabre_DAV_Browser_Plugin
2014-03-12 22:28:01 +01:00
b92be2ef1c
Merge pull request #7669 from owncloud/versions_predelete
...
add preDelete hook for files_versions app
2014-03-12 17:23:54 +01:00
881739cbac
Merge pull request #7668 from owncloud/trashbin_predelete
...
add preDelete hook for files_trashbin app
2014-03-12 17:23:38 +01:00
8320b8eb7a
[tx-robot] updated from transifex
2014-03-12 01:57:17 -04:00
ae13ff112f
remove Sabre_DAV_Browser_Plugin
2014-03-12 00:10:16 +01:00
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
3f4a0778c8
Update index.php
...
On line #69 added id="selectedActionsList" to allow an easy adding of new actions customs apps wants to perform on selected files;
2014-03-11 14:29:26 +01:00
9a5c2d0080
add preDelete hook for files_versions app
2014-03-11 14:17:08 +01:00
0f864c38bb
add preDelete hook for files_trashbin app
2014-03-11 14:10:12 +01:00
d55c7223a9
Merge branch 'master' into foldersize-reuse
...
Conflicts:
lib/private/files/cache/homecache.php
2014-03-11 13:04:20 +01:00
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
36885dc64c
fix path creation for re-shares, issue #7662
2014-03-11 12:58:46 +01:00
b0ec38e202
[tx-robot] updated from transifex
2014-03-11 01:59:39 -04:00
022d76c7bb
Fixed warning when browsing Shared folder
...
The virtual "Shared" folder doesn't have an unencrypted_size field.
This fix adds a check to prevent warnings in the log.
2014-03-10 17:25:16 +01:00
41f814515e
Merge branch 'master' into close-session-faster-master
2014-03-10 17:00:09 +01:00
9fb9684da7
Merge pull request #7646 from owncloud/fix_ocs_api_unshare
...
we need the file_source to delete a share successfully
2014-03-10 16:06:17 +01:00
4fdf7682c9
Merge pull request #7398 from owncloud/trash_dont_rely_on_db
...
[trash] fall back if file is not in db
2014-03-10 16:04:47 +01:00
5ddabd7cd0
fix mimetype detection, introduce fake etag to identify preview images
2014-03-10 15:13:28 +01:00
4562909a20
get trash size from file cache
2014-03-10 15:13:28 +01:00
abad625cac
only enable previews if the encryption is disabled
2014-03-10 15:13:28 +01:00
eab844e226
if file is not in db, fall back to restore file to the users root
2014-03-10 15:13:28 +01:00
58c216d0e8
close the session on all file operations
2014-03-10 14:39:27 +01:00
8ab7d18a6a
Move the router classes to a namespace and expose it with a public interface
2014-03-10 14:04:58 +01:00
0ffd32a1ae
Merge pull request #7629 from owncloud/files-allfileswarningtypo
...
Fixed log warning when deleting a single file
2014-03-10 11:40:28 +01:00
9548670da7
we need the file_source to delete a share successfully
2014-03-10 11:35:54 +01:00
92df8deb0a
Merge pull request #7631 from ichEben/master
...
[6.0.2RC1] Share folder as link -- no public upload, drag&drop still works #7422
2014-03-10 10:04:54 +01:00
26513bc17b
Merge pull request #7624 from owncloud/enc-encryptedusedspacefix
...
[master] Fixed used space to be based on unencrypted size
2014-03-10 09:38:24 +01:00
e7d5715114
only initialise upload dropZone if public upload is allowed
2014-03-07 17:45:24 +01:00
5671aac5ca
Fixed log warning when deleting a single file
2014-03-07 15:03:35 +01:00
48d63a6278
Return unencrypted_size of folder when queried
...
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
2014-03-07 14:59:09 +01:00
3eb58d9973
Merge pull request #7529 from owncloud/getlocalfile-cache
...
Add caching for getLocalFile on remote storages
2014-03-07 13:29:47 +01:00
ef65381a0b
Moved LdapFilter into a separate js file in user_ldap.
2014-03-07 10:10:42 +13:00
43e79f41f3
Added improved version of patch by @blizzz in https://github.com/owncloud/core/issues/6651#issuecomment-32261257 to stop filter settings from being reset under a race condition.
2014-03-07 09:17:41 +13:00
536c33895f
Merge pull request #7592 from owncloud/fixstoragefreespace
...
Fixed upload issue when free space is not known (ex: FTP)
2014-03-06 17:22:40 +01:00
0dcac65aa1
Fixed upload issue when free space is not known
2014-03-06 13:53:55 +01:00
07f78c8248
Added unit tests for "add()" method for file upload
...
- Added OC.Upload.init() to make the code testable
- Added unit tests for the add() method of the uploader with some error
cases
2014-03-06 13:53:34 +01:00
84cf40ed82
merge master into webdav-injection
2014-03-06 13:35:06 +01:00
f850fcfac5
"reset" ldap pagedSearch control by setting it to a high value
2014-03-06 12:23:20 +01:00
6585bd5a50
"reset" ldap pagedSearch control by setting it to a high value
...
call nextEntry via invokeLDAPMethod
2014-03-06 12:07:03 +01:00
8fcc29ee8b
only check ldap_errno if an ldap_* function actually fails
...
fix wizard errors
reset search paging right after the search, not before some of the possible next search operations
cookie contains binary characters, don't log it
(avoids json_encode(): Invalid UTF-8 sequence in argument errors)
2014-03-06 12:07:03 +01:00
32b29c9d73
Merge branch 'master' into fix-7307
...
Conflicts:
core/js/router.js
settings/js/admin.js
2014-03-06 00:15:08 +01:00
1785c0c9b9
Merge pull request #7575 from owncloud/issue/7571
...
Do not set #dir when on public.php
2014-03-05 19:57:25 +01:00
e3156fa5ad
Merge pull request #7354 from pschmitt/master
...
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-03-05 19:25:09 +01:00
1ab10cb4f7
Do not set #dir when on public.php
...
Fix #7571
2014-03-05 18:46:55 +01:00
9111af0478
Merge pull request #7531 from owncloud/dont_create_shared_folder
...
don't allow to create a file or folder named 'Shared' in the root folder
2014-03-05 18:13:31 +01:00
7ad7f94797
fix some spaces to tabs issues reported by Scrutinizer
2014-03-05 15:47:12 +01:00
bd86642747
Merge pull request #7261 from owncloud/issue/6793
...
Allow admins to disable certain external storages for users
2014-03-05 14:41:36 +01:00
36d7c0b6a7
Merge pull request #7556 from owncloud/enc_dont_create_files_folder
...
[enc] don't create users files folder
2014-03-05 13:30:11 +01:00
a687498547
Fix encryption webdav tests
2014-03-05 13:19:08 +01:00
2e73c957e5
don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters
2014-03-05 13:16:25 +01:00
fbd8c00a89
don't create files folder, let ownCloud core handle it
2014-03-05 12:44:02 +01:00
2cfd875e61
Merge pull request #7012 from owncloud/display-share-owner-master
...
adding share owner information to the file list
2014-03-05 12:43:10 +01:00
84550fbfb4
fix another oversight... sigh..
2014-03-05 10:42:35 +01:00
4645d0a93a
getGroups(): fix overall max search limit for paged searches
2014-03-04 21:12:47 +01:00
eb1e361824
getGroups() $limit was not handled correctly
2014-03-04 21:07:27 +01:00
eb59e63c3b
revert updateGroups job to use getGroups() instead of getAllGroups()
2014-03-04 19:47:49 +01:00
039f7b054a
merge functionality of getAllGroups into getGroups
2014-03-04 18:02:27 +01:00
15ef3145f8
Merge branch 'ldap_paging_chunksize' into ldap_get_all_groups
2014-03-04 17:24:46 +01:00
a5813acb64
add ldap_paging_size config option
2014-03-04 17:23:04 +01:00
1da90fab84
Merge pull request #7508 from owncloud/ldap-configkeycasing
...
Fixed configkey casing for PostgreSQL
2014-03-04 17:08:29 +01:00
a8c67dc675
Add caching for getLocalFile on remote storages
2014-03-04 15:44:58 +01:00
f42b6f1a4e
Merge pull request #7525 from owncloud/fix_S3string
...
fix https://github.com/owncloud/core/issues/6825
2014-03-04 14:30:30 +01:00
bacda81bf7
use getAllGroup() in the updateGroups background job
...
needed in active directory deployments with > 1000 groups
2014-03-04 14:17:22 +01:00
a135f1ebbb
add getAllGroups() that uses a paged search if available
...
this circumvents server side search limits
(active directory has a limit of 1000 by default)
2014-03-04 14:17:22 +01:00
5ef37c28d1
Remove the need for a custom SabreDav server constructor
2014-03-04 13:28:48 +01:00
0bca969e99
fix https://github.com/owncloud/core/issues/6825
2014-03-04 12:38:56 +01:00
fd5dec0298
Fixed configkey casing for PostgreSQL
2014-03-03 16:15:23 +01:00
b968eed27b
remove remaining testing artefact
2014-03-03 10:20:37 +01:00
c7751c0795
intendetion. where did the whitespaces come from?
2014-03-03 10:20:31 +01:00
a8883f4ed2
LDAP: let proxy for multiple server access methods from Access
2014-03-03 10:20:25 +01:00
9f087a2070
fixing download url in files app
2014-03-02 23:41:14 +01:00
1291303c5a
Replace OC.Router.generate() with OC.generateUrl()
2014-03-02 22:30:24 +01:00
15d1df055b
Merge branch 'master' into display-share-owner-master
...
Conflicts:
apps/files_sharing/lib/cache.php
2014-02-28 14:54:10 +01:00
da386aad59
Allow re-using already known fileinfo when calculating folder sizes
2014-02-28 14:23:07 +01:00
8a93a2e7d5
Merge pull request #7455 from owncloud/rawlist-fileinfo
...
Update rawlist to work with new fileinfo object
2014-02-28 12:36:56 +01:00
61bc76fdd6
Merge pull request #7454 from owncloud/enc_remember_fopen_mode
...
[enc] remember original fopen access type in pre-proxy
2014-02-28 09:57:58 +01:00
fefd724858
Fixed wrong field name
...
This re-fixes an issue where the unencrypted size isn't updated
correctly when saving a text file in the UI multiple times.
Fixes #7467
2014-02-27 23:53:29 +01:00
4ace1a273d
remember original fopen access type in pre-proxy because sometimes they change
...
during the fopen call, e.g. 'r' becomes 'r+' if we open an URL
2014-02-27 14:16:03 +01:00
7c92e2e3ad
Update rawlist to work with new fileinfo object
2014-02-27 14:04:19 +01:00
ba4b593f84
Merge pull request #7446 from owncloud/etag_assert_fixes
...
use assertSame and assertNotSame for etag checks
2014-02-27 13:51:14 +01:00
577e47e207
Merge pull request #7432 from owncloud/enc_cleanup_session_after_decrypt_all
...
close encryption session after decryption was finished
2014-02-27 11:10:45 +01:00
39f2f564a9
use assertSame and assertNotSame for etag checks
2014-02-27 09:39:34 +01:00
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
86b3cdc132
close encryption session after decryption was finished
2014-02-26 17:18:38 +01:00
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
932c4ee927
Allow admins to disable certain external storages for users
...
Fix issue #6793
2014-02-26 15:02:41 +01:00
6c5cc46380
disable autocomplete for shared link password input, fix #7419
2014-02-26 14:48:15 +01:00
4b8717df9d
Merge pull request #7416 from owncloud/share_api_7311
...
[share api] only add "received_from" field if a share was found
2014-02-26 14:42:31 +01:00
d9a153dbe9
Merge pull request #7174 from owncloud/issue/7166
...
Add option to change email settings in admin section
2014-02-26 14:41:07 +01:00
bc49c6be04
Manually triger the filecache update hooks before any other hook
2014-02-26 14:29:13 +01:00
3be5e48b0c
only add "received_from" if a share was found
2014-02-26 12:52:35 +01:00
2b423e5a44
coding style fixes, cut long lines, comments not on same lines, curly braces
2014-02-26 10:16:54 +01:00
e3f676e009
fix path in sharing results if it is a file in the Shared folder
2014-02-25 17:27:23 +01:00
3a21755963
Pass the filesystem view as argument in the sabredav connectors and use the fileinfo object
2014-02-25 16:23:09 +01:00
7f7d674c2a
Merge pull request #7335 from owncloud/fix-7333
...
Fix code to search for mount.json in custom data folders
2014-02-25 15:27:47 +01:00
ec9fe3f57f
Merge pull request #6299 from leo-b/ldap_nested_groups
...
Add LDAP nested groups
2014-02-25 15:41:10 +02:00
e10ca7c2e9
Merge pull request #7374 from owncloud/enc_dont_overwrite_keys
...
[encryption] don't overwrite keys if rename was done by a stream copy
2014-02-25 12:34:49 +01:00
d3a24e945b
add test case if a file gets moved out from the shared folder
2014-02-24 17:56:00 +01:00
ebd73aee8f
don't overwrite keys if rename was done by a stream copy
2014-02-24 17:24:43 +01:00
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
8d17f6d675
Merge pull request #7320 from owncloud/GuillaumeAmat-patch-1
...
Update page title when navigating through directories (local)
2014-02-24 13:34:07 +01:00
7c4f81bd78
rename url parameter
2014-02-24 13:24:10 +01:00
539ea0882b
Fixed mount config path
2014-02-24 10:35:24 +01:00
11ca014034
Merge pull request #7305 from owncloud/extstorage-configclass
...
Added extra checks for ext storage class
2014-02-22 08:10:31 +01:00
300b1131b4
replace spaces with tabs
...
use true instead of 1
2014-02-21 17:09:36 +01:00
9b9b2255b6
Merge pull request #7355 from owncloud/new-menu-svg
...
Use SVG icons in New file menu
2014-02-21 16:18:43 +01:00
59ec61dc03
Merge branch 'master' into GuillaumeAmat-patch-1
2014-02-21 16:04:31 +01:00
f1475671ab
Merge branch 'master' into extstorage-configclass
2014-02-21 15:51:41 +01:00
6f56fd99a6
fix too much distance between text and icon
2014-02-21 14:10:13 +01:00
877cfb963a
use SVG icons from icons.css for New file menu
2014-02-21 14:07:25 +01:00
4715fb12c8
Add url parameter to control whether previews should return 404 when the mimetype is unsupported
2014-02-21 14:06:15 +01:00
3f52eb073d
Merge branch 'master' into mimeicons-svg
2014-02-21 14:00:17 +01:00
43b1d81f77
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-02-21 13:45:57 +01:00
0c0e4fced5
fix test so that it doesn't depend on the array order
2014-02-21 13:37:47 +01:00
6ca4d3bfde
fix usersPath and add unit tests
2014-02-21 13:37:46 +01:00
b22d82f941
code style: else on same line
2014-02-21 09:42:19 +01:00
fe24aafe7d
Merge pull request #7312 from owncloud/ldap_fix_add_test
...
LDAP: fix and extend tests
2014-02-21 00:42:43 +01:00
089052b13a
Fixed issue with drag and drop not in the root directory, for folders and files
2014-02-20 20:18:27 +00:00
6cb64a4fce
Fix code to search for mount.json in custom data folders
2014-02-20 18:34:27 +01:00
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
d0c8b310b9
uppercase text and fix dialog popup
2014-02-20 18:24:42 +01:00
179fbada32
show share owner within shared folders as well
2014-02-20 18:24:42 +01:00
2b84f5e0b9
remove duplicate selectors and declaration
2014-02-20 18:24:42 +01:00
271684dcfe
update share owner
2014-02-20 18:24:42 +01:00
d6e89a9a28
store the share owner in a data-attribute instead of a separate span
2014-02-20 18:24:42 +01:00
7c68025010
adding share owner information to the file list
2014-02-20 18:24:42 +01:00
f710205ee7
Make unit tests expect the svg icons
2014-02-20 16:56:09 +01:00
0624476aa1
Merge branch 'master' into mimeicons-svg
2014-02-20 16:55:18 +01:00
d1b1ad0813
Merge pull request #7290 from owncloud/issue/5463
...
Correctly redirect to settings page when not selecting cert file for upload
2014-02-20 16:24:31 +01:00
984ea7b3ff
Merge pull request #7205 from owncloud/fix_7153
...
LDAP: prevent other configuration from being deleted when deleting the f...
2014-02-20 16:22:43 +01:00
658758c3f7
fix intendation
2014-02-20 15:36:52 +01:00
44441b56d6
Fixed trashbin title
2014-02-20 15:16:45 +01:00
c869e0116b
Merge pull request #6999 from kofemann/mount-config
...
mount: make location of mount.json configurable
2014-02-20 15:15:00 +01:00
476444ab1a
Fixed title format
2014-02-20 14:56:28 +01:00
6cf83de60e
Merge branch 'patch-1' of github.com:GuillaumeAmat/core into GuillaumeAmat-patch-1
2014-02-20 14:49:54 +01:00
d5690a174e
LDAP: fix and extend tests
2014-02-20 14:05:45 +01:00
719f1111b6
Merge pull request #6714 from owncloud/files-newfileinvalidcharsfix
...
Added extra checks for invalid file chars in newfile.php and newfolder.php
2014-02-20 11:53:58 +01:00
b060a17b59
Added extra checks for ext storage class
2014-02-20 10:40:10 +01:00
49f2014e0c
Revert "Added extra checks for ext storage class"
...
This reverts commit 9e9a5b9ea1
2014-02-20 10:01:49 +01:00
8f22535e75
Merge pull request #7284 from owncloud/ldap_filter_compilation
...
LDAP: improve compilation of filters
2014-02-20 09:55:02 +01:00
38d6c56249
Merge pull request #7294 from owncloud/extstorage-configclass
...
Added extra checks for ext storage class
2014-02-20 09:53:52 +01:00
577559458d
Uses OC.basename instead of custom code
2014-02-19 22:50:49 +01:00
b01492fecd
Feature Added : Ability to drag and drop in Chrome
2014-02-19 21:28:32 +00:00
79a6d89bcc
Feature Added : Ability to drag and drop in Chrome
2014-02-19 21:23:39 +00:00
9e9a5b9ea1
Added extra checks for ext storage class
2014-02-19 19:08:28 +01:00
b2b35cd335
Fixed ext storage webdav path encoding
...
- Some WebDAV servers like lighttpd need paths in URLs to be properly
encoded
- Added error log output when curl connection failed
- Added check for 'resourcetype' in case the WebDAV server doesn't
support/return it
- Fixed touch() to return false if the server doesn't implement
PROPPATCH
- Added optional delay in WebDAV unit tests to use when testing against
lighttpd's WebDAV
2014-02-19 18:34:08 +01:00
513940f4a4
Correctly redirect to settings page when not selecting cert file for upload
...
Fix #5463
2014-02-19 17:07:29 +01:00
f33d35cd07
Fix svg icons for public shares and external/shared files
2014-02-19 15:08:05 +01:00
609a91a9b1
Show svg mime icons when no preview is available
2014-02-19 14:47:29 +01:00
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
c0328b4f0f
LDAP: improve compilation of filters
2014-02-19 13:13:01 +01:00
7330f61a94
Merge pull request #4799 from owncloud/tune_legacy_cache_webdav_properties_prefixing_master
...
Concatenate string in SQL instead of PHP
2014-02-19 11:58:48 +01:00
bcad6e641a
Merge pull request #7274 from owncloud/scrutinizer-patch-1
...
Scrutinizer Auto-Fixes
2014-02-19 11:51:04 +01:00
fdb0d2067f
Remove duplicated definition and move OC.msg to js/js.js
...
Fix issue #7166
2014-02-19 10:20:52 +01:00
e517e642be
Merge pull request #7257 from owncloud/filelist-fileinfo
...
use a FileInfo object of the directory when generting the filelist
2014-02-19 09:40:11 +01:00
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
c6f4f85e27
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/migration/content.php
2014-02-18 18:31:33 +01:00
1e84d6b14b
Merge pull request #7190 from owncloud/appconfig-legacy-apps
...
Remove usage of legacy OC_Appconfig
2014-02-18 18:10:22 +01:00
797e0a614c
Added extra checks for invalid file chars in newfile.php and newfolder.php
...
- added PHP utility function to check for file name validity
- fixes issue where a user can create a file called ".." from the files UI
- added extra checks to make sure newfile.php and newfolder.php also
check for invalid characters
2014-02-18 17:54:32 +01:00
3b1083f46e
Merge pull request #7176 from owncloud/style
...
Some style fixes
2014-02-18 17:30:26 +01:00
d18b9f6ea4
use a FileInfo object of the directory when generting the filelist
2014-02-18 15:39:35 +01:00
323cc1166b
Merge pull request #7235 from DavidVentura/master
...
small change for compatibility
2014-02-17 21:16:39 +01:00
5a80339b51
Merge pull request #7211 from mattcaron/master
...
Fit shared videos to viewer, just like images. Issue #1648
2014-02-17 20:59:29 +01:00
aa1a50f5b3
Consolidate two sections, per code review. Issue #1648
2014-02-17 12:57:54 -05:00
94b3296a71
Trashbin select all now doesn't send file list
...
- Fixed "delete" and "restore" actions to not send the file list when
all files are selected
- When some files are selected, sends the current dir
- Removed "dirListing" attribute as the backend is able to compute the
value based on the current dir
2014-02-17 18:34:59 +01:00
a282afcbbb
small change for compatibility
2014-02-17 13:27:07 -03:00
54f9db403f
LDAP: improve wizard strings, fixes #5567
2014-02-17 17:19:48 +01:00
6778dc5a4a
don't block login forever if we are stuck in the middle of the initial encryption
2014-02-17 10:03:57 +01:00
f2f5769df7
catch errors during decryption
2014-02-17 10:03:57 +01:00
2ab062193a
catch errors during initial encryption
2014-02-17 09:58:46 +01:00
9fac95c2ab
Merge branch 'master' into scrutinizer_documentation_patches
...
Conflicts:
lib/private/appconfig.php
2014-02-14 23:03:27 +01:00
2887fb1f48
Fit shared videos to viewer, just like images. Issue #1648
2014-02-14 16:09:51 -05:00
2933668355
fileinfo is no longer a array
2014-02-14 18:05:59 +01:00
d88c6778ff
LDAP: prevent other configuration from being deleted when deleting the first one which has an empty prefix for historical reasons
2014-02-14 15:34:22 +01:00
2a7509ee50
Merge pull request #6748 from owncloud/fileinfo
...
Add a FileInfo class which holds all info of a file ...
2014-02-14 15:16:39 +01:00
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
595b908b74
Merge pull request #7183 from owncloud/remove-force-lowercase
...
remove forced lowercase from extension, fix #4747
2014-02-14 13:58:42 +01:00
afe133d5d1
Merge pull request #7168 from owncloud/issue/7152
...
Send correct path on file upload when using public app
2014-02-14 12:25:20 +01:00
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
181bbd4325
Remove usage of legacy OC_Appconfig
2014-02-13 16:28:49 +01:00
01dc7c5482
Gets the page title from oc_defaults in Files app
2014-02-13 10:48:01 +01:00
6e17d71a0d
remove forced lowercase from extension, fix #4747 , also coding style fixes
2014-02-13 10:39:38 +01:00
30662fa7ac
Merge pull request #7178 from owncloud/issue/6277
...
External FTP Storage should request hostname instead of URL
2014-02-12 23:01:41 +01:00
658af627ce
External FTP Storage should request hostname instead of URL
...
Fix issue #6277
2014-02-12 18:20:10 +01:00
d10f6e94dc
fix coding style to blizzz happy.. ;-)
2014-02-12 16:56:17 +01:00
9619459e37
Send correct path on file upload when using public app
...
Fix issue #7152
2014-02-12 15:49:09 +01:00
7af456730e
Merge pull request #6964 from owncloud/storagestatistics-reuse
...
Reuse the calculated free_space in buildFileStorageStatistics
2014-02-12 15:48:14 +01:00
1fb5f96c37
Style fixes
2014-02-12 09:09:51 +01:00
a62b393d02
Update page title when navigating through directories
2014-02-12 00:54:35 +01:00
3699728a3a
Merge pull request #7085 from owncloud/quick-fix-7019-master
...
Load authentication apps to get users from all backends
2014-02-11 18:41:08 +01:00
14d1abf63f
LDAP: improve debug message
2014-02-10 14:45:37 +01:00
18e1a10e96
LDAP: also try MS AD's thumbnailPhoto when looking for an avatar image
2014-02-10 14:45:31 +01:00
eba1d574cf
Merge pull request #7134 from owncloud/issue/5794
...
Make google drive client secret and dropbox api secret a password field
2014-02-10 14:34:24 +01:00
753af3a3ff
Merge branch 'master' into storagestatistics-reuse
2014-02-10 14:01:32 +01:00
02bdb47049
Merge pull request #7140 from owncloud/enc_dont_login_during_encryption
...
refuse login as long as the initial encryption is running
2014-02-10 13:25:39 +01:00
299d37154b
LDAP: add documentation info in info.xml
2014-02-10 12:59:11 +01:00
6b5a7035ee
Merge pull request #7126 from nickvergessen/issue/6683
...
Only add files to file list when uploading to current directory
2014-02-10 12:14:05 +01:00
e156f85bfb
Rephrase and clarify log message
2014-02-10 11:29:08 +01:00
a76840d206
Wizard: enable base DN for editing, if not base DN could have been detected. Also part of fix for #6670
2014-02-10 11:29:02 +01:00
e825a008c9
Wizard: disable LDAP referrals, fixes #6670
2014-02-10 11:28:55 +01:00
a908bd5695
throw an info message, when base dn test failed
2014-02-10 11:28:46 +01:00
bc17b40650
LDAP: extend LDAP wrapper search method for sizelimit, improves performance in wizard
2014-02-10 11:28:38 +01:00
050e84a08f
refuse login as long as the initial encryption is running
2014-02-10 10:56:11 +01:00
e7db48cd7f
Merge pull request #7133 from owncloud/fix-implied-eval
...
Fix implied evals and doubled definition of variable
2014-02-10 10:08:40 +01:00
b330d07b51
Fix more documentation failes
...
Issue #7111
2014-02-08 11:47:55 +01:00
828985dc60
Make google drive client secret and dropbox api secret a password field
...
Fix issue #5794
2014-02-07 18:12:01 +01:00
91254c304d
name users after test
2014-02-07 18:07:38 +01:00
13fa0e2a9d
Fix implied evals and doubled definition of variable
...
fixes #7119
fixes #7120
fixes #7121
fixes #7122
2014-02-07 17:47:42 +01:00
af7366cd30
Only add files to file list when uploading to current directory
...
Fix Issue #6683
2014-02-07 13:06:50 +01:00
a8943ad022
replace 'size' with 'unencrypted_size' if encryption is enabled
2014-02-07 12:53:13 +01:00
2a6a9a8cef
polish documentation based on scrutinizer patches
2014-02-06 17:02:21 +01:00
aff1cafaca
Merge pull request #7089 from owncloud/sharing-searchbymime
...
Fixed searchByMime in shared cache
2014-02-06 14:15:00 +01:00
79fc4f3126
Within OC:init() the minimum set of apps is loaded - which is filesystem, authentication and logging
2014-02-06 11:34:27 +01:00
21207c6a73
remove superfluous $RUNTIME_APPTYPES
2014-02-06 09:50:11 +01:00
946fccc0dd
Remove unused template variable assignment of files_sharing/template/public.php
2014-02-06 12:26:36 +08:00
8c56e21ced
Move template variable assignment to correct place
2014-02-06 12:06:16 +08:00
Bjoern Schiessle
Vincent Petry
Arthur Schiwon
Thomas Müller
Jenkins for ownCloud
Volkan Gezer
icewind1991
Morris Jobke
Robin Appelman
Robin McCorkell
Raghu Nayyar
Jörn Friedrich Dreyer
Andreas Fischer
Jan-Christoph Borchardt
Morris Jobke
Bart Visscher
Lukas Reschke
Volkan Gezer
Philipp Kapfer
Alexander Bergolth
Scott Arciszewski
kondou
Oskar Hollmann
Frank Karlitschek
ben-denham
Jamie McClelland
Francesco Piraneo G.
Georg Ehrke
IchEben
Joas Schilling
VicDeo
Philipp Schmitt
Luke Policinski
Guillaume AMAT
Scrutinizer Auto-Fixer
Matthew Caron
David
Pellaeon Lin