Commit Graph

10918 Commits

Author SHA1 Message Date
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
Clark Tomlinson 5466dcadc0 adding correct blocking logic for fff 2015-06-22 11:42:42 -04:00
VicDeo 5cfcda3e95 Merge pull request #17068 from owncloud/fix_16878
fix search for results only from subfolder
2015-06-22 17:55:56 +03:00
Joas Schilling 738b78f1b0 Use \OC\HintException and translate the hint 2015-06-22 15:34:06 +02:00
Jan-Christoph Borchardt 9dde482315 remove whitespace on bottom when no search results, fix laylout, fix #16878 2015-06-22 15:30:29 +02:00
Lukas Reschke 3d2ac6dbb6 Use trusted mimetype
We shall not use untrusted mimetypes in this context
2015-06-22 15:30:27 +02:00
Bjoern Schiessle 8eda9ae83c add filter-empty class if no search result in current folder 2015-06-22 12:13:05 +02:00
Jenkins for ownCloud c77e44117d [tx-robot] updated from transifex 2015-06-22 01:55:00 -04:00
Robin McCorkell 05fb9ceef9 Merge pull request #17025 from owncloud/sftp-rmdir-emptydir
Workaround for empty dir deletion for SFTP
2015-06-21 23:50:58 +01:00
Jenkins for ownCloud 59513ac377 [tx-robot] updated from transifex 2015-06-21 01:55:06 -04:00
Jenkins for ownCloud 183bd6dd49 [tx-robot] updated from transifex 2015-06-20 01:55:10 -04:00
Bjoern Schiessle ed3dc199ae remove files_encryption from database at the end of the migration process 2015-06-19 14:15:56 +02:00
Thomas Müller 5c2646a4bf Merge pull request #17024 from owncloud/master-verify-if-path-exists-in-upload
[master] Verify if path exists
2015-06-19 13:20:38 +02:00
Jenkins for ownCloud a5eb2f01a9 [tx-robot] updated from transifex 2015-06-19 01:55:29 -04:00
Vincent Petry e15dd783ab Workaround for empty dir deletion for SFTP
Explicitly clear the stat cache after deleting an empty folder to make
sure it is properly detected as deleted in subsequent requests.

This works around a problem with phpseclib where the folder is properly
deleted remotely but the stat cache was not updated.
2015-06-18 17:40:38 +02:00
Lukas Reschke ebb5523698 Verify if path exists
We need to check if the path exists and throw an error instead of handling this situation ungraciously.
2015-06-18 16:48:32 +02:00
Björn Schießle 7a0917e5b2 Merge pull request #16692 from owncloud/add_social_media_buttons
Add social media buttons
2015-06-18 14:41:58 +02:00
Bjoern Schiessle f9093466bf add id to url 2015-06-18 13:00:50 +02:00
Thomas Müller a04cb82fd9 Merge pull request #16890 from owncloud/fix-16588
the user is gone, userExists will not bring him back. But the user's …
2015-06-18 12:51:06 +02:00
Lukas Reschke 8d4f918671 Merge pull request #16993 from owncloud/verify-if-path-exists
[master] Verify if path exists
2015-06-18 10:05:12 +02:00
Jenkins for ownCloud c4cb34da9d [tx-robot] updated from transifex 2015-06-18 01:55:14 -04:00
Morris Jobke 9a0b0ba488 Merge pull request #16893 from owncloud/fixSlideToggle
Fix childs of slideToggle not sliding the target
2015-06-17 16:06:47 +02:00
Jan-Christoph Borchardt b43bfaf132 fix look of 'Share with me via ownCloud' button, fix wording 2015-06-17 16:05:05 +02:00
Lukas Reschke 414896d8a0 Throw nicer error message instead 500 2015-06-17 15:39:13 +02:00
Lukas Reschke 2d648ed0eb Verify if path exists
We need to verify if the specified path exists to gracefully prevent errors.
2015-06-17 15:06:50 +02:00
Jan-Christoph Borchardt 2abedd544b remove unneeded span around Settings text, fixes cursor 2015-06-17 14:37:58 +02:00
Arthur Schiwon 0e522a0b01 delete user test to take getHome into account to ensure it is also deleted subsequently 2015-06-17 14:13:01 +02:00
Bjoern Schiessle fa16c1f9b4 fix path to owncloud logo 2015-06-17 13:53:59 +02:00
Bjoern Schiessle ac9733a8b8 make the click actions work 2015-06-17 13:53:59 +02:00
Jan-Christoph Borchardt 4599da9608 federated cloud ID: add icons, fix HTML & layout, fix wording 2015-06-17 13:53:59 +02:00
Bjoern Schiessle 06d0a41915 add social media button for diaspora, twitter, facebook and google+ 2015-06-17 13:53:59 +02:00
Thomas Müller d2305f2527 Merge pull request #16729 from owncloud/scanner-read-lock
keep a read lock while scanning a file or folder
2015-06-17 11:52:54 +02:00
Jenkins for ownCloud 3898b8c9b8 [tx-robot] updated from transifex 2015-06-17 01:55:34 -04:00
Bjoern Schiessle b645d795d2 add occ tool to delete versions 2015-06-16 16:56:27 +02:00
Morris Jobke b052eccd9a Merge pull request #16938 from owncloud/ext-s3-opendirduplicate
Skip directory entry in S3 opendir
2015-06-16 09:48:10 +02:00
Jenkins for ownCloud 0a5d73b874 [tx-robot] updated from transifex 2015-06-16 01:55:41 -04:00
Vincent Petry f98030020f Properly set mtime on S3 for touch operation
The code was missing the "MetadataDirective".
Once added, some other parts of the code failed because the format of mtime was wrong.
So this PR uses the RFC format that the S3 library already uses.

Additionally, the code path where mtime is null was missing. Now defaulting to
the current time.
2015-06-15 17:35:09 +02:00
Vincent Petry d3f828af45 Skip directory entry in S3 opendir
The result set contains the directory itself, so skip it to avoid
scanning a non-existing directory
2015-06-15 17:30:09 +02:00
Robin Appelman f02e110aea explain pre-hook scan 2015-06-15 15:43:19 +02:00
Robin Appelman 5efbab4ab8 ensure we dont have to scan a file in the trash wrapper 2015-06-15 14:32:29 +02:00
Thomas Müller 433db48027 Merge pull request #16911 from oparoz/prettier-public-thumbnails
Determine the size we need before asking for a thumbnail
2015-06-15 13:30:44 +02:00
Thomas Müller 3ce616fb03 Merge pull request #16885 from owncloud/files-previewurlresolutionrounding
Truncate preview resolution
2015-06-15 12:53:05 +02:00
Jenkins for ownCloud 2806c9476c [tx-robot] updated from transifex 2015-06-15 01:54:58 -04:00
Jenkins for ownCloud fe9b28a800 [tx-robot] updated from transifex 2015-06-14 01:54:49 -04:00
Jenkins for ownCloud 51d181f331 [tx-robot] updated from transifex 2015-06-13 01:55:04 -04:00
Olivier Paroz 7b84343cfc floats are not welcome when setting the size of a preview 2015-06-12 18:56:18 +02:00
Olivier Paroz 8ff4a66f01 Determine the size we need before asking for a thumbnail
We need to set the size of the preview using the devicePixelRatio and use that as arguments when using the preview endpoint or that endpoint will use the default 36x36 and thumbnails will be blurry on high DPI devices
2015-06-12 18:50:21 +02:00
Jenkins for ownCloud abd70932c6 [tx-robot] updated from transifex 2015-06-12 01:55:11 -04:00
Arthur Schiwon 97127cd971 the user is gone, userExists will not bring him back. But the user's folder needs to be deleted anyway 2015-06-11 18:24:45 +02:00
Vincent Petry d256425aba Truncate preview resolution
This prevents having float numbers appear in the URL
2015-06-11 17:17:40 +02:00
Jenkins for ownCloud 88d3c9ad40 [tx-robot] updated from transifex 2015-06-11 01:55:05 -04:00
Thomas Müller 4747c7f509 Merge pull request #16736 from owncloud/utilize-member-of
Utilize memberOf to boost loading time on users page (depending on LDAP server config)
2015-06-10 08:47:53 +02:00
Jenkins for ownCloud 4d88302b3a [tx-robot] updated from transifex 2015-06-10 01:54:55 -04:00
Thomas Müller 5f4f7e69cf Merge pull request #16810 from owncloud/disable-search-if-not-implemented
Disable search field in case there is no search available to the curr…
2015-06-09 23:49:25 +02:00
Morris Jobke 7550bf0917 Disable video preview if previews are disabled 2015-06-09 17:49:59 +02:00
Thomas Müller 0fde0e6569 Search results have to explicitly be added to the content area of the app 2015-06-09 12:39:40 +02:00
Morris Jobke bacd5de453 Merge pull request #16811 from espenfjo/master
Fix regression in preview height calculation
2015-06-09 09:31:30 +02:00
Jenkins for ownCloud 75bd040f1c [tx-robot] updated from transifex 2015-06-09 01:55:06 -04:00
Bjoern Schiessle d743d6d356 add hint to exception 2015-06-08 21:16:23 +02:00
Espen Fjellvær Olsen 308b97db4c Fix regression in preview height calculation
Fix regressions introduced in a672e9d regarding the image height calculation
2015-06-08 20:57:19 +02:00
Jenkins for ownCloud 2fb1b0864a [tx-robot] updated from transifex 2015-06-08 01:55:01 -04:00
Jenkins for ownCloud 3542148761 [tx-robot] updated from transifex 2015-06-07 01:55:03 -04:00
Jenkins for ownCloud 16708ae187 [tx-robot] updated from transifex 2015-06-06 01:55:26 -04:00
Morris Jobke 62ae39208a Add owner to the storage stats to enable better notifications
* getstoragestats.php returns now the owner and it's display name
* show proper storage stats notifications for shared folders
2015-06-05 18:21:41 +02:00
Thomas Müller 9899e10a04 Merge pull request #16753 from owncloud/issue-16752-check-for-existing-user-in-expire-tasks
Check whether the user exists before trying to set up his file system
2015-06-05 16:22:03 +02:00
Joas Schilling bd0b9a0fe0 Add unit tests for non existing users 2015-06-05 13:23:50 +02:00
Thomas Müller ccbb1cce3c Merge pull request #16718 from owncloud/files-catchajaxexceptions
Catch exceptions in files ajax calls
2015-06-05 12:01:01 +02:00
Joas Schilling 4e24486a89 Check whether the user exists before trying to set up his file system 2015-06-05 11:31:49 +02:00
Morris Jobke c747a58978 Merge pull request #16748 from owncloud/fix-ldap-port-detection-regression
port detection needs to take care of now thrown exceptions when LDAP …
2015-06-05 11:10:37 +02:00
Jenkins for ownCloud e544d5b2c6 [tx-robot] updated from transifex 2015-06-05 01:55:04 -04:00
Arthur Schiwon 6f69fab384 port detection needs to take care of now thrown exceptions when LDAP server is not available 2015-06-04 16:28:48 +02:00
Jenkins for ownCloud 66a24ff479 [tx-robot] updated from transifex 2015-06-04 01:56:24 -04:00
Arthur Schiwon 090478a95e if possible, getUserGroups should get memberships using memberOf virtual attribute 2015-06-03 17:38:27 +02:00
Morris Jobke a90a84b0a7 Merge pull request #16691 from owncloud/trash-deleteasrecipientkeepversions
Keep versions when deleting as recipient
2015-06-03 16:03:31 +02:00
Arthur Schiwon 91841bb25d Implement a faster way for checking availability of memberOf. Users tab in the wizard benefits. 2015-06-03 15:23:37 +02:00
Vincent Petry 263bb46ff8 Catch exceptions in files ajax calls 2015-06-03 14:31:58 +02:00
Joas Schilling d3e3a84cae Move the helpful method to the TestCase class 2015-06-03 12:33:29 +02:00
Jenkins for ownCloud 410a836702 [tx-robot] updated from transifex 2015-06-03 01:55:29 -04:00
Vincent Petry 61356b5560 Keep versions when deleting as recipient
The original owner could not be resolved because the original file was
already deleted, so no versions were retained.

This fix passes the owner and path to retainVersions() since it was
already resolved before the file deletion. This reactivates the versions
logic and creates a copy of the versions in each trashbin.
2015-06-02 17:13:00 +02:00
Lukas Reschke 1cccb227c3 Merge pull request #16686 from owncloud/show_cloud_id
show federated cloud id in the personal settings
2015-06-02 17:05:33 +02:00
Morris Jobke 70f0cf67a5 L10n for federated cloud ID and rtrim '/' on ID 2015-06-02 15:16:21 +02:00
Bjoern Schiessle 6e5ed81064 show federated cloud id in the personal settings 2015-06-02 14:09:53 +02:00
Morris Jobke cf2c599218 Merge pull request #16200 from owncloud/kill-globalfilecache
Drop file caching
2015-06-02 09:11:33 +02:00
Jenkins for ownCloud baca5c60c0 [tx-robot] updated from transifex 2015-06-02 01:56:23 -04:00
Lukas Reschke 418f4e1a90 Bump Dropbox library to newest upstream version 2015-06-01 17:03:46 +02:00
Robin Appelman 661c9e2444 add changeLock to the storage api 2015-06-01 13:24:02 +02:00
Robin Appelman 536e187e51 add locking to the storage api 2015-06-01 13:22:56 +02:00
Vincent Petry 5a38964218 Merge pull request #16629 from owncloud/files-renametoreservedname
Check target name on rename with web UI
2015-06-01 11:07:08 +02:00
Lukas Reschke 88ee082115 Merge pull request #16638 from owncloud/fix-handlebars-l10n-method-calls
Fix files_external l10n
2015-06-01 09:11:21 +02:00
Jenkins for ownCloud b1ac538679 [tx-robot] updated from transifex 2015-06-01 01:54:54 -04:00
Jenkins for ownCloud 8d23b34402 [tx-robot] updated from transifex 2015-05-31 01:54:44 -04:00
Morris Jobke 80d4309669 Fix files_external l10n
* current l10n..pl script can't extract JS functions that are within a handlebars
  template - therefore they are duplicated until the script is fixed
2015-05-30 14:00:52 +02:00
Jenkins for ownCloud a3bc112412 [tx-robot] updated from transifex 2015-05-30 01:55:46 -04:00
Vincent Petry 13617c8bf1 Check target name on rename with web UI
When renaming over the web UI, check early that the target name is
valid.

This prevents nonsensical error messages when renaming to a name with a
trailing backslash.
2015-05-29 19:30:09 +02:00
Björn Schießle 01a241f711 Merge pull request #16622 from owncloud/versions-cancelexpireforunexistingfiles
Abort expiration when file is gone
2015-05-29 15:19:04 +02:00
Vincent Petry 9a6d253af3 Abort expiration when file is gone
Sometimes a background job for versions expiration was scheduled for a
file that has been moved or deleted since.

This prevents showing useless warnings in the log and simply bail out.
2015-05-29 13:15:12 +02:00
Thomas Müller c700f42b68 Merge pull request #16517 from owncloud/remove-logo-wide
replace logo-wide on share page as well with better icon + text
2015-05-29 12:15:02 +02:00
Martin f084eb07f2 Missing translation in ldap part.wizard-server.php 2015-05-29 10:50:02 +02:00
Jenkins for ownCloud fff0fb66d6 [tx-robot] updated from transifex 2015-05-29 01:56:13 -04:00
Thomas Müller b95ebb76e5 Merge pull request #16607 from owncloud/ie9-textpreviewfallback
Fallback to picture preview for IE <= 9
2015-05-28 20:45:14 +02:00
Thomas Müller 863139c1e2 Merge pull request #16585 from mmattel/Missing_translation_in_External_storage_back_end
Make string 'SFTP with secret key login' translateable
2015-05-28 20:42:08 +02:00
Vincent Petry 29c68a4e61 Return 404 in shareinfo.php when outgoing s2s disabled 2015-05-28 17:59:43 +02:00
Vincent Petry 2daef7c7dc Fallback to picture preview for IE <= 9
IE 9 and below do not provide window.btoa and there is currently no way
to generate base64 strings without introducting further dependencies.

So for now the solution is to fall back to the ugly picture mode for
text files whenever IE <= 9 is used.
2015-05-28 15:36:28 +02:00
Björn Schießle e1483f65c3 Merge pull request #16591 from owncloud/enc_improved_error_message
improved error message for various states
2015-05-28 10:55:53 +02:00
Jenkins for ownCloud 1726d84e73 [tx-robot] updated from transifex 2015-05-28 01:55:22 -04:00
Bjoern Schiessle 68db3059ee detect migration status 2015-05-27 21:00:02 +02:00
Bjoern Schiessle 5549641f1f improve error messages displayed to the user 2015-05-27 21:00:02 +02:00
Martin cdbf472c4d Make string 'SFTP with secret key login' translatable 2015-05-27 15:38:05 +02:00
Jenkins for ownCloud fda0995e4c [tx-robot] updated from transifex 2015-05-27 01:55:34 -04:00
Björn Schießle 9366dde875 Merge pull request #15985 from owncloud/hotfix/fix-encryption-references
[enc2] fix references to legacy encryption app name
2015-05-26 17:28:27 +02:00
Vincent Petry 39c6a36488 Merge pull request #16532 from owncloud/cors-no-cookie-auth
Disallow cookie auth for cors requests
2015-05-26 12:12:04 +02:00
Jenkins for ownCloud 6198fb20cb [tx-robot] updated from transifex 2015-05-26 01:54:57 -04:00
Jenkins for ownCloud fe610a65d3 [tx-robot] updated from transifex 2015-05-25 01:55:06 -04:00
Jenkins for ownCloud 06934e7c00 [tx-robot] updated from transifex 2015-05-24 01:55:03 -04:00
Jenkins for ownCloud e189435499 [tx-robot] updated from transifex 2015-05-23 01:55:05 -04:00
Roeland Jago Douma 41a8f45b93 OCS Share API link shares now always have an url
To make sure clients have the correct and latest link add an url field
to all OCS Share API return statements on public link shares.

* Added unit tests
2015-05-22 14:42:57 +02:00
Bernhard Posselt c8e3599cad disallow cookie auth for cors requests
testing ...

fixes

fix test

add php doc

fix small mistake

add another phpdoc

remove not working cors annotations from files app
2015-05-22 14:06:26 +02:00
Jenkins for ownCloud 156881efce [tx-robot] updated from transifex 2015-05-22 01:55:04 -04:00
Jan-Christoph Borchardt 78a0464354 replace logo-wide on share page as well with better icon + text 2015-05-22 00:04:47 +02:00
Jenkins for ownCloud 42dd40ad80 [tx-robot] updated from transifex 2015-05-21 01:55:57 -04:00
Vincent Petry d560d1ef2a Merge pull request #16469 from oparoz/restore-minheight-for-single-public-previews
Restore min-height for single previews
2015-05-20 16:48:27 +02:00
Morris Jobke 39d1e99228 Merge pull request #16322 from owncloud/trash-view
dont go trough the view when moving to trash
2015-05-20 14:44:01 +02:00
Morris Jobke 1a67e5cdc3 Merge pull request #16465 from owncloud/s2s-returnpropererrorwhenpublicwebdavdisabled
Return 401 when accessing public webdav and s2s is disabled
2015-05-20 14:28:45 +02:00
Olivier Paroz 13ab251c6d Restore min-height for single previews 2015-05-20 14:09:31 +02:00
Vincent Petry 7386257676 Merge pull request #16075 from owncloud/skeleton-copy-delay
wait with copying the skeleton untill login and setupfs are done
2015-05-20 13:52:08 +02:00
Vincent Petry f2a900e04c Return 401 when accessing public webdav and s2s is disabled 2015-05-20 12:19:03 +02:00
Morris Jobke 3a4568313f Merge pull request #16326 from owncloud/fix-16192
include base dn test in functionality test
2015-05-20 12:12:52 +02:00
Jan-Christoph Borchardt 0d78ebf6cd Merge pull request #16444 from owncloud/close-new-dropdown
Closes "New" dropdown when switching category
2015-05-20 11:15:21 +02:00
Lukas Reschke 9be6d8cd39 Merge pull request #16446 from owncloud/fix-url-generation
Fix URL generation
2015-05-20 08:20:38 +02:00
Jenkins for ownCloud c49a06a684 [tx-robot] updated from transifex 2015-05-20 01:56:19 -04:00
Thomas Müller f9d04f62a8 Merge pull request #16440 from owncloud/scrutinizer-patch-1
Scrutinizer Auto-Fixes
2015-05-19 22:12:35 +02:00
Vincent Petry f7a2b5e7a9 Added unit tests for download URL in public sharing page 2015-05-19 17:41:06 +02:00
Thomas Müller f59576c3ca Merge pull request #16447 from owncloud/fix-minor-code-problems
Fix unexisting class and broken doc
2015-05-19 16:23:36 +02:00
Morris Jobke d3d70e5d90 Re-add use statement 2015-05-19 16:15:00 +02:00
Joas Schilling d832c4ae23 Fix unexisting class and broken doc 2015-05-19 15:27:50 +02:00
Lukas Reschke 07483033c1 Fix URL generation
`params` in the `OC.generateUrl` function call only replaces all specified occurences of a key just like the l10n PHP functionality does.

This means that to build a query string we have to use `OC.buildQueryString` instead of the params parameters.

Fixes https://github.com/owncloud/core/issues/16336 which is a regression introduced with 58a87d0bab of https://github.com/owncloud/core/pull/15652.

Without this fix downloading single files from a public shared folder is not possible.
2015-05-19 15:12:08 +02:00
Morris Jobke 581227324a Closes "New" dropdown when switching category
* fixes #16394
* return false - stops all following event callbacks
2015-05-19 14:47:13 +02:00
Robin Appelman 733784ae41 cleanup move/copy logic in trash 2015-05-19 14:22:09 +02:00
Scrutinizer Auto-Fixer fdbc21fc6c Scrutinizer Auto-Fixes
This commit consists of patches automatically generated for this project on https://scrutinizer-ci.com
2015-05-19 11:23:06 +00:00
Arthur Schiwon 76dfc87227 add primary group users to resultset before caching 2015-05-19 12:56:07 +02:00
Arthur Schiwon 6b218039ba Fixes returns of group memberships and counting if all members have the specific groups as primary set. 2015-05-19 12:56:07 +02:00
Thomas Müller 6d97dfb00c Catch NotFoundException and return no quota information which simply reflects the current state - no file storage has been initialized for the user. 2015-05-19 12:38:03 +02:00
Thomas Müller d90b83725f Merge pull request #16085 from owncloud/encryption-module-rename
rename to 'Default encryption module'
2015-05-19 11:13:33 +02:00
Joas Schilling 9e0cb4460e Merge pull request #16354 from owncloud/remove-browser-from-publicwebdav
Show a empty response for GET on non-files instead of the Browser Plugin
2015-05-19 10:54:11 +02:00
Morris Jobke 68a593a667 Merge pull request #16181 from owncloud/fix-15982
catch unallowed anonymous auth attempt and show specific error
2015-05-19 10:36:35 +02:00
Jenkins for ownCloud 313994a33d [tx-robot] updated from transifex 2015-05-19 01:55:35 -04:00
Arthur Schiwon cdb0689334 handle unallowed auth exception on port detection 2015-05-18 18:14:05 +02:00
Arthur Schiwon 5a56393657 throw exception on LDAP error 1, which we usually do not see and is pretty generic. AD uses is for uses not enlisted in the RFC, like on issues with anonymous binds. we also try to guess this case and show a hint. 2015-05-18 18:14:05 +02:00
Arthur Schiwon b9e5309757 catch unallowed anonymous auth attempt and show specific error 2015-05-18 18:14:05 +02:00
Robin Appelman 8f1a609512 adjust test 2015-05-18 17:16:13 +02:00
Robin Appelman 89959a856c fix target path for move 2015-05-18 17:16:13 +02:00
Robin Appelman a0854b36f0 update cache after move to trash 2015-05-18 17:16:13 +02:00
Robin Appelman b70e1ffc6d dont go trough the view when moving to trash 2015-05-18 17:16:12 +02:00
Clark Tomlinson 7d2666699b removing encryption preview check 2015-05-18 09:47:46 -04:00
Clark Tomlinson d557519746 removing deletion of encryption keys
this will be handled in the wrapper now
2015-05-18 09:47:46 -04:00
Joas Schilling 30d165ebf2 Add missing import for the exception 2015-05-18 15:45:47 +02:00
Clark Tomlinson a0c6c01137 fix references to legacy encryption app name 2015-05-18 09:45:41 -04:00
Joas Schilling 4444db61b7 Add a unit test for the decrypt method 2015-05-18 15:45:11 +02:00
Bjoern Schiessle 7676166254 add l10n to constructor 2015-05-18 15:43:53 +02:00
Vincent Petry 86cf8e1f68 Merge pull request #16404 from owncloud/enc_encrypt_files_in_trash
also encrypt files in trash bin
2015-05-18 14:59:34 +02:00
Bjoern Schiessle 7d492fefae also encrypt files in trash bin 2015-05-18 12:51:47 +02:00
Vincent Petry 5899b7b6ea Fix provisioning API unit tests for login
Properly login the user every time to make sure their FS is properly
setup.
2015-05-18 12:28:54 +02:00
Robin Appelman 724f88d9ff fix tests 2015-05-18 12:11:32 +02:00
Robin Appelman 415f16eb24 fix tests 2015-05-18 12:11:31 +02:00
Roeland Jago Douma dd3d0194a6 Move files sharing app (mostly) to OCP\DB 2015-05-18 11:06:23 +02:00
Roeland Jago Douma be8d0a08ec Move away from private static deprecated functio 2015-05-18 11:03:48 +02:00
Roeland Jago Douma 7a8072e958 Move core apps from OC_Log::write to OCP\Util 2015-05-18 10:57:52 +02:00
Bjoern Schiessle 887be709f5 a new approach to display the error message 2015-05-18 10:15:17 +02:00
Jenkins for ownCloud 73a3086945 [tx-robot] updated from transifex 2015-05-18 01:54:58 -04:00
Jenkins for ownCloud 16c320df26 [tx-robot] updated from transifex 2015-05-17 01:55:56 -04:00
Jenkins for ownCloud 744a9f2c78 [tx-robot] updated from transifex 2015-05-16 01:54:47 -04:00
Vincent Petry 246000f799 Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota
Validate the quota value to be a correct value
2015-05-15 18:07:13 +02:00
Thomas Müller 8e61ad0872 Merge pull request #15811 from owncloud/exception-on-lost-ldap-connection
throw exception when LDAP Connection was lost
2015-05-15 17:32:07 +02:00
Joas Schilling 03e26a0fbe Merge pull request #16337 from owncloud/versions-expireforowner
Use owner when expiring versions, not the logged in user
2015-05-15 15:02:26 +02:00
Vincent Petry f86699cd48 Fix restoring files from trash with unique name
When restoring a file, a unique name needs to be generated if a file
with the same name already exists.

Also fixed the restore() method to return false if the file to restore
does not exist.

Added unit tests to cover restore cases.
2015-05-15 12:42:27 +02:00
Vincent Petry f8a4cc0284 Added unit tests for versions storing 2015-05-15 12:24:34 +02:00
Joas Schilling e1923bac07 Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrash
Added rmdir to trashbin storage wrapper
2015-05-15 11:16:13 +02:00
Thomas Müller 937306b416 Merge pull request #16323 from owncloud/enc_webdav_fixes
some encryption fixes
2015-05-15 10:38:22 +02:00
Jenkins for ownCloud 49c4ee98b4 [tx-robot] updated from transifex 2015-05-15 01:54:49 -04:00
Lukas Reschke e0a136d344 Show a empty response for GET on non-files instead of the Browser Plugin
As discussed in https://github.com/owncloud/core/pull/14151, we missed to add this to the `files_sharing` S2S public WebDAV backend though.
2015-05-14 14:02:32 +02:00
Jenkins for ownCloud 1596a1fd32 [tx-robot] updated from transifex 2015-05-14 01:54:47 -04:00
Bjoern Schiessle ccbefb6e75 delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories 2015-05-13 19:06:23 +02:00
Vincent Petry 033b3dac92 Use owner when expiring versions, not the logged in user 2015-05-13 18:40:35 +02:00
Arthur Schiwon 2bf92e0a43 include base dn test in functionality test 2015-05-13 16:21:50 +02:00
Lukas Reschke 5941e826b8 Merge pull request #16284 from owncloud/shared-storage-view
dont go trough the view when renaming/copying on shared storages
2015-05-13 10:37:04 +02:00
Jenkins for ownCloud 504586aec6 [tx-robot] updated from transifex 2015-05-13 01:55:14 -04:00
Robin Appelman 3b1dde7005 dont go trough the view when renaming/copying on shared storages 2015-05-12 17:09:37 +02:00
Morris Jobke 44091a1a12 Merge pull request #16277 from owncloud/fix-15971
remove superflous button. fixes #15971
2015-05-12 15:54:49 +02:00
Jan-Christoph Borchardt 46e4d8818c Merge pull request #16127 from owncloud/fix-file-icons-in-shared-file-view
Enable file icons & previews in "Shared ..." categories
2015-05-12 15:17:43 +02:00
Arthur Schiwon acafc8ca46 remove superflous button. fixes #15971 2015-05-12 14:54:05 +02:00
Vincent Petry beb6a38d85 Added rmdir to trashbin storage wrapper
This makes sure that folders are moved to trash when deleted with
rmdir() instead of unlink().

This happens for example when deleting a folder over WebDAV.
The web UI uses unlink() so it wasn't affected.
2015-05-12 11:09:02 +02:00
Jenkins for ownCloud deeeca69fe [tx-robot] updated from transifex 2015-05-12 01:55:10 -04:00
Vincent Petry 20d2d8d3dd Merge pull request #15881 from owncloud/share-moveversionsproperly
Fix version rename with files and folders
2015-05-11 18:24:34 +02:00
Morris Jobke 90d8e4bc00 Merge pull request #15815 from owncloud/unshare-etag-propagate
Update etag of direct parent on unshare
2015-05-11 13:42:20 +02:00
Morris Jobke f057efc42e Merge pull request #16213 from cmeh/patch-5
Grammar, removal of line break
2015-05-11 09:18:45 +02:00
Jenkins for ownCloud a331f6b83e [tx-robot] updated from transifex 2015-05-11 01:54:43 -04:00
Jenkins for ownCloud 52fc45e6e3 [tx-robot] updated from transifex 2015-05-10 01:56:13 -04:00
Christian Hoffmann 6441721626 Grammar, removal of line break
* Corrected "… if the user forgets their password." to "… if the user forgets his or her password" in line 17.
* Removed line break from line 17 to line 18.
2015-05-09 11:31:21 +02:00
Jenkins for ownCloud 6f5854a8de [tx-robot] updated from transifex 2015-05-09 01:55:35 -04:00
Arthur Schiwon 90611e6594 only use memcache, if available 2015-05-08 13:27:27 +02:00
Bjoern Schiessle 4a450c9d0d improved admin settings 2015-05-08 11:41:38 +02:00
Thomas Müller e4c05acf94 Merge pull request #16170 from owncloud/fix-15621
drop global file cache support, fixes #15621
2015-05-08 11:06:00 +02:00
Thomas Müller dfd451777c Merge pull request #16183 from owncloud/fix-16147
check optional parameter before using it, fixes #16147
2015-05-08 10:47:33 +02:00
Morris Jobke 1fbf9c3d71 Merge pull request #16160 from owncloud/issue-15924-php-notice-empty-path-pathinfo
Do not run method when the path is empty
2015-05-08 09:49:51 +02:00
Jenkins for ownCloud ff0faacf0b [tx-robot] updated from transifex 2015-05-08 01:54:52 -04:00
Arthur Schiwon f2d23d7f02 check optional parameter before using it, fixes #16147 2015-05-07 22:18:29 +02:00
Thomas Müller 15d134124b Validate the quota value to be a correct value 2015-05-07 17:56:13 +02:00
Joas Schilling 2b092f2e93 Add a test for getting the versions of an empty path 2015-05-07 16:02:35 +02:00
Arthur Schiwon 57e8b76f48 drop global file cache support, fixes #15621 2015-05-07 14:52:44 +02:00
Joas Schilling 05fe2006ee Do not run method when the path is empty 2015-05-07 14:31:21 +02:00
Morris Jobke 12b24ee567 Merge pull request #16034 from owncloud/issue-15987-encryption-module-admin-page
Display the module settings in the list of the encryption modules
2015-05-07 10:44:03 +02:00
Jenkins for ownCloud 3dee907b70 [tx-robot] updated from transifex 2015-05-07 01:56:44 -04:00
Morris Jobke b1713b2f75 Enable file icons & previews in "Shared ..." categories
* sharing API returns now the mimetype icon path
* file previews are now lazyloaded by default (as the doc says)
* fixes #16086
2015-05-06 18:32:52 +02:00
Arthur Schiwon 71e6644ec8 fix filter index on selected groups is updated too early 2015-05-06 15:34:44 +02:00
Jan-Christoph Borchardt 35292eb66c rename to 'Default encryption module' 2015-05-06 15:31:05 +02:00
Arthur Schiwon 795a48d45c fix broken group presentation in selected groups list 2015-05-06 15:29:36 +02:00
Jenkins for ownCloud 910146824e [tx-robot] updated from transifex 2015-05-06 01:55:19 -04:00
Arthur Schiwon 0e7fd82e89 cleanup 2015-05-05 14:21:12 +02:00
Arthur Schiwon 1c791e6000 not only send them back but also apply defaults to a new configuration. Fixes #15933 2015-05-05 14:20:58 +02:00
Joas Schilling efce8ff905 Merge pull request #16052 from owncloud/fix-phpdoc-sharecontroller
Fix PHPDoc for the ext. share controller
2015-05-05 10:52:28 +02:00
Björn Schießle 2ce01ee0bf Merge pull request #15938 from owncloud/enc_update_recovery_share_key
[encryption] check recovery key setting for the correct user
2015-05-05 10:48:09 +02:00
Jenkins for ownCloud b60dcd91bb [tx-robot] updated from transifex 2015-05-05 01:55:36 -04:00
Lukas Reschke d9746d8abd Fix PHPDoc for the ext. share controller 2015-05-04 18:06:16 +02:00
Björn Schießle ed16127a8d Merge pull request #16026 from owncloud/enc_ux_improvements
[encryption] some small ux improvements
2015-05-04 17:40:05 +02:00
Thomas Müller 08b98a8ede Merge pull request #16042 from owncloud/fix-output-buffering
Remove hard-dependency on disabled output_buffering
2015-05-04 16:43:32 +02:00
Joas Schilling eadc2c330c Display the module settings in the list of the encryption modules 2015-05-04 15:04:03 +02:00
Lukas Reschke 4b9e034968 Remove hard-dependency on disabled output_buffering
This removes the hard-dependency on output buffering as requested at https://github.com/owncloud/core/issues/16013 since a lot of distributions such as Debian and Ubuntu decided to use `4096` instead of the PHP recommended and documented default value of `off`.

However, we still should encourage disabling this setting for improved performance and reliability thus the setting switches in `.user.ini` and `.htaccess` are remaining there. It is very likely that we in other cases also should disable the output buffering but aren't doing it everywhere and thus causing memory problems.

Fixes https://github.com/owncloud/core/issues/16013
2015-05-04 14:15:15 +02:00
Morris Jobke 760ce3bd63 Fix DeleteOrphanedSharesJob
* remove unneeded use statements
* the the interval properly in the constructor
* set the log level to debug (from info) - fixes #16036
2015-05-04 13:58:58 +02:00
Bjoern Schiessle f76c055244 some small ux improvements 2015-05-04 11:55:06 +02:00
Lukas Reschke 17fedc80da Merge pull request #15652 from oparoz/better-text-previews
Show a text preview instead of a bitmap preview of text
2015-05-04 11:44:51 +02:00
Thomas Müller 0f7b8dd338 Merge pull request #15752 from owncloud/feature/fix-encryption-return-values
[enc2] fixing return values and adding tests
2015-05-04 11:44:15 +02:00
Thomas Müller 7376ea9b26 Merge pull request #15584 from owncloud/enc_fix_upload_shared_folder
skip user if we don't have a public key
2015-05-04 09:57:19 +02:00
Jenkins for ownCloud 7fa308977b [tx-robot] updated from transifex 2015-05-04 01:54:47 -04:00
Morris Jobke 7a3b74a8b9 Merge pull request #15486 from owncloud/versions-rollbackkeepfileid
Keep fileid when restoring version, using stream copy
2015-05-03 13:12:54 +02:00
Jenkins for ownCloud aa0d439ed9 [tx-robot] updated from transifex 2015-05-02 01:54:49 -04:00
Jenkins for ownCloud eda4d45836 [tx-robot] updated from transifex 2015-05-01 01:54:43 -04:00
Vincent Petry 972e189605 Use moveFromStorage instead of streamCopy when restoring version 2015-04-30 16:15:18 +02:00
Vincent Petry 2228faaa39 Fix version rollback to keep fileid 2015-04-30 16:15:18 +02:00
Joas Schilling 4a6808a0f4 Simplify the test 2015-04-30 12:04:02 +02:00
Bjoern Schiessle 4ef9df8750 skip user if we don't have a public key 2015-04-30 12:04:02 +02:00
Bjoern Schiessle 70a44621be check recovery setting for the right user 2015-04-30 11:38:53 +02:00