41d7870d7b
Merge pull request #15964 from owncloud/fix-l10n-string-warn
...
Fix #15962
2015-04-30 15:55:40 +02:00
d0ad69aa9c
use the preSetup hook to ensure the encryption wrapper is applied correctly
2015-04-30 13:28:06 +02:00
360d0e3e5e
fix #15962
2015-04-30 12:44:45 +02:00
d308ec4f0e
Merge pull request #15949 from owncloud/l10n-string-json
...
Implement json serialize for l10n string
2015-04-30 11:11:16 +02:00
08aef98e11
Merge pull request #15946 from owncloud/auto-controller-resolve
...
Make controller automatically assemblable
2015-04-30 10:12:17 +02:00
ae853445ef
[tx-robot] updated from transifex
2015-04-30 03:27:57 -04:00
1e58538f0e
add aliases to pascal case constructor paramters to make it possible to auto assemble controllers
2015-04-29 22:29:45 +02:00
5b857a6eab
implement json serialize for l10n string
2015-04-29 21:22:42 +02:00
8c7db2536d
Merge pull request #15596 from owncloud/issue/15589
...
Correctly generate the feedback URL for remote share
2015-04-29 10:52:43 +02:00
7df7a3b360
Merge pull request #15906 from rullzer/fix_15777
...
Password set via OCS API should not be double escaped
2015-04-29 10:44:25 +02:00
34d0e610cc
Filter potential dangerous filenames for avatars
...
We don't want to have users misusing this API resulting in a potential file disclosure of "avatar.(jpg|png)" files.
2015-04-28 16:57:23 +02:00
2eecfcbb80
Fix scrutinizer complains and return type doc
2015-04-28 11:28:55 +02:00
9fb7d0bca9
Correctly remove the protocol before prepeding it
2015-04-28 11:28:54 +02:00
8f7c64253e
Correctly generate the feedback URL for remote share
...
The trailing slash was added in c78e3c4a7f
2015-04-28 11:28:54 +02:00
de8c15e1a4
Merge pull request #14764 from owncloud/shared-etag-propagate
...
Propagate etags across shared storages
2015-04-28 10:58:50 +02:00
b4a15db046
Merge pull request #15901 from owncloud/fix-share-docs
...
fix several issues with doc blocks on share.php
2015-04-28 10:41:04 +02:00
73bb3a22f6
Password set via OCS API should not be double escaped
2015-04-28 10:33:19 +02:00
7c65448377
Fix return type of the getRootFolder() method
2015-04-28 09:36:29 +02:00
46083006e1
fix several issues with doc blocks on share.php
2015-04-28 08:40:47 +02:00
eb0e9e5646
Merge pull request #15890 from owncloud/fix-helper-docs
...
Fix several type(hint) errors in private/helper.php
2015-04-27 15:28:50 +02:00
7d0eba7a41
Merge pull request #15886 from owncloud/fix-15848-master
...
Adjust isLocal() on encryption wrapper
2015-04-27 15:06:26 +02:00
db6395ae20
Fix several type(hint) errors in private/helper.php
2015-04-27 14:45:05 +02:00
678b7d7e4d
Merge pull request #15860 from owncloud/enc_fallback_old_encryption
...
[encryption] handle encrypted files correctly which where encrypted with a old version of ownCloud (<=oc6)
2015-04-27 14:32:19 +02:00
936d564058
fixes #15848
2015-04-27 14:26:05 +02:00
93c25a1f4a
Merge pull request #15882 from owncloud/fix-type-annotation
...
Fix type annotation
2015-04-27 14:17:59 +02:00
2e897f05b1
triger propagation for webdav uploads
...
use post hooks for share etag propagator
2015-04-27 14:07:16 +02:00
45784f213f
fix propagation when renaming a directly reshared folder
2015-04-27 14:07:16 +02:00
30ad56813a
propagate etags for all user of a share
2015-04-27 14:07:15 +02:00
518d5aadf5
Allow getting *all* share entries owned by a user
2015-04-27 14:07:15 +02:00
849e5521de
Make the change propagator an emitter
2015-04-27 14:07:15 +02:00
cc331609bf
Merge pull request #15411 from mmattel/fix_for_15375_better_message_text
...
Improve error messge text for app upgrade try (#15375 )
2015-04-27 13:38:16 +02:00
d0363fe396
Fix type annotation
...
Obviously should be an int
2015-04-27 13:31:18 +02:00
27683f9442
fall back to the ownCloud default encryption module and aes128 if we read a encrypted file without a header
2015-04-27 13:01:18 +02:00
5855d23ff9
Make methods explicit public
2015-04-27 11:03:51 +02:00
d600955a51
Make getDefaultModuleId public and get module protected
2015-04-27 11:03:51 +02:00
a09df6d453
Verify that the encryption module exists before setting it
2015-04-27 11:03:50 +02:00
e58029f8ad
[tx-robot] updated from transifex
2015-04-27 01:54:46 -04:00
4dfdaf741c
Merge pull request #15834 from owncloud/make-temporary-file-really-unique
...
Fix collision on temporary files + adjust permissions
2015-04-25 23:18:26 +02:00
b9df932e3c
Merge pull request #15683 from owncloud/block-legacy-clients
...
Block old legacy clients
2015-04-24 18:21:10 +02:00
9a5783b284
fix unit tests
2015-04-24 16:47:27 +02:00
49df8ef525
Update encryption.php
2015-04-24 16:44:00 +02:00
238302ee7d
fixed name
2015-04-24 16:44:00 +02:00
1756562501
Update encryption.php
2015-04-24 16:44:00 +02:00
735f6cc037
fix encryption header error
...
When moving back the pointer to position 0 (using stream_seek), the pointer on the encrypted stream will be moved to the position immediately after the header. Reading the header again (invoked by stream_read) will cause an error, writing the header again (invoked by stream_write) will corrupt the file. Reading/writing the header should therefore happen when opening the file rather than upon read or write. Note that a side-effect of this PR is that empty files will still get an encryption header; I think that is OK, but it is different from how it was originally implemented.
2015-04-24 16:43:16 +02:00
4334e77035
Merge pull request #15839 from owncloud/enc_fix_moving_shared_files
...
[encryption] fix moving files to a shared folder
2015-04-24 15:07:36 +02:00
1592be117a
Use public interfaces for type hinting
2015-04-24 13:06:03 +02:00
24128d1384
only update share keys if the file was encrypted
2015-04-24 10:19:09 +02:00
2646bccb83
update share keys if file gets copied
2015-04-23 17:18:48 +02:00
2990b0e07e
update share keys if a file is moved to a shared folder
2015-04-23 17:18:48 +02:00
b1bb6a3d36
Ignore test folders when checking the code for compliance
2015-04-23 16:59:26 +02:00
Thomas Müller
Robin Appelman
Bernhard Posselt
Jenkins for ownCloud
Morris Jobke
Lukas Reschke
Joas Schilling
Roeland Jago Douma
Bjoern Schiessle
jknockaert
Joas Schilling