Bjoern Schiessle
fb4c99fe06
make sure that we emit the hooks if a file gets moved from a subfolder to the root folder with the nodes API
2015-07-29 11:02:38 +02:00
Morris Jobke
c34e63bb1f
Merge pull request #15543 from rullzer/mimetypedetector
...
Mimetypedetector
2015-07-28 13:35:26 +02:00
Roeland Douma
73169b0edb
Merge pull request #17195 from rullzer/no_multiple_remote_shares_of_same_file
...
Remote shares should be uique
2015-07-28 13:06:25 +02:00
Morris Jobke
4076f84f88
Merge pull request #17910 from owncloud/fix-modified-tooltip
...
Fix tooltip for modification time
2015-07-28 08:41:26 +02:00
Jenkins for ownCloud
c683b1d3c9
[tx-robot] updated from transifex
2015-07-28 01:55:00 -04:00
Vincent Petry
6ada1e3276
Merge pull request #17902 from owncloud/fix_17898
...
get header size before we open the file to avoid locking exception
2015-07-27 16:58:32 +02:00
Thomas Müller
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
Hendrik Leppelsack
f67477206b
fixed tooltip for modified date
2015-07-27 15:56:03 +02:00
Roeland Jago Douma
d276aebf40
Pass config dir as parameter to detection class
...
In order to properly test the mimetype function:
* constructor takes path to configdir
* Added unit tests for mimetype (only if vfsStream is available)
2015-07-27 14:59:49 +02:00
Roeland Jago Douma
88fb389eab
Proper deprecate methods
2015-07-27 14:59:49 +02:00
Roeland Jago Douma
9cdd637050
Loading of mapping/aliases is done in class
2015-07-27 14:59:49 +02:00
Roeland Jago Douma
141a0f0f47
Move mimetypedetection to files/type/detection
2015-07-27 14:59:45 +02:00
Roeland Jago Douma
6db6689740
Added mimetype detector
...
* Copied unit tests from old functions
2015-07-27 14:58:45 +02:00
Bjoern Schiessle
0736b45d92
get header size before we open the file to avoid locking exception
2015-07-27 14:29:07 +02:00
Thomas Müller
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
Morris Jobke
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
Bjoern Schiessle
5923270004
add condition to update query
2015-07-27 12:08:13 +02:00
Lukas Reschke
c20d4d1a0b
Add unit tests
2015-07-27 11:21:49 +02:00
Robin Appelman
f74525c349
check if the user is trying to scan a valid path
2015-07-27 11:21:48 +02:00
Morris Jobke
4efbf12fb8
Implement OCP Since Check for classes and interfaces
2015-07-27 10:49:45 +02:00
Morris Jobke
c9e22f70c8
Add PHPDoc for classes and interfaces
2015-07-27 10:49:26 +02:00
Morris Jobke
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
Morris Jobke
660e36b49b
Merge pull request #17882 from owncloud/allow-classes-in-titles
...
Allow classes in <h2> tags
2015-07-27 09:13:18 +02:00
Morris Jobke
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
Morris Jobke
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
Jenkins for ownCloud
bacada263c
[tx-robot] updated from transifex
2015-07-27 01:54:38 -04:00
Lukas Reschke
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
Hendrik Leppelsack
6574dfcf23
remove title option from tipsy shim
2015-07-26 17:22:53 +02:00
Hendrik Leppelsack
5b21ed805c
Merge pull request #17871 from owncloud/add-fallback-to-shim
...
Add `fallback` to shim
2015-07-26 13:01:25 +02:00
Jenkins for ownCloud
5da44c69cb
[tx-robot] updated from transifex
2015-07-26 01:54:56 -04:00
Lukas Reschke
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
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
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
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