Commit Graph

15972 Commits (9caa354cfc1f73159f335646ca89be4db72b125e)
 

Author SHA1 Message Date
Arthur Schiwon 9caa354cfc simplify two methods a bit, because they are not used for group search anymore 2014-06-16 17:52:12 +07:00
Arthur Schiwon 0ba9a6b73d make all this work in an early configuration state in the wizard by marking the config active and ignoring the validation state. 2014-06-16 17:51:31 +07:00
Arthur Schiwon c491fa272e Wizard: get really all groups from LDAP by power of Paged Search 2014-06-16 17:51:31 +07:00
Arthur Schiwon e23e459c41 fix PHPdoc 2014-06-16 17:51:31 +07:00
Arthur Schiwon 78feb6514b consolidate requirement check 2014-06-16 17:51:31 +07:00
Arthur Schiwon 1c634ab772 LDAP Wizard: count users and groups with the power of paged search 2014-06-16 17:51:31 +07:00
Arthur Schiwon 53e036e5c0 add method to count groups on LDAP 2014-06-16 17:51:31 +07:00
Arthur Schiwon f56a9c08f8 fix PHPdoc 2014-06-16 17:51:31 +07:00
blizzz 659a3d4a37 Merge pull request #8623 from owncloud/fix-8457
LDAP: fix possible infinite loop, that causes hanging wizard, fixes #8457
2014-06-16 17:42:46 +07:00
Lukas Reschke 3d26896431 Merge pull request #9033 from owncloud/validate-dire
Add deprecation notice to load* functions
2014-06-16 16:20:21 +07:00
Vincent Petry f6c970e214 Merge pull request #9008 from owncloud/repair-parent-stable6
Repair broken parent link in the scanner - stable6
2014-06-16 15:00:22 +07:00
Robin Appelman 84222e30a7 Fix unit test 2014-06-16 13:37:08 +07:00
Lukas Reschke 81fc7cfb21 Add deprecation notice to load* functions
This functions are deprecated and/or removed since ownCloud 7. Additionally a issubdirectory check has been added here to prevent developers to use this function in a potentially insecure way.

Please review @karlitschek and others. Backport to stable5 and master requested.
2014-06-14 11:05:12 +07:00
Morris Jobke 04817fb0f3 Merge pull request #9015 from owncloud/stable6-downloadwithdisabledzip
[stable6] Fix public download link when zip download is disabled
2014-06-13 13:09:41 +07:00
Vincent Petry bca536eb3d Merge pull request #8988 from owncloud/stable6_fix_encryption
Stable6 fix encryption
2014-06-13 10:31:18 +07:00
Morris Jobke 64534546be Merge pull request #9016 from owncloud/stable6-maxheartbeatinterval
[stable6] Added max heartbeat interval to prevent integer overflow
2014-06-13 00:19:36 +07:00
Vincent Petry 00ec5fc193 Added max heartbeat interval to prevent integer overflow
When using big session timeout values, the interval value might overflow
and cause the setInterval() call to ping the server in a loop without
any delay.

This fix adds a maximum ping interval of 24 hours.
2014-06-12 18:27:21 +07:00
Vincent Petry 8ef1542ad0 Fix public download link when zip download is disabled
When zip download is disabled, the public download action defined in
public.js is overridden by the one in fileactions.js because of the JS
loading order.

This quick fix prevents the override to happen when a download action is
already defined.

There are additional changes that were required to make the download
action icon work when registered from the public page.
2014-06-12 17:29:55 +07:00
Robin Appelman eeca726d28 remove unused argument 2014-06-12 15:07:05 +07:00
Robin Appelman e793a87954 add some comments 2014-06-12 15:06:01 +07:00
Robin Appelman 6e0a218d11 Repair broken parent link in the scanner 2014-06-12 15:05:45 +07:00
Jörn Friedrich Dreyer b2fae8a8b7 Fix copy conflict dialog translation
backport of fileexist template translations
with minor fixes
2014-06-11 20:25:10 +07:00
Bjoern Schiessle 193d237b56 fix rename of encryption keys 2014-06-11 18:38:20 +07:00
Vincent Petry 4bc091965f Merge pull request #8970 from owncloud/cache-change-propagator-stable6
Cache change propagator stable6
2014-06-10 17:17:35 +07:00
Robin Appelman 3ea94a7930 Fix unit tests 2014-06-10 16:32:46 +07:00
Robin Appelman 129bfad204 Fix size calculation during recursive scan 2014-06-10 16:24:08 +07:00
Robin Appelman 4d7e1c568c Fix unit tests 2014-06-10 16:24:00 +07:00
Robin Appelman f36e354a42 Fix recursive scanning 2014-06-10 16:20:59 +07:00
Robin Appelman 81f6e78c0c propagate changes in the scanner 2014-06-10 16:20:51 +07:00
Robin Appelman a543f46699 Split of cache writes in the scanner to their own methods 2014-06-10 16:20:48 +07:00
Robin Appelman 2895261102 Add a change propagator class to handle propagating etag and mtime changes 2014-06-10 16:16:46 +07:00
Thomas Müller 2911906586 Merge pull request #8885 from owncloud/flock-stable6
[stable6][WIP] Move Flock basics into stable6
2014-06-06 17:58:08 +07:00
Thomas Müller 909913d581 fix failing unit test 2014-06-06 15:48:02 +07:00
Jan-Christoph Borchardt edced60ed4 keep long file names in one line to not overflow download button on mobile 2014-06-06 15:35:12 +07:00
Jan-Christoph Borchardt 45d165405f add max-width to directLink input to prevent overflow 2014-06-06 15:34:36 +07:00
Robin Appelman e98627d6ab Dont backport unit tests for code that isn't backported 2014-06-05 16:48:04 +07:00
Thomas Müller a4c422a6da added missing LockNotAcquiredException 2014-06-05 16:48:03 +07:00
ringmaster 6ec29711fc Continued flock work.
add actual locking and log changes necessary for debugging.

Simpler log unique id.

Respect locked files, surface correct exception.

Conflicts:
	lib/private/connector/sabre/file.php

Remove unused methods.

Conflicts:
	lib/private/files/storage/local.php

Fix typo

Fix typo

Removed unused vars/declarations, update PHPDoc.

Don't error out on console.

Move Lock to private namespace, add interface. Update PHPDoc.

Restore the reference to this used exception class.

make sure to close the stream at the end of each test

Normalize lock exception messages.

don't ask for fileInfo if we already have one

Conflicts:
	apps/files_encryption/lib/proxy.php

name the storage wrapper to make sure that we don't apply the wrapper multiple times

Conflicts:
	lib/private/util.php

fix unit test after adding the additional parameter to addStorageWrapper()

only lock if unlink is called for a file

Can't use assertInstanceOf on wrapped storage; use assertTrue(instanceOfStorage() instead.

Conflicts:
	tests/lib/files/filesystem.php

Use ->instanceOfStorage() not instanceof for Storage instances.

Conflicts:
	lib/private/helper.php

get the storage from the view

Conflicts:
	apps/files_encryption/tests/webdav.php

workaround to get the unit test going

Conflicts:
	apps/files_encryption/hooks/hooks.php

Added isLocal() method to storage, used for xsendfile

Added isLocal() method to Storage to find out whether the storage is
local or not.
This method is used for the x-sendfile logic to find out whether to add
the headers.

Conflicts:
	lib/private/files.php

Add ->instanceOfStorage to handle instanceof for storage wrappers

Conflicts:
	lib/private/files/storage/common.php
	lib/private/files/storage/wrapper/wrapper.php
	lib/public/files/storage.php

Use instanceOfStorage instead of instanceof

Conflicts:
	lib/private/files.php

Fix storage wrapper being called with null

Pass any methods custom to specific storage implementations to the wrapped storage

remove duplicate declaration of isLocal()

remove file locking - code will continue to live in it's own app
2014-06-05 16:47:37 +07:00
Vincent Petry 49f2955119 Merge pull request #8870 from owncloud/storage-instanceof-stable6
Add storage->instanceOfStorage() - stable6
2014-06-05 11:16:08 +07:00
Robin Appelman b62ba9808a Pass any methods custom to specific storage implementations to the wrapped storage 2014-06-04 14:30:40 +07:00
Robin Appelman f814b9a23c Fix storage wrapper being called with null 2014-06-04 14:30:17 +07:00
Robin Appelman b3c8b574df Use instanceOfStorage instead of instanceof 2014-06-04 14:29:55 +07:00
Robin Appelman 79b953a920 Add ->instanceOfStorage to handle instanceof for storage wrappers 2014-06-04 14:17:52 +07:00
Thomas Müller d3445d9668 Merge pull request #8847 from owncloud/stable6_backport_8557
Stable6 backport of #8557
2014-06-04 10:26:59 +07:00
Thomas Müller e5dcec75ba Merge pull request #8850 from owncloud/stable6_backport_8607
[backport] [stable6] Skip filescan but execute hooks
2014-06-04 09:34:39 +07:00
ringmaster a908e281e7 [backport] [stable6] Skip filescan but execute hooks
Backport of #8607
2014-06-03 10:52:12 +07:00
ringmaster 2910486979 Allow apps to create custom session handlers. 2014-06-03 10:20:42 +07:00
blizzz 58b6b89ec4 Merge pull request #8579 from owncloud/ldap_nail_filter_on_upgrade
LDAP: fix filter can be reset and broken after upgrade from OC 5
2014-06-02 12:02:15 +07:00
Frank Karlitschek 8758b66fc4 Merge pull request #8672 from owncloud/stable6-obfuscatepasswords
[backport] [stable6] Added password obfuscation for external storage config
2014-06-02 11:56:36 +07:00
Thomas Müller 8429dde4d9 Merge pull request #8692 from owncloud/fix_unit_tests_oc6
fix failing unit tests on OC6
2014-05-28 17:44:40 +07:00