4076f84f88
Merge pull request #17910 from owncloud/fix-modified-tooltip
...
Fix tooltip for modification time
2015-07-28 08:41:26 +02:00
c683b1d3c9
[tx-robot] updated from transifex
2015-07-28 01:55:00 -04:00
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
f67477206b
fixed tooltip for modified date
2015-07-27 15:56:03 +02:00
5923270004
add condition to update query
2015-07-27 12:08:13 +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
1e48eb8882
[tx-robot] updated from transifex
2015-07-25 01:54:48 -04: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
582f07950f
Merge pull request #17075 from owncloud/bootstrap-tooltip
...
Replace jQuery tipsy with bootstrap tooltip
2015-07-23 19:25:09 +02:00
9ccf94ca06
[tx-robot] updated from transifex
2015-07-23 01:55:22 -04: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
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
e97c1db728
improved app description and adjust it to the way the new encryption module works
2015-07-22 13:43:46 +02:00
4699a29a70
Fixing line comments and indentation
2015-07-21 22:19:53 +02:00
f77e5f411d
Fix existing usages by removing the quotes
2015-07-21 15:25:47 +02:00
de348180ae
Use the public interface and our method instead of the doctrine thing
2015-07-21 15:25:47 +02:00
2d691c2fb4
Merge pull request #17381 from owncloud/fix_sharing_add_to_group
...
[sharing] fix addToGroup hook
2015-07-21 13:30:41 +02:00
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
24f12e65ec
[tx-robot] updated from transifex
2015-07-21 01:54:52 -04:00
570dd17d4f
fix mount point detection
2015-07-20 16:00:33 +02:00
89d6439445
Merge pull request #17701 from owncloud/fix_repeated_migration
...
don't move keys if the key where already moved in a previous migration run
2015-07-20 15:12:52 +02:00
f573659b3a
Merge pull request #17723 from owncloud/fix-17631
...
fix runtime caching in ldap's user manager, fixes #17631
2015-07-20 09:29:15 +02:00
83a13c0635
[tx-robot] updated from transifex
2015-07-20 01:54:47 -04:00
b961a29b0c
fix indentation. no code changes, whitespace only.
2015-07-20 01:21:52 +02:00
4f910221c4
fix runtime caching in ldap's user manager, fixes #17631
2015-07-17 18:57:56 +02:00
37d085901b
Merge pull request #17706 from rullzer/external_diricon_filelist
...
The external directories should get the correct icon in filelist
2015-07-17 16:39:46 +02:00
4dba920fdd
unit tests
2015-07-17 15:19:10 +02:00
3000f0125f
don't move keys if the key where already moved in a previous migration run
2015-07-17 15:19:10 +02:00
b0f21c0a43
The external directories should get the correct icon
2015-07-17 14:30:12 +02:00
8723410319
[tx-robot] updated from transifex
2015-07-17 01:54:52 -04:00
15877ac7eb
Merge pull request #17474 from owncloud/fix_trashbin
...
Don't try to move files to the trashbin outside of user/files
2015-07-16 14:15:45 +02:00
d6f02eb703
Merge pull request #17500 from owncloud/encryption_migration_improvements
...
Only clean up if migration finished succesfully
2015-07-16 14:03:21 +02:00
bfb90d10ed
Merge pull request #17046 from nicolas-grekas/fix-16654
...
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:35:25 +02:00
472d48f6e3
Do not use OC*::mb_*_replace(), they are useless
2015-07-16 11:00:04 +02:00
23d1cf26b9
Lock scanner to the given user
2015-07-15 14:08:06 +02:00
5cd7f7eccd
Merge pull request #17623 from owncloud/fed-throwcorrectexception
...
Throw storage not available on guzzle error
2015-07-14 10:12:32 +02:00
2d5ddb02fa
[tx-robot] updated from transifex
2015-07-14 01:54:45 -04:00
3d6be69f25
Throw storage not available on guzzle error
...
If the remote server is in maintenance mode, we must throw storage not
available exception instead of not found which might auto-remove the
share.
2015-07-13 18:51:25 +02:00
b3b080e1c0
Strip public webdav info about sharing and mount points
...
Remove information about whether a file is an incoming share or mount
point when requested over public webdav.
2015-07-13 14:20:35 +02:00
52e9c94e08
[tx-robot] updated from transifex
2015-07-13 01:54:50 -04:00
7cf6badad5
[tx-robot] updated from transifex
2015-07-12 01:54:49 -04:00
bfd7194cf9
[tx-robot] updated from transifex
2015-07-11 01:54:51 -04:00
87f3500fda
Merge pull request #17483 from rullzer/migrate-mimetype-js
...
Move away from OCA.files.getMimeIcon and use OC.MimeType.getIconUrl
2015-07-10 10:14:03 +02:00
176dabd976
[tx-robot] updated from transifex
2015-07-10 01:54:55 -04:00
42eb18c747
Merge pull request #17473 from owncloud/enc_fix_migration
...
more secure way to update the database
2015-07-09 22:41:56 +02:00
eb7a796ad9
Fix unit tests
2015-07-09 18:42:46 +02:00
7d943b2ddc
Make the filelist get the mimetypeicon from the mimetype
2015-07-09 13:56:43 +02:00
a727cbc7a9
Remove ajax/mimeicon.php and its route
2015-07-09 13:40:13 +02:00
5c381ea532
Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl
2015-07-09 13:40:13 +02:00
Morris Jobke
Jenkins for ownCloud
Thomas Müller
Hendrik Leppelsack
Bjoern Schiessle
Joas Schilling
Bernhard Posselt
Robin McCorkell
Viktor Szépe
Joas Schilling
Björn Schießle
blizzz
Roeland Jago Douma
Vincent Petry
Nicolas Grekas
Robin Appelman