wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
31695 commits 157 branches 562 tags 714 MiB
Commit graph

3005 commits

Author SHA1 Message Date
Lukas Reschke
06a4da43ec
[master] Ignore certificate file if it starts with file:// 2016-04-21 19:02:31 +02:00
Vincent Petry
b50d3255fb Merge pull request #22791 from owncloud/enc_master_key_improvements 
Enc master key improvements
 2016-04-21 11:48:26 +02:00
Thomas Müller
cd01c440a0 Merge pull request #23919 from owncloud/cyclyc-share-dep-example 
SharedStorage to new sharing code + cleanup
 2016-04-20 20:37:27 +02:00
Thomas Müller
cdcabbd0b3 Merge pull request #24098 from owncloud/fix_23782 
When calling file_put_contents clear the checksum
 2016-04-20 20:37:01 +02:00
Thomas Müller
aa33ab0c03 Merge pull request #24094 from owncloud/move_dummy_group_backend_to_test 
Move the group dummy backend to test
 2016-04-20 11:55:00 +02:00
Roeland Jago Douma
0dbcbc4cae
When the scanner detects a file is changed clear checksum 
Fixes #23782 and #23783

If the file scanner detects a changed file we clear the checksum while
we update the cache.

* Unit test added
 2016-04-19 20:20:45 +02:00
Thomas Müller
5b2ef92eb2 Merge pull request #24004 from owncloud/dont-transfer-files-to-not-ready-user 
Introduce isReadyForUser and verify in file transfer ownership
 2016-04-19 15:56:47 +02:00
Roeland Jago Douma
dd7e0d13e5
Move the group dummy backend to test 
The dummy backend is only used for testing and should thus reside in
tests.
 2016-04-19 15:13:31 +02:00
Roeland Douma
0c5f915377 Merge pull request #24054 from owncloud/data_fingerprint 
Add data-fingerprint property
 2016-04-19 14:24:27 +02:00
Roeland Jago Douma
92abb5f23d
Fix tests 2016-04-19 14:04:00 +02:00
Thomas Müller
1773dcbef2 Merge pull request #23973 from owncloud/share_move_post_delete_from_group_hook 
Move post_removeFromGroup to shareManager
 2016-04-19 06:59:58 +02:00
Lukas Reschke
8222ad5157
Move logout to controller 
Testable code. Yay.
 2016-04-18 21:21:52 +02:00
Thomas Müller
1626850fc9
Remove deprecated HTTPHelper 2016-04-18 17:28:10 +02:00
Thomas Müller
5c3183cedd
Move version check code out of class Updater 2016-04-18 17:12:59 +02:00
Roeland Jago Douma
a2c8597b00
Add occ command for updating the data-fingerprint 2016-04-18 16:08:19 +02:00
Lukas Reschke
fee95084ae
Rename username to loginName 
UID and login name are two different things.
 2016-04-15 19:02:19 +02:00
Lukas Reschke
8a650a51be
Use !== instead of empty 
Users can be named null
 2016-04-15 18:57:11 +02:00
Lukas Reschke
331e4efacb
Move login form into controller 
First step on getting the authorisation stuff cleaned up. This is only for the login form, all other stuff is still where it is.
 2016-04-15 17:36:23 +02:00
Thomas Müller
50e20e531e
Introduce isReadyForUser and verify in file transfer ownership - fixes #23786 2016-04-15 15:07:40 +02:00
Robin McCorkell
4717605d22 Fix storage backend class namespaces and move to subdir 
All classes that were previously \OC\Files\Storage\FooBar are now
\OCA\Files_External\Lib\Storage\FooBar
 2016-04-14 00:44:28 +01:00
Roeland Jago Douma
6144ced7a0
Move post_removeFromGroup to shareManager 
The last sharing hook to be moved over.

* Added unit tests
* Removed old tests that relied on old behaviour
* Removed old hooks.php
 2016-04-13 15:00:12 +02:00
Thomas Müller
e90a3b5ba7 Merge pull request #23954 from stweil/master 
misc: Fix some typos
 2016-04-13 11:08:58 +02:00
Lukas Reschke
ef93ec8bc2
Add test 2016-04-12 21:32:40 +02:00
Stefan Weil
ee5f5eebe5 misc: Fix some typos 
Some of them were found by codespell.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-04-12 18:36:39 +02:00
Thomas Müller
fdee771aca Add unit testing capabilities for templates (#23708) 
Add unit testing capabilities for templates
 2016-04-12 12:49:11 +02:00
Roeland Douma
495a964ca2 Migrate post_groupDelete hook to share manager (#23841) 
The hook now calls the share manager that will call the responsible
shareProvider to do the proper cleanup.

* Unit tests added

Again nothing should change it is just to cleanup old code
 2016-04-12 09:46:25 +02:00
Joas Schilling
8e16e7bf34 Merge pull request #23856 from owncloud/share_remove_addtogroup_hooks 
Remove pre/post_addToGroup hooks for shares
 2016-04-11 15:05:20 +02:00
Roeland Jago Douma
2a0244df27
Fix mappertest 2016-04-08 15:23:09 +02:00
Roeland Jago Douma
f9ade49c7e
Fix notification tests 2016-04-08 15:23:06 +02:00
Roeland Jago Douma
b9b19cef41
Fix avatar controller tests 2016-04-08 15:23:00 +02:00
Roeland Jago Douma
e65e7a5ad7
Fix ShareManager tests 2016-04-08 15:22:57 +02:00
Thomas Müller
1d3d43b1e9 Merge pull request #23553 from owncloud/lock-ttl-execution-time 
Make lock ttl configurable
 2016-04-08 14:53:26 +02:00
Roeland Jago Douma
bd3bde2f3b
Set proper permissions on link share 
If we do not allow public upload we should limit the permissions on
links shares upon retrieval.

* Added unit test
* Allow fetching federated shares by token as well
 2016-04-08 14:17:05 +02:00
Roeland Jago Douma
3fae4c82d2
Remove pre/post_addToGroup hooks for shares 
There is no need to perform the checks for unique targets on add to
group as we have to do this all when mounting the shares anyway.
 2016-04-08 11:56:38 +02:00
Joas Schilling
0de15a86f0 Merge pull request #23773 from owncloud/share_move_delete_user_hook 
Migrate post_userDelete hook to share manager
 2016-04-07 13:01:10 +02:00
Robin Appelman
cdedda99e4 Make lock ttl configurable 2016-04-07 08:24:13 +02:00
Stefan Weil
02e226a6b3 tests: Fix typos (found by codespell) 
Fix also a small grammar issue.

Signed-off-by: Stefan Weil <sw@weilnetz.de>
 2016-04-06 15:08:27 +02:00
Thomas Müller
56ab04f11e Merge pull request #23823 from owncloud/drop-js-based-acceptance-tests 
Drop JS based acceptance tests - we have our behat based integration …
 2016-04-06 14:17:08 +02:00
Roeland Douma
93b1768eb7 Merge pull request #23819 from owncloud/move-core-completely-to-psr4 
Move OC/Core completely to PSR-4
 2016-04-06 13:31:44 +02:00
Thomas Müller
e515061ee7 Drop JS based acceptance tests - we have our behat based integration tests which are activly maintained 2016-04-06 12:28:23 +02:00
Lukas Reschke
5a0c936f99
Remove OC/Settings from old autoloader 2016-04-06 11:34:53 +02:00
Lukas Reschke
c952adabb5
Remove OC/Core autoloading from old autoloader 2016-04-06 11:34:29 +02:00
Jörn Friedrich Dreyer
4445ef82e0 Test locking with strange filename 2016-04-05 16:13:28 +02:00
Roeland Jago Douma
e0cee43cf0 Migrate post_userDelete hook to share manager 
This makes the post_userDelete hook call the sharemanager. This will
cleanup to and from this user.

* All shares owned by this user
* All shares with this user (user)
* All custom group shares
* All link share initiated by this user (to avoid invisible link shares)

Unit tests are added for the defaultshare provider as well as the
federated share provider
 2016-04-04 14:15:38 +02:00
Frank Karlitschek
2bff34be56 Merge pull request #23707 from owncloud/make-sure-that-encrypted-version-is-set 
Make sure that the encrypted version is set
 2016-03-31 20:37:17 +02:00
Frank Karlitschek
fdb59079a2 Merge pull request #23675 from owncloud/fix_encryption_versions_on_external_storages 
fix creation of versions of encrypted files on external storages
 2016-03-31 20:36:03 +02:00
Bjoern Schiessle
93ed965cbb fix creation of versions of encrypted files on external storages 
in order to create a 1:1 copy of a file if a version gets created
we need to store this information on copyBetweenStorage(). This
allows us to by-pass the encryption wrapper if we read the source file.
 2016-03-31 19:24:47 +02:00
Lukas Reschke
c427bf3b5d Make sure that the encrypted version is set 
The code path called when using external storage with WebDAV is using `\OC\Files\Storage\Wrapper\Encryption::getMetaData` which did not contain the actual encrypted version inside the cache entry version. This lead to the following:

1. User uploaded a file
2. File is created and `\OC\Files\Storage\Wrapper\Encryption::getMetaData` is called. It has an empty `encryptedVersion` but sets `encrypted` to either `true` or `false`.
3. The call when updating the file cache will use the old version.
 2016-03-31 18:06:37 +02:00
Roeland Jago Douma
8da48a4482 Add unit tests 
Add some unit tests for setting the internal id and the provider id
 2016-03-30 23:08:35 +02:00
Roeland Jago Douma
2f4294e781 Add setId and setProviderID to the public interface 
Fixes #23337

We only allow the id to be set once!
 2016-03-30 22:55:03 +02:00