d01a2acbcf
Merge pull request #15469 from owncloud/fix/15463
...
Fix language level incompatibilties
2015-04-08 14:30:56 +02:00
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
69ba67ec0f
Merge pull request #15464 from owncloud/fixmasterunittests
...
Replace originalStorage in tests with a proper teardown
2015-04-08 14:24:42 +02:00
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
4acf6747d2
Disable trashbin when testing orphaned shares deletion job
2015-04-08 13:04:06 +02:00
19834211b4
Merge pull request #15443 from owncloud/encryption-user-hook-tests
...
adding test for user hooks
2015-04-08 12:56:18 +02:00
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
9c3893ce69
Added FIXME about registering jobs in apps.php
2015-04-08 12:09:42 +02:00
d53aa4a816
Fixing issue #15322 - showing Settings button next to gear icon
2015-04-08 11:57:33 +02:00
17b141337a
Delete orphaned shares in a background job
2015-04-08 10:47:55 +02:00
cefdcea021
[command] delete orphaned file cache entries
...
* ./occ files:cleanup
* delete file cache entries without an existing storage
2015-04-08 10:23:56 +02:00
215a9bcbc3
fix function call
2015-04-08 09:32:55 +02:00
4098f5f7fd
adding test for user hooks
2015-04-07 11:49:50 -04:00
a4483243ac
fixing license headers - encryption code related
2015-04-07 17:02:49 +02:00
54a3bdf1c5
fixing unit test execution related to trashbin
2015-04-07 13:30:31 +02:00
d637bffac6
adding user setup test and adding 4 tests to keymanager
2015-04-07 13:30:31 +02:00
28c8017928
adding recoverFileTest
2015-04-07 13:30:31 +02:00
c7c3caedf5
adding recovery tests
2015-04-07 13:30:31 +02:00
111fbabfb4
PHPDoc cleanup - clean code \o/
2015-04-07 13:30:31 +02:00
b9e4e61759
userRecovery() was replaced by setRecoveryForUser()
2015-04-07 13:30:31 +02:00
9a7fbbbc5a
fix versions tests
2015-04-07 13:30:31 +02:00
a7e7151364
remove unused code
2015-04-07 13:30:31 +02:00
e8fa3a2370
fix versions download and previews
2015-04-07 13:30:31 +02:00
d3e887a7cf
reset init status before login
2015-04-07 13:30:30 +02:00
8cf9b423d5
cleanup
2015-04-07 13:30:30 +02:00
fac7ec3fc4
fix re-shares with encryption
2015-04-07 13:30:30 +02:00
60d8a39f03
store init status per user
2015-04-07 13:30:30 +02:00
8b1a12a224
use loginHelper from base class
2015-04-07 13:30:30 +02:00
391fab35f0
reset storage for each unit test
2015-04-07 13:30:30 +02:00
4c899238e9
fixing unit test execution
2015-04-07 13:30:30 +02:00
e507dc11a0
adding util test and reducing keymanager instances to one in test
2015-04-07 13:30:30 +02:00
2511c32e61
add more descriptive message to the exception, will be displayed to the user
2015-04-07 13:30:30 +02:00
ee53ba5ed6
remove encryption specific code from files app
2015-04-07 13:30:30 +02:00
5ea94b7c45
add priority to trashbin storage wrapper so that he is always on top
2015-04-07 13:30:30 +02:00
664b2bb7af
cleaning up exception mess
2015-04-07 13:30:30 +02:00
de4ec21c39
work arround to make sure that shares are initialized only once
2015-04-07 13:30:30 +02:00
feb9a6e216
Set human readable module ids
2015-04-07 13:30:30 +02:00
43c0af2580
Fix shouldEncrypt and don't throw exception id fileKey not present - can happen
2015-04-07 13:30:30 +02:00
a057108c0c
make recovery key work
2015-04-07 13:30:30 +02:00
cac83642f2
Finally fixing encryption with public share
2015-04-07 13:30:30 +02:00
d203296e35
only encrypt files and files_versions
2015-04-07 13:30:30 +02:00
035646c0f6
fix exception handling
2015-04-07 13:30:30 +02:00
d90663704c
fix hook registration
2015-04-07 13:30:29 +02:00
505e0eaf61
remove useless setup base class
2015-04-07 13:30:29 +02:00
1fb29ec546
adding hook manager test
2015-04-07 13:30:29 +02:00
c9ca068427
keyManagerTest: remove code which is no longer needed
2015-04-07 13:30:29 +02:00
4efbcb0280
cleanup keymanager test and add some additional tests
2015-04-07 13:30:29 +02:00
dac94679c6
delete recovery keys on disable
2015-04-07 13:30:29 +02:00
ea6b53042d
fixing test helper and undoing fubar in class...
2015-04-07 13:30:29 +02:00
48e3864c77
💯 % coverage for session class
2015-04-07 13:30:29 +02:00
1358d07d35
let user enable recovery key
2015-04-07 13:30:29 +02:00
e4895bda01
add helper class accessible for encryption modules to ask for a list of users with access to a file, needed to apply the recovery key to all files
2015-04-07 13:30:29 +02:00
bd933b1c85
Adding app icon and fixing admin setting
2015-04-07 13:30:29 +02:00
6bd83c0422
register settings and hooks only once
2015-04-07 13:30:29 +02:00
4b4aeaa5b2
fix set recovery key and implement change password
2015-04-07 13:30:29 +02:00
a98b7dbf6f
Fix double registration of encryption module
2015-04-07 13:30:29 +02:00
3458b5ab4c
Remove old encryption left overs from trashbin
2015-04-07 13:30:29 +02:00
f5638d9163
Fix settings
2015-04-07 13:30:29 +02:00
bf809ac85a
Removing left overs from old encryption app
2015-04-07 13:30:29 +02:00
4843e5ce30
use password change logic to userhooks to avoid recursions
2015-04-07 13:30:28 +02:00
0f28d538a0
add session class to handle all session operations
2015-04-07 13:30:28 +02:00
e6dc6944c2
moving methods to their final places
...
and updating test some.
2015-04-07 13:30:28 +02:00
1b42b492dc
kill OC_FileProxy 💥
2015-04-07 13:30:28 +02:00
dbdd754c3f
Further cleanup of files_encryption
2015-04-07 13:30:28 +02:00
00338f9dca
Removing files_encryption left overs
2015-04-07 13:30:28 +02:00
e7a68d1c21
remove old encryption app
2015-04-07 13:30:28 +02:00
0eee3a2618
remove unencrypted_size from the cache, size will contain the unencrypted size
2015-04-07 13:30:28 +02:00
a905f641b3
various fixes & start to unit test the encryption storage wrapper
2015-04-07 13:30:28 +02:00
a85e2e0bfd
make recovery settings work
2015-04-07 13:30:28 +02:00
2331298380
fix parameter declaration and class initialisation
2015-04-07 13:30:28 +02:00
48fc3f3afe
fix unit test execution, variable naming and kill no longer used $cacheFactory
2015-04-07 13:30:28 +02:00
c64e0af4fb
check if recovery key exists and encrypt the file with the recovery key if needed
2015-04-07 13:30:28 +02:00
24c6604388
add public link share key to file if it was shared as public link
2015-04-07 13:30:28 +02:00
bd99042a66
add setting templates
2015-04-07 13:30:28 +02:00
37e8268447
make sharing and unsharing work
2015-04-07 13:30:27 +02:00
d15c2e52b0
cleanup and removing cachefactory
2015-04-07 13:30:27 +02:00
2e00acda07
read encrypted files
2015-04-07 13:30:27 +02:00
6c9251d9f8
make sure that all file keys are written to the key storage
2015-04-07 13:30:27 +02:00
198b73fe32
write encrypted file to disc
2015-04-07 13:30:27 +02:00
7ffd77fac9
enable encryption unit test execution
2015-04-07 13:30:27 +02:00
c00e728e5f
encryption app: remove legacy code, we do only server-side encryption
2015-04-07 13:30:27 +02:00
ecb3834554
fixing obvious bugs while testing
2015-04-07 13:30:27 +02:00
0c2f9ca849
Updating keystorage movement and fixing hooks
2015-04-07 13:30:27 +02:00
39733c8da1
Initial commit
2015-04-07 13:30:27 +02:00
e16d61e293
Remove server timezone dependency from files list test
2015-04-07 10:12:15 +02:00
95e55aa4ad
[tx-robot] updated from transifex
2015-04-07 01:54:47 -04:00
2bff92ade5
[tx-robot] updated from transifex
2015-04-05 01:54:51 -04:00
4996706078
Merge pull request #15338 from owncloud/encryption-mount-option
...
Add mount point to disable the encryption wrapper
2015-04-04 12:51:41 +02:00
9b250baf9e
[tx-robot] updated from transifex
2015-04-04 01:54:43 -04:00
3bf269e565
Merge pull request #15229 from owncloud/response-setContentLengthHeader
...
Add OC_Response::setContentLengthHeader() for Apache PHP SAPI workaround...
2015-04-03 22:51:36 +02:00
23f1702f24
[tx-robot] updated from transifex
2015-04-03 01:54:53 -04:00
519d568847
add unit test
2015-04-02 18:31:26 +02:00
10b85871cc
adjust unt tests
2015-04-02 18:17:28 +02:00
4082436419
Merge pull request #15367 from owncloud/pre-setup-hook
...
setup storage wrappers before setting up the filesystem
2015-04-02 17:40:23 +02:00
cc96105ebe
[tx-robot] updated from transifex
2015-04-02 01:54:47 -04:00
3cb53b7756
setup storage wrappers before setting up the filesystem
2015-04-01 17:12:06 +02:00
9e3dcd01bc
Use URLGenerator instread of OC_Helper
2015-04-01 14:57:01 +02:00
8ff94f0d15
Merge pull request #15356 from rullzer/apps_oc_to_ocs
...
Move core apps from private to public functions (trivial part)
2015-04-01 13:24:54 +02:00
730efe25a4
Make scrutinizer happy
2015-04-01 12:13:49 +02:00
2b81d0f237
Move core apps from private to public functions
...
Apps still use OC_Helper and OC_Util functions even when public ones are
already available. Sometimes the public one is even used in the same
file.
2015-04-01 12:06:04 +02:00
297e29248d
Merge pull request #15336 from owncloud/revive-15215
...
Properly quote file names in listFiles query for GDrive
2015-04-01 10:35:39 +02:00
f5c7ba6b81
[tx-robot] updated from transifex
2015-04-01 01:55:33 -04:00
efcc2e87ab
Adjust by/self filter aswell and fix tests
2015-03-31 17:35:04 +02:00
116b257b4d
DeMorgan applied the wrong transformation
2015-03-31 17:07:44 +02:00
bac9b54bef
Add mount point to disable the encryption wrapper
2015-03-31 16:25:33 +02:00
c052ee7584
Only escape single quotes
2015-03-31 15:30:49 +02:00
7036309e22
Added rawurlencode for other params in GDrive storage
2015-03-31 15:14:08 +02:00
5c9998179f
Properly quote file names in listFiles query for GDrive
2015-03-31 15:14:03 +02:00
53f67fc65d
Revert "Properly quote file names in listFiles query for GDrive"
2015-03-31 15:12:35 +02:00
b216b3fad0
Merge pull request #15215 from owncloud/ext-gdrivelistfilequoting
...
Properly quote file names in listFiles query for GDrive
2015-03-31 09:08:59 -04:00
1d06d93d27
[tx-robot] updated from transifex
2015-03-31 01:55:55 -04:00
9233d32834
Move tag related code into a helper so we can test the query without a view
2015-03-30 17:21:06 +02:00
8e0fef74ff
Merge pull request #15312 from owncloud/activity-fix-compilation
...
Correct the app name for sharing events
2015-03-30 17:12:54 +02:00
308a43a10e
Merge pull request #15076 from owncloud/fix-smb-oc-admin
...
Support constructing an SMB_OC without saved session credentials
2015-03-30 15:38:22 +01:00
e365ea7ec5
Use DI for the objects where possible
2015-03-30 15:23:10 +02:00
17f882c3cf
Add a filter for favorites and allow limiting the all-list to favorites
...
WARNING: do not use this, when you have a lot of favorites, ~50 should be the
limit
2015-03-30 15:23:09 +02:00
4c9c73bef9
Correct the app name for sharing events
2015-03-30 15:14:31 +02:00
b0aa17b13f
OCS Fixes to allow setting of password without removing additional settings
...
- Added setPassword to share.php
- Fixed OCS API call
- Added unit tests
2015-03-30 14:00:50 +02:00
cfe241a959
Merge pull request #13964 from rullzer/capabilities
...
Add OCS sharing info to capabilities - take 2
2015-03-30 10:06:05 +02:00
00b2be11dd
Merge pull request #15239 from owncloud/see-no-evil
...
Move federated cloud sharing, files externals and updater to special pos...
2015-03-30 09:05:31 +02:00
da55ff630c
[tx-robot] updated from transifex
2015-03-30 01:54:41 -04:00
1db9605afb
[tx-robot] updated from transifex
2015-03-29 01:55:31 -04:00
8b9b600644
[tx-robot] updated from transifex
2015-03-28 01:55:46 -04:00
4d12c4a38b
Merge pull request #13938 from owncloud/deprecate-iappconfig
...
Deprecated \OCP\IAppConfig - add missing methods to IConfig
2015-03-27 16:07:41 +01:00
0ecc1c89ad
Merge pull request #15254 from owncloud/fix-14853-master
...
Adding a pending indicator to the files summary
2015-03-27 14:18:47 +01:00
7ad4dfa201
Merge pull request #15227 from owncloud/ocetag-header
...
Copy Etag header to OC-Etag for sabre calls
2015-03-27 13:10:27 +01:00
5aa81833f9
Merge pull request #15260 from owncloud/adjust-controls-bar-width
...
adjust controls bar width to not overlay scrollbar
2015-03-27 11:56:22 +01:00
908538d863
fix layout for Sharing settings
2015-03-27 09:38:13 +01:00
495562f40c
Move federated cloud sharing, files externals and updater to special positions
2015-03-27 09:38:09 +01:00
880b31c513
[tx-robot] updated from transifex
2015-03-27 01:56:21 -04:00
d728b85fdd
adjust controls bar width to not overlay scrollbar
2015-03-27 01:34:55 +01:00
2b0906cdff
Adding a pending indicator to the files summary - fixes #14853
2015-03-27 01:16:29 +01:00
e09fd331eb
adjust emptycontent messages for files and files_external
2015-03-26 23:22:26 +01:00
d082e37270
Merge pull request #15244 from owncloud/use_default_share_folder
...
always fall back to default share folder
2015-03-26 22:39:04 +01:00
c2909355bf
Merge pull request #14925 from owncloud/ext-mountoptions-ui
...
Mount options GUI for external storage
2015-03-26 21:36:34 +00:00
e8109f0bc3
Merge pull request #13802 from owncloud/share-partfilepermissions
...
Fix share permission checks
2015-03-26 22:01:05 +01:00
a3592534ef
always fall back to default share folder
2015-03-26 21:56:44 +01:00
7bff0681fe
Merge pull request #15001 from owncloud/kill-share-proxy
...
Replace share proxy with a hook
2015-03-26 21:20:05 +01:00
232518ac54
Merge pull request #15234 from owncloud/encryption2_core
...
core part of encryption 2.0
2015-03-26 21:14:59 +01:00
ff9c85ce60
implement basic encryption functionallity in core to enable multiple encryption modules
2015-03-26 20:56:51 +01:00
0cb133003c
Merge pull request #15237 from owncloud/remove-ide-autocomplete-fail
...
Remove IDE autocomplete fail
2015-03-26 20:21:26 +01:00
d3ed020d34
Merge pull request #15214 from owncloud/no-php-timeouts-on-webdav-master
...
no php execution timeout for webdav
2015-03-26 20:18:01 +01:00
1be7da4a57
replace share proxy with hook
2015-03-26 19:56:57 +01:00
173c31e42a
rename proxy test
2015-03-26 19:56:31 +01:00
c8c722bc6d
Merge pull request #15129 from owncloud/version-command-bus
...
expire versions in a background command
2015-03-26 19:55:13 +01:00
071a339593
Remove IDE autocomplete fail
...
🙈 *cough* *cough*
2015-03-26 19:39:15 +01:00
58b4c2c0e5
Make sure mountOptions keep their data type
...
str_replace for $user substitution was converting the data type of
mountOptions to string. This fix prevents this to happen by making sure
only strings are processed by substitution.
Also added a int conversion when reading the watcher policy
2015-03-26 19:24:37 +01:00
e3d60ee5b0
Merge pull request #14958 from owncloud/dropdown-style
...
popover style for apps and user dropdown menus
2015-03-26 18:07:35 +01:00
6447962f2a
teardown after we're done
2015-03-26 17:30:43 +01:00
a8b756154a
Merge pull request #14495 from owncloud/update-mailmap-01
...
Updating .mailmap
2015-03-26 17:17:18 +01:00
Lukas Reschke
Bjoern Schiessle
Vincent Petry
Thomas Müller
James Anslow
Morris Jobke
Clark Tomlinson
Joas Schilling
Jenkins for ownCloud
Robin Appelman
Roeland Jago Douma
Roeland Douma
Frank Karlitschek
Robin McCorkell
Jan-Christoph Borchardt