68f14a943a
Merge pull request #17840 from owncloud/fix-enc-wrapper-without-encryption
...
Only set is encrypted when encryption is enabled
2015-07-27 16:06:39 +02:00
c030ae9dec
Merge pull request #17879 from owncloud/scan-check-path
...
check if the user is trying to scan a valid path
2015-07-27 13:39:53 +02:00
e68741c1b0
Merge pull request #17894 from owncloud/since-check-for-classes-and-interfaces
...
Implement OCP Since Check for classes and interfaces
2015-07-27 13:14:56 +02:00
5923270004
add condition to update query
2015-07-27 12:08:13 +02:00
c20d4d1a0b
Add unit tests
2015-07-27 11:21:49 +02:00
f74525c349
check if the user is trying to scan a valid path
2015-07-27 11:21:48 +02:00
4efbf12fb8
Implement OCP Since Check for classes and interfaces
2015-07-27 10:49:45 +02:00
c9e22f70c8
Add PHPDoc for classes and interfaces
2015-07-27 10:49:26 +02:00
4edfadac96
Merge pull request #17878 from owncloud/fix-tipsy-fallback-title
...
Fix title attribute of tipsy shim
2015-07-27 10:29:48 +02:00
660e36b49b
Merge pull request #17882 from owncloud/allow-classes-in-titles
...
Allow classes in <h2> tags
2015-07-27 09:13:18 +02:00
59c636e853
Merge pull request #17804 from owncloud/update-sabredav-2.1.6-master
...
[MASTER] Update sabre-dav to 2.1.6
2015-07-27 08:59:14 +02:00
933f087d21
Merge pull request #17526 from owncloud/fix-17516
...
LDAP: when checking group for matching filter, also take base DN into…
2015-07-27 08:38:45 +02:00
bacada263c
[tx-robot] updated from transifex
2015-07-27 01:54:38 -04:00
b344e40acc
Allow classes in <h2> tags
...
Previously something like `<h2 class="inlineblock"><?php p($l->t('Some title')) ?></h2>` was shown as `<h2 class="inlineblock">Some title` within the sidebar instead as `Some Title` due to the fact that the regex was catching these classes but was not properly running the string replace function.
2015-07-26 23:00:50 +02:00
6574dfcf23
remove title option from tipsy shim
2015-07-26 17:22:53 +02:00
5b21ed805c
Merge pull request #17871 from owncloud/add-fallback-to-shim
...
Add `fallback` to shim
2015-07-26 13:01:25 +02:00
5da44c69cb
[tx-robot] updated from transifex
2015-07-26 01:54:56 -04:00
56cff46dc3
Add `fallback` to shim
...
Tipsy also supported the `fallback` element which will now not work anymore. To enhance compatibility we shall also implement it in the shim.
Fixes https://github.com/owncloud/core/issues/17870
2015-07-25 22:10:21 +02:00
1e48eb8882
[tx-robot] updated from transifex
2015-07-25 01:54:48 -04:00
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
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
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
f558b3071f
Merge pull request #17849 from owncloud/remove-commented-code
...
Remove commented code
2015-07-24 08:49:22 +02:00
b757f9c893
[tx-robot] updated from transifex
2015-07-24 01:54:54 -04:00
5265a44260
Remove commented code
2015-07-24 00:47:41 +02:00
582f07950f
Merge pull request #17075 from owncloud/bootstrap-tooltip
...
Replace jQuery tipsy with bootstrap tooltip
2015-07-23 19:25:09 +02:00
42baeb36dc
Add a unit test for the disabled encryption case
2015-07-23 17:01:44 +02:00
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
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
632e39a750
Fix PHPDoc on setPassword
2015-07-23 16:11:06 +02:00
9cee8ff9f8
Only set is encrypted when encryption is enabled
2015-07-23 15:18:59 +02:00
ac08685234
Use a hook to integrate sharing password verification
2015-07-23 14:44:48 +02:00
d93535b5cb
Adding error handling in case setting the password fails
2015-07-23 09:39:26 +02:00
9ccf94ca06
[tx-robot] updated from transifex
2015-07-23 01:55:22 -04:00
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
3841bb1c07
assign error message to correct object
...
fix for #17817
2015-07-22 18:42:46 +02:00
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
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
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
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
780a2ed093
use arrow to indicate external link, use correct quotes and capitalization
2015-07-22 14:20:55 +02:00
50cbb57065
make sure that there is a space between user- and admin-documentation
2015-07-22 14:02:43 +02:00
e97c1db728
improved app description and adjust it to the way the new encryption module works
2015-07-22 13:43:46 +02:00
1dac78644a
Update sabre-dav to 2.1.6
2015-07-22 12:28:03 +02:00
5768b3fe2c
Merge pull request #17792 from szepeviktor/master
...
Fixing line comments and indentation, closes #17781
2015-07-22 10:21:41 +01:00
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
4699a29a70
Fixing line comments and indentation
2015-07-21 22:19:53 +02:00
20cd0ae55b
Add a log message when the Doctrine Query Builder is retrieved
2015-07-21 15:53:28 +02:00
f9071ed5b7
Comment out LIMIT 0 case because of the mixed results
2015-07-21 15:25:48 +02:00
c9564503c2
Fix tests for setFirstResult and setMaxResults on oracle
2015-07-21 15:25:48 +02:00
Thomas Müller
Morris Jobke
Bjoern Schiessle
Lukas Reschke
Robin Appelman
Jenkins for ownCloud
Hendrik Leppelsack
Joas Schilling
Roeland Douma
Bernhard Posselt
michag86
Björn Schießle
Robin McCorkell
Jan-Christoph Borchardt
Viktor Szépe