Commit Graph

9008 Commits

Author SHA1 Message Date
Lukas Reschke 8009df0b60 Merge pull request #10420 from owncloud/external-share-self-signed
Make external shares work with imported self signed certificates
2014-08-31 15:50:30 +02:00
Robin Appelman 2fcedcc503 fix test 2014-08-31 10:47:50 +02:00
Robin Appelman c1b11571ea Move certificate management interface from files_external to core 2014-08-31 10:47:50 +02:00
Robin Appelman 298011bf29 fix indention 2014-08-31 10:45:11 +02:00
Robin Appelman dcc4f96d3e Verify names of certificates 2014-08-31 10:45:11 +02:00
Robin Appelman c2ebc192a6 Make external shares work with imported self-signed certificates 2014-08-31 10:45:11 +02:00
Robin Appelman ecdbf00628 Move certificate management code to core 2014-08-31 10:45:10 +02:00
Robin Appelman d0266c0bf8 Use public api for getting l10n 2014-08-31 10:08:22 +02:00
Jenkins for ownCloud 23137f4798 [tx-robot] updated from transifex 2014-08-31 01:56:20 -04:00
Robin McCorkell a8dc4368c0 Merge pull request #10428 from owncloud/files_external_better_config
Improve external storage configuration UI
2014-08-30 15:11:39 +01:00
Robin McCorkell 0e8a973579 Improve UI of external storage configuration
* Highlight fields that need to be filled
 * Remove (required) and (optional) strings where possible
 * Focus first configuration field when creating new external storage
 * Add ability to force external storage re-check
 * Various jQuery improvements
 * Prevent wrapping of checkboxes in configuration
2014-08-30 09:02:37 +01:00
Jenkins for ownCloud 53f3b7ab52 [tx-robot] updated from transifex 2014-08-30 01:57:04 -04:00
Andreas Fischer 7458e21f2c Use Doctrine Platform to generate SQL query for table truncation. 2014-08-29 20:53:51 +02:00
Morris Jobke 033b0361ed Merge pull request #9214 from owncloud/wizard_email_detection
LDAP: Wizard email attribute detection
2014-08-29 12:58:51 +02:00
Thomas Müller 2b63c375a4 Merge pull request #10719 from owncloud/files-external-personal-undefined
Prevent undefined index error loading external storages
2014-08-29 11:59:34 +02:00
Arthur Schiwon aa0ddf21b5 adjust static method vars as well 2014-08-29 11:14:36 +02:00
Arthur Schiwon 371cab367d trigger email detection by Wizard upon any user filter filter change. before it happenend only upon user automatic list filter creation, but not on manual editing 2014-08-29 11:14:36 +02:00
Arthur Schiwon 34761dabb1 write log message, if original value was changed 2014-08-29 11:14:36 +02:00
Arthur Schiwon f47a4a8c15 add unit test for mail detection 2014-08-29 11:14:35 +02:00
Arthur Schiwon 441c600c90 remove Access as hard dependency, inject it instead 2014-08-29 11:14:16 +02:00
Arthur Schiwon baa49cd58a Wizad: email attribute detection 2014-08-29 11:14:16 +02:00
Jörn Friedrich Dreyer f551917a3c kill OC::$session
maintain deprecated \OC::$session when getting or setting the session via the server container or UserSession

restore order os OC::$session and OC::$CLI

remove unneded initialization of dummy session

write back session when $useCustomSession is true

log warning when deprecated app is used
2014-08-29 10:22:21 +02:00
Robin McCorkell bffccdbea7 Add missing 'personal' mount configuration option 2014-08-29 09:08:46 +01:00
Jenkins for ownCloud 359590d576 [tx-robot] updated from transifex 2014-08-29 01:56:59 -04:00
Clark Tomlinson 54eb2f42df Merge pull request #10647 from owncloud/implementing_momentjs
Implementing momentjs
2014-08-28 11:47:37 -04:00
Vincent Petry f4e6cd5f3e Merge pull request #10658 from owncloud/sftp_prevent_error
Prevent errors on broken SFTP config
2014-08-28 17:09:36 +02:00
Clark Tomlinson 92685acf60 Implementing moment.js
Updating Usages

Removing unused method

Adding JS Doc
2014-08-28 09:28:45 -04:00
blizzz 6fa609325c Merge pull request #8507 from owncloud/ajaxify_user_list_for_files_external
Ajaxify user list for files external
2014-08-28 13:39:21 +02:00
Arthur Schiwon 1c0cc6c7bc fix wizard test, adjust to changed parameters of the tested method, introduced by 9caa354cfc 2014-08-28 11:53:40 +02:00
Arthur Schiwon dbd51d15e1 Port of #8623
set result entry identifier earlier, i.e. before a continue for the same level can happen. otherwise  will always get the same value and we end up in an infinite loop

add unit test to make sure the infinite loop never comes back

Conflicts:
	apps/user_ldap/tests/wizard.php
2014-08-28 11:52:33 +02:00
Jenkins for ownCloud 1b342a70d6 [tx-robot] updated from transifex 2014-08-28 01:56:36 -04:00
Robin McCorkell 87167d3141 Prevent errors on broken SFTP config 2014-08-27 09:02:14 +01:00
Jenkins for ownCloud 2740908a5b [tx-robot] updated from transifex 2014-08-27 01:54:40 -04:00
Jenkins for ownCloud c733842a9a [tx-robot] updated from transifex 2014-08-26 01:56:33 -04:00
Clark Tomlinson 58ab105515 Merge pull request #10421 from owncloud/share-external-delete
Remove no longer existing files from the cache when scanning external storage
2014-08-25 11:28:50 -04:00
Vincent Petry 5e2f627d3d Merge pull request #10108 from owncloud/files_external-allowed-backend
Only load personal external storages for allowed backends
2014-08-25 17:07:35 +02:00
Lukas Reschke f33312f767 Use AppFramework instead of custom controller 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer 6202ef3258 use displayname lookup route in files_external settings 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer e09e11b93e no need to load user display names 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer 393d136faf fix deletion of shares 2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer 308e8d6379 replace chosen with select2 to provide ajaxified user and group selection for files_external, fixes #7499
remove minified select2 js

show avatars for users, simpler results

remove unneeded users and groups from settings template

fix css, escape user and group names
2014-08-25 11:50:19 +02:00
Jörn Friedrich Dreyer bff39f796e add select2 to app specific thirdparty 2014-08-25 11:49:23 +02:00
Vincent Petry 8ab1c84161 Merge pull request #10591 from owncloud/routes_for_files_external
explicit routes for files_external
2014-08-25 11:45:41 +02:00
Jenkins for ownCloud adca48aa93 [tx-robot] updated from transifex 2014-08-25 01:56:07 -04:00
Jenkins for ownCloud 70db496b58 [tx-robot] updated from transifex 2014-08-24 01:56:10 -04:00
Jenkins for ownCloud 047ec64ac0 [tx-robot] updated from transifex 2014-08-23 01:57:00 -04:00
Jörn Friedrich Dreyer ffe54e260a explicit routes for files_external 2014-08-22 11:51:39 +02:00
Jenkins for ownCloud 8c94153d3e [tx-robot] updated from transifex 2014-08-22 01:56:25 -04:00
blizzz 52d5429768 Merge pull request #10522 from owncloud/removeLoadAppScript
Remove loadAppScriptFile
2014-08-21 19:59:31 +02:00
Morris Jobke 0cb189353f Merge pull request #10548 from owncloud/encryption-app-description
Better description to prevent people from misunderstanding the use case of encryption app
2014-08-21 13:01:18 +02:00
Bernhard Posselt ba8eed0788 Better description to prevent people from misunderstanding the use case 2014-08-21 12:05:56 +02:00
Jenkins for ownCloud 952fac8493 [tx-robot] updated from transifex 2014-08-21 01:56:31 -04:00
Clark Tomlinson 61f63718ce Merge pull request #10562 from Volker-E/master
fixing #10561 & HTML structure
2014-08-20 17:27:25 -04:00
Lukas Reschke 92c80dd946 Merge pull request #10518 from owncloud/fix_storage_const_autoload
Fix storage const autoload
2014-08-20 23:23:42 +02:00
Volker E. 98d0d48b54 fix HTML structure by rmv. obsolete input end tag 2014-08-20 22:36:58 +02:00
Jörn Friedrich Dreyer 6c593c6adf Merge pull request #10423 from owncloud/urlencode_s3_copyobject_copysource
urlencode s3 copyObject() copysource
2014-08-20 15:48:51 +02:00
Jenkins for ownCloud ea8c0bce08 [tx-robot] updated from transifex 2014-08-20 01:56:58 -04:00
Clark Tomlinson 5ddea98df2 Merge pull request #10525 from owncloud/remove-download-message
remove obsolete 'Download preparing' message for zip downloads, fix #3755
2014-08-19 14:17:15 -04:00
Jan-Christoph Borchardt e713e97df5 remove obsolete 'Download preparing' message for zip downloads, fix #3755 2014-08-19 16:44:28 +02:00
Jan-Christoph Borchardt 3d8031564e fix multiselect bar offset on shared page 2014-08-19 15:51:10 +02:00
Lukas Reschke 381340c9b2 Add routing to user_ldap 2014-08-19 15:26:15 +02:00
Lukas Reschke b12af9ea7f Add routing to files_versions 2014-08-19 15:25:16 +02:00
Lukas Reschke 8524e61fcc Add routing to files_trashbin 2014-08-19 15:24:47 +02:00
Lukas Reschke 520ee969f2 Add routing to files_encryption 2014-08-19 15:23:45 +02:00
Lukas Reschke ad202250a8 Add routing to files_sharing 2014-08-19 15:22:54 +02:00
Lukas Reschke f9881abf25 Use proper routes for files 2014-08-19 15:19:18 +02:00
Morris Jobke b3b3354809 move to public namespace 2014-08-19 14:05:08 +02:00
Stephan Peijnik 2df52e54d7 Fix STORAGE_* constants usage by moving those constants into \OC\Files\Filesystem.
As constants not defined within a class cannot be automatically found by the
autoloader moving those constants into a class makes them accessible to
code which uses them.

Signed-off-by: Stephan Peijnik <speijnik@anexia-it.com>
2014-08-19 13:55:35 +02:00
Björn Schießle 19610157d3 Merge pull request #10425 from owncloud/set_default_share_folder
Set default share folder
2014-08-19 10:21:21 +02:00
Björn Schießle 312ed53307 Merge pull request #10494 from owncloud/fix_upload_to_public_folder
set incognitoMode to true during upload to a public folder
2014-08-19 10:13:38 +02:00
Morris Jobke df963b3ccf Merge pull request #10492 from owncloud/hidesharesectionswhendisabled
Hide sharing sections in files app when sharing API is disabled
2014-08-19 08:53:19 +02:00
Jenkins for ownCloud 77cfddff0f [tx-robot] updated from transifex 2014-08-19 01:57:09 -04:00
blizzz 8f7676c762 Merge pull request #10340 from owncloud/fix-9887
better check whether string resembles a DN, fixes #9887
2014-08-18 19:24:41 +02:00
Arthur Schiwon 97fd39e983 unify tests 2014-08-18 16:55:08 +02:00
Lukas Reschke 594078e22f Fix copyright 2014-08-18 16:52:48 +02:00
Bjoern Schiessle 193a0b1a17 fix broken unit tests 2014-08-18 16:52:48 +02:00
Bjoern Schiessle c25915cde4 update unit tests with configurable share folder 2014-08-18 16:52:48 +02:00
Bjoern Schiessle c9903f2e68 make share folder configurable 2014-08-18 16:52:48 +02:00
Bjoern Schiessle 043cd1d02b set incognitoMode to true, getUser should always return false during public upload 2014-08-18 16:39:25 +02:00
Vincent Petry 1de5ae8845 Hide sharing sections in files app when sharing API is disabled 2014-08-18 16:33:29 +02:00
Jenkins for ownCloud 4dd07f572c [tx-robot] updated from transifex 2014-08-18 01:56:30 -04:00
Lukas Reschke 69e0e23789 Merge pull request #10407 from owncloud/rm-obsolete-japanese
remove obsolete japanese lang code
2014-08-17 19:07:14 +02:00
Jenkins for ownCloud b1415fc4fc [tx-robot] updated from transifex 2014-08-17 01:56:22 -04:00
Lukas Reschke 283b99a42d Merge pull request #10276 from owncloud/skip-webdavput
skip WebdavTest of encryption
2014-08-16 10:32:04 +02:00
Morris Jobke 5498186333 Merge pull request #10447 from owncloud/share-foldericonfix
Fixed folder icon update routine when share owner exists
2014-08-16 10:19:19 +02:00
Jenkins for ownCloud c132dd6357 [tx-robot] updated from transifex 2014-08-16 01:56:44 -04:00
Lukas Reschke 8d112ff61f Merge pull request #10449 from owncloud/share-clientsidesortnoservercall
Client side sort for sharing overview
2014-08-15 21:25:30 +02:00
Volkan Gezer 3da69ed7d0 ssl capital 2014-08-15 20:41:40 +02:00
Vincent Petry 3a99f15af2 Client side sort for sharing overview
Since the server doesn't support sorting, use client side sort directly
instead of calling reload() first.
2014-08-15 16:52:41 +02:00
Vincent Petry 607ea636be Fixed folder icon update routine when share owner exists
Whenever a folder has a "data-share-owner" attribute, the icon is now
properly updated to a shared folder icon.
2014-08-15 16:19:50 +02:00
Bjoern Schiessle 5a2fef4309 login as user1 before performing a test 2014-08-15 15:48:44 +02:00
Jenkins for ownCloud 93f5e90c9f [tx-robot] updated from transifex 2014-08-15 01:56:14 -04:00
Jan-Christoph Borchardt f6a6f8541a Merge pull request #10374 from ogasser/compare_upload_limit_against_biggest_file
Compare upload limit against biggest file
2014-08-14 23:24:18 +02:00
Jörn Friedrich Dreyer 240b952333 use S3Client::encodeKey(), fixes #8325 2014-08-14 21:46:50 +02:00
Robin Appelman a645da3640 Merge pull request #10398 from owncloud/external-share-ssl-warn
Give a better error message for external shares with self-signed ssl certificates
2014-08-14 16:10:29 +02:00
Robin Appelman bbe17f35a1 Remove no longer existing files from the cache when scanning external storage 2014-08-14 14:50:52 +02:00
Björn Schießle 27d94e9273 Merge pull request #10295 from owncloud/file_actions_error_handling
file actions improved error handling
2014-08-14 11:44:50 +02:00
Jenkins for ownCloud 67b7160e7b [tx-robot] updated from transifex 2014-08-14 01:55:35 -04:00
Thomas Müller fc462c5edb Merge pull request #10396 from owncloud/kill-filesync
Kill filesync.php in files/appinfo
2014-08-13 23:56:59 +02:00
Volkan Gezer d1f483c9ed remove obsolete japanese lang code 2014-08-13 22:35:08 +02:00
Robin Appelman bba59bf815 Cast file id's to int so we can compare them properly 2014-08-13 19:18:34 +02:00
Robin Appelman 9509bc403a Give a better error message for external shares with self-signed ssl certificates 2014-08-13 16:46:04 +02:00
Morris Jobke cad52dbce9 Kill filesync.php in files/appinfo
* ref comment: https://github.com/owncloud/core/issues/10392#issuecomment-52050567
2014-08-13 15:58:43 +02:00
Vincent Petry f282a5cff0 Merge pull request #9754 from owncloud/enc_support_aes_256
[encryption] support aes 256
2014-08-13 12:34:21 +02:00
Jenkins for ownCloud 609a52ebe2 [tx-robot] updated from transifex 2014-08-13 01:54:44 -04:00
Morris Jobke d4eaa74b76 fixes from git push force 2014-08-12 21:29:05 +02:00
Bjoern Schiessle 53c5a84eac add unit tests 2014-08-12 21:15:39 +02:00
Bjoern Schiessle da1feafc78 fix detection of system wide mount points 2014-08-12 21:14:22 +02:00
Oliver Gasser eb2669448d Compare upload limit against biggest file
When uploading multiple files from the web interface, compare the PHP
upload limit against the largest file, not against the sum of all files.
2014-08-12 19:46:04 +02:00
Arthur Schiwon eb7d70fc39 adjust login test to code changes 2014-08-12 16:13:17 +02:00
Volkan Gezer e18b0fca47 Merge pull request #10357 from owncloud/l10n-alert-fix
Fix alert text
2014-08-12 13:56:33 +02:00
Jenkins for ownCloud e4221869c2 [tx-robot] updated from transifex 2014-08-12 01:56:16 -04:00
Volkan Gezer f2a775acb8 Fix alert text 2014-08-12 01:13:30 +02:00
Volkan Gezer 4dd9414f2c Transifex suggestion by mnestis 2014-08-11 21:31:15 +02:00
blizzz c46b60e822 Merge pull request #9848 from dupondje/master
Fix memberOf detection. Fixes: #9835
2014-08-11 16:58:30 +02:00
Arthur Schiwon fc6793f2ae better check whether string resembles a DN, fixes #9887 2014-08-11 16:40:41 +02:00
Jean-Louis Dupond e46fc7a18a Fix initializing in #9848 2014-08-11 13:50:13 +02:00
Vincent Petry 173059f6d0 Fixed file list sorting
Now using a natural sort algorithm that is more consistent between JS
and PHP (although not perfect in some corner cases)

- added OC.Util.naturalSortComparator that uses the same algo that was
  used for the user list
- changed user list and files list to use OC.Util.naturalSortComparator
- removed toLowerCase() and changed the comparator to use
  String.localeCompare()
- added unit tests
- added OC_NaturalSort that is used by OCP\Util::naturalSortCompare()
2014-08-11 13:28:53 +02:00
Robin Appelman 86ae3bd1e7 Merge pull request #10303 from owncloud/sharing-breadcrumb-folder-name
use OC_Util::basename
2014-08-11 13:10:45 +02:00
Bjoern Schiessle bc8e1ebf75 new unit test added 2014-08-11 12:03:08 +02:00
Bjoern Schiessle 5b75b15292 no error if we try to delete a file which no longer exists 2014-08-11 12:03:08 +02:00
Bjoern Schiessle 5bbecdb9ee no special action for folder named 'Shared' needed 2014-08-11 12:03:08 +02:00
Bjoern Schiessle b3cff4beb6 add error message if user wants to rename a file which no longer exists 2014-08-11 12:03:08 +02:00
Jean-Louis Dupond fc662917e7 Fix remarks in #9848 2014-08-11 09:15:56 +02:00
Jenkins for ownCloud 411f6c7704 [tx-robot] updated from transifex 2014-08-11 01:54:32 -04:00
Jenkins for ownCloud c920ca32e8 [tx-robot] updated from transifex 2014-08-10 01:55:15 -04:00
Jenkins for ownCloud f12f835485 [tx-robot] updated from transifex 2014-08-09 01:55:08 -04:00
Thomas Müller 7b6b99f55a Merge pull request #10290 from owncloud/check_quota_on_new_via_web
check quota when trying to download a file via new -> web
2014-08-08 17:32:50 +02:00
Jörn Friedrich Dreyer c24957565c check quota when trying to download a file via new -> web 2014-08-08 14:35:33 +02:00
Bjoern Schiessle 008498dcad only show "share with others" and "share by link" navigation bar entries if user is allowed to share files 2014-08-08 12:12:24 +02:00
Morris Jobke fa260b1649 Merge pull request #10280 from owncloud/lazyloading-earlier
trigger lazy loading earlier, fix #9823
2014-08-08 10:02:43 +02:00
Jenkins for ownCloud d63b9e68c4 [tx-robot] updated from transifex 2014-08-08 01:55:11 -04:00
Jan-Christoph Borchardt 5ee0a57598 trigger lazy loading earlier, fix #9823 2014-08-08 00:27:31 +02:00
Morris Jobke 5e7b164560 Merge pull request #10248 from owncloud/enc_remove_keys_from_session
add logout hook to remove keys from session
2014-08-07 23:01:11 +02:00
Thomas Müller 461fdd854f Merge pull request #10261 from owncloud/fix-9829
ldap_ prefix will be added in invokeLDAPMethod(), having it would lead t...
2014-08-07 21:38:12 +02:00
Arthur Schiwon 2676e681e9 ldap_ prefix will be added in invokeLDAPMethod(), having it would lead to a unexisting function, fixes #9829 2014-08-07 17:15:36 +02:00
Bjoern Schiessle 0b3ddbed68 add logout hook to remove keys from session 2014-08-07 15:29:35 +02:00
Thomas Müller 6da9c09467 Merge pull request #10238 from owncloud/fix-public-download-with-encryption-master
we can only close the session if encryption is not used
2014-08-07 14:29:54 +02:00
Robin Appelman f1091280de Merge pull request #10184 from owncloud/getbyid-node
Fix Folder::getById
2014-08-07 13:40:17 +02:00
Jan-Christoph Borchardt 9e6b65fabe Merge pull request #10223 from dannosaur/patch-1
fix tiny thumbnails in public preview/share mode
2014-08-07 12:36:57 +02:00
Thomas Müller 8b2fe69bb2 Merge pull request #10218 from owncloud/pzy-master
Adding link tag to enable facebook timeline previews
2014-08-07 12:14:30 +02:00
Thomas Müller d2365afad6 Merge pull request #8915 from owncloud/MorrisJobke-travis
Travis support for PRs and master, stable5 and stable6
2014-08-07 11:33:13 +02:00
Thomas Müller 2fb8fcf6cb we can only close the session if encryption is not used 2014-08-07 11:07:11 +02:00
pzy dc15633111 Update public.php
added tag to make facebook load a preview picture

Update public.php

add check ifMimeSupported and put the thumbsize in a variable

generate preview for all supported mimes
2014-08-07 10:44:07 +02:00
Jenkins for ownCloud 2821f7241b [tx-robot] updated from transifex 2014-08-07 01:55:10 -04:00
Dan Jones 4bbea118c2 fix tiny thumbnails in public preview/share mode 2014-08-06 19:32:21 +01:00
Robin Appelman eb8683e6ee trim leading slash 2014-08-06 14:57:54 +02:00
Robin Appelman 12207ec0c7 Fix SharedCache::getPathById 2014-08-06 13:38:14 +02:00
Thomas Müller 6599dc1b5c Merge pull request #10186 from owncloud/versioning_fix_path
[versioning] make sure that getVersions() return the correct path
2014-08-06 09:30:28 +02:00
Morris Jobke 9fb79c86f0 Merge pull request #10191 from owncloud/sharing_rm_trailing_slash
[sharing] remove trailing slash
2014-08-05 23:13:35 +02:00
Bjoern Schiessle f451173817 remove unused variable 2014-08-05 20:34:18 +02:00
Morris Jobke e15b4d08a6 Disable encryption migration tests 2014-08-05 18:35:53 +02:00
Morris Jobke e717833b07 mark tests as skipped - TODO travis
* swift causes some timeouts and test failures
2014-08-05 18:35:47 +02:00
Bjoern Schiessle 785ae5dc9a add unit test to make sure getVersions returns the correct result 2014-08-05 17:26:23 +02:00
Bjoern Schiessle b7ada5da57 make sure that the versions array contains the correct path 2014-08-05 17:25:55 +02:00
Morris Jobke 676fa459d7 Minor fixes
* instanceof \OC\Files\View
* fix misplaced paranthesis
* remove misplaced character in comment
2014-08-05 16:53:28 +02:00
Morris Jobke c83c90342e Merge pull request #10168 from owncloud/parallel-download-on-public-shared-folder-master
close session right before the download starts - this enables parallel d...
2014-08-05 14:54:44 +02:00
Arthur Schiwon 7fd7706542 Hack to avoid Agent DN + Password being overwritten by some ugly browsers with stored site credentials
Conflicts:
	apps/user_ldap/css/settings.css
2014-08-05 12:14:29 +02:00
Thomas Müller b68275baba close session right before the download starts - this enables parallel downloads 2014-08-05 11:21:42 +02:00
Jenkins for ownCloud 5ecbc27753 [tx-robot] updated from transifex 2014-08-05 02:05:17 -04:00
Jenkins for ownCloud 5a2952e2eb [tx-robot] updated from transifex 2014-08-04 01:54:39 -04:00
Jenkins for ownCloud d1aaa7a12e [tx-robot] updated from transifex 2014-08-02 01:54:33 -04:00
Robin Appelman 73607e5d16 Only load personal external storages for allowed backends 2014-08-01 17:15:46 +02:00
Robin Appelman 4886c8582d Merge pull request #9529 from helmutschneider/fix-8326
Fixes #8326: deletion of directories on S3
2014-08-01 14:04:21 +02:00
Morris Jobke 6cbfe8fd98 Merge pull request #10067 from owncloud/fix-#9119
Quick fix for #9119. Increase preview to keep empty message more centered
2014-08-01 09:25:15 +02:00
Jenkins for ownCloud 86cdfa3db3 [tx-robot] updated from transifex 2014-08-01 01:54:28 -04:00
Jörn Friedrich Dreyer dc6180427c Merge pull request #10048 from owncloud/fix_search_in_shared_files
traverse folders in php to search in shared files
2014-07-31 18:27:47 +02:00
Jörn Friedrich Dreyer 1af436cb59 add test for search() in shared cache 2014-07-31 15:07:49 +02:00
Jörn Friedrich Dreyer a7b4cd77b1 traverse folders in php to search in shared files 2014-07-31 12:05:29 +02:00
Thomas Müller 4eb2b4e1b0 Merge pull request #10051 from owncloud/preview-empty-text
Use svg mimeicons for empty text files
2014-07-31 11:38:29 +02:00
Jenkins for ownCloud c1562057e8 [tx-robot] updated from transifex 2014-07-31 01:55:01 -04:00
Remco Brenninkmeijer a1b5bc8684 Quick fix for #9119. Increase preview to keep empty message more centered and push footer down. 2014-07-30 22:41:17 +02:00
Jan-Christoph Borchardt 8389ff5875 Merge pull request #10054 from owncloud/dont_preload_videos
don't preload videos on public sharing, fixes #10042
2014-07-30 21:10:57 +02:00
Morris Jobke 62b37fbb99 Merge pull request #10024 from owncloud/preview-restrict-height
Also keep maxY into account when scaling a preview while preserving aspect ratio
2014-07-30 17:22:20 +02:00
Georg Ehrke 3d0bcb7c46 don't preload videos on public sharing, fixes #10042 2014-07-30 17:06:41 +02:00
Robin Appelman 4a9b0d5465 Use svg mimeicons for empty text files 2014-07-30 16:31:37 +02:00
Bjoern Schiessle 1a797f90bb add unit test for rename and copy operation 2014-07-30 15:14:01 +02:00
Bjoern Schiessle dba2574c52 make sure that we always find all versions 2014-07-30 15:14:01 +02:00
Bjoern Schiessle c738f71657 make the versions and encryption app aware of the copy operation 2014-07-30 15:14:01 +02:00
Robin Appelman c066320208 Also keep maxY into account when scaling a preview while preserving aspect ratio 2014-07-30 13:52:40 +02:00
Björn Schießle 2946a63f6b Merge pull request #9721 from owncloud/enc_define_type_in_pre_hook
[encryption] define type in pre hook
2014-07-29 16:29:28 +02:00
Björn Schießle f7d60f1190 Merge pull request #9951 from owncloud/enc_inproved_error_messages
show a warning in the personal settings and admin settins if the encyption keys are not initialized
2014-07-29 16:27:24 +02:00
Björn Schießle 03f7c5c561 Merge pull request #9983 from owncloud/sharing_add_unshare_to_overview
update attributes for share-with-user view
2014-07-29 14:00:57 +02:00
Jenkins for ownCloud 29a3f1e2af [tx-robot] updated from transifex 2014-07-29 09:16:02 +02:00
Bjoern Schiessle aff948925a update attributes for share with user list, file should always have delete permissions, this means unshare in this context, and the overview page is always a root view 2014-07-28 22:04:13 +02:00
Björn Schießle c53b56e313 Merge pull request #9798 from owncloud/ocs_share_api_add_expire_date
[share api] add OCS api call to set expire date for link shares
2014-07-28 17:28:32 +02:00
Jan-Christoph Borchardt 13ca1c6a99 Merge pull request #9585 from owncloud/design-fix-public-footer
move public page footer rules from sharing app to core so it is used by other apps too
2014-07-28 12:53:29 +02:00
Bjoern Schiessle b7958f79c3 adjust error code 2014-07-28 12:39:22 +02:00
Bjoern Schiessle de4233bc1c show a warning in the personal settings and admin settins if the encyption keys are not initialized 2014-07-28 11:31:06 +02:00
Jenkins for ownCloud a169572223 [tx-robot] updated from transifex 2014-07-28 01:54:30 -04:00
Jenkins for ownCloud 9a4d2871eb [tx-robot] updated from transifex 2014-07-27 01:54:31 -04:00
Jenkins for ownCloud 010732019a [tx-robot] updated from transifex 2014-07-26 01:54:40 -04:00
Bjoern Schiessle ecc1f92bb6 add OCS api call to set expire date for link shares 2014-07-25 13:38:18 +02:00
Björn Schießle 40f2a34be1 Merge pull request #9867 from owncloud/fix_sharing_update
fix sharing update, add proper escaping
2014-07-25 10:16:22 +02:00
Jenkins for ownCloud 3f58d949e0 [tx-robot] updated from transifex 2014-07-25 01:54:32 -04:00
Bjoern Schiessle c22b5c7884 fix sharing update, add proper escaping 2014-07-24 20:16:40 +02:00
Morris Jobke fa333c02a0 Merge pull request #9703 from owncloud/files-preview-animate
[OC 7] Fix preview animation on uploading
2014-07-24 14:19:00 +02:00
Jean-Louis Dupond 71f3326035 Fix memberOf detection. Fixes: #9835 2014-07-24 14:18:41 +02:00
Jenkins for ownCloud e2327f83ed [tx-robot] updated from transifex 2014-07-24 01:54:37 -04:00
Robin Appelman 97de7bb23e Fix remote share when remote server is installed at the root 2014-07-23 13:45:56 +02:00
Bjoern Schiessle ffa6b33047 add unit test for aes256/aes128 2014-07-23 12:14:02 +02:00
Bjoern Schiessle de9d3797ff update existing unit tests 2014-07-23 12:14:02 +02:00
Bjoern Schiessle 4bbdcfbccf support aes 256 2014-07-23 12:14:01 +02:00
Vincent Petry 5565eabb81 Merge pull request #9683 from owncloud/fix_#8819_sorting
Fix #8819 sorting
2014-07-22 10:11:00 +02:00
Jenkins for ownCloud 5696a88fc3 [tx-robot] updated from transifex 2014-07-22 01:54:29 -04:00
Remco Brenninkmeijer 319caa7089 Sorting triangles pointing up for ascending, down for descending 2014-07-21 23:07:52 +02:00
Jenkins for ownCloud ddd8eae932 [tx-robot] updated from transifex 2014-07-21 01:54:30 -04:00
Jenkins for ownCloud ddc85a9871 [tx-robot] updated from transifex 2014-07-20 01:54:40 -04:00
Jenkins for ownCloud d09ec36751 [tx-robot] updated from transifex 2014-07-19 01:54:42 -04:00
Vincent Petry c8a2418815 Merge pull request #9720 from owncloud/sftp-stream-wrapper-new-connection
Pass existing Net_SFTP object into Net_SFTP_Stream.
2014-07-18 19:19:33 +02:00
blizzz 1d520108c5 Merge pull request #9576 from owncloud/bcmath-check
LDAP Active Directory Primary Groups support depends on bcmath module
2014-07-18 19:15:36 +02:00
Andreas Fischer a27753dd80 Pass existing Net_SFTP object into Net_SFTP_Stream. 2014-07-18 15:47:13 +02:00
Bjoern Schiessle b5cb1cfe4e define type in pre hook 2014-07-18 14:34:04 +02:00
blizzz 6c28c9b141 Merge pull request #9718 from owncloud/sftp-early-login
SFTP: login() must be called after getServerPublicHostKey().
2014-07-18 13:34:28 +02:00
Jenkins for ownCloud 80983f5853 [tx-robot] updated from transifex 2014-07-18 01:54:43 -04:00
Remco Brenninkmeijer 3ebcc29ee3 Before I get spanked ;) 2014-07-17 21:31:54 +02:00
Remco Brenninkmeijer d0cd4d5ad9 Adjusted tests for new default sorting 2014-07-17 20:27:55 +02:00
Remco Brenninkmeijer 4f747aaa7a While busy cleaning, also removed extra enters 2014-07-17 13:05:58 +02:00
Remco Brenninkmeijer 616c5b2681 Corrected (Netbeans?) inserted spaces 2014-07-17 12:48:50 +02:00
Vincent Petry 7a1048956f Fix preview animation on uploading
When adding/uploading files, the preview is now animated.
When loading a list of files directly the preview is displayed directly.
2014-07-17 12:42:09 +02:00
Bjoern Schiessle 78b13de4bf check that the file proxies are enabled after each test 2014-07-17 11:22:22 +02:00
Bjoern Schiessle 6e447b6724 update keys recursively if a folder was moved 2014-07-17 11:22:22 +02:00
Jenkins for ownCloud b736864e78 [tx-robot] updated from transifex 2014-07-17 01:55:09 -04:00
Remco Brenninkmeijer e307572e8d Fixed comments from PVince81 2014-07-16 22:53:14 +02:00
Remco Brenninkmeijer c8c00d27c4 Cleanup of unnecesary addition 2014-07-16 22:08:03 +02:00
Remco Brenninkmeijer 742589fe01 Show sorting icons when hovering over 2014-07-16 21:52:08 +02:00
Vincent Petry 7a43c623ae Merge pull request #9653 from owncloud/fix-9590
external storage table layout fixes
2014-07-16 16:52:08 +02:00
Björn Schießle cbf3e2b829 Merge pull request #9662 from owncloud/enc_error_handling_master
[encryption] improved error handling
2014-07-16 15:31:20 +02:00
Robin McCorkell ec2686db91 Merge pull request #9647 from owncloud/files_external_multiuser_tests
Add unit test for multi-user configuration loading
2014-07-16 13:42:12 +01:00
Morris Jobke 454d8d9362 Merge pull request #9664 from owncloud/enc-removelegacytests
[OC8] Removed legacy encryption tests
2014-07-16 14:39:48 +02:00
Morris Jobke 384be680be fix CSS coding style 2014-07-16 14:30:58 +02:00
Vincent Petry 5a33c9c360 Removed legacy encryption tests 2014-07-16 12:38:41 +02:00
Bjoern Schiessle 8105f2ac8a introduce some encryption exceptions and catch additional error cases 2014-07-16 12:36:30 +02:00
Bjoern Schiessle de69c05f99 make sure that the crypt library is loaded 2014-07-16 12:10:52 +02:00
Vincent Petry 658828867c Correctly return the owner display name for children of shares 2014-07-16 12:07:02 +02:00
Jenkins for ownCloud 0155326227 [tx-robot] updated from transifex 2014-07-16 01:55:55 -04:00
Stephane V 934229d1fb Fix #9590. Fix #9612.
For external storage with lots of parameter settings (>4), wrap the content of the cell to let a full view of the parameters.
The rows of the table are now always visible until the end (the trash icon is accessible).
(Note : A strange 3px margin forces me to add a class on the row added by javascript, to be able to align them with the rows rendered by the server.)
2014-07-15 22:33:30 +02:00
Robin McCorkell 483f86513f Add unit test for multi-user configuration loading 2014-07-15 18:39:09 +01:00
icewind1991 bf657883d2 Merge pull request #9639 from owncloud/prevent-irc-trolls-fro-using-this
Add warning because there are people that enable this app because they think it's the WebDAV implementation of ownCloud
2014-07-15 17:28:17 +02:00
Vincent Petry a8d95356ca Merge pull request #8987 from owncloud/lastindexid-debug
[DEBUG] Test case for debugging the last index ID bug from Doctrine/MySQL
2014-07-15 17:01:57 +02:00
Lukas Reschke bebecc6bbf Update info.xml 2014-07-15 15:35:02 +02:00
Bjoern Schiessle 40fe1275de throw exception if file is to large for trash bin 2014-07-15 13:56:02 +02:00
blizzz 0ce8f85bae Merge pull request #9570 from PhilJung/master
[Issue #9559] identifiers uid=xxx must be considered as user DN and not ...
2014-07-15 11:43:31 +02:00
Morris Jobke 4c0ca27909 Merge pull request #9596 from owncloud/fixing-9503-master
reduce share action text to the user name only
2014-07-15 09:15:32 +02:00
Jenkins for ownCloud ff11ef3c5b [tx-robot] updated from transifex 2014-07-15 01:55:20 -04:00
Philippe Jung c13cb6145b File written by blizzz 2014-07-14 22:21:56 +02:00
Thomas Müller 7159d6118e reduce share action text to the user name only 2014-07-14 21:11:50 +02:00
Vincent Petry 10a29556b0 - Added test to trigger index id error
- re-enable encryption migration tests
- sqlite requires reconnect after schema changes
2014-07-14 16:20:09 +02:00
Björn Schießle 45c3a948b9 Merge pull request #9572 from owncloud/deleteunsharetooltip
mountType attribute + delete hint fix
2014-07-14 11:50:19 +02:00
Vincent Petry 8cad574379 Merge pull request #9605 from owncloud/sftp-missing-streamwrapper
Re-add missing sftp:// stream wrapper
2014-07-14 11:45:35 +02:00
Vincent Petry dd7529da98 Added mountType attribute and adapted Delete action text
Added mountType attribute for files/folder to indicated whether they are
regular, external or shared.

The client side then adapts the "Delete" action hint text based on this
information.

Only the mount roots must have the delete icon hint adapted.
To make this detectable on the client side, the mountType can now
be null, "shared", "shared-root", "external" or "external-root".

This also gives room to icon customization on the client side.
2014-07-14 10:36:04 +02:00
Jenkins for ownCloud 5dd76b510f [tx-robot] updated from transifex 2014-07-14 01:54:27 -04:00
Morris Jobke ec3224aab9 Merge pull request #9563 from owncloud/version-delete-cache
Remove deleted versions from the cache
2014-07-13 18:14:14 +02:00
Jenkins for ownCloud d7b8e3209b [tx-robot] updated from transifex 2014-07-13 01:54:35 -04:00
Andreas Fischer e18c8f23df login() must be called after getServerPublicHostKey(). 2014-07-12 20:41:35 +02:00
Andreas Fischer d02604b3fb Add short description explaining how SFTP ext storage class works. 2014-07-12 13:58:49 +02:00
Andreas Fischer c8024934c0 The file providing the sftp:// scheme needs to be included manually. 2014-07-12 13:57:27 +02:00
Jenkins for ownCloud c1e95d62ec [tx-robot] updated from transifex 2014-07-12 01:54:39 -04:00
Vincent Petry 9fa28aa3f4 Disable legacy encryption tests
It seems these tests are not needed any more, but will now be skipped
instead until the case is cleared out.
2014-07-11 15:20:58 +02:00
Arthur Schiwon 537468f4c4 make tests deal with missing bcmath 2014-07-11 14:08:19 +02:00
Arthur Schiwon ebee3543ce warn and continue gracefully if bcmath is not installed 2014-07-10 21:26:31 +02:00
Thomas Müller b8c2e644cc remove pointless require of Blowfish.php 2014-07-10 16:42:21 +02:00
Vincent Petry e391108ebc Merge pull request #9538 from owncloud/fileactions-cleanup
Propagate file action changes to the file lists
2014-07-10 16:15:23 +02:00
Robin Appelman aab33b8b0e Remove deleted versions from the cache 2014-07-10 15:19:40 +02:00
Philippe Jung 79a108c116 [Issue #9559] identifiers uid=xxx must be considered as user DN and not as owncloud users 2014-07-10 14:27:31 +02:00
Vincent Petry 480f5ddda3 Merge pull request #9516 from owncloud/kill-legacy-encryption-oc8
[OC8] Kill legacy encryption migration
2014-07-10 14:01:06 +02:00
Jenkins for ownCloud 77792b5b7e [tx-robot] updated from transifex 2014-07-10 04:59:40 -04:00
Vincent Petry b63e646053 Merge pull request #9460 from owncloud/versions-local
Dont assume local home storage for files_version
2014-07-10 10:28:24 +02:00
Johan Björk ac75a24597 Converted an array to PHP5.3 compatible version 2014-07-09 14:54:03 +02:00
Vincent Petry 22653e21a2 Propagate file action changes to the file lists
Whenever an app needs to register an event late, it does that on the
original file actions object.

Since the file actions that the file list work on is a merged list, not
the original one, the registration event needs to be propagated there as
well.
2014-07-09 12:26:33 +02:00
Jenkins for ownCloud 6e2e0108ee [tx-robot] updated from transifex 2014-07-09 01:55:51 -04:00
Johan Björk e44a7aa034 Fixes #8326: deletion of directories on S3 2014-07-08 22:41:11 +02:00
blizzz 51ee4fc5df Merge pull request #9385 from owncloud/fix-7052
support for AD primary groups
2014-07-08 21:33:50 +02:00
Arthur Schiwon da490bdbbe support for AD primary groups
support for primary groups

actually the problem is only known on AD, it is only needed to take care of their attributes

adjust to ADs special behaviour

this change was not intended

cache the SID value so it is not requested over and over again

theres only one, use singular

we are access

add tests for new Access methods

add tests for new Group methods

address scrutinizer findings, mostly doc

call ldap_explode_dn from ldap wrapper, enables tests without php5-ldap

PHP Doc

yo dawg, i heard you like backslashes … php doc fix

PHPDoc updated and typos fixed while reviewing
2014-07-08 21:32:21 +02:00
Remco Brenninkmeijer 1a65d09f70 Changed default sorting except for names. 2014-07-08 19:52:28 +02:00
Vincent Petry 87adbf1c6e Merge pull request #9515 from owncloud/update-sharecleanupfix
Fix update cleanup to only affect file and folders
2014-07-08 18:09:26 +02:00
Thomas Müller 10978a80c2 Merge pull request #9507 from owncloud/fix-9302-master
Upload abortion is now detected within the  OC_Connector_Sabre_File::put...
2014-07-08 17:39:34 +02:00
Arthur Schiwon 3338a0f236 port of #9500
don't trigger update from checkPassword, it is already  called by userExists, this is enough.

do not write to database when the value is the same

add test cases. also split test classes in a file each, looks like only the first class is being executed

also appconfig shall not write to database if the value is unchanged
2014-07-08 16:32:01 +02:00
Vincent Petry f4f52cf242 Fix update cleanup to only affect file and folders
Fix bug in the SQL query that cleans up stray shares for removed
files/folders, which is now correctly limited to that item type instead
of also removing all other share types.
2014-07-08 14:53:31 +02:00
Thomas Müller 064ac77e44 Kill legacy encryption migration 2014-07-08 13:07:05 +02:00
Thomas Müller ea269f0067 Upload abortion is now detected within the OC_Connector_Sabre_File::put()
OC_Connector_Sabre_AbortedUploadDetectionPlugin is pointless

Adding unit test testUploadAbort()
2014-07-08 11:09:59 +02:00
Christopher T. Johnson 599ab7a802 Fix Signiture Does Not Match when mounting Amazon S3 external storage
For some reason the aws-sdk-php package does not caclulate the
signiture correctly when accessing an object in a bucket with a name of
'.'.

When we are at the top of a S3 bucket there is a need(?) to have a directory
name.  Per standard Unix the name picked was '.' (dot or period).  This
choice exercises the aws-sdk bug.

This fix is to add a field to the method to store the name to use instead of
'.' which at this point is hard coded to '<root>'.  We also add a private
function 'cleanKey()' which will test for the '.' name and replace it with
the variable.  Finally all calls to manipulate objects where the path is
not obviously not '.' are processed through cleanKey().

An example where we don't process through clean key would be
	'Key' => $path.'/',

Use correct relationship operator

Per feed back use === instead of ==

use '/' instead of '<root>'
2014-07-08 10:16:48 +02:00
Jenkins for ownCloud 20fc4b8b53 [tx-robot] updated from transifex 2014-07-08 01:55:17 -04:00
Vincent Petry 5506f9dc81 Merge pull request #9495 from owncloud/remove-moved-mount
When changing the mountpoint of an external storage, ensure the old one ...
2014-07-07 23:23:04 +02:00
Morris Jobke 45a4751f0e Merge pull request #9499 from owncloud/shares-hidetokenrecipient
Do not show recipient for link shares in file list
2014-07-07 20:02:59 +02:00
Morris Jobke 29bdfc0ce2 Merge pull request #9502 from owncloud/add_ocsids
Add ocsids for shipped apps in core repo
2014-07-07 19:58:41 +02:00
Morris Jobke 54a8dce380 Merge pull request #9415 from owncloud/external-sharedialog
Improved external share dialog
2014-07-07 19:51:54 +02:00
Georg Ehrke e5e8e28ae7 add ocsids to info.xml 2014-07-07 17:11:50 +02:00
Vincent Petry 4ba492f28d Fixed shared list sorting
Use Array.sort instead of underscore's sortBy() as they don't use the
same method/function signature.
2014-07-07 16:49:32 +02:00
Vincent Petry 8ddff52c51 Do not show recipient for link shares in file list
In the "Shared with link" section, the share_with field can contain a
value when a password was set.

This fix prevents this value to be shown as it is not intended for the
end user.
2014-07-07 16:33:23 +02:00
Vincent Petry 130b8018a1 Improved external share dialog
Changed title, label and buttons.
Removed icon.
2014-07-07 15:57:26 +02:00
Robin Appelman 18572b2367 Dont delete versions as local files 2014-07-07 15:49:08 +02:00
Robin Appelman 128c226063 When changing the mountpoint of an external storage, ensure the old one is removed 2014-07-07 15:40:01 +02:00
Jan-Christoph Borchardt 498adda0f4 move public page footer rules from sharing app to core so it is used by other apps too 2014-07-07 12:21:48 +02:00
Jenkins for ownCloud 6e9905d7cf [tx-robot] updated from transifex 2014-07-07 01:54:28 -04:00
Frank Karlitschek a468687682 Merge pull request #9453 from owncloud/enc_fix_wrong_file_size
[encryption] always take unencrypted size
2014-07-06 10:38:06 -04:00
Jenkins for ownCloud 33492b4448 [tx-robot] updated from transifex 2014-07-06 01:54:33 -04:00
Jenkins for ownCloud 23e0ef6ed0 [tx-robot] updated from transifex 2014-07-05 01:56:33 -04:00
Björn Schießle a544bd3a0f Merge pull request #9357 from owncloud/sharing_unshare_on_delete
[sharing] unshare childrens on delete
2014-07-04 17:42:52 +02:00
Bjoern Schiessle 5397101e1c improved unit tests 2014-07-04 17:37:35 +02:00