Vincent Petry
2865f09984
Merge pull request #15282 from owncloud/keepsharerelationshipondelete
...
Keep shares when deleting shared folders
2015-04-09 18:10:17 +02:00
Vincent Petry
5803a1f5f7
Remove trashbin storage wrapper when disabling it for tests
2015-04-09 15:02:24 +02:00
Lukas Reschke
96e7f607d5
Remove unneeded file
2015-04-09 13:29:51 +02:00
Vincent Petry
08a9d1d2dc
Remove unused $toRemove
2015-04-09 12:34:19 +02:00
Jan-Christoph Borchardt
c840c18252
Merge pull request #15499 from owncloud/admin-hints
...
add admin documentation hints to Federated Cloud Sharing and cron
2015-04-09 12:12:53 +02:00
Jan-Christoph Borchardt
65dc958418
add admin documentation hints to Federated Cloud Sharing and cron
2015-04-09 12:07:05 +02:00
Lukas Reschke
4ca6419475
Fix PHPDoc
2015-04-09 10:54:53 +02:00
Lukas Reschke
3aad47c0f0
Fix code style
2015-04-09 10:46:46 +02:00
Lukas Reschke
d869f8212b
Enforce string as passed type
2015-04-09 10:45:50 +02:00
Vincent Petry
461302244e
Keep shares when deleting shared folders
...
The share entries will be linked with the fileid while they are kept in
the trashbin.
In the future a background just will scrape orphaned shares and delete
them.
2015-04-09 10:16:40 +02:00
Morris Jobke
56f1ffe820
Merge pull request #14676 from owncloud/deleteorphanedshares
...
Delete orphaned shares in a background job
2015-04-09 00:18:53 +02:00
Morris Jobke
9c76d068c3
Merge pull request #15196 from owncloud/limit-file-activities-to-favorites
...
Limit file activities to favorites
2015-04-09 00:18:31 +02:00
Morris Jobke
62936aa323
Merge pull request #15488 from owncloud/files-navigation-icons
...
add icons to Files sidebar
2015-04-08 21:06:03 +02:00
Morris Jobke
91a90e25ae
fix for IE8
2015-04-08 21:05:31 +02:00
Jan-Christoph Borchardt
84c2fe85b7
add icons to files sidebar, fix shade, fix position of settings icon and text
2015-04-08 19:25:28 +02:00
Clark Tomlinson
fc2711e156
Merge pull request #15472 from owncloud/enc_backward_compatibility
...
make private key handling backward compatible
2015-04-08 09:38:27 -04:00
Morris Jobke
103d451459
Merge pull request #14987 from rullzer/ocs_password_fix2
...
OCS Fixes to allow setting of password without removing additional settings
2015-04-08 14:44:17 +02:00
Lukas Reschke
d01a2acbcf
Merge pull request #15469 from owncloud/fix/15463
...
Fix language level incompatibilties
2015-04-08 14:30:56 +02:00
Bjoern Schiessle
4ce5669419
read cipher from key header and always write a key header if a new private key is stored
2015-04-08 14:26:00 +02:00
Vincent Petry
69ba67ec0f
Merge pull request #15464 from owncloud/fixmasterunittests
...
Replace originalStorage in tests with a proper teardown
2015-04-08 14:24:42 +02:00
Lukas Reschke
c3c50fb481
Fix language level incompatibilties
...
Arbitrary expressions in empty are allowed in PHP 5.5 ands upwards. Seems to only affect master.
Fixed https://github.com/owncloud/core/issues/15463
2015-04-08 13:55:10 +02:00
Vincent Petry
4acf6747d2
Disable trashbin when testing orphaned shares deletion job
2015-04-08 13:04:06 +02:00
Thomas Müller
19834211b4
Merge pull request #15443 from owncloud/encryption-user-hook-tests
...
adding test for user hooks
2015-04-08 12:56:18 +02:00
Vincent Petry
f8cfc03f36
Replace originalStorage in tests with a proper teardown
...
The purpose of $originalStorage in unit tests was to remount the old
root.
However that storage itself is already wrapped by storage wrapper, so
remounting it would rewrap the storage several times.
This fix makes use of "loginAsUser()" and "logout()" from the TestCase
class to properly initialize and cleanup the FS as expected.
2015-04-08 12:45:38 +02:00
Vincent Petry
9c3893ce69
Added FIXME about registering jobs in apps.php
2015-04-08 12:09:42 +02:00
James Anslow
d53aa4a816
Fixing issue #15322 - showing Settings button next to gear icon
2015-04-08 11:57:33 +02:00
Vincent Petry
17b141337a
Delete orphaned shares in a background job
2015-04-08 10:47:55 +02:00
Bjoern Schiessle
215a9bcbc3
fix function call
2015-04-08 09:32:55 +02:00
Clark Tomlinson
4098f5f7fd
adding test for user hooks
2015-04-07 11:49:50 -04:00
Thomas Müller
a4483243ac
fixing license headers - encryption code related
2015-04-07 17:02:49 +02:00
Thomas Müller
54a3bdf1c5
fixing unit test execution related to trashbin
2015-04-07 13:30:31 +02:00
Clark Tomlinson
d637bffac6
adding user setup test and adding 4 tests to keymanager
2015-04-07 13:30:31 +02:00
Clark Tomlinson
28c8017928
adding recoverFileTest
2015-04-07 13:30:31 +02:00
Clark Tomlinson
c7c3caedf5
adding recovery tests
2015-04-07 13:30:31 +02:00
Thomas Müller
111fbabfb4
PHPDoc cleanup - clean code \o/
2015-04-07 13:30:31 +02:00
Bjoern Schiessle
b9e4e61759
userRecovery() was replaced by setRecoveryForUser()
2015-04-07 13:30:31 +02:00
Bjoern Schiessle
9a7fbbbc5a
fix versions tests
2015-04-07 13:30:31 +02:00
Bjoern Schiessle
a7e7151364
remove unused code
2015-04-07 13:30:31 +02:00
Bjoern Schiessle
e8fa3a2370
fix versions download and previews
2015-04-07 13:30:31 +02:00
Bjoern Schiessle
d3e887a7cf
reset init status before login
2015-04-07 13:30:30 +02:00
Thomas Müller
8cf9b423d5
cleanup
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
fac7ec3fc4
fix re-shares with encryption
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
60d8a39f03
store init status per user
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
8b1a12a224
use loginHelper from base class
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
391fab35f0
reset storage for each unit test
2015-04-07 13:30:30 +02:00
Thomas Müller
4c899238e9
fixing unit test execution
2015-04-07 13:30:30 +02:00
Clark Tomlinson
e507dc11a0
adding util test and reducing keymanager instances to one in test
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
2511c32e61
add more descriptive message to the exception, will be displayed to the user
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
ee53ba5ed6
remove encryption specific code from files app
2015-04-07 13:30:30 +02:00
Bjoern Schiessle
5ea94b7c45
add priority to trashbin storage wrapper so that he is always on top
2015-04-07 13:30:30 +02:00
