78203ecc2f
Merge pull request #18082 from owncloud/share-group-conflict
...
Re-use the share entry we have for the shared storage instead of searching for it every time
2015-08-06 12:21:59 +02:00
52085cc1ef
Merge pull request #16961 from owncloud/hardening-ldap
...
Hardening home folder retrieval in user_ldap
2015-08-06 11:32:43 +02:00
6787774a32
integration tests for hardening user home retrieval
2015-08-06 09:31:07 +02:00
7f44b0fd18
Merge pull request #18077 from owncloud/fix_18055
...
Set proper mimetype for directories
2015-08-05 23:38:02 +02:00
859da8f0b3
just pass the share instead of searching for it
2015-08-05 15:41:29 +02:00
085acaf6ba
add unit tests for share target conflict with group shares
2015-08-05 15:41:03 +02:00
bc91c5c2de
Set proper mimetype for directories
2015-08-05 13:54:09 +02:00
99224905d8
Use absolute namespace
2015-08-05 10:30:39 +02:00
728780aee8
Merge pull request #18024 from owncloud/phpseclib-2.0
...
Update phpseclib to 2.0 for increased PHP7 compatibility
2015-08-04 16:33:14 +02:00
7b70343dc3
fix infinite loops with propagating etags on reshares
2015-08-03 17:33:12 +02:00
4105d17133
Merge pull request #17989 from owncloud/enc_only_update_file_cache_once
...
only update database on the first run
2015-08-03 11:33:46 +02:00
3b803db6d8
Update phpseclib to 2.0
2015-08-03 09:43:45 +02:00
54e94b95bc
[tx-robot] updated from transifex
2015-08-01 01:55:02 -04:00
2f4bebb045
only update database on the first run (first run = we have a version number from the old encryption app)
2015-07-31 10:47:02 +02:00
de01951da3
[tx-robot] updated from transifex
2015-07-31 01:56:30 -04:00
5699fff889
Merge pull request #17175 from owncloud/add-download-feedback
...
Add loading spinner to download icon
2015-07-30 16:34:35 +02:00
a07254856c
[tx-robot] updated from transifex
2015-07-30 01:55:20 -04:00
0e922b1841
Only throw exception if on new LDAP setups
...
* this is done by setting enforce_home_folder_naming_rule for the user_ldap
app in the app settings
2015-07-29 20:25:05 +02:00
3fa6f6f77c
Hardening home folder retrieval in user_ldap
...
* if the home folder naming rule is specified it should not fallback
to the "use owncloud username as home folder" scenario
* this does not allow the mixed setup of users with the attribute
and some users without the attribute (which then would fallback to
"use owncloud username as home folder" rule) anymore
2015-07-29 20:25:05 +02:00
033eacefd1
use inline confirm button style for password-protected links, ref #15176
2015-07-29 16:31:45 +02:00
332492548f
Merge pull request #17923 from owncloud/fix-17921
...
Remove Log info when no group filter is set, fixes #17921
2015-07-29 16:12:08 +02:00
b0036ecff6
Merge pull request #17464 from owncloud/fix-17232
...
fix uncaught exception on not permitted file types when setting avatar, fixes #17232
2015-07-29 12:37:48 +02:00
e0d5eb8989
remove unused var
2015-07-29 12:10:33 +02:00
e77b2e5317
[tx-robot] updated from transifex
2015-07-29 01:55:08 -04:00
6f72c37464
Merge pull request #17922 from owncloud/smb-storageiddoubleslash
...
Double slash for SMB storage id for compatibility
2015-07-28 19:54:11 +01:00
761ba344b7
Double slash for SMB storage id for compatibility
2015-07-28 11:41:54 +02:00
81f5672393
Remove Log info when no group filter is set, fixes #17921
...
The log message is superfluous and too noisy. If an admin decides not to use groups, he does not need to be reminded about it on almost every request.
2015-07-28 11:41:21 +02:00
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
0967a54755
fix test after rebasing
2015-07-27 17:34:45 +02:00
b37d62d9d3
fix uncaught exception on not permitted file types when setting avatar, fixes #17232
2015-07-27 17:27:00 +02:00
85b7bde7d4
add integration tests for avatar update
2015-07-27 17:27:00 +02:00
68706de45b
refactor integration tests to make it easier to add new ones
2015-07-27 17:27:00 +02: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
a1037f1679
Do not use magic strings when there are constants for it
2015-07-22 15:10:34 +02:00
270ec3aaba
Make the favorite type stream only
2015-07-22 15:10:34 +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
009d1f3214
move updateFileActionSpinner to OCA.Files.FileActions
2015-07-22 10:35:15 +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
df19cabb44
Store storage availability in database
...
Storage status is saved in the database. Failed storages are rechecked every
10 minutes, while working storages are rechecked every request.
Using the files_external app will recheck all external storages when the
settings page is viewed, or whenever an external storage is saved.
2015-07-20 16:27:26 +01: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
db89d1cec8
handle rmdir on files for ftp storages
2015-07-16 15:44:10 +02: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
da951ba059
Use the new IteratorDirectory instead of the fakedir wrapper
2015-07-15 13:57:53 +02:00
43afa4c0e3
refactor this to proper separation of concerns
2015-07-15 11:14:20 +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
1aa2f6638f
Make getMimeIcon use OC.MimeType.getIconUrl
2015-07-09 13:40:12 +02:00
bfdf39b9bd
LDAP: when checking group for matching filter, also take base DN into consideration. Fixes #17516
2015-07-09 12:19:04 +02:00
2b86ba43e3
Merge pull request #14341 from rullzer/public_share_do_not_leak_mounttype
...
No more leaking of mounttype via metadata or icon in public shares.
2015-07-09 09:41:27 +02:00
6d9bb17360
[tx-robot] updated from transifex
2015-07-09 01:54:53 -04:00
1e284b15ff
only create new key pair if both keys are missing
2015-07-08 19:08:41 +02:00
85c3b9d5cf
only cleanUp the remaining keys if the migration really finished succesfully
2015-07-08 18:23:18 +02:00
876d7c160d
more secure way to update the database
2015-07-08 13:26:53 +02:00
db65eeb580
only move real files to the trash bin
2015-07-08 11:32:06 +02:00
03a6e12bdb
fix tipsy dependency
2015-07-08 10:55:53 +02:00
0fe81d2f21
Merge pull request #17330 from owncloud/fix-share-path-for-group-exceptions
...
Fix the path for users which have an exception for a group share
2015-07-08 10:33:42 +02:00
2fd84607ee
[tx-robot] updated from transifex
2015-07-08 01:55:28 -04:00
3f5aa27d49
refactoring into proper methods
2015-07-07 15:16:37 +02:00
Vincent Petry
Jörn Friedrich Dreyer
Arthur Schiwon
Morris Jobke
Robin Appelman
Roeland Jago Douma
Lukas Reschke
Thomas Müller
Björn Schießle
Andreas Fischer
Jenkins for ownCloud
Bjoern Schiessle
Jan-Christoph Borchardt
Robin McCorkell
Hendrik Leppelsack
Joas Schilling
Bernhard Posselt
Robin McCorkell
Viktor Szépe
Joas Schilling
Nicolas Grekas