Commit Graph

7494 Commits

Author SHA1 Message Date
Pellaeon Lin 19675c2c9d Fix variable name 2014-01-24 22:54:16 +08:00
Morris Jobke 1fe60e435e Merge pull request #6184 from owncloud/6051-ux-files-Move-File-Spinner
#6051 [ux][files] Move File Spinner
2014-01-24 06:53:53 -08:00
Vincent Petry 9f003a3546 Merge pull request #5954 from owncloud/extstorage-stream-sftp
[Ext storage] Now using SFTP stream wrapper from phpseclib
2014-01-24 06:20:23 -08:00
Vincent Petry c6695bbd76 Fixed download URL in public page
- Refactored download URL building to make it overridable
- Added download URL override in public page
- Added JS unit tests for download URL
- Added OC.redirect() method to facilitate unit testing
2014-01-24 13:38:39 +01:00
Vincent Petry 0671c58e36 Fixed filelist unit tests hidden params
Also added dummy table
2014-01-24 13:19:44 +01:00
Thomas Müller 9fa788c452 Merge pull request #6736 from owncloud/tests-jsunittests
Added Javascript unit tests
2014-01-23 12:43:05 -08:00
Vincent Petry 4734146580 Fixed max upload size input field style
Added "type=text" makes it look like nice like all other fields
2014-01-23 20:50:09 +01:00
Thomas Müller 617aa3cf29 Instead of 'No preview available for ...' we simple display the mieme-type icon 2014-01-23 20:15:10 +01:00
Bjoern Schiessle 28b6434f46 increase size of mimetype column 2014-01-23 18:28:59 +01:00
Jan-Christoph Borchardt 799e744ad7 remove background and width from multiselect bar, fix Download button not showing on mobile 2014-01-23 15:35:30 +01:00
Vincent Petry bf95532fb6 Removed unused writeBack method 2014-01-23 15:05:05 +01:00
Jan-Christoph Borchardt f0c9e8205f remove %webroot from files_sharing app 2014-01-23 14:04:13 +01:00
Morris Jobke 4b7dfd34f8 fix conflicts and add missing closing tag 2014-01-23 13:51:51 +01:00
Jan-Christoph Borchardt 809fb8482d remove %webroot% from files app 2014-01-23 13:11:08 +01:00
Vincent Petry 421f24868a Now using SFTP stream wrapper from phpseclib
- Upgraded phpseclib to master version (post 0.3.5)
- Now using fopen() on sftp URL for both read and write
- Fixes #4063
2014-01-23 12:43:12 +01:00
Björn Schießle 0daabe5b6a Merge pull request #6898 from owncloud/encryption_infinite_loop
[encryption] infinite loop on sharing
2014-01-23 01:09:34 -08:00
Thomas Müller ade726ad32 focus link text only on click in the input field - closes #6817 2014-01-23 01:08:42 +01:00
Thomas Müller f950ce82ae Merge branch 'master' into mobile-style
Conflicts:
	apps/files/js/files.js
	apps/files_sharing/css/public.css
	apps/files_sharing/js/public.js
	apps/files_sharing/templates/public.php
2014-01-23 00:39:11 +01:00
Bjoern Schiessle b489d6b0af fix infinite loop if folder and subfolder has the same name 2014-01-22 17:15:01 +01:00
Bjoern Schiessle eaed786eed add path relative to the files folder of the currently logged in user to the output of getFolderContent() 2014-01-22 17:11:37 +01:00
Robin Appelman 02aa44d055 Merge branch 'master' into memcache-public 2014-01-22 13:19:49 +01:00
Björn Schießle 4474421ada Merge pull request #6890 from owncloud/version_fix_array_order
[files_versions] fix array order
2014-01-22 02:52:30 -08:00
Morris Jobke cf6e79cda8 Merge pull request #6719 from tripflex/fix_pubup_progbar
Fix public upload progress bar
2014-01-22 02:28:28 -08:00
Bjoern Schiessle a567f74d86 fix array order 2014-01-22 11:13:15 +01:00
Bjoern Schiessle 8d36ddcf03 code clean-up 2014-01-22 11:10:32 +01:00
Bjoern Schiessle 0b89a45f11 fix size calculation of getAllVersions() 2014-01-22 11:10:23 +01:00
Thomas Müller 9bab05fd45 Merge branch 'master' into fixing-gallery-password-protected-access-master 2014-01-21 19:36:20 +01:00
Thomas Müller 3b7fea25a3 Merge pull request #6863 from owncloud/versioning_expire_function_tests
Versioning expire function tests
2014-01-21 08:39:50 -08:00
Vincent Petry 91e66eeee1 Merge pull request #6868 from owncloud/enc-fixrandomfailunittest
Replaced time() with uniqid() to make sure the file name is unique
2014-01-21 08:35:41 -08:00
Vincent Petry f09c19c316 Replaced time() with uniqid() to make sure the file name is unique
The cache isn't cleared properly because unlink() doesn't remove the
cache entry which caused side-effects when reusing the same file name
(which randomly happens when time() returns the same value)

This fix first makes sure the unit tests don't fail any more.
The unlink() case with the cache will be investigated separately.
2014-01-21 16:31:58 +01:00
Bjoern Schiessle 85269641db add first unit test for the versioning app 2014-01-21 16:22:08 +01:00
Bjoern Schiessle 9efd07fbab isolate getExpireList function to make it testable 2014-01-21 16:22:08 +01:00
Thomas Müller c57c9eae76 Merge branch 'master' into fixing-gallery-password-protected-access-master 2014-01-21 16:01:24 +01:00
Thomas Müller 262f221d11 Merge branch 'master' into fix-setupfs-only-for-existing-users-master 2014-01-21 15:35:32 +01:00
Thomas Müller 37e278f2a9 don't use the user id within the versions preview call as it could be used to access previews of another user 2014-01-21 13:50:56 +01:00
Jörn Friedrich Dreyer 21832bc890 user workarount to compare CLOB column with CHAR value 2014-01-21 11:56:34 +01:00
Thomas Müller 23a4d0d44e OC_Util::setupFS($user) will create a data dir for the given string - no matter if the user really exists - OCP\JSON::checkUserExists($owner); introduces a ready to use check which will bail out with an JSON error 2014-01-21 11:32:30 +01:00
Thomas Müller 9fd4cb1b66 adding password protection check to getShareByToken() 2014-01-21 10:42:47 +01:00
icewind1991 92d8db6f19 Merge pull request #6849 from owncloud/checkupdate-reuse
Reuse the data retrieved from the cache in checkUpdate
2014-01-20 10:37:18 -08:00
Vincent Petry ee30977383 Merge pull request #6851 from owncloud/files-fixtrashandversionrootsizecalc
When reading the size of "files" mountpoints need to be excluded
2014-01-20 09:28:49 -08:00
Myles McNamara 9555305565 change publicUploadButtonMock to public_upload
Changed jQuery selector for public preview to public_upload to correctly show preview
2014-01-20 11:58:01 -05:00
Thomas Müller 4ec6debe2b remove unused variable 2014-01-20 17:27:03 +01:00
Vincent Petry ca57a849ff When reading the size of "files" mountpoints need to be excluded
The versions and trashbin app are now passing "includeMountPoints=false"
to "getFileInfo()" to make sure that the calculated total size doesn't
include mount points like Shared or external storage.

This is because the default call (legacy) used to return the size of
mount points as well.

Fixes #6731
2014-01-20 17:11:33 +01:00
Robin Appelman 3d6d8d1bb6 Reuse the data retrieved from the cache in checkUpdate 2014-01-20 15:21:21 +01:00
Morris Jobke f88360eba3 Merge pull request #6827 from rnveach/fix_6730
Fix 6730
2014-01-20 01:44:34 -08:00
Vincent Petry f354717c4c Merge pull request #6819 from owncloud/files-ispreviewenabledwarningfix
Fixed isPreviewAvailable warnings in log
2014-01-19 04:48:12 -08:00
kondou fea1cc82e8 Keep the EOF-Newline 2014-01-18 17:51:41 +01:00
raghunayyar 9edbd142a2 Removes Bogus Styles. 2014-01-18 00:46:06 +05:30
rnveach a41440436c added trigger to redo selection text on a directory change 2014-01-17 11:49:00 -05:00
rnveach 90a41ef26a fixed selector string and removed all checkbox if it was selected 2014-01-17 11:46:44 -05:00
Morris Jobke f0a5007e9a fix input element closing tag 2014-01-17 16:32:01 +01:00
Jan-Christoph Borchardt b291fb9cd7 make sure there's enough room for the file actions 2014-01-17 15:47:26 +01:00
Bjoern Schiessle 1df6bf997a add link to documentation 2014-01-17 14:56:15 +01:00
Robin Appelman 5cb08bb9cb Merge branch 'master' into fileinfo
Conflicts:
	tests/lib/files/cache/cache.php
2014-01-17 14:47:29 +01:00
Robin Appelman 299bb4d99d remove more is_array from encryption 2014-01-17 14:38:14 +01:00
Vincent Petry f4c198b907 Fixed isPreviewAvailable warnings in log
isPreviewAvailable wasn't always set as the files formatting code is
slightly different than the one from the files app.

Fixes #6423
2014-01-17 14:22:05 +01:00
Vincent Petry 21d32d8a9e Merge pull request #6810 from kofemann/for-upstream
webdav: return SPACE_UNKNOWN if server do not support quota
2014-01-17 04:09:53 -08:00
Robin Appelman ec7c339930 Don't use is_array on FileInfo 2014-01-17 12:56:17 +01:00
Vincent Petry 4d4bbbda3a Merge pull request #6807 from owncloud/enc_updated_description
updated description of the files encryption app
2014-01-17 03:54:09 -08:00
Tigran Mkrtchyan a78dc11732 webdav: return SPACE_UNKNOWN if server do not support quota
Signed-off-by: Tigran Mkrtchyan <tigran.mkrtchyan@desy.de>
2014-01-17 11:45:26 +01:00
Bjoern Schiessle 6b69c52037 updated description of the files encryption app 2014-01-17 11:08:49 +01:00
Pellaeon Lin 4726a2021b Add $freeSpace and $uploadLimit to files_sharing 2014-01-17 17:10:42 +08:00
raghunayyar 4f593f99b6 Removes Bogus classes from previous commits. 2014-01-16 23:35:30 +05:30
Vincent Petry 350214c609 Added Javascript unit tests
- added karma utility to run jasmine unit tests
- added Sinon library (for stubs/mocks/fakeserver)
- added a few unit tests for core and files
- added autotest-js.sh script
2014-01-16 17:12:29 +01:00
raghunayyar 12e5d0f68d Fixes typos, adds ; wherever not present. 2014-01-16 21:06:14 +05:30
raghunayyar b7b83377c5 Fixes header going down in trash bin app. 2014-01-16 21:00:57 +05:30
Jan-Christoph Borchardt d463edaf09 on mobile, show single shared image at full width without margin 2014-01-16 15:56:18 +01:00
Jan-Christoph Borchardt 5cdab5fff3 show publicly shared image on full width, without margin 2014-01-16 15:32:23 +01:00
Jan-Christoph Borchardt c0590676a0 fix public share download button width 2014-01-16 15:28:39 +01:00
Morris Jobke 16033c8123 Merge pull request #6264 from owncloud/files-draggabledestroy
Fix to not destroy draggable when no draggable was set
2014-01-16 05:52:43 -08:00
Pellaeon Lin 6ec50e4b0c Comments to clarify 2014-01-16 19:48:46 +08:00
Vincent Petry 2233aa2a04 Fixed files row height in Firefox/KDE
Firefox is using native checkboxes and in KDE the checkboxes have a
bigger height which caused the row height to increase and be misaligned
with the date column.

This fix makes the checkbox absolute to prevent it to influence the row
height.
2014-01-16 12:05:05 +01:00
Pellaeon Lin cd6ab29313 Use t() 's native method 2014-01-16 17:51:00 +08:00
raghunayyar fd49d3c5c5 Fixes typo in versions.css 2014-01-16 14:45:23 +05:30
raghunayyar 775e08e0ee Merge branch 'master' into core-em-to-px
Conflicts:
	apps/files_sharing/css/public.css
	apps/user_ldap/css/settings.css
	core/css/multiselect.css
	core/css/share.css
2014-01-16 14:42:37 +05:30
raghunayyar f975fd5499 Fixes Trashbin and Files Style Conflicts, more em to px conversions post rebase 2014-01-16 14:23:39 +05:30
Myles McNamara 62040fe2d2 change em to px 2014-01-15 17:06:48 -05:00
Vincent Petry bd643c47f3 Merge pull request #6223 from owncloud/extstorage-grantaccessasyncfix
Fixed Dropbox/Google storage async save call
2014-01-15 07:41:01 -08:00
Björn Schießle 5163e648f8 Merge pull request #6780 from owncloud/trash_bin_copy_recursively
copy files to owners trash recursively
2014-01-15 06:57:33 -08:00
Jan-Christoph Borchardt 3e7cf4110d tweak color and position of username in public share 2014-01-15 15:49:42 +01:00
Jan-Christoph Borchardt db837bf696 improvements to public files mobile view 2014-01-15 15:48:42 +01:00
Thomas Müller 50ae2ab14c add download button on single file share page 2014-01-15 15:31:27 +01:00
Thomas Müller b3a6683784 remove unused js code and css rules 2014-01-15 15:22:40 +01:00
Thomas Müller ce231c406d no new menu on public upload 2014-01-15 15:07:52 +01:00
Thomas Müller 6c76b4ba12 fixing preview generation 2014-01-15 15:07:24 +01:00
Thomas Müller 807b885a0e reuse file upload as used within files app - remove public upload button 2014-01-15 14:36:18 +01:00
Bjoern Schiessle 592ae16603 remove old code 2014-01-15 14:35:17 +01:00
Bjoern Schiessle f4179a3f5a don't try to encrypt/decrypt cache chunks or files in the trash bin 2014-01-15 14:29:33 +01:00
Bjoern Schiessle f11f65c6a5 copy files to owner trash recursively 2014-01-15 14:27:23 +01:00
Robin Appelman d279ddd9a2 Show the name of the shared folder in the breadcrumb when viewing a publicly shared folder 2014-01-15 13:36:14 +01:00
Robin Appelman 729210daa0 Merge branch 'master' into memcache-public
Conflicts:
	apps/user_ldap/lib/connection.php
2014-01-15 13:02:15 +01:00
Bjoern Schiessle 76fa7bab63 call getFileInfo to enforce a file cache entry for the new version, fix #6286 2014-01-15 11:37:47 +01:00
raghunayyar d8eac2b9bc Merge branch 'master' into files-em-to-px
Conflicts:
	apps/files/css/files.css
2014-01-15 14:59:50 +05:30
Pellaeon Lin dbbbfee7de Fix namespace 2014-01-15 12:36:27 +08:00
Jan-Christoph Borchardt 072ef7f010 remove min-width rule to fix mobile views 2014-01-14 22:14:46 +01:00
Jan-Christoph Borchardt 2bdd014f83 first mobile style rules, hide extra columns in files view and scroll header 2014-01-14 22:14:06 +01:00
Vincent Petry 8135828b2e Fix to not destroy draggable when no draggable was set
When a dir has no delete permission, the draggable isn't initialized on
files. This fix makes sure we don't try to destroy a draggable when it
wasn't inited in the first place.

Fixes #6254
2014-01-14 19:17:23 +01:00
Arthur Schiwon 25fecb4f25 typo, grammar 2014-01-14 16:33:18 +01:00
Arthur Schiwon 097b6b8be9 LDAP: only read config from database, if configID is given. Not what we want to do when on-the-fly-testing settings from the admin page 2014-01-14 16:33:09 +01:00
Arthur Schiwon bb6bad6b3c remove unused variables 2014-01-14 16:33:02 +01:00
Arthur Schiwon e4b7c6ef10 LDAP: fix TLS detection 2014-01-14 16:32:55 +01:00
Vincent Petry ab21c25e38 Merge pull request #6759 from owncloud/extstorage-smbtimezonefix
Fixed timezone issue with SMB storage
2014-01-14 06:03:24 -08:00
Bjoern Schiessle fa7f53e89d it is not an urgent error... a DEBUG message is enough at this point 2014-01-14 13:38:41 +01:00
Andreas Fischer cb071a9f35 Merge pull request #6755 from owncloud/remove-ru_RU-master
remove ru_RU - it has bee removed from transifex

* owncloud/remove-ru_RU-master:
  remove ru_RU - it has bee removed from transifex
2014-01-14 00:44:34 +01:00
Vincent Petry 1eb5ebd58c Fixed timezone issue with SMB storage
Now forcing smbclient to also run on UTC
2014-01-14 00:37:57 +01:00
Bjoern Schiessle d1b47021f1 don't unshare on delete 2014-01-13 16:49:16 +01:00
Thomas Müller 92969052d7 remove ru_RU - it has bee removed from transifex 2014-01-13 16:41:10 +01:00
Vincent Petry 5e04b7f284 Merge pull request #6422 from ccerrillo/fixing-6301-external-mount-webdav-blank-files
Fixing Issue #6301 on master branch
2014-01-13 07:09:01 -08:00
Myles McNamara 97be32e2e8 modify js to move upload wrapper, modify css to match core values 2014-01-10 14:07:20 -05:00
Myles McNamara 9ebffd6635 remove extra upload controls 2014-01-10 14:03:55 -05:00
Myles McNamara 0802b662be fix upload button layout 2014-01-10 12:20:31 -05:00
Vincent Petry 1042733634 Fixed various file name escaping issues in core apps
- Refactored file tr lookup into FileList.findFileEl that uses
  filterAttr to avoid escaping issues in jQuery selectors
- Fixed versions and sharing app to properly escape file names in
  attributes
2014-01-10 15:02:26 +01:00
Vincent Petry b24c21b00f Merge pull request #6687 from owncloud/sharing-fixpartfilehandling
Removed special handling of part files in shared storage rename
2014-01-09 06:16:43 -08:00
Robin Appelman 5d456c7cc2 Merge branch 'master' into memcache-public 2014-01-09 13:54:58 +01:00
Robin Appelman d50c7391d8 Use $server->getMemCacheFactory() in ldap connection 2014-01-09 13:54:50 +01:00
blizzz d8b8abb429 Merge pull request #6681 from owncloud/userreport
add command line option to get user number statistics
2014-01-08 10:41:39 -08:00
Vincent Petry 8eaa39f4e2 Removed special handling of part files in shared storage rename
This fixes the issue introduced by the transfer id which itself wasn't
taken into account by the shortcut code for part file in the shared
storage class.
2014-01-08 18:43:20 +01:00
Arthur Schiwon 677d83d45f LDAP: add tests for countUsers 2014-01-08 12:24:29 +01:00
Arthur Schiwon 53498bc876 remove unnecessary line 2014-01-08 12:20:56 +01:00
Arthur Schiwon b669e1a3c1 LDAP: implement userCount action. This required to (finally) clean up and refactor the search method, which will have a positive performance impact on paged search. 2014-01-08 12:07:57 +01:00
Thomas Müller a8d20e0919 Merge pull request #5238 from owncloud/externalstorage-owncloudbackend
Added ownCloud backend for external storage
2014-01-08 01:49:15 -08:00
Jenkins for ownCloud 6be2dee5bc [tx-robot] updated from transifex 2014-01-08 01:55:41 -05:00
Thomas Müller 2d5427efa9 Merge pull request #6290 from owncloud/files-androidcontentdisposition
Files androidcontentdisposition
2014-01-07 11:06:20 -08:00
Jenkins for ownCloud d2f2645a6a [tx-robot] updated from transifex 2014-01-07 01:56:11 -05:00
Jenkins for ownCloud 0e843b9d7d [tx-robot] updated from transifex 2014-01-06 01:55:59 -05:00
Thomas Müller e2d739fa21 Merge pull request #6580 from monreal/master
Silence output of 'which' command used in smbclient detection
2014-01-05 04:32:30 -08:00
Jenkins for ownCloud e4616199df [tx-robot] updated from transifex 2014-01-05 01:55:53 -05:00
Jenkins for ownCloud aaa48576ee [tx-robot] updated from transifex 2014-01-04 01:55:57 -05:00
Jenkins for ownCloud 095f9b8ee0 [tx-robot] updated from transifex 2014-01-02 01:56:21 -05:00
Jenkins for ownCloud 760fa9ea30 [tx-robot] updated from transifex 2013-12-31 01:55:42 -05:00
Jenkins for ownCloud 9ea9638490 [tx-robot] updated from transifex 2013-12-30 01:55:38 -05:00
Jenkins for ownCloud e345f3f511 [tx-robot] updated from transifex 2013-12-29 01:55:36 -05:00
Jenkins for ownCloud 71c829f92a [tx-robot] updated from transifex 2013-12-28 01:55:35 -05:00
Michael Monreal f52a9e5e42 Silence output of 'which' command used in smbclient detection 2013-12-27 18:10:47 +01:00
Jenkins for ownCloud 64a001edab [tx-robot] updated from transifex 2013-12-27 01:55:35 -05:00
Jenkins for ownCloud dbfe313a63 [tx-robot] updated from transifex 2013-12-25 01:55:35 -05:00
Thomas Müller 6523960de9 Merge pull request #6554 from owncloud/fix_5982
fix preview for reshared file
2013-12-24 04:03:20 -08:00
Jenkins for ownCloud dbbd99db09 [tx-robot] updated from transifex 2013-12-24 01:55:40 -05:00
Georg Ehrke c90e3e4f5b fix preview for reshared file 2013-12-22 20:27:38 +01:00
Jenkins for ownCloud f60ecfc7fd [tx-robot] updated from transifex 2013-12-22 01:56:05 -05:00
Jenkins for ownCloud cd26631a6d [tx-robot] updated from transifex 2013-12-21 01:56:13 -05:00
Jenkins for ownCloud 371a476eb5 [tx-robot] updated from transifex 2013-12-20 01:57:49 -05:00
Björn Schießle 6a3e38266f Merge pull request #6507 from owncloud/enc_fix_getUser
[encryption] fix getUser Helper
2013-12-19 11:09:41 -08:00
Bjoern Schiessle 517a55a437 tests added 2013-12-19 19:43:57 +01:00
Björn Schießle f0da7b20c1 Merge pull request #6517 from owncloud/fix_6510
[encryption] fix rename of shared files
2013-12-19 10:19:09 -08:00
Bjoern Schiessle 552d0a6feb check if the old owner and the old path is available 2013-12-19 18:40:40 +01:00
Bjoern Schiessle 165542f27d fix rename of shared files 2013-12-19 17:29:38 +01:00
Vincent Petry 06dec2632f Merge pull request #6512 from owncloud/master-failingoracletests
Removed numRows usage from encryption app
2013-12-19 08:22:44 -08:00
Björn Schießle 079f1a6f41 Merge pull request #6495 from owncloud/enc_fseek_fallback
Added fseek fallback to the encryption app
2013-12-19 07:09:07 -08:00
Bjoern Schiessle fe7fb66ef8 we can also have a path user/cache/... 2013-12-19 15:58:10 +01:00
Vincent Petry 963ee31efb Removed numRows usage from encryption app
numRows on Oracle always seem to return 0.

This fix removes numRows usage from the encryption and sharing app.

This fixes unit tests and potentially the encryption app itself
(migration status) when running on Oracle
2013-12-19 15:51:24 +01:00
Jenkins for ownCloud 37cdbc3be0 [tx-robot] updated from transifex 2013-12-19 01:57:03 -05:00
Bjoern Schiessle df0c1fe7f3 add test for the stream wrapper to read encrypted files from the system folder /tmp 2013-12-18 17:07:35 +01:00
Bjoern Schiessle f9ec3a7124 test for isEncryptedPath() 2013-12-18 16:39:34 +01:00
Bjoern Schiessle 4f8ae789ae extend the encryption stream wrapper to handle local files and add a fall back for file size calculation if the storage doesn't support fseek 2013-12-18 15:43:50 +01:00
Bjoern Schiessle d9668977cd implement ftell stream wrapper and fix return value from fseek stream wrapper 2013-12-18 15:41:40 +01:00
Thomas Müller 277ae28171 Merge pull request #6295 from owncloud/files-fromlinkerrormessagefixes
Fixed download file from URL error messages
2013-12-18 06:03:50 -08:00
Thomas Müller 930a46e8e2 Merge pull request #6469 from owncloud/enc_cleanup
remove duplicated code
2013-12-18 05:21:42 -08:00
Jan-Christoph Borchardt ee2ecbe543 Merge pull request #6366 from owncloud/fix-6335
Bump the footer down 20px to avoid overlap.
2013-12-17 14:59:24 -08:00
Jenkins for ownCloud 6488ff2c75 [tx-robot] updated from transifex 2013-12-17 16:43:17 -05:00
Björn Schießle 22a6bf9e5a Merge pull request #6474 from owncloud/enc_detect_encrypted_files
reliable detect encrypted files
2013-12-17 09:12:02 -08:00
Frank Karlitschek 0b9f4130b0 clarifying license 2013-12-17 17:32:01 +01:00
Bjoern Schiessle 9a94c07553 remove unused method tail() 2013-12-17 16:19:00 +01:00
Bjoern Schiessle c955381d56 fall back to getLocalFile if storage doesn't support fseek 2013-12-17 16:18:05 +01:00
Bjoern Schiessle 69b89454a4 reliable detect encrypted files 2013-12-17 15:53:25 +01:00
Jenkins for ownCloud a99dd3183c [tx-robot] updated from transifex 2013-12-17 06:46:52 -05:00
Bjoern Schiessle 83417d69be remove duplicated code 2013-12-17 11:28:05 +01:00
Carlos Cerrillo c06844c374 Fix ```createCertificateBundle``` and ```getCertificates``` methods
from ```OC_Mount_config``` to use ```OC_User::getHome``` to get the
path
2013-12-17 10:13:14 +01:00
Carlos Cerrillo b245e2e3d8 Fixing tab/space coding style
Only set SSL things when ```$this->secure``` is ```true```
2013-12-17 09:38:43 +01:00
Frank Karlitschek 753525c57f Merge pull request #6386 from owncloud/trash_always_show_deleted_files_breadcrumb
always show 'Deleted Files' breadcrumb
2013-12-17 00:25:06 -08:00
Björn Schießle 4ae148cebd Merge pull request #6183 from owncloud/enc_tests
enable more encryption tests
2013-12-16 08:46:52 -08:00
Bjoern Schiessle 3e17fbe30d always show home breadcrumb in files view 2013-12-16 17:40:35 +01:00
Bjoern Schiessle 95892c8be9 update file cache for target file 2013-12-16 16:05:24 +01:00
Bjoern Schiessle cdd816c930 only remove encryption keys if a real file gets deleted, skip this method if a file outside of /data/user/files was deleted 2013-12-16 16:05:24 +01:00
Bjoern Schiessle 6d489e0474 call set password hook because it doesn't get triggered during test execution and fix paths 2013-12-16 16:00:16 +01:00
Carlos Cerrillo 7c264c88fe Fixing Issue #6301 on master branch
Added private var $certPath to store the user root cert

Move logic to determine the $certPath path to the constructor and modify to get the path from OC_User::getHome()

Add curl options to use the certificate to avoid certificate errors with self-signed certicates in the downdload/upload method so we don't get blank files
2013-12-15 17:22:52 +01:00
Jenkins for ownCloud 77b68505c2 [tx-robot] updated from transifex 2013-12-13 14:44:31 -05:00
Vincent Petry 769256cb39 Merge pull request #6321 from sevoku/master
fix smbclient directory listing parser
2013-12-13 09:13:06 -08:00
Arthur Schiwon 1292793c4b LDAP: fix method behind save button on advancend and expert tabs, fixes at least Home Folder setinng 2013-12-13 16:29:42 +01:00
Bjoern Schiessle 3831b8b1be always show 'Deleted Files' breadcrumb 2013-12-13 12:17:10 +01:00
ringmaster e2197c7108 Bump the footer down 20px to avoid overlap.
Fixes #6335.
2013-12-12 13:06:57 -05:00
Bjoern Schiessle 79719d9ae5 toggle select all checkbox 2013-12-12 17:33:04 +01:00
Arthur Schiwon 5ba9344b0e LDAP: the browser shall not autofill userdn and password, usually login credentials are inserted. fixes #6283 2013-12-12 14:15:39 +01:00
Vincent Petry 335b2f40a6 Fixed download file from URL error messages
- L10N now converted to string to make them work with json_encode
- Added specific error message when server doesn't allow fopen on URLs
- Fixed client side to correctly show error message in a notification
- Added OCP\JSON::encode() method to encode JSON with support for the
  OC_L10N_String values
2013-12-12 10:38:12 +01:00
Jenkins for ownCloud 7b20212c0a [tx-robot] updated from transifex 2013-12-11 13:32:13 -05:00
Vsevolod Kukol a8f814fe2d fix smbclient directory listing parser 2013-12-11 17:21:34 +01:00
Vincent Petry 050f87c9e4 Merge pull request #6270 from owncloud/sharing-mixeduppermissionsfix
Fixed sharing results to include the correct permissions
2013-12-11 02:59:22 -08:00
root 2b127a6ac5 fix indentation
use identity test where appropriate
use camelcase variable names
_getGroupsByMember is a private function
2013-12-11 10:43:48 +01:00
Pellaeon Lin 5ddd85ff9c Contextual upload error message 2013-12-11 15:40:58 +08:00
Pellaeon Lin 4b081be956 #max_upload is needed after all 2013-12-11 12:21:39 +08:00
Pellaeon Lin 0aa38165a4 Update #free_space on getstoragestats AJAX call 2013-12-11 12:18:18 +08:00
root a18cff4479 remove debug output 2013-12-10 19:02:01 +01:00
root e1d80b3356 Merge remote branch 'upstream/master' into ldap_nested_groups 2013-12-10 18:57:04 +01:00
root 4fb16804d6 move nested group checkbox to directory settings 2013-12-10 18:47:59 +01:00
Vincent Petry 409b510889 Moved content disposition code+workarounds to OCP\Response
Added new OC\Response API called setContentDispositionHeader() that
contains the needed workarounds for UTF8 and IE.

Refactored download code to use the new API.

Removed unused trashbin download file.
2013-12-10 12:42:26 +01:00
Vincent Petry e9255e5d57 Added unit test for sharing permissions 2013-12-10 11:19:09 +01:00
Vincent Petry 89eb3759a8 Fixed sharing results to include the correct permissions
Passing $includeCollections would return more than one entry which gives
mixed up file permissions.

Added a method getFile() that doesn't set $includeCollections to make
sure we only get one result which is the file itself.

Fixes #6265
2013-12-09 18:14:58 +01:00
Jenkins for ownCloud 6aab1ebf44 [tx-robot] updated from transifex 2013-12-09 06:40:22 -05:00
Pellaeon Lin 64bf0fa47f Display different messages for uploadLimit and freeSpace 2013-12-08 23:17:35 +08:00
root 86809be638 combineFilterWithAnd recently moved to Access 2013-12-08 15:49:25 +01:00
Pellaeon Lin 69f2bde324 Change misleading message when file size exceeds upload limit 2013-12-08 15:41:20 +08:00
Jenkins for ownCloud 079d20a80e [tx-robot] updated from transifex 2013-12-07 22:28:29 -05:00
Björn Schießle 575a68074f Merge pull request #6220 from owncloud/debug_oracle_errors
cherry-picks from #5884, just for debugging purpose
2013-12-06 10:00:04 -08:00
blizzz b5939324b0 Merge pull request #6218 from leo-b/fix_ldap_setOption_returncode
correctly propagate the return value of ldap_set_option
2013-12-06 08:54:29 -08:00
Vincent Petry e13be94e56 Fixed Dropbox/Google storage async save call
When clicking "Grant access", the settings for Dropbox/Google were saved
through a call that gets cancelled when redirecting to the grant page
(for example in Firefox)

This fix makes sure the "save settings" call finished before redirecting
to the grant page.

Fixes #6176
2013-12-06 17:25:09 +01:00
Bart Visscher 40f148cc6c Don't try to encrypt a file when the temp file isn't created 2013-12-06 17:01:13 +01:00
root 48e426b589 add support for nested groups 2013-12-06 16:46:52 +01:00
Bjoern Schiessle 9ff231590c set unencrypted_size to 0 after decryption... so that the unencrypted_size gets re-calculated if encryption was enabled again 2013-12-06 16:11:41 +01:00
Björn Schießle b18c8e5c53 Merge pull request #6206 from owncloud/sharing_etag_propagation_on_expire
Sharing etag propagation on expire
2013-12-06 05:41:08 -08:00
Bjoern Schiessle e447d978d3 it is not possible to unshare files 2013-12-06 12:35:47 +01:00
Bjoern Schiessle 9371944e43 fix typo 2013-12-06 12:20:42 +01:00
Bjoern Schiessle 58c0117c3d only create new key on password change if a recovery key exists or if the user don't have any private/public keys 2013-12-06 12:20:31 +01:00
Bjoern Schiessle 8082ef2073 show change password form if key couldn't be decrypted 2013-12-06 12:20:22 +01:00
Bjoern Schiessle 85467b973a add method to check if users private/public key exists 2013-12-06 12:20:14 +01:00
root 54e47b4180 correctly propagate the return value of ldap_set_option
otherwise LDAP_OPT_REFERRALS won't be set to 0 and in turn
active directory paging will stop working
(Operations error on ldap_control_paged_result_response)
2013-12-06 12:04:17 +01:00
Jenkins for ownCloud 4dd84b3627 [tx-robot] updated from transifex 2013-12-05 22:24:39 -05:00
Bjoern Schiessle ace1d40ed6 get owner from share item, if we expire a share while the user updates his /Shared folder than the owner is different from the currently logged in user 2013-12-05 17:25:01 +01:00
Jenkins for ownCloud 7e702f294f [tx-robot] updated from transifex 2013-12-04 18:14:17 -05:00
zombiehugs 8fb4ab097d Fixed indention.
As per @kabum request, indention on line 694 has been fixed.
2013-12-04 12:30:06 -06:00
Arthur Schiwon 3480766a78 LDAP Wizard: don't generate filter when not allowed 2013-12-04 18:59:30 +01:00
Arthur Schiwon 60b1191c88 some equals are more equal than other equals 2013-12-04 18:59:12 +01:00
Arthur Schiwon 01af3bdb05 LDAP Wizard: return correct var 2013-12-04 18:58:52 +01:00
Arthur Schiwon 06577f1fe2 LDAP Wizard: make sure auto-detected suggestions are really applied initially. Also make initial filter compilation and user counting robust against race conditions. 2013-12-04 18:58:29 +01:00
Arthur Schiwon cc725674e0 LDAP: on testing configuration, set active property to true, otherwise inactive connections cannot be tested properly 2013-12-04 18:58:09 +01:00
Arthur Schiwon a10d1977b5 LDAP: set default value for login filter to empty, otherwise the wizard signals completed configuration too early when it might be not correct, i.e. login won't work 2013-12-04 18:57:54 +01:00
Arthur Schiwon 9808dee149 LDAP Wizard: don't send ldap_tls change back to the interface as the element was removed, for it is detected fully automatically. Resolves an JS error and thus an ever-spinning spinner 2013-12-04 18:57:32 +01:00
zombiehugs be0197a29a #6051 [ux][files] Move File Spinner
Added spinner to file icon when moving to new folder or out of folder.

Commit is related to #6051
2013-12-04 11:27:24 -06:00
Arthur Schiwon 430f85cc59 LDAP Wizard: avoid a manually deactivated LDAP configuration is enabled by just opening the admin page 2013-12-04 17:57:47 +01:00
Arthur Schiwon 1c6568cf68 LDAP: make unsetting checkboxes from Advanced tab work again, fixes #6143 2013-12-04 17:57:40 +01:00
Bjoern Schiessle b919a65432 enable more tests 2013-12-04 17:43:38 +01:00
Björn Schießle 737b9a990f Merge pull request #6181 from owncloud/auto_expire_trash
config switch to disable auto expire for the trash bin
2013-12-04 07:44:02 -08:00
Bjoern Schiessle 6b7fdda4f5 config switch to disable auto expire for the trash bin 2013-12-04 16:11:40 +01:00
Morris Jobke 36bc6b871f Revert "Adjust files_encryption requirements to the new core requirement (PHP 5.3.8)."
This reverts commit efbf18652c.
2013-12-04 13:27:38 +01:00
Vincent Petry 72f80c972f Merge pull request #5946 from owncloud/public-page-details
Public page details
2013-12-03 07:26:00 -08:00
Morris Jobke b3a96c081b fix public page - gallery view issues 2013-12-03 13:46:58 +01:00
Vincent Petry 3b7905364f Fixed test function for S3
Fixes #5752
2013-12-03 12:26:08 +01:00
Vincent Petry 76b1fcbf27 Fixed Amazon S3 ext storage config UI
Optional parameters are now really optional

Fixes #5861
2013-12-03 12:26:08 +01:00
Vincent Petry d6121464a0 Fixed placeholder after page reload
The placeholder somehow had too many characters stripping from it...
2013-12-03 12:26:08 +01:00
Morris Jobke 62827376b8 fix trashbin and pbulic page controls 2013-12-03 10:59:22 +01:00
Morris Jobke a6f10a59fc fix and cleanup CSS for public page 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt 5e9ac2f20f change different shades of grey for public share page to white 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt 7867604e22 remove app specific code 2013-12-03 10:54:18 +01:00
Jan-Christoph Borchardt d673dd066a fix details for buttons in header and controls bar 2013-12-03 10:54:18 +01:00
Jenkins for ownCloud 83ec234f53 [tx-robot] updated from transifex 2013-12-02 17:28:29 -05:00
Bjoern Schiessle ee66db447f make it possible to select folders 2013-12-02 16:30:03 +01:00
Vincent Petry a81d4175ba Merge pull request #6148 from owncloud/fix_trash_restore
Fix restore anbd delete operations in trash bin
2013-12-02 04:33:37 -08:00
Bjoern Schiessle fac2f2a626 check explicitely all possible dir values 2013-12-02 12:13:32 +01:00
Bjoern Schiessle edc4447d6a set delete all to true if a complete folder was deleted 2013-12-02 11:59:09 +01:00
Bjoern Schiessle 8ce3ea3e2c fix delete files from trash bin 2013-12-02 11:50:55 +01:00
Andreas Fischer efbf18652c Adjust files_encryption requirements to the new core requirement (PHP 5.3.8). 2013-11-29 20:34:57 +01:00
Vincent Petry baa587fd3c Merge pull request #6123 from owncloud/extstorage-deletedirs2
Fixed FTP and SMB to use rmdir() when deleting folders
2013-11-29 11:23:02 -08:00
Jenkins for ownCloud 1b18c5a047 [tx-robot] updated from transifex 2013-11-29 14:10:40 -05:00
Bjoern Schiessle 71589e65d2 fix restore from files in sub-folders 2013-11-29 16:43:50 +01:00
Vincent Petry d69243ee51 Fixed FTP and SMB to use rmdir() when deleting folders
Some storages need to use different calls for deleting files or folders,
usually unlink() and rmdir().

Fixes #4532 (SMB dir deletion)
Fixes #5941 (FTP dir deletion)

Note that the extra is_dir() should be fast because it's read from the
stat cache.
2013-11-29 13:01:01 +01:00
Frank Karlitschek 0b698e6901 Merge pull request #6111 from owncloud/non-floating-trash-button-chrome
Fix resize issue for trash button in chrome and overflowing spinner in ....
2013-11-29 02:44:49 -08:00
Morris Jobke 41a1a32e5a Merge pull request #6099 from owncloud/fix_source_not_found_warnings
make sure that we don't try to access an already deleted files
2013-11-28 12:59:24 -08:00
Morris Jobke 0cbe9d79ba Merge pull request #6106 from owncloud/fix_preview_creation
Fix preview creation
2013-11-28 12:48:19 -08:00
Morris Jobke 587fc1aff3 Fix resize issue for trash button in chrome and overflowing spinner in .update class
fixes #6108
2013-11-28 21:36:43 +01:00
Bjoern Schiessle b3724cd9c6 remove duplicate 2013-11-28 20:58:32 +01:00
Bjoern Schiessle 348706854c use better coding style 2013-11-28 19:31:35 +01:00
Bjoern Schiessle bef5108218 detect mimetype from the original filename, without the versioning timestamp 2013-11-28 18:59:38 +01:00
Bjoern Schiessle 863aedf784 detect mimetype from the original filename, without the delete timestamp 2013-11-28 18:59:12 +01:00
ganomi f723bf744a Merge pull request #6090 from ganomi/summaryfix
Fix filellist/rename/summary problem
2013-11-28 08:00:41 -08:00
Morris Jobke 3a31f7eb4a Merge pull request #6097 from owncloud/extstorage-ftptrailingslash
Add trailing slash in FTP root path when missing
2013-11-28 04:52:08 -08:00
Morris Jobke 603613e6e6 Merge pull request #6098 from owncloud/files-renamediriconfix
Fixed directory icon after rename
2013-11-28 04:50:17 -08:00
Bjoern Schiessle eaedda2116 make sure that we don't try to access an already deleted files, fixes some file source not found warnings 2013-11-28 13:31:08 +01:00
Arthur Schiwon ee78d48186 loginname is not necessarily username 2013-11-28 13:26:31 +01:00
Vincent Petry da1a89fd15 Fixed directory icon after rename 2013-11-28 13:15:20 +01:00
Frank Karlitschek dab3629ff5 Merge pull request #6089 from owncloud/files-mimetyperefreshafterrename
Redetect mime type whenever extension is renamed
2013-11-28 03:46:42 -08:00
Vincent Petry 30b2ed588b Merge pull request #6096 from owncloud/files-txtextfornewfiles
New file box now has default file name + extension
2013-11-28 03:38:58 -08:00
Vincent Petry 84f3dd15a6 Add trailing slash in FTP root path when missing
Fixes #6093
2013-11-28 11:45:26 +01:00
Vincent Petry 69a3327f47 Moved new file extension out of the translated string 2013-11-28 10:52:59 +01:00
Vincent Petry a1d2f0f516 Merge pull request #6094 from owncloud/enc_fix_reshares
fix path reconstruction for reshares
2013-11-28 01:41:34 -08:00
Vincent Petry 24a08c686d New file box now has default file name + extension
Whenever a user creates a file or folder in the web UI, the input field
will contain a default file name, pre-selected up to the extension for
easier typing.

The purpose is mostly to prevent users creating text files without an
extension.

Fixes #6045
2013-11-28 10:18:31 +01:00
Bjoern Schiessle efe7c4075a fix path reconstruction for reshares 2013-11-27 23:26:04 +01:00
Vincent Petry bc64931cd0 Fixed unit tests for ajax rename 2013-11-27 23:19:57 +01:00
Morris Jobke 54b24ca88d Merge pull request #6048 from owncloud/encryption_initial_enc_indicator
show a message at the log-in screen if inital encryption take place
2013-11-27 14:10:11 -08:00
Morris Jobke 55d7cf8ffd improve encryption message 2013-11-27 23:07:19 +01:00
Bjoern Schiessle d9729168f9 some small js fixes 2013-11-27 22:42:03 +01:00
Bjoern Schiessle 0219b8b3b9 add spinner to the template so that it can be loaded in time 2013-11-27 22:36:47 +01:00
Bjoern Schiessle e0924a5f07 switch to large spinner 2013-11-27 21:58:38 +01:00
Vincent Petry 68f610a90e Update file list entry on rename
Whenever a file is renamed, if the extension changes, the mime type and
preview might change. This fix passes the updated info to the client
that updates it.
2013-11-27 21:35:00 +01:00
Björn Schießle 5295993144 Merge pull request #6088 from owncloud/fix_public_previews
fix public preview creation if a user is logged in
2013-11-27 11:05:27 -08:00
Björn Schießle 34a8c3c4cd Merge pull request #6039 from owncloud/trashbin_move_file_to_owners_trash
move files to owners trash
2013-11-27 10:24:55 -08:00
ganomi f94180a996 Fix filellist/rename/summary problem
Fixes #6055
This contribution is MIT licensed!
2013-11-27 19:09:49 +01:00
Bjoern Schiessle aee7781f22 fix public preview creation if a user ios logged in 2013-11-27 18:44:01 +01:00
Jenkins for ownCloud 4a78f12682 [tx-robot] updated from transifex 2013-11-27 12:10:54 -05:00
Vincent Petry d2840a045d Fixed sharing hook to not remove the share before the trashbin
Fixed the hook order between sharing app and trashbin
2013-11-27 17:22:48 +01:00
Bjoern Schiessle 1536c7ea58 switch from "name" attribute to "id" 2013-11-27 17:01:21 +01:00
Bjoern Schiessle 1065c33543 Merge branch 'master' into encryption_initial_enc_indicator 2013-11-27 16:44:06 +01:00
Bjoern Schiessle 060e0ad0cd with the latest changes in master $this-userID is always the correct ID, so we no longer need the extra parameter 2013-11-27 15:35:32 +01:00
Bjoern Schiessle 9fb71af988 Merge branch 'master' into encryption_enable_public_upload
Conflicts:
	apps/files_encryption/lib/helper.php
	apps/files_encryption/lib/keymanager.php
	apps/files_encryption/lib/stream.php
	apps/files_encryption/lib/util.php
	apps/files_encryption/tests/keymanager.php
2013-11-27 15:08:09 +01:00
Thomas Müller 5b7b053634 Merge pull request #5976 from owncloud/encryption_work_with_public_gallery
Encryption work with public gallery
2013-11-27 04:25:54 -08:00
Bjoern Schiessle 7f2bdb0e97 typo fixed 2013-11-27 12:25:04 +01:00
Bjoern Schiessle 7f3b178d73 some small changes according to the review comments 2013-11-27 11:46:24 +01:00
blizzz 34704eded6 Merge pull request #5955 from owncloud/fix5863
LDAP Wizard: Add raw login filter to corresponding tab for consistency, fix behaviour on raw filter input
2013-11-27 00:30:15 -08:00
blizzz 4f15282bc9 Merge pull request #6058 from owncloud/ldap2avatar
Set Avatar for LDAP users automatically (if a picture is available)
2013-11-26 12:05:32 -08:00
Bjoern Schiessle 7240d349da Merge branch 'master' into encryption_initial_enc_indicator 2013-11-26 19:15:53 +01:00
Vincent Petry e2ca88af5e Merge pull request #6066 from owncloud/extstorage-sftp-overwriteonrename
Fixed SFTP storage to overwrite on rename
2013-11-26 09:01:41 -08:00
Bjoern Schiessle c7e1fe50c2 added a small version of the dark loading gif, looks nicer on the blue background 2013-11-26 17:14:16 +01:00
Jenkins for ownCloud fb7aa2f014 [tx-robot] updated from transifex 2013-11-26 10:47:07 -05:00
Vincent Petry 30e086fb53 Fixed SFTP storage to overwrite on rename 2013-11-26 16:32:44 +01:00
Vincent Petry 2653d914d9 Merge pull request #6008 from owncloud/extstorage-smb-webdav-renamefix
Fixed SMB rename function to overwrite target file
2013-11-26 06:42:36 -08:00
Morris Jobke a48fc120d0 Merge pull request #6054 from owncloud/extstorage-dropboxfixes
Fixed various Dropbox issues + unit tests
2013-11-26 04:48:54 -08:00
Bjoern Schiessle 5d2299eab8 only create complete share key if we know the exact path 2013-11-26 13:30:59 +01:00
Arthur Schiwon 69518b9013 Make sure Avatar is set from LDAP upon first login, not later, but also not before due to missing user folder 2013-11-26 12:57:39 +01:00
Vincent Petry 712b47757a Updated unit tests for SMB
- coverage for touch return value
- fixed directory provider to exclude unsupported cases
2013-11-26 12:53:03 +01:00
Vincent Petry e102eec89a Return true when touch succeeds 2013-11-26 12:47:00 +01:00
Vincent Petry 7c81ac3d28 Fixed various Dropbox issues + unit tests
- fixed touch function to return true on success
- fixed local metadata cache to remove deleted files/directories
- fixed getMetaData() to ignore files reported as deleted by
  Dropbox
- fixed "file not found" case to not log as exception
- fixed "overwrite on rename" case
- fixed unit tests to exclude unsupported cases
- added unit test for touch return value
- unit tests for Dropbox should all run correctly now
2013-11-26 11:59:36 +01:00
Bjoern Schiessle 0617e06f69 use POST instead of GET 2013-11-26 11:38:49 +01:00
Bjoern Schiessle 35a6ad255d fix typo in var name 2013-11-26 11:38:45 +01:00
Jenkins for ownCloud dc67c7efa9 [tx-robot] updated from transifex 2013-11-26 04:04:05 -05:00
Bjoern Schiessle 46dff0677d Merge branch 'master' into calc_version_size 2013-11-26 00:03:54 +01:00
Bjoern Schiessle 8974107b4e remove debug output 2013-11-25 23:57:08 +01:00
Bjoern Schiessle d6fb2afa85 show a message at the log-in screen if inital encryption take place 2013-11-25 23:49:05 +01:00
Arthur Schiwon 03375d6c52 LDAP: username2dn should only return DNs that belong to the current LDAP server. Might be not perfect. Easy perfect solution would increase communication with LDAP server. Let's see if it is good enough 2013-11-25 22:08:11 +01:00
Arthur Schiwon 3955388f20 LDAP: proxy: configurable return to determine when to try the next LDAP server and when to return (multi server setup) 2013-11-25 22:05:00 +01:00
Vincent Petry 944d4156bf Fixed FTP storage unit tests to use the correct class 2013-11-25 18:44:34 +01:00
Bjoern Schiessle f8fcd567a7 move files to owners trash 2013-11-25 16:51:31 +01:00
Björn Schießle 31d0ba0344 Merge pull request #5641 from owncloud/filestrash-emptytrash
Deleting all files in trash now only sends a single flag
2013-11-25 05:24:11 -08:00
Vincent Petry d88025bf6b Fixed ext storage touch function to return true on success
Some ext storage impl didn't return true on success.

Fixes #5943 (Dropbox)
Fixes #6010 (WebDAV)
2013-11-25 12:44:27 +01:00
Vincent Petry 1b0c5e57e5 Fixed SMB rename function to overwrite target file
When uploading files through WebDAV, a part file is created and a rename
operation is performed with the expectation that the part file
overwrites an existing file, if any.

This fix makes the SMB external storage delete the target file before
renaming, as smbclient doesn't support overwrite on move/rename.

Fixes #5348
2013-11-25 11:17:38 +01:00
Bjoern Schiessle 49038545f8 Merge branch 'encryption_work_with_public_gallery' of github.com:owncloud/core into encryption_work_with_public_gallery 2013-11-25 10:29:53 +01:00
Bjoern Schiessle 9c4b8ae54c fix typo in comment 2013-11-25 10:29:05 +01:00
Morris Jobke b82146eeee Merge pull request #5991 from owncloud/extstorage-mountpointvalidation
Prevent using root as mount point for external storage
2013-11-25 00:30:06 -08:00
Thomas Mueller 2a465fb20f Merge branch 'master' into encryption_work_with_public_gallery 2013-11-24 23:20:46 +01:00
Vincent Petry aef34618de Merge pull request #5995 from owncloud/extstorage-isreadablefix
Return plausible isReadable() default impl for ext storage
2013-11-24 03:04:33 -08:00
Jenkins for ownCloud ba0e09adce [tx-robot] updated from transifex 2013-11-24 00:14:51 -05:00
Arthur Schiwon d9347f2c9b LDAP: last avatar lookup must be stored per user. Someone had a blackout, eh? 2013-11-22 23:58:30 +01:00
Vincent Petry 2d947835b9 Now also preventing the user of "Shared" as mountpoint 2013-11-22 18:36:27 +01:00
Vincent Petry c62cce8269 Moved default isReadable/isUpdatable impl into Common class
Also adjusted all ext storage backends to not override these when the
default behavior is expected.
2013-11-22 18:21:17 +01:00
Vincent Petry a49e873d3f Return plausible isReadable() default impl for ext storage
When an ext storage doesn't implement isReadable(), always returning
true made the file scanner believe that the file exists and creates a
cache entry with the size zero.

This fix makes the default impl of isReadable() use file_exists().

Fixes #5940
2013-11-22 18:21:17 +01:00
Bjoern Schiessle acf74b24f2 remove unused variable 2013-11-22 16:10:30 +01:00
Thomas Müller c67b8f2b22 fixed documentation 2013-11-22 14:58:36 +01:00
Arthur Schiwon 6fdce3b7e9 LDAP: user proxy must support canChangeAvatar too 2013-11-22 13:25:20 +01:00
Arthur Schiwon 54f0deff2a LDAP: get user photo from LDAP and set it as avatar if available 2013-11-22 13:25:20 +01:00
Jenkins for ownCloud 60cfdae503 [tx-robot] updated from transifex 2013-11-21 21:07:12 -05:00
Vincent Petry 3b48d23478 Merge pull request #5970 from owncloud/extstorage-webdavdotdirfix
Fixed path normalization to prevent dot dirs
2013-11-21 09:01:47 -08:00
Vincent Petry 476d8e6de0 Added unit test for root mount point validation 2013-11-21 17:26:13 +01:00
Vincent Petry 0b2c9b823c Prevent using root as mount point for external storage
Fixes #5981
2013-11-21 17:22:12 +01:00
Vincent Petry 39cbdca429 Fixed path normalization to prevent dot dirs
Fixes #5945 where stat(.) would cause the backend OC to cache a dot dir
(only in older versions)
2013-11-21 16:07:01 +01:00
Jenkins for ownCloud 5d9731cef2 [tx-robot] updated from transifex 2013-11-21 10:05:34 -05:00
Bjoern Schiessle 6443e570c2 Merge branch 'encryption_work_with_public_gallery' into encryption_enable_public_upload 2013-11-21 16:00:21 +01:00
Vincent Petry d0265f3388 Merge pull request #5715 from owncloud/quota-sharing-wrapotherusershome
Quota storage wrapper is now used for all users in sharing mode
2013-11-21 06:59:50 -08:00
Bjoern Schiessle d2e6f7d979 check HTTP Referer to check if we come from public.php or from a internal page.
Necessary to detect public access also if a user is logged in.
2013-11-21 15:57:49 +01:00
Morris Jobke 3e1ade4397 Merge pull request #5988 from owncloud/files-mobilequickfix
Added min width to files table
2013-11-21 06:09:11 -08:00
Vincent Petry 14ad1ebf53 Added min width to files table
Having a too small widths for the files table doesn't make sense as it
overlaps file actions with the files themselves and make them
unclickable, especially when viewed on mobile phone.

The compromise that this fix introduces is to have a minimum width that
will trigger horizontal scrolling, which will at least make it possible
to click files on mobile phones.
2013-11-21 14:45:24 +01:00
blizzz a20c6049c3 Merge pull request #5979 from owncloud/fix5881
LDAP Wizard: add objectclass for group detection in Zimbra
2013-11-21 04:03:33 -08:00
Bjoern Schiessle 9d16353e09 disable trahs in files_sharing/public.php 2013-11-21 12:06:35 +01:00
Vincent Petry 356eef0739 Quota storage wrapper is now used for all users in sharing mode
When accessing a shared folder, the folder's owner appears as mountpoint
but wasn't wrapped by a quota storage wrapper.

This fix makes sure that all home storages are wrapped by a quota
storage wrapper, if applicable, to make sure quotas are respected when
uploading into shared folders.
2013-11-21 12:04:54 +01:00