Commit Graph

24662 Commits

Author SHA1 Message Date
Jenkins for ownCloud eda4d45836 [tx-robot] updated from transifex 2015-05-01 01:54:43 -04:00
Morris Jobke 8f117cb89b Merge pull request #15993 from owncloud/admin-documentation
add admin documentation links for Sharing, Encryption and Email server
2015-05-01 00:15:06 +02:00
Jan-Christoph Borchardt 9ec80377e6 fix layout for documentation link hints 2015-04-30 17:12:34 -04:00
Jan-Christoph Borchardt 8b37e25ec2 add admin documentation links for Sharing, Encryption and Email server 2015-04-30 17:10:24 -04:00
Thomas Müller ca8b6f24cb Merge pull request #15955 from owncloud/move-dummy-encryption
Moving encryption_dummy to the apps repo
2015-04-30 18:14:01 +02:00
Thomas Müller e14540c1f1 Merge pull request #15972 from owncloud/enable-scrutinizer-code-coverage
Enable code coverage on scrutinizer
2015-04-30 18:12:36 +02:00
Thomas Müller 41d7870d7b Merge pull request #15964 from owncloud/fix-l10n-string-warn
Fix #15962
2015-04-30 15:55:40 +02:00
Thomas Müller 42097bfc6a Merge pull request #15968 from owncloud/enc-wrapper-presetup
use the preSetup hook to ensure the encryption wrapper is applied correctly
2015-04-30 14:14:31 +02:00
Robin Appelman d0ad69aa9c use the preSetup hook to ensure the encryption wrapper is applied correctly 2015-04-30 13:28:06 +02:00
Thomas Müller 4ef797f649 Enable code coverage on scrutinizer 2015-04-30 13:18:15 +02:00
Bernhard Posselt 360d0e3e5e fix #15962 2015-04-30 12:44:45 +02:00
Thomas Müller d308ec4f0e Merge pull request #15949 from owncloud/l10n-string-json
Implement json serialize for l10n string
2015-04-30 11:11:16 +02:00
Thomas Müller 7795265d93 Moving encryption_dummy to the apps repo - fixes #15950 2015-04-30 10:51:51 +02:00
Morris Jobke b9c1bf26ee Merge pull request #15951 from owncloud/fix-install-again
Make command optional
2015-04-30 10:45:23 +02:00
Thomas Müller 08aef98e11 Merge pull request #15946 from owncloud/auto-controller-resolve
Make controller automatically assemblable
2015-04-30 10:12:17 +02:00
Morris Jobke 8bc9c56dcf Merge pull request #15947 from owncloud/add-title-to-multiselect
add title to multiselect list items so longer group names are visible
2015-04-30 10:04:43 +02:00
Jenkins for ownCloud ae853445ef [tx-robot] updated from transifex 2015-04-30 03:27:57 -04:00
Joas Schilling 9205a9b52e Merge pull request #15942 from owncloud/revert-15875-multiline-buttons
Revert "fix layout for multiline buttons which are <a class='button'>"
2015-04-30 08:25:43 +02:00
Clark Tomlinson 4209757d61 Merge pull request #15919 from owncloud/enc_handle_empty_files
Encryption improve handling of empty and unencrypted files
2015-04-29 19:32:02 -04:00
Bernhard Posselt 7c0dc06c10 make command optional 2015-04-29 22:53:16 +02:00
Bernhard Posselt 1e58538f0e add aliases to pascal case constructor paramters to make it possible to auto assemble controllers 2015-04-29 22:29:45 +02:00
Bernhard Posselt 5b857a6eab implement json serialize for l10n string 2015-04-29 21:22:42 +02:00
Thomas Müller 8955f38e55 Merge pull request #15926 from owncloud/install-empty-pw
Make it possible to pass empty database passwords to install command
2015-04-29 21:19:28 +02:00
Jan-Christoph Borchardt 3dfa05c0d0 add title to multiselect list items so longer group names are visible, fix #15819 2015-04-29 13:53:29 -04:00
Jan-Christoph Borchardt 9ecfc7c237 Revert "fix layout for multiline buttons which are <a class='button'>" 2015-04-29 11:53:46 -04:00
Bernhard Posselt b0d1d61db2 default to an empty string for database password if ommited
fix null passwords

remove password trimming
2015-04-29 15:39:51 +02:00
Vincent Petry 002d74f95a Merge pull request #15908 from owncloud/fix-replace-with-sed
Replace `replace` with `sed` statement
2015-04-29 12:28:23 +02:00
Morris Jobke 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
Morris Jobke 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
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