Morris Jobke
0ab16cb823
Replace replace with sed statement
2015-04-29 09:53:45 +02:00
Björn Schießle
6ebb021359
Merge pull request #15911 from owncloud/enc_create_header_for_new_key
...
make sure that we create a header for the encrypted private key
2015-04-29 09:43:54 +02:00
Lukas Reschke
3e06fd9342
Merge pull request #15706 from owncloud/fix-15705-master
...
move creation of shared key to the login handler
2015-04-29 09:36:34 +02:00
Thomas Müller
fa6cb494ed
Merge pull request #15922 from JostBaron/patch-1
...
Fix error message when wrong user on console
2015-04-29 09:31:19 +02:00
Thomas Müller
416ef1eb62
Merge pull request #15921 from cmeh/patch-4
...
Spelling in wizardTabElementary.js: Correct "More then …" to "More than …"
2015-04-29 09:28:27 +02:00
Joas Schilling
52c7758436
Merge pull request #15918 from owncloud/harden-avatar
...
Filter potential dangerous filenames for avatars
2015-04-29 08:40:49 +02:00
Jenkins for ownCloud
9db338df29
[tx-robot] updated from transifex
2015-04-29 01:54:45 -04:00
Jost Baron
47ddd1794b
Fix error message when wrong user on console
...
Owncloud complains if the user runs a shell script with a user other than the user that owns `config/config.php`. The error message does not reflect this, and instead speaks about the web server user. Related issue: #15920 .
2015-04-28 22:51:19 +02:00
cmeh
5e3fe7fb06
Update wizardTabElementary.js
...
Corrected "More then …" to "More than …".
2015-04-28 22:11:24 +02:00
Bjoern Schiessle
29bcfb2fdb
method shouldn't be static
2015-04-28 20:21:53 +02:00
Bjoern Schiessle
d5cbb66b66
also create encryption keys for empty files
2015-04-28 20:21:53 +02:00
Bjoern Schiessle
df428b76ac
skip update of encryption keys if file is not encrypted
2015-04-28 20:21:53 +02:00
Lukas Reschke
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
Thomas Müller
132ce04f31
Merge pull request #15915 from owncloud/fix-sharing
...
Fix routes
2015-04-28 15:54:08 +02:00
Joas Schilling
b55ef51a27
Add tests for the correct share id on the call aswell
2015-04-28 14:56:13 +02:00
Lukas Reschke
1b84a1cd48
Fix routes
...
Fixes public sharing as reported on https://github.com/owncloud/core/issues/15913
2015-04-28 14:41:14 +02:00
Joas Schilling
34181c3aef
Correctly send Federate-Cloud Share Feedback against the remote share ID
2015-04-28 14:29:04 +02:00
Roeland Jago Douma
02269b6464
Added unit test
2015-04-28 14:00:36 +02:00
Bjoern Schiessle
7d05f387fb
make sure that we create a header for the encrypted private key
2015-04-28 13:00:09 +02:00
Joas Schilling
2eecfcbb80
Fix scrutinizer complains and return type doc
2015-04-28 11:28:55 +02:00
Joas Schilling
02c60949dd
make scrutinizer happy
2015-04-28 11:28:54 +02:00
Joas Schilling
9fb7d0bca9
Correctly remove the protocol before prepeding it
2015-04-28 11:28:54 +02:00
Joas Schilling
d146c13abd
Add tests for the remote sharing url
2015-04-28 11:28:54 +02:00
Joas Schilling
66dca76f72
check the called URL
2015-04-28 11:28:54 +02:00
Joas Schilling
8f7c64253e
Correctly generate the feedback URL for remote share
...
The trailing slash was added in c78e3c4a7f
2015-04-28 11:28:54 +02:00
Thomas Müller
557b4a2cb0
Merge pull request #15892 from owncloud/fix-failed-require-in-l10n-createjs
...
handle case where the given language is unknown - refs #15794
2015-04-28 11:22:25 +02:00
Morris Jobke
de8c15e1a4
Merge pull request #14764 from owncloud/shared-etag-propagate
...
Propagate etags across shared storages
2015-04-28 10:58:50 +02:00
Thomas Müller
5fa5f46a88
Merge pull request #15773 from owncloud/fix-15766
...
LDAP Wizard: increasing server numbers and avoid configID collisions, fixes #15766
2015-04-28 10:46:23 +02:00
Thomas Müller
b55297a059
Merge pull request #15896 from owncloud/autotest-external-replacecommand
...
Add check for "replace" command in autotest-external
2015-04-28 10:44:32 +02:00
Morris Jobke
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
Roeland Jago Douma
73bb3a22f6
Password set via OCS API should not be double escaped
2015-04-28 10:33:19 +02:00
Thomas Müller
9108c103b2
Merge pull request #15903 from owncloud/issue-15899-fix-getfoortfolder-doc
...
Fix return type of the getRootFolder() method
2015-04-28 10:04:15 +02:00
Joas Schilling
7c65448377
Fix return type of the getRootFolder() method
2015-04-28 09:36:29 +02:00
Joas Schilling
46083006e1
fix several issues with doc blocks on share.php
2015-04-28 08:40:47 +02:00
Jenkins for ownCloud
6679ef287a
[tx-robot] updated from transifex
2015-04-28 01:54:44 -04:00
Morris Jobke
24bb4e3f6f
Merge pull request #15893 from owncloud/files-fixnewfilevalidation
...
Fix file name validation in New menu
2015-04-27 22:59:14 +02:00
Lukas Reschke
28ecc1e9d4
Merge pull request #15891 from owncloud/LukasReschke-patch-1
...
Rephrase "TL;DR"
2015-04-27 19:50:11 +02:00
Vincent Petry
6d8884e8a1
Add check for "replace" command
2015-04-27 18:03:49 +02:00
Thomas Müller
aa2bd28a6a
fix typo
2015-04-27 16:34:58 +02:00
Vincent Petry
69f88b38c9
Fix file name validation in New menu
2015-04-27 16:31:18 +02:00
Thomas Müller
66f9811151
handle case where the given language is unknown - refs #15794
2015-04-27 15:40:16 +02:00
Lukas Reschke
4006c1c3d9
Simplify even more
2015-04-27 15:39:37 +02:00
Thomas Müller
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
Lukas Reschke
69c041cb63
Rephrase "TL;DR"
...
"TL;DR" seems not to be understood or respected by everyone. Maybe we should do a try with "Important". Open for alternative suggestions.
2015-04-27 15:19:29 +02:00
Robin Appelman
5304afbecb
dont pass floats as timestamp to the changepropagator
2015-04-27 15:18:25 +02:00
Thomas Müller
3b54161164
Merge pull request #15887 from owncloud/issue-15885-empty-getenv-path
...
Can't use function return value in write context
2015-04-27 15:16:27 +02:00
Thomas Müller
7d0eba7a41
Merge pull request #15886 from owncloud/fix-15848-master
...
Adjust isLocal() on encryption wrapper
2015-04-27 15:06:26 +02:00
Joas Schilling
db6395ae20
Fix several type(hint) errors in private/helper.php
2015-04-27 14:45:05 +02:00
Thomas Müller
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
Joas Schilling
1341d03455
Can't use function return value in write context
2015-04-27 14:28:31 +02:00
