]> source.dussan.org Git - nextcloud-server.git/log
nextcloud-server.git
10 years agoAdded core unit tests for basename and dirname
Vincent Petry [Thu, 30 Jan 2014 12:22:16 +0000 (13:22 +0100)]
Added core unit tests for basename and dirname

Note that it doesn't work 100% like the PHP functions so the tests
have TODO comments to fix those core functions eventually.

10 years agoFixed unit test scripts + coverage
Vincent Petry [Mon, 27 Jan 2014 20:15:21 +0000 (21:15 +0100)]
Fixed unit test scripts + coverage

Tried to add more apps (others break).
"preprocessors" is now populated automatically based on the tested apps.

10 years agoMerge pull request #6736 from owncloud/tests-jsunittests
Thomas Müller [Thu, 23 Jan 2014 20:43:05 +0000 (12:43 -0800)]
Merge pull request #6736 from owncloud/tests-jsunittests

Added Javascript unit tests

10 years agoMerge pull request #6234 from owncloud/change-email-by-enter
Jan-Christoph Borchardt [Thu, 23 Jan 2014 16:03:22 +0000 (08:03 -0800)]
Merge pull request #6234 from owncloud/change-email-by-enter

change mail address by pressing enter - fixes #6179

10 years agoMerge pull request #6898 from owncloud/encryption_infinite_loop
Björn Schießle [Thu, 23 Jan 2014 09:09:34 +0000 (01:09 -0800)]
Merge pull request #6898 from owncloud/encryption_infinite_loop

[encryption] infinite loop on sharing

10 years agofix infinite loop if folder and subfolder has the same name
Bjoern Schiessle [Wed, 22 Jan 2014 15:55:04 +0000 (16:55 +0100)]
fix infinite loop if folder and subfolder has the same name

10 years agoadd path relative to the files folder of the currently logged in user to the output...
Bjoern Schiessle [Wed, 22 Jan 2014 15:54:17 +0000 (16:54 +0100)]
add path relative to the files folder of the currently logged in user to the output of getFolderContent()

10 years agoMerge pull request #6890 from owncloud/version_fix_array_order
Björn Schießle [Wed, 22 Jan 2014 10:52:30 +0000 (02:52 -0800)]
Merge pull request #6890 from owncloud/version_fix_array_order

[files_versions] fix array order

10 years agoMerge pull request #6719 from tripflex/fix_pubup_progbar
Morris Jobke [Wed, 22 Jan 2014 10:28:28 +0000 (02:28 -0800)]
Merge pull request #6719 from tripflex/fix_pubup_progbar

Fix public upload progress bar

10 years agofix array order
Bjoern Schiessle [Wed, 22 Jan 2014 10:13:15 +0000 (11:13 +0100)]
fix array order

10 years agocode clean-up
Bjoern Schiessle [Wed, 22 Jan 2014 10:10:32 +0000 (11:10 +0100)]
code clean-up

10 years agofix size calculation of getAllVersions()
Bjoern Schiessle [Wed, 22 Jan 2014 10:10:23 +0000 (11:10 +0100)]
fix size calculation of getAllVersions()

10 years agoMerge pull request #6856 from owncloud/fixing-gallery-password-protected-access-master
Vincent Petry [Tue, 21 Jan 2014 19:08:58 +0000 (11:08 -0800)]
Merge pull request #6856 from owncloud/fixing-gallery-password-protected-access-master

adding password protection check to getShareByToken()

10 years agoMerge branch 'master' into fixing-gallery-password-protected-access-master
Thomas Müller [Tue, 21 Jan 2014 18:36:20 +0000 (19:36 +0100)]
Merge branch 'master' into fixing-gallery-password-protected-access-master

10 years agoMerge pull request #6863 from owncloud/versioning_expire_function_tests
Thomas Müller [Tue, 21 Jan 2014 16:39:50 +0000 (08:39 -0800)]
Merge pull request #6863 from owncloud/versioning_expire_function_tests

Versioning expire function tests

10 years agoMerge pull request #6868 from owncloud/enc-fixrandomfailunittest
Vincent Petry [Tue, 21 Jan 2014 16:35:41 +0000 (08:35 -0800)]
Merge pull request #6868 from owncloud/enc-fixrandomfailunittest

Replaced time() with uniqid() to make sure the file name is unique

10 years agoMerge pull request #6844 from owncloud/fix-css-loading-master
Jörn Friedrich Dreyer [Tue, 21 Jan 2014 16:31:22 +0000 (08:31 -0800)]
Merge pull request #6844 from owncloud/fix-css-loading-master

Revert "use getAppWebPath() in here as well"

10 years agoMerge pull request #6858 from owncloud/fix-setupfs-only-for-existing-users-master
Thomas Müller [Tue, 21 Jan 2014 15:36:30 +0000 (07:36 -0800)]
Merge pull request #6858 from owncloud/fix-setupfs-only-for-existing-users-master

OC_Util::setupFS($user) will create a data dir for the given string - no...

10 years agoReplaced time() with uniqid() to make sure the file name is unique
Vincent Petry [Tue, 21 Jan 2014 15:19:26 +0000 (16:19 +0100)]
Replaced time() with uniqid() to make sure the file name is unique

The cache isn't cleared properly because unlink() doesn't remove the
cache entry which caused side-effects when reusing the same file name
(which randomly happens when time() returns the same value)

This fix first makes sure the unit tests don't fail any more.
The unlink() case with the cache will be investigated separately.

10 years agoadd first unit test for the versioning app
Bjoern Schiessle [Tue, 21 Jan 2014 11:10:24 +0000 (12:10 +0100)]
add first unit test for the versioning app

10 years agoisolate getExpireList function to make it testable
Bjoern Schiessle [Mon, 20 Jan 2014 15:03:26 +0000 (16:03 +0100)]
isolate getExpireList function to make it testable

10 years agoMerge branch 'master' into fixing-gallery-password-protected-access-master
Thomas Müller [Tue, 21 Jan 2014 15:01:24 +0000 (16:01 +0100)]
Merge branch 'master' into fixing-gallery-password-protected-access-master

10 years agoMerge branch 'master' into fix-setupfs-only-for-existing-users-master
Thomas Müller [Tue, 21 Jan 2014 14:35:32 +0000 (15:35 +0100)]
Merge branch 'master' into fix-setupfs-only-for-existing-users-master

10 years agoMerge pull request #6864 from owncloud/protect-versions-preview-master
Thomas Müller [Tue, 21 Jan 2014 14:16:22 +0000 (06:16 -0800)]
Merge pull request #6864 from owncloud/protect-versions-preview-master

don't use the user id within the versions preview call as it could be us...

10 years agodon't use the user id within the versions preview call as it could be used to access...
Thomas Müller [Tue, 21 Jan 2014 12:50:56 +0000 (13:50 +0100)]
don't use the user id within the versions preview call as it could be used to access previews of another user

10 years agoMerge pull request #6861 from owncloud/neutral_download_zip_default_name
Thomas Müller [Tue, 21 Jan 2014 12:19:26 +0000 (04:19 -0800)]
Merge pull request #6861 from owncloud/neutral_download_zip_default_name

use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'

10 years agoMerge pull request #6857 from owncloud/fix_user_ldap_sql_on_oracle
Thomas Müller [Tue, 21 Jan 2014 12:14:28 +0000 (04:14 -0800)]
Merge pull request #6857 from owncloud/fix_user_ldap_sql_on_oracle

user workaround to compare CLOB column with CHAR value

10 years agouse 'download.zip' as default name for zip downloads instead of 'owncloud.zip'
Jörn Friedrich Dreyer [Tue, 21 Jan 2014 11:41:10 +0000 (12:41 +0100)]
use 'download.zip' as default name for zip downloads instead of 'owncloud.zip'

10 years agofixing comment + adding unit test for checkPasswordProtectedShare
Thomas Müller [Tue, 21 Jan 2014 11:07:08 +0000 (12:07 +0100)]
fixing comment + adding unit test for checkPasswordProtectedShare

10 years agouser workarount to compare CLOB column with CHAR value
Jörn Friedrich Dreyer [Tue, 21 Jan 2014 10:56:34 +0000 (11:56 +0100)]
user workarount to compare CLOB column with CHAR value

10 years agoOC_Util::setupFS($user) will create a data dir for the given string - no matter if...
Thomas Müller [Tue, 21 Jan 2014 10:32:30 +0000 (11:32 +0100)]
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

10 years agoin case no share is found for the given token we can return right away
Thomas Müller [Tue, 21 Jan 2014 09:55:10 +0000 (10:55 +0100)]
in case no share is found for the given token we can return right away

10 years agoadding password protection check to getShareByToken()
Thomas Müller [Tue, 21 Jan 2014 09:42:47 +0000 (10:42 +0100)]
adding password protection check to getShareByToken()

10 years agoadding code coverage support
Thomas Müller [Mon, 20 Jan 2014 23:57:18 +0000 (00:57 +0100)]
adding code coverage support

10 years agoMerge pull request #6820 from owncloud/phpunit-test-config
Thomas Müller [Mon, 20 Jan 2014 20:14:09 +0000 (12:14 -0800)]
Merge pull request #6820 from owncloud/phpunit-test-config

Load a separate config (if present) when running unit tests

10 years agoMerge pull request #6849 from owncloud/checkupdate-reuse
icewind1991 [Mon, 20 Jan 2014 18:37:18 +0000 (10:37 -0800)]
Merge pull request #6849 from owncloud/checkupdate-reuse

Reuse the data retrieved from the cache in checkUpdate

10 years agoMerge pull request #6851 from owncloud/files-fixtrashandversionrootsizecalc
Vincent Petry [Mon, 20 Jan 2014 17:28:49 +0000 (09:28 -0800)]
Merge pull request #6851 from owncloud/files-fixtrashandversionrootsizecalc

When reading the size of "files" mountpoints need to be excluded

10 years agochange publicUploadButtonMock to public_upload
Myles McNamara [Mon, 20 Jan 2014 16:58:01 +0000 (11:58 -0500)]
change publicUploadButtonMock to public_upload

Changed jQuery selector for public preview to public_upload to correctly show preview

10 years agoMerge pull request #6842 from owncloud/fix-quotes-again-master
Jörn Friedrich Dreyer [Mon, 20 Jan 2014 16:52:21 +0000 (08:52 -0800)]
Merge pull request #6842 from owncloud/fix-quotes-again-master

Quote column names on adding description

10 years agoWhen reading the size of "files" mountpoints need to be excluded
Vincent Petry [Mon, 20 Jan 2014 16:10:09 +0000 (17:10 +0100)]
When reading the size of "files" mountpoints need to be excluded

The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.

This is because the default call (legacy) used to return the size of
mount points as well.

Fixes #6731

10 years agoReuse the data retrieved from the cache in checkUpdate
Robin Appelman [Mon, 20 Jan 2014 14:21:21 +0000 (15:21 +0100)]
Reuse the data retrieved from the cache in checkUpdate

10 years agoMerge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix
Vincent Petry [Mon, 20 Jan 2014 13:29:27 +0000 (05:29 -0800)]
Merge pull request #6838 from owncloud/core-quotawrapperfailedfopenfix

Fixed quota wrapper to not wrap failed fopen streams

10 years agoMove test config folder to tests/config
Robin Appelman [Mon, 20 Jan 2014 12:41:52 +0000 (13:41 +0100)]
Move test config folder to tests/config

10 years agoMerge pull request #6827 from rnveach/fix_6730
Morris Jobke [Mon, 20 Jan 2014 09:44:34 +0000 (01:44 -0800)]
Merge pull request #6827 from rnveach/fix_6730

Fix 6730

10 years agoadding a comment to the database schema
Thomas Müller [Mon, 20 Jan 2014 09:17:31 +0000 (10:17 +0100)]
adding a comment to the database schema

10 years agoRevert "use getAppWebPath() in here as well"
Thomas Müller [Mon, 20 Jan 2014 09:10:34 +0000 (10:10 +0100)]
Revert "use getAppWebPath() in here as well"

This reverts commit 6254f0a403e315461f8e20ebccf71cb91e9313a3.

10 years agoUpdating 3rdparty once more ....
Thomas Müller [Mon, 20 Jan 2014 08:25:30 +0000 (09:25 +0100)]
Updating 3rdparty once more ....

10 years agoMerge pull request #6676 from aseques/check_internet_proxy
Thomas Müller [Sun, 19 Jan 2014 20:08:55 +0000 (12:08 -0800)]
Merge pull request #6676 from aseques/check_internet_proxy

Fix internet detection to use OC_Util::getUrlContent

10 years agoFixed quota wrapper to not wrap failed fopen streams
Vincent Petry [Sun, 19 Jan 2014 17:49:51 +0000 (18:49 +0100)]
Fixed quota wrapper to not wrap failed fopen streams

When calling fopen() on some storage types, these return false instead
of throwing an exception.

This fix makes sure that in case the stream wasn't opened (for example
when a file doesn't exist any more) the stream isn't wrapped.

Also added 'rb' as another case that doesn't need to be wrapped.

Fixes #6832

10 years agoMerge pull request #6819 from owncloud/files-ispreviewenabledwarningfix
Vincent Petry [Sun, 19 Jan 2014 12:48:12 +0000 (04:48 -0800)]
Merge pull request #6819 from owncloud/files-ispreviewenabledwarningfix

Fixed isPreviewAvailable warnings in log

10 years agofix double call of changeEmailAddress()
Morris Jobke [Sat, 18 Jan 2014 21:59:49 +0000 (22:59 +0100)]
fix double call of changeEmailAddress()

10 years agoMerge pull request #6721 from tsumi/patch-1
Morris Jobke [Sat, 18 Jan 2014 16:34:45 +0000 (08:34 -0800)]
Merge pull request #6721 from tsumi/patch-1

Added SVG fallback to apps settings popup

10 years agoMerge pull request #6784 from owncloud/fix-activation-of-unknown-apps
Morris Jobke [Sat, 18 Jan 2014 16:13:57 +0000 (08:13 -0800)]
Merge pull request #6784 from owncloud/fix-activation-of-unknown-apps

Fix activation of unknown apps

10 years agoMerge pull request #6818 from owncloud/add_documentation_to_appinfo
Morris Jobke [Sat, 18 Jan 2014 16:09:07 +0000 (08:09 -0800)]
Merge pull request #6818 from owncloud/add_documentation_to_appinfo

Allow app developers to add documentation links to the appinfo

10 years agoadded trigger to redo selection text on a directory change
rnveach [Fri, 17 Jan 2014 16:49:00 +0000 (11:49 -0500)]
added trigger to redo selection text on a directory change

10 years agofixed selector string and removed all checkbox if it was selected
rnveach [Fri, 17 Jan 2014 16:46:44 +0000 (11:46 -0500)]
fixed selector string and removed all checkbox if it was selected

10 years agoadded website field
Bjoern Schiessle [Fri, 17 Jan 2014 15:35:48 +0000 (16:35 +0100)]
added website field

10 years agodistinguish app links from doc links
Bjoern Schiessle [Fri, 17 Jan 2014 15:07:58 +0000 (16:07 +0100)]
distinguish app links from doc links

10 years agoshow link to app documentation
Bjoern Schiessle [Fri, 17 Jan 2014 13:05:39 +0000 (14:05 +0100)]
show link to app documentation

10 years agoadd link to documentation
Bjoern Schiessle [Fri, 17 Jan 2014 13:05:33 +0000 (14:05 +0100)]
add link to documentation

10 years agoLoad a separate config (if present) when running unit tests
Robin Appelman [Fri, 17 Jan 2014 13:40:48 +0000 (14:40 +0100)]
Load a separate config (if present) when running unit tests

10 years agoMerge pull request #6812 from owncloud/tests-fixcachesyntaxforoldphp
Thomas Müller [Fri, 17 Jan 2014 13:39:08 +0000 (05:39 -0800)]
Merge pull request #6812 from owncloud/tests-fixcachesyntaxforoldphp

Fix array access syntax for older PHP

10 years agoFixed isPreviewAvailable warnings in log
Vincent Petry [Fri, 17 Jan 2014 13:21:15 +0000 (14:21 +0100)]
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

10 years agoMerge pull request #6810 from kofemann/for-upstream
Vincent Petry [Fri, 17 Jan 2014 12:09:53 +0000 (04:09 -0800)]
Merge pull request #6810 from kofemann/for-upstream

webdav: return SPACE_UNKNOWN if server do not support quota

10 years agoMerge pull request #6807 from owncloud/enc_updated_description
Vincent Petry [Fri, 17 Jan 2014 11:54:09 +0000 (03:54 -0800)]
Merge pull request #6807 from owncloud/enc_updated_description

updated description of the files encryption app

10 years agoFix array access syntax for older PHP
Vincent Petry [Fri, 17 Jan 2014 11:29:21 +0000 (12:29 +0100)]
Fix array access syntax for older PHP

There was a syntax error when running tests in PHP 5.3.10.

10 years agodon't enable files_external tests
Thomas Müller [Fri, 17 Jan 2014 11:07:27 +0000 (12:07 +0100)]
don't enable files_external tests

10 years agowebdav: return SPACE_UNKNOWN if server do not support quota
Tigran Mkrtchyan [Thu, 16 Jan 2014 09:53:58 +0000 (10:53 +0100)]
webdav: return SPACE_UNKNOWN if server do not support quota

Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
10 years agoupdated description of the files encryption app
Bjoern Schiessle [Fri, 17 Jan 2014 10:08:49 +0000 (11:08 +0100)]
updated description of the files encryption app

10 years agoAdded Javascript unit tests
Vincent Petry [Sun, 12 Jan 2014 17:57:53 +0000 (18:57 +0100)]
Added Javascript unit tests

- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script

10 years agoMerge pull request #6264 from owncloud/files-draggabledestroy
Morris Jobke [Thu, 16 Jan 2014 13:52:43 +0000 (05:52 -0800)]
Merge pull request #6264 from owncloud/files-draggabledestroy

Fix to not destroy draggable when no draggable was set

10 years agoMerge pull request #6786 from wakeup/master
Björn Schießle [Thu, 16 Jan 2014 11:22:55 +0000 (03:22 -0800)]
Merge pull request #6786 from wakeup/master

Fix untranslated text when deleting user

10 years agoMerge pull request #6644 from ben-denham/unshare-all-fix
Björn Schießle [Thu, 16 Jan 2014 11:13:26 +0000 (03:13 -0800)]
Merge pull request #6644 from ben-denham/unshare-all-fix

\OCP\Share::unshareAll() fix

10 years agochange em to px
Myles McNamara [Wed, 15 Jan 2014 22:06:48 +0000 (17:06 -0500)]
change em to px

10 years agoFix untranslated text when deleting user
Volkan Gezer [Wed, 15 Jan 2014 17:36:33 +0000 (18:36 +0100)]
Fix untranslated text when deleting user

This should fix issue #6728

10 years agoproperly handle app activation for unit testing
Thomas Müller [Wed, 15 Jan 2014 16:12:42 +0000 (17:12 +0100)]
properly handle app activation for unit testing

10 years agoerror handling in case a requested app doesn't exists
Thomas Müller [Wed, 15 Jan 2014 16:11:29 +0000 (17:11 +0100)]
error handling in case a requested app doesn't exists

10 years agoMerge pull request #6223 from owncloud/extstorage-grantaccessasyncfix
Vincent Petry [Wed, 15 Jan 2014 15:41:01 +0000 (07:41 -0800)]
Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfix

Fixed Dropbox/Google storage async save call

10 years agoMerge pull request #6780 from owncloud/trash_bin_copy_recursively
Björn Schießle [Wed, 15 Jan 2014 14:57:33 +0000 (06:57 -0800)]
Merge pull request #6780 from owncloud/trash_bin_copy_recursively

copy files to owners trash recursively

10 years agoMerge pull request #6779 from owncloud/sharing-breadcrumb-folder-name
Jan-Christoph Borchardt [Wed, 15 Jan 2014 14:56:59 +0000 (06:56 -0800)]
Merge pull request #6779 from owncloud/sharing-breadcrumb-folder-name

Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder

10 years agoremove old code
Bjoern Schiessle [Wed, 15 Jan 2014 13:35:17 +0000 (14:35 +0100)]
remove old code

10 years agodon't try to encrypt/decrypt cache chunks or files in the trash bin
Bjoern Schiessle [Wed, 15 Jan 2014 13:29:33 +0000 (14:29 +0100)]
don't try to encrypt/decrypt cache chunks or files in the trash bin

10 years agocopy files to owner trash recursively
Bjoern Schiessle [Wed, 15 Jan 2014 13:27:23 +0000 (14:27 +0100)]
copy files to owner trash recursively

10 years agoShow the name of the shared folder in the breadcrumb when viewing a publicly shared...
Robin Appelman [Wed, 15 Jan 2014 12:36:14 +0000 (13:36 +0100)]
Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder

10 years agoMerge pull request #6774 from owncloud/versions_update_cache
icewind1991 [Wed, 15 Jan 2014 11:57:22 +0000 (03:57 -0800)]
Merge pull request #6774 from owncloud/versions_update_cache

call getFileInfo to enforce a file cache entry for the new version

10 years agoMerge pull request #3234 from owncloud/mjob-password-strength
Thomas Müller [Wed, 15 Jan 2014 11:35:41 +0000 (03:35 -0800)]
Merge pull request #3234 from owncloud/mjob-password-strength

Indicate password strength

10 years agoMerge pull request #6744 from owncloud/fix_ocs_response_messages
Thomas Müller [Wed, 15 Jan 2014 11:17:24 +0000 (03:17 -0800)]
Merge pull request #6744 from owncloud/fix_ocs_response_messages

keep response message

10 years agocall getFileInfo to enforce a file cache entry for the new version, fix #6286
Bjoern Schiessle [Wed, 15 Jan 2014 10:37:47 +0000 (11:37 +0100)]
call getFileInfo to enforce a file cache entry for the new version, fix #6286

10 years agoIndicate password strength using strengthify
Morris Jobke [Wed, 13 Mar 2013 10:03:52 +0000 (11:03 +0100)]
Indicate password strength using strengthify

 * uses zxcvbn
 * outsourced to separate jquery plugin
 * async loading
 * hide strength meter if input is empty
 * feedback if user enters weakest password
 * fade in and out
 * show tipsy with strength
 * Opera 12, IE8-10, FF 23, Chromium 29

10 years agoMerge pull request #6768 from owncloud/scanner-use-storage-mtime
Vincent Petry [Wed, 15 Jan 2014 09:31:33 +0000 (01:31 -0800)]
Merge pull request #6768 from owncloud/scanner-use-storage-mtime

Use storage_mtime when determining if we can reuse cached data while scanning

10 years agoUseless else removed
tsumi [Wed, 15 Jan 2014 08:39:21 +0000 (09:39 +0100)]
Useless else removed

As suggested by @PVince81 : https://github.com/owncloud/core/pull/6721#issuecomment-32289922

10 years agoupdate another test
Robin Appelman [Tue, 14 Jan 2014 19:19:05 +0000 (20:19 +0100)]
update another test

10 years agoFix to not destroy draggable when no draggable was set
Vincent Petry [Mon, 9 Dec 2013 15:03:23 +0000 (16:03 +0100)]
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

10 years agoextended test to also check the status messages
Bjoern Schiessle [Tue, 14 Jan 2014 16:11:04 +0000 (17:11 +0100)]
extended test to also check the status messages

10 years agotypo, grammar
Arthur Schiwon [Wed, 8 Jan 2014 18:55:28 +0000 (19:55 +0100)]
typo, grammar

10 years agoLDAP: only read config from database, if configID is given. Not what we want to do...
Arthur Schiwon [Fri, 13 Dec 2013 17:01:42 +0000 (18:01 +0100)]
LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page

10 years agoremove unused variables
Arthur Schiwon [Fri, 13 Dec 2013 16:52:43 +0000 (17:52 +0100)]
remove unused variables

10 years agoLDAP: fix TLS detection
Arthur Schiwon [Fri, 13 Dec 2013 16:52:19 +0000 (17:52 +0100)]
LDAP: fix TLS detection

10 years agoMerge pull request #6704 from owncloud/encryptedfoldersizecalc
Vincent Petry [Tue, 14 Jan 2014 15:20:16 +0000 (07:20 -0800)]
Merge pull request #6704 from owncloud/encryptedfoldersizecalc

Fix calculated folder size to use unencrypted size

10 years agouse different value for mtime and storage_mtime in test
Robin Appelman [Tue, 14 Jan 2014 14:13:21 +0000 (15:13 +0100)]
use different value for mtime and storage_mtime in test