Commit Graph

10958 Commits

Author SHA1 Message Date
Thomas Müller 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
Robin Appelman 7b70343dc3 fix infinite loops with propagating etags on reshares 2015-08-03 17:33:12 +02:00
Björn Schießle 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
Andreas Fischer 3b803db6d8 Update phpseclib to 2.0 2015-08-03 09:43:45 +02:00
Roeland Jago Douma 98a7e42ebb [provisioning api] Move away from OC\Util to OCP\Util 2015-08-02 10:27:36 +02:00
Roeland Jago Douma cea72c47f9 [provisioning_api] Move tests to OCP 2015-08-02 10:22:26 +02:00
Roeland Jago Douma a4822f9f9a [provisioning_api] Move part of apps to OCP 2015-08-02 10:22:26 +02:00
Roeland Jago Douma 97d79202ac [provisioning_api] OC_User to IUserSession 2015-08-02 10:22:26 +02:00
Roeland Jago Douma 9f59add9ed [provisioning_api] subadmin check for users 2015-08-02 10:22:26 +02:00
Roeland Jago Douma b745e75737 [provisioning_api] Moved groups away from static stuff 2015-08-02 10:22:26 +02:00
Roeland Jago Douma abca7737b7 [provisioning_api] Move users away from static code 2015-08-02 10:22:26 +02:00
Jenkins for ownCloud 54e94b95bc [tx-robot] updated from transifex 2015-08-01 01:55:02 -04:00
Bjoern Schiessle 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
Jenkins for ownCloud de01951da3 [tx-robot] updated from transifex 2015-07-31 01:56:30 -04:00
Morris Jobke 5699fff889 Merge pull request #17175 from owncloud/add-download-feedback
Add loading spinner to download icon
2015-07-30 16:34:35 +02:00
Jenkins for ownCloud a07254856c [tx-robot] updated from transifex 2015-07-30 01:55:20 -04:00
Morris Jobke 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
Morris Jobke 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
Jan-Christoph Borchardt 033eacefd1 use inline confirm button style for password-protected links, ref #15176 2015-07-29 16:31:45 +02:00
blizzz 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
blizzz 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
blizzz e0d5eb8989 remove unused var 2015-07-29 12:10:33 +02:00
Jenkins for ownCloud e77b2e5317 [tx-robot] updated from transifex 2015-07-29 01:55:08 -04:00
Robin McCorkell 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
Vincent Petry 761ba344b7 Double slash for SMB storage id for compatibility 2015-07-28 11:41:54 +02:00
blizzz 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
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
Arthur Schiwon 0967a54755 fix test after rebasing 2015-07-27 17:34:45 +02:00
Arthur Schiwon b37d62d9d3 fix uncaught exception on not permitted file types when setting avatar, fixes #17232 2015-07-27 17:27:00 +02:00
Arthur Schiwon 85b7bde7d4 add integration tests for avatar update 2015-07-27 17:27:00 +02:00
Arthur Schiwon 68706de45b refactor integration tests to make it easier to add new ones 2015-07-27 17:27:00 +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
Bjoern Schiessle 5923270004 add condition to update query 2015-07-27 12:08:13 +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
Jenkins for ownCloud 1e48eb8882 [tx-robot] updated from transifex 2015-07-25 01:54:48 -04: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
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
Jenkins for ownCloud 9ccf94ca06 [tx-robot] updated from transifex 2015-07-23 01:55:22 -04: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
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
Joas Schilling a1037f1679 Do not use magic strings when there are constants for it 2015-07-22 15:10:34 +02:00
Joas Schilling 270ec3aaba Make the favorite type stream only 2015-07-22 15:10:34 +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
Morris Jobke 009d1f3214 move updateFileActionSpinner to OCA.Files.FileActions 2015-07-22 10:35:15 +02:00
Viktor Szépe 4699a29a70 Fixing line comments and indentation 2015-07-21 22:19:53 +02:00
Joas Schilling f77e5f411d Fix existing usages by removing the quotes 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
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
Jenkins for ownCloud 24f12e65ec [tx-robot] updated from transifex 2015-07-21 01:54:52 -04:00
Robin McCorkell 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
Bjoern Schiessle 570dd17d4f fix mount point detection 2015-07-20 16:00:33 +02:00
Björn Schießle 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
Robin McCorkell d3bcafe618 Update .user.ini when setting upload size limit 2015-07-20 12:52:43 +01:00
blizzz 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
Jenkins for ownCloud 83a13c0635 [tx-robot] updated from transifex 2015-07-20 01:54:47 -04:00
Arthur Schiwon b961a29b0c fix indentation. no code changes, whitespace only. 2015-07-20 01:21:52 +02:00
Arthur Schiwon 4f910221c4 fix runtime caching in ldap's user manager, fixes #17631 2015-07-17 18:57:56 +02:00
Morris Jobke 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
Bjoern Schiessle 4dba920fdd unit tests 2015-07-17 15:19:10 +02:00
Bjoern Schiessle 3000f0125f don't move keys if the key where already moved in a previous migration run 2015-07-17 15:19:10 +02:00
Roeland Jago Douma b0f21c0a43 The external directories should get the correct icon 2015-07-17 14:30:12 +02:00
Jenkins for ownCloud 8723410319 [tx-robot] updated from transifex 2015-07-17 01:54:52 -04:00
Robin Appelman db89d1cec8 handle rmdir on files for ftp storages 2015-07-16 15:44:10 +02:00
Vincent Petry 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
Thomas Müller 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
blizzz 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
Nicolas Grekas 472d48f6e3 Do not use OC*::mb_*_replace(), they are useless 2015-07-16 11:00:04 +02:00
Robin Appelman 23d1cf26b9 Lock scanner to the given user 2015-07-15 14:08:06 +02:00
Robin Appelman da951ba059 Use the new IteratorDirectory instead of the fakedir wrapper 2015-07-15 13:57:53 +02:00
Morris Jobke 43afa4c0e3 refactor this to proper separation of concerns 2015-07-15 11:14:20 +02:00
Morris Jobke 5cd7f7eccd Merge pull request #17623 from owncloud/fed-throwcorrectexception
Throw storage not available on guzzle error
2015-07-14 10:12:32 +02:00
Jenkins for ownCloud 2d5ddb02fa [tx-robot] updated from transifex 2015-07-14 01:54:45 -04:00
Vincent Petry 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
Vincent Petry 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
Jenkins for ownCloud 52e9c94e08 [tx-robot] updated from transifex 2015-07-13 01:54:50 -04:00
Jenkins for ownCloud 7cf6badad5 [tx-robot] updated from transifex 2015-07-12 01:54:49 -04:00
Jenkins for ownCloud bfd7194cf9 [tx-robot] updated from transifex 2015-07-11 01:54:51 -04:00
Vincent Petry 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
Jenkins for ownCloud 176dabd976 [tx-robot] updated from transifex 2015-07-10 01:54:55 -04:00
Morris Jobke 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
Roeland Jago Douma eb7a796ad9 Fix unit tests 2015-07-09 18:42:46 +02:00
Roeland Jago Douma 7d943b2ddc Make the filelist get the mimetypeicon from the mimetype 2015-07-09 13:56:43 +02:00
Roeland Jago Douma a727cbc7a9 Remove ajax/mimeicon.php and its route 2015-07-09 13:40:13 +02:00
Roeland Jago Douma 5c381ea532 Move calls to Files.getMimeIcon to OC.MimeType.getIconUrl 2015-07-09 13:40:13 +02:00
Roeland Jago Douma 1aa2f6638f Make getMimeIcon use OC.MimeType.getIconUrl 2015-07-09 13:40:12 +02:00
Arthur Schiwon bfdf39b9bd LDAP: when checking group for matching filter, also take base DN into consideration. Fixes #17516 2015-07-09 12:19:04 +02:00
Morris Jobke 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
Jenkins for ownCloud 6d9bb17360 [tx-robot] updated from transifex 2015-07-09 01:54:53 -04:00
Bjoern Schiessle 1e284b15ff only create new key pair if both keys are missing 2015-07-08 19:08:41 +02:00
Bjoern Schiessle 85c3b9d5cf only cleanUp the remaining keys if the migration really finished succesfully 2015-07-08 18:23:18 +02:00
Bjoern Schiessle 876d7c160d more secure way to update the database 2015-07-08 13:26:53 +02:00
Bjoern Schiessle db65eeb580 only move real files to the trash bin 2015-07-08 11:32:06 +02:00
Hendrik Leppelsack 03a6e12bdb fix tipsy dependency 2015-07-08 10:55:53 +02:00
Morris Jobke 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
Jenkins for ownCloud 2fd84607ee [tx-robot] updated from transifex 2015-07-08 01:55:28 -04:00
Morris Jobke 3f5aa27d49 refactoring into proper methods 2015-07-07 15:16:37 +02:00
Morris Jobke 3d8297c254 Fix unit tests and introduce better mocks of the HTML 2015-07-07 13:56:49 +02:00
Morris Jobke e557fe0aab Add proper download started feedback
* this code adds a cookie when a special get parameter is set
* the content of this get parameter is used as value for the cookie
* the cookie expires after 20 seconds
* the JS code checks every 500 milliseconds for the cookie
  -> if the cookie is set the request returned and the download is started
2015-07-07 13:56:49 +02:00
Morris Jobke 5a528214b8 Make download status fully visible 2015-07-07 13:56:49 +02:00
Morris Jobke 28a8697995 Reduce timeout for download spinner to 2 seconds 2015-07-07 13:56:49 +02:00
Morris Jobke 16c29021e6 Add loading spinner to multi select download button 2015-07-07 13:56:48 +02:00
Morris Jobke 0cdb46b5c6 Fix layout of disabled links in the file list
* also disable download button after click
2015-07-07 13:56:48 +02:00
Morris Jobke 28a51ef724 Add loading spinner to download icon
* vanishes after 7 seconds
2015-07-07 13:56:48 +02:00
Joas Schilling 594f5b6a29 Add visibility to test methods 2015-07-07 11:07:11 +02:00
Vincent Petry fb0fef78f4 Add test case when owner renames shared folder 2015-07-07 11:06:21 +02:00
Vincent Petry 547c4b9a9f Add unit test for getUsersSharingFile
This is to test if the user list and paths are correct, even when a
recipient renamed the received shared folder
2015-07-07 11:06:11 +02:00
Jenkins for ownCloud ee5dd25290 [tx-robot] updated from transifex 2015-07-07 01:55:18 -04:00
Roeland Douma b4f782b568 Merge pull request #16724 from owncloud/mimetype-js
Javascript to fetch mimetype icons
2015-07-06 20:59:56 +02:00
Jan-Christoph Borchardt e84806f017 Merge pull request #17418 from owncloud/fix-public-download-button-regression
Fix regression of button at public download page
2015-07-06 17:10:23 +02:00
Roeland Jago Douma 868bc421cb Share app no longer use the OCS API icon
Switch to new javascript mimetype resolver
2015-07-06 16:32:15 +02:00
Thomas Müller 14eef434ff Merge pull request #17290 from owncloud/remove-readonly-wrapper
Replace readonly wrapper with permissions mask
2015-07-06 15:36:11 +02:00
Thomas Müller dba6ba2523 Merge pull request #16964 from owncloud/versions_occ
add occ tool to delete versions
2015-07-06 15:34:40 +02:00
Morris Jobke 7da5e53741 Fix regression of button at public download page
* introduced with #17159
2015-07-06 13:37:14 +02:00
Joas Schilling 4dbc8ab77f Merge pull request #17335 from owncloud/better-federated-cloud-sharing-activities
Improve federated cloud sharing activities
2015-07-06 10:23:33 +02:00
Joas Schilling fca6bcb632 Merge pull request #16733 from owncloud/add-smashbox-tests-remote-shares
Add OCS API to send, get, accept and decline remote shares
2015-07-06 10:12:29 +02:00
Jenkins for ownCloud 5734edfe20 [tx-robot] updated from transifex 2015-07-06 01:54:38 -04:00
Jenkins for ownCloud 55f4d0eea1 [tx-robot] updated from transifex 2015-07-05 01:54:50 -04:00
Jenkins for ownCloud 468871818d [tx-robot] updated from transifex 2015-07-04 01:55:24 -04:00
Roeland Jago Douma cf732c4d27 Do not leak mounttype of a public share 2015-07-04 07:27:56 +02:00
Thomas Müller d3ac73c0c9 Remove OC_Log 2015-07-03 18:00:16 +02:00
Vincent Petry cc373ab89a Merge pull request #15470 from rullzer/files_sharing_getUrlContent
Move away from private static function OC_Util::getUrlContent
2015-07-03 17:47:46 +02:00
Bjoern Schiessle 763b601e4a use the correct user if we update the share table 2015-07-03 15:58:52 +02:00
Björn Schießle 525745caf5 Merge pull request #17140 from owncloud/trashbin_occ
add occ command to remove deleted files
2015-07-03 15:10:50 +02:00
Morris Jobke 9da10788bc Merge pull request #17349 from owncloud/share-onlyshowstaticownerifavailable
Do not show static share owner if not available
2015-07-03 09:31:40 +02:00
Joas Schilling 2118713477 Add OCS api to get, accept and decline remote shares 2015-07-03 09:30:49 +02:00
Joas Schilling df303b910a Allow sharing with type remote share 2015-07-03 09:28:56 +02:00
Jenkins for ownCloud b8f5b2c47a [tx-robot] updated from transifex 2015-07-03 01:54:57 -04:00
Morris Jobke a3df41ddb6 Merge pull request #17159 from owncloud/fix-duplicate-id
remove duplicate ID in HTML template for public shares
2015-07-02 17:50:39 +02:00
Vincent Petry 71ae96bb56 Do not show static share owner if not available
In some corner cases, an outgoing share exists but sharing is not
allowed for the current user. This would cause the file list to break
because the static text could not be rendered as the owner was
undefined.
2015-07-02 16:38:20 +02:00
Vincent Petry e65034e4bc Do not register JS share plugin if core sharing API is disabled 2015-07-02 14:56:33 +02:00
Joas Schilling ddb8cc2303 Use federated cloud id as a parameter type 2015-07-02 13:14:02 +02:00
Thomas Müller 063071b58d Merge pull request #17328 from owncloud/revert-15363-ext-ocp
Revert "Use OCP classes as much as possible in files_external"
2015-07-02 13:02:35 +02:00
Morris Jobke f5c57e076e Merge pull request #17077 from owncloud/files-scan-absolute-path
fix getting mount points when passing a path to the files:scan command
2015-07-02 13:02:20 +02:00
Vincent Petry aedf4848f7 Merge pull request #17324 from owncloud/fix-duplicated-line-in-doc-block
Fix duplicated line in doc block
2015-07-02 13:00:22 +02:00
Thomas Müller 079e9cecba Revert "Use OCP classes as much as possible in files_external" 2015-07-02 13:00:21 +02:00
Joas Schilling c7968d202f Merge pull request #17316 from owncloud/master-delete-ocsid-from-db-if-none-specified
[Master] Delete OCS ID from DB if none is specified
2015-07-02 12:37:31 +02:00
Joas Schilling aa7c8ad191 Add the item name to the federated sahre activity 2015-07-02 12:28:48 +02:00
Joas Schilling 95faaad5cf Use the app constant to fix the grouping 2015-07-02 12:27:58 +02:00
Joas Schilling 7e3f8d3ac1 Use the item name when refering to the unaccepted remote share 2015-07-02 12:26:06 +02:00
Joas Schilling bfcb8ffeb3 Merge pull request #17246 from owncloud/share-lock-owner-parent
lock parent folders for the owner when locking a shared file as recipient
2015-07-02 10:38:08 +02:00
Joas Schilling a6ea91996c Fix duplicated line in doc block 2015-07-02 10:24:16 +02:00
Lukas Reschke b100036457 Bump versions 2015-07-02 09:18:41 +02:00
Lukas Reschke 68f8717056 [master] Remove OCS IDs
While making the AppStore ready for 8.1 I also deleted some dummy entries which means that these IDs do not resolve anymore. We should remove them to prevent errors such as https://github.com/owncloud/core/issues/17307

Ref https://github.com/owncloud/activity/issues/320#issuecomment-117691867
2015-07-02 08:45:16 +02:00
Jenkins for ownCloud d2e1cae331 [tx-robot] updated from transifex 2015-07-02 01:59:26 -04:00
Vincent Petry 9c06975bd5 Fix scanFile signature to avoid boring warning 2015-07-01 16:29:11 +02:00
Robin Appelman dd20cd1995 remove no longer needed readonly wrapper 2015-07-01 15:45:54 +02:00
Robin Appelman 365fafc9bc use permissions mask wrapper instead of readonly wrapper 2015-07-01 15:45:23 +02:00
Robin Appelman 3c0be7d126 only lock the parent folders 2015-07-01 15:10:25 +02:00
Robin Appelman d6f56ea609 lock parent folders for the owner when locking a shared file as recipient 2015-07-01 15:10:22 +02:00
Vincent Petry 5caeda33f1 Merge pull request #17273 from owncloud/s2s-catchmoreexceptiontypes
Catch more error codes thrown by federated shares
2015-07-01 12:30:32 +02:00
Vincent Petry 5d3aa36355 Catch more error codes thrown by federated shares
Most of the time it doesn't make sense to forward Guzzle's
RequestException, so we convert it to StorageNotAvailable instead.

This prevents unpredictable error codes to block access to unrelated
folders needlessly.
2015-07-01 11:14:03 +02:00
Robin McCorkell 728a22cda1 Use OCP classes as much as possible in files_external 2015-07-01 09:08:28 +02:00
Morris Jobke 8f05d4b662 Merge pull request #16535 from rullzer/ocs_share_api_url
OCS Share API link shares now always have an url
2015-07-01 08:54:48 +02:00
Morris Jobke 044d2ece07 Merge pull request #15506 from rullzer/core_apps_oc_log2ocp_util
Move core apps from OC_Log::write to OCP\Util
2015-07-01 08:53:16 +02:00
Morris Jobke f25b71f70e Merge pull request #15475 from rullzer/files_sharing_OCP_DB
Move files sharing app (mostly) to OCP\DB
2015-07-01 08:53:03 +02:00
Thomas Müller 0a23d566ba Merge pull request #17255 from owncloud/fix-17119
[LDAP] Filter user groups obtained by memberof
2015-07-01 00:33:39 +02:00
Arthur Schiwon 5f4db0540a tests solidity 2015-06-30 14:09:11 +02:00
Arthur Schiwon 646f2f1d41 adjust unit test 2015-06-30 13:56:25 +02:00
Arthur Schiwon 663cd7af4d integration test 2015-06-30 12:52:27 +02:00
Thomas Müller 372a9afabe Fixing ctor calls and ctor itself to not break usage in calendar and contacts ..... 2015-06-29 15:54:05 +02:00
Robin Appelman abb0c728ef handle error during setup 2015-06-29 14:06:32 +02:00
Vincent Petry b55f71ee03 Merge pull request #17083 from owncloud/share-etag-update-target
take share target into account when updating recipient etags
2015-06-29 09:10:37 +02:00
Jenkins for ownCloud 733d59ed44 [tx-robot] updated from transifex 2015-06-29 01:54:44 -04:00
Jenkins for ownCloud 4d565a8447 [tx-robot] updated from transifex 2015-06-28 01:55:19 -04:00
Lukas Reschke af01958f3e Add missing annotations for parameters 2015-06-27 20:35:47 +02:00
Lukas Reschke d1f0ff372e Merge pull request #17163 from owncloud/update-licenses
Update license headers
2015-06-27 20:22:23 +02:00
Lukas Reschke 465606c254 Merge pull request #17199 from owncloud/feature/show-error-when-shareservice-dies
add check if server returns a 500 and display error
2015-06-27 09:34:34 +02:00
Jenkins for ownCloud 28c223edc6 [tx-robot] updated from transifex 2015-06-27 01:55:58 -04:00
Clark Tomlinson ca1da0acb7 add check if server returns a 500 and display error
resolves https://github.com/owncloud/core/issues/17170
2015-06-26 12:50:09 -04:00
Olivier Paroz b30515ddda Signature of overriding method should match the parent 2015-06-26 17:45:04 +02:00
Arthur Schiwon 8625a8cf23 ensure groups match filter when using memberOf to read users group, refs #17119 2015-06-26 16:42:11 +02:00
Vincent Petry 56d9df34cb Unit test for etag update on custom share folder 2015-06-26 16:32:28 +02:00
Björn Schießle b318b9cf17 Merge pull request #17008 from owncloud/fix-17006
Improve splitting of username and remote adress when username contains an `@`
2015-06-26 16:01:16 +02:00
Thomas Müller 9558562883 Merge pull request #17082 from owncloud/shared-etag-propagate-file
Fix etag propagation for single file shares
2015-06-26 12:36:17 +02:00
Jenkins for ownCloud b1e29c7dde [tx-robot] updated from transifex 2015-06-26 01:55:35 -04:00
Robin Appelman 0128a86df1 add some docs 2015-06-25 14:29:40 +02:00
Morris Jobke f63915d0c8 update license headers and authors 2015-06-25 14:13:49 +02:00
Morris Jobke 5cb1e20214 remove duplicate ID in HTML template for public shares 2015-06-25 10:13:56 +02:00
Morris Jobke 160d8003f8 Merge pull request #17152 from owncloud/LDAP/AD-Typo
Ldap/ad typo
2015-06-25 07:56:04 +02:00
Jenkins for ownCloud dddbfb903f [tx-robot] updated from transifex 2015-06-25 01:55:15 -04:00
Lukas Reschke a63f6023fd Dropped an S from the mouseover
We had a typo in the ldap initial binding menu mouse over, so changed the text in all references to be correct.
2015-06-24 22:10:10 +02:00
Bjoern Schiessle 407db913de add occ command to trashbin to remove deleted files 2015-06-24 19:09:20 +02:00
Robin Appelman c87ab65081 fix etag propagation for single file shares 2015-06-24 18:16:03 +02:00
Robin Appelman f847d9409e add unit test for single file share etag propagation 2015-06-24 18:16:03 +02:00
Morris Jobke 5f59393b30 Merge pull request #17110 from owncloud/share-error-handling
[sharing] handle shares of users that aren't available anymore
2015-06-24 17:38:34 +02:00
Lukas Reschke 004280e407 Merge pull request #17136 from rullzer/fix_remove_link_OCS
Allow removing of link password in OCS again
2015-06-24 16:45:00 +02:00
Roeland Jago Douma 6c3da1ec90 Added unit test to verify link password removeal 2015-06-24 12:38:33 +02:00
Thomas Müller 4da1c84296 Rename user_webdavauth to prevent accidental activation - refs #17112 2015-06-24 12:17:17 +02:00
Jenkins for ownCloud ceb80ac123 [tx-robot] updated from transifex 2015-06-24 01:55:55 -04:00
Morris Jobke 4f2f8a6f28 [sharing] handle shares of users that aren't available anymore
* properly handle the case where an abandoned share is left and
  simply skip it
2015-06-23 18:22:36 +02:00
Vincent Petry e01db549a0 Merge pull request #17048 from owncloud/hotfix/fix-firewall-blocking-dir-message
adding correct blocking logic for ffw
2015-06-23 15:08:47 +02:00
Björn Schießle cce841c665 Merge pull request #17045 from owncloud/enc_improvements
encryption improvements
2015-06-23 14:30:21 +02:00
Morris Jobke a059b090c3 Merge pull request #17085 from owncloud/use-trusted-mimetype
Use trusted mimetype
2015-06-23 08:45:05 +02:00
Jenkins for ownCloud 3cad0d4ed2 [tx-robot] updated from transifex 2015-06-23 01:56:15 -04:00
Thomas Müller 25581c7b63 Merge pull request #16940 from owncloud/ext-s3-touchmtimefix
Properly set mtime on S3 for touch operation
2015-06-22 22:25:45 +02:00
Robin Appelman 5e1865530b take share target into account when updating recipient etags 2015-06-22 18:21:54 +02:00