Commit Graph

26142 Commits

Author SHA1 Message Date
Jenkins for ownCloud 1e48eb8882 [tx-robot] updated from transifex 2015-07-25 01:54:48 -04:00
Thomas Müller 11244736ae Merge pull request #17838 from owncloud/sharing-password-policy-master
Use a hook to integrate sharing password verification
2015-07-24 16:47:18 +02:00
Robin Appelman 91fbee8988 also log the class for dav exceptions 2015-07-24 13:30:52 +02:00
Thomas Müller 1f8ee61006 Merge pull request #17755 from owncloud/alias-container-alive
Add registerAlias method to shortcut interface registration #17714
2015-07-24 13:11:32 +02:00
Joas Schilling 20cf8ec205 Add an update script to reset the value
In case encryption was not enabled, we accidently set encrypted = 1 for
files inside mount points, since 8.1.0. This breaks opening the files in
8.1.1 because we fixed the code that checks if a file is encrypted.
In order to fix the file, we need to reset the flag of the file. However,
the flag might be set because the file is in fact encrypted because it was
uploaded at a time where encryption was enabled.

So we can only do this when:
- Current version of ownCloud before the update is 8.1.0 or 8.2.0.(0-2)
- Encryption is disabled
- files_encryption is not known in the app config

If the first two are not the case, we are save. However, if files_encryption
values exist in the config, we might have a false negative here.
Now if there is no file with unencrypted size greater 0, that means there are
no files that are still encrypted with "files_encryption" encryption. So we
can also safely reset the flag here.

If this is not the case, we go with "better save then sorry" and don't change
the flag but write a message to the ownCloud log file.
2015-07-24 10:37:39 +02:00
Roeland Douma f558b3071f Merge pull request #17849 from owncloud/remove-commented-code
Remove commented code
2015-07-24 08:49:22 +02:00
Jenkins for ownCloud b757f9c893 [tx-robot] updated from transifex 2015-07-24 01:54:54 -04:00
Morris Jobke 5265a44260 Remove commented code 2015-07-24 00:47:41 +02:00
Bernhard Posselt 582f07950f Merge pull request #17075 from owncloud/bootstrap-tooltip
Replace jQuery tipsy with bootstrap tooltip
2015-07-23 19:25:09 +02:00
Joas Schilling 42baeb36dc Add a unit test for the disabled encryption case 2015-07-23 17:01:44 +02:00
Thomas Müller 01b7e306c4 Merge pull request #17827 from owncloud/dont-set-share-password-twice-master-2
Adding error handling in case setting the password fails
2015-07-23 16:34:13 +02:00
Roeland Douma 0e6c4e1902 Merge pull request #17818 from owncloud/fix-password-change-error-always-shows-default-error
assign password change error message to correct object
2015-07-23 16:15:19 +02:00
Thomas Müller 632e39a750 Fix PHPDoc on setPassword 2015-07-23 16:11:06 +02:00
Joas Schilling 9cee8ff9f8 Only set is encrypted when encryption is enabled 2015-07-23 15:18:59 +02:00
Thomas Müller ac08685234 Use a hook to integrate sharing password verification 2015-07-23 14:44:48 +02:00
Thomas Müller d93535b5cb Adding error handling in case setting the password fails 2015-07-23 09:39:26 +02:00
Jenkins for ownCloud 9ccf94ca06 [tx-robot] updated from transifex 2015-07-23 01:55:22 -04:00
Thomas Müller 2d1f7705e1 Merge pull request #17815 from owncloud/update-blueimp-md5
Update blueimp-md5 to 1.1.0
2015-07-22 22:49:45 +02:00
Bernhard Posselt 546cd39217 condense doc warnings into small section that gets showed to the user before enabling encryption
remove share warning

remove app and just write it out as feature

adjust warnings

reframe storage issue

fix typo
2015-07-22 21:59:31 +02:00
michag86 3841bb1c07 assign error message to correct object
fix for  #17817
2015-07-22 18:42:46 +02:00
Björn Schießle f137f1a049 Merge pull request #17807 from owncloud/improve_apps_template
make sure that there is a space between user- and admin-documentation
2015-07-22 18:38:11 +02:00
Morris Jobke 296ed4c276 Merge pull request #17413 from owncloud/public-api-querybuilder
Add public api for Doctrine QueryBuilder and ExpressionBuilder
2015-07-22 17:29:08 +02:00
Morris Jobke 640d55cc2a Update blueimp-md5 to 1.1.0
Yes this is pretty empty, but it's the truth:

https://github.com/blueimp/JavaScript-MD5/compare/1.0.3...1.1.0
2015-07-22 16:17:56 +02:00
Morris Jobke e0455d77c2 update moment.js to 2.10.3 2015-07-22 16:10:40 +02:00
Robin McCorkell 145ab3a28d Merge pull request #17806 from owncloud/enc_improved_app_description
improved app description for the default encryption module
2015-07-22 15:06:08 +01:00
Jan-Christoph Borchardt 780a2ed093 use arrow to indicate external link, use correct quotes and capitalization 2015-07-22 14:20:55 +02:00
Bjoern Schiessle 50cbb57065 make sure that there is a space between user- and admin-documentation 2015-07-22 14:02:43 +02:00
Bjoern Schiessle e97c1db728 improved app description and adjust it to the way the new encryption module works 2015-07-22 13:43:46 +02:00
Joas Schilling 1dac78644a Update sabre-dav to 2.1.6 2015-07-22 12:28:03 +02:00
Robin McCorkell 5768b3fe2c Merge pull request #17792 from szepeviktor/master
Fixing line comments and indentation, closes #17781
2015-07-22 10:21:41 +01:00
Morris Jobke 009d1f3214 move updateFileActionSpinner to OCA.Files.FileActions 2015-07-22 10:35:15 +02:00
Roeland Douma d37b8969f4 Merge pull request #17342 from rullzer/test_preview_conditions
Only run some preview unit tets if imagemagick is available
2015-07-22 09:34:31 +02:00
Viktor Szépe 4699a29a70 Fixing line comments and indentation 2015-07-21 22:19:53 +02:00
Joas Schilling 20cd0ae55b Add a log message when the Doctrine Query Builder is retrieved 2015-07-21 15:53:28 +02:00
Joas Schilling f9071ed5b7 Comment out LIMIT 0 case because of the mixed results 2015-07-21 15:25:48 +02:00
Joas Schilling c9564503c2 Fix tests for setFirstResult and setMaxResults on oracle 2015-07-21 15:25:48 +02:00
Joas Schilling 22849238fb Set a limit until doctrine released a version that fixes Sqlite
See https://github.com/doctrine/dbal/pull/782 for more info
2015-07-21 15:25:48 +02:00
Joas Schilling 32cb30cb84 Correctly count the number of items (rowCount is Update/Insert/Delete only) 2015-07-21 15:25:47 +02:00
Joas Schilling 577a7c92e1 Can not test the string, thanks oracle.... 2015-07-21 15:25:47 +02:00
Joas Schilling f77e5f411d Fix existing usages by removing the quotes 2015-07-21 15:25:47 +02:00
Joas Schilling 516f7e8299 Add unit tests and automatic quoting 2015-07-21 15:25:47 +02:00
Joas Schilling de348180ae Use the public interface and our method instead of the doctrine thing 2015-07-21 15:25:47 +02:00
Joas Schilling 1bfb944d51 Add QueryBuilder, ExpressionBuilder and CompositeExpression wrappers 2015-07-21 15:25:47 +02:00
Morris Jobke 2d691c2fb4 Merge pull request #17381 from owncloud/fix_sharing_add_to_group
[sharing] fix addToGroup hook
2015-07-21 13:30:41 +02:00
Joas Schilling a35193c704 Merge pull request #17750 from owncloud/enc_migration_fix_mountpoint_detection
fix system wide mount point detection on migration
2015-07-21 11:06:02 +02:00
Roeland Douma 40170f35f6 Merge pull request #17766 from owncloud/escape-ampersand
Escape ampersand in logout URL
2015-07-21 09:32:16 +02:00
Jenkins for ownCloud 24f12e65ec [tx-robot] updated from transifex 2015-07-21 01:54:52 -04:00
Morris Jobke 5a5c59639b Escape ampersand in logout URL
* fixes #17757
2015-07-21 00:26:30 +02:00
Bernhard Posselt d20e2002a6 Merge pull request #17743 from owncloud/return-proper-statuscodes
Return proper status code in case of a CORS exception
2015-07-20 18:03:25 +02:00
Robin McCorkell 75a5e6e12b Fix mounting wrapped storages resulting in many-layered wrapping
This usually doesn't cause issues, but in unit tests sometimes a wrapped
storage is passed to Filesystem::mount() and gets rewrapped, hitting the
XDebug function nesting level limit when used.
2015-07-20 16:27:26 +01:00