Commit Graph

7556 Commits

Author SHA1 Message Date
Jan-Christoph Borchardt 40c20b2eeb mobile: remove shift for multiselect bar to account for missing navigation 2014-03-21 14:34:05 +01:00
Thomas Müller 6ff96b34ad Merge branch 'master' into load-apps-proper-master
Conflicts:
	apps/files/ajax/rawlist.php
	cron.php
	ocs/v1.php
2014-03-21 14:05:08 +01:00
Vincent Petry 37af74efb3 Merge pull request #7655 from owncloud/shared-unencryptedsize
Fixed warning when browsing Shared folder
2014-03-21 12:28:27 +01:00
blizzz 3f95f9325f Merge pull request #7823 from owncloud/fix_7796
Add FreeIPA UUID compatibility, fixes #7796
2014-03-21 11:27:18 +01:00
Jenkins for ownCloud bcf388d3c5 [tx-robot] updated from transifex 2014-03-21 01:55:35 -04:00
Robin McCorkell 7c3da27bf6 Fix duplicate ipauniqueid 2014-03-20 20:38:06 +00:00
Robin McCorkell 7a0eccfc63 Correct field modifier checking
Existing code checks for the existence of a modifier ('&', '!', '#', '*')
anywhere in the field name, but strips the first character regardless. This
change makes it so that only modifiers at the beginning of the string are
counted.
2014-03-20 18:28:42 +00:00
Robin McCorkell ed0c10a10b Enable the use of 'optional' on password fields
The logic has been changed, in that 'class="optional"' is applied to both
password and text types if the field begins with the optional market, '&'.
2014-03-20 18:27:40 +00:00
Lukas Reschke 2c561c9c50 Merge pull request #7794 from owncloud/extstorage-obfuscatepasswords
Obfuscate passwords in ext storage config
2014-03-20 16:31:12 +01:00
Vincent Petry d95fde3924 Removed comment 2014-03-20 15:24:05 +01:00
Morris Jobke 5747e0e3f9 remove executable flag for file-upload.js 2014-03-20 13:26:21 +01:00
Morris Jobke 95a13e2690 Merge pull request #7814 from oskholl/master
Fix: 'Upload button tooltip doesn't disappear'
2014-03-20 13:25:21 +01:00
Vincent Petry 1e4e0cfcd5 Lazy load phpseclib in ext storage config 2014-03-20 13:21:34 +01:00
Robin Appelman cf23defa52 Fix typo in mount loading 2014-03-20 12:52:09 +01:00
Thomas Müller 8a81df0f2c Merge pull request #7651 from owncloud/close-session-faster-master
Close session faster
2014-03-20 11:07:21 +01:00
Jenkins for ownCloud 3aa8647634 [tx-robot] updated from transifex 2014-03-20 01:56:42 -04:00
Oskar Hollmann 90839b784f Comment moved to prevent 'Line is too long' warning. 2014-03-19 23:05:03 +01:00
Oskar Hollmann fa28c089fa Fix: 'Upload button tooltip doesn't disappear'
Fixes issue #7461. Tipsy tooltip must be hidden when the upload starts. Otherwise it covers the progress bar and stays in DOM.
2014-03-19 22:09:09 +01:00
Robin McCorkell ca595611f5 Add FreeIPA UUID compatibility, fixes #7796
Ability to use ipauniqueid for the UUID of a user
2014-03-19 20:30:24 +00:00
Vincent Petry 9116c39a82 Fixed ext storage password field order issue
The old password field is now preserved in the JSON structure to make
sure that the order is preserved.
This is a quick fix until the UI is fixed to not rely on the PHP array
key order.
2014-03-19 17:56:36 +01:00
Vincent Petry 5b6c36347b Fixed ext storage unit test for groups
Now creating real users and groups for testing external storage mounts
2014-03-19 17:55:34 +01:00
Vincent Petry 8e0a5ed5df Added tests to check mount point list for a target user 2014-03-19 15:21:54 +01:00
Robin Appelman 214357ca68 Improve sorting performance of large lists of files 2014-03-19 13:53:59 +01:00
Vincent Petry 4cb53f77b2 Moved external storage mounting code to files_external app
Moved the mounting code for external storage from
OC\Filesystem::initMountPoint to files_external using the
post_initMountPoints hook
2014-03-19 12:45:38 +01:00
Thomas Müller c216c4777b Merge branch 'master' into close-session-faster-master
Conflicts:
	apps/files/ajax/upgrade.php
2014-03-19 11:44:21 +01:00
Vincent Petry 80180bea32 Added IV for ext storage password encryption 2014-03-19 11:42:22 +01:00
Thomas Müller 33e96597d1 Merge pull request #7790 from owncloud/fix/7788
drop file cache migration OC5 -> OC6
2014-03-19 11:29:50 +01:00
Vincent Petry 40a70ecf79 Added password obfuscation for external storage config
Added obfuscation for all "password" options from external storages.
Added unit tests for reading/writing the configuration.
2014-03-19 10:52:22 +01:00
Vincent Petry e0dada704c Added ext storage unit tests for writing then reload the mount config 2014-03-19 10:52:22 +01:00
Vincent Petry ff5b79edeb Merge pull request #7792 from owncloud/extstorage-fixpersonalstorage
Fix validation of allowed personal backend
2014-03-19 10:00:12 +01:00
Jenkins for ownCloud 7b1d52f5b9 [tx-robot] updated from transifex 2014-03-19 01:55:39 -04:00
Robin McCorkell 340cd2734b Merge pull request #7766 from Xenopathic/master
Fix smb4php to work with home shares
2014-03-18 19:42:04 +00:00
Vincent Petry 1f79f368ef Added unit tests for when adding ext storage mount points
- test config was written correctly (global and local)
- test that personal mount points can be added for allowed backends
- test that personal mount points cannot be added for disallowed backends
- added $skipTest flag to make it possible add mount points without
  doing an actual check/connection (note: this is necessary because the
  static class OC_Mount_Config cannot be mocked)
2014-03-18 18:29:08 +01:00
Thomas Müller 76961ce072 fixing javascript error where $(Files.breadcrumbs[1]).get(0) returns undefined - happens on resize to a very small width 2014-03-18 17:59:21 +01:00
Vincent Petry 8ababef4cd Fix validation of allowed personal backend 2014-03-18 17:54:14 +01:00
Thomas Müller 6b9ae27b90 drop file cache migration OC5 -> OC6 2014-03-18 17:14:38 +01:00
Jan-Christoph Borchardt 285fc5ba96 mobile: change CSS order so rename and versions are hidden 2014-03-18 11:50:08 +01:00
Thomas Müller 153eadd753 Merge branch 'master' into close-session-faster-master 2014-03-17 21:57:48 +01:00
Thomas Müller 756bbe8786 Merge pull request #7649 from owncloud/routing-public
Move routing classes to an interface and expose it in the public api
2014-03-17 21:07:05 +01:00
Thomas Müller ea8705bac8 additional class is added to the file actions called e.g. 'action-share', 'action-rename'
in order to allow proper translations of the action's display name an additional parameter has been added to the register function
2014-03-17 20:15:10 +01:00
Robin Appelman 38b1529c2a More robust way to check if the folder is empty 2014-03-17 17:03:32 +01:00
Robin Appelman 332c14a878 Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache 2014-03-17 16:35:08 +01:00
Robin McCorkell 792d0d3314 Fix smb4php to work with home shares
Stat'ing a share with url_stat now checks if the user can run 'ls' in that share rather than checking if the share is listed by the server. This means that OwnCloud can now mount user home shares, which are never listed by the server.
2014-03-17 15:03:25 +00:00
Frank Karlitschek 8a24e1eb96 clearify the use-case of this app 2014-03-17 12:29:17 +01:00
Morris Jobke 7ffaf0d70a Merge pull request #7734 from owncloud/icon-class-remove
remove unneeded icon class
2014-03-16 10:24:57 +01:00
Jenkins for ownCloud c89aa6d5fe [tx-robot] updated from transifex 2014-03-16 03:13:21 -04:00
Jenkins for ownCloud b2e929d580 [tx-robot] updated from transifex 2014-03-15 02:14:22 -04:00
Thomas Müller bbbbb033f3 in case of phpunit executions calling header() and exit() is too bad 2014-03-14 18:20:33 +01:00
Jan-Christoph Borchardt 55c630ea7d remove unneeded icon class 2014-03-14 14:47:40 +01:00
Jan-Christoph Borchardt ec67d7e635 mobile: first mobile fixes for Files. We still need to hide Rename and Versions 2014-03-14 09:16:53 +01:00
Jenkins for ownCloud 4b802aa7cb [tx-robot] updated from transifex 2014-03-13 17:12:37 -04:00
Björn Schießle b2757e621c Merge pull request #7686 from owncloud/ocs_fix_paths
finally fix the paths for the OCS Share API
2014-03-13 20:27:07 +01:00
Robin Appelman eabeedb306 Merge branch 'master' into cachehooks-first 2014-03-13 15:22:00 +01:00
Bjoern Schiessle 9d32475260 finally fix the paths for the OCS Share API 2014-03-13 15:16:59 +01:00
Vincent Petry 9fa9c791eb Merge pull request #7671 from fpiraneo/patch-1
Update index.php
2014-03-13 13:04:30 +01:00
Jenkins for ownCloud 1295e54173 [tx-robot] updated from transifex 2014-03-13 01:55:50 -04:00
Lukas Reschke b506de6f08 Merge pull request #7681 from owncloud/remove-Sabre_DAV_Browser_Plugin-master
remove Sabre_DAV_Browser_Plugin
2014-03-12 22:28:01 +01:00
Vincent Petry b92be2ef1c Merge pull request #7669 from owncloud/versions_predelete
add preDelete hook for files_versions app
2014-03-12 17:23:54 +01:00
Vincent Petry 881739cbac Merge pull request #7668 from owncloud/trashbin_predelete
add preDelete hook for files_trashbin app
2014-03-12 17:23:38 +01:00
Jenkins for ownCloud 8320b8eb7a [tx-robot] updated from transifex 2014-03-12 01:57:17 -04:00
Thomas Müller ae13ff112f remove Sabre_DAV_Browser_Plugin 2014-03-12 00:10:16 +01:00
Björn Schießle 03f40116e1 Merge pull request #7665 from owncloud/fix_ocs_share_api_paths
Fix ocs share api paths
2014-03-11 16:55:52 +01:00
Francesco Piraneo G. 3f4a0778c8 Update index.php
On line #69 added id="selectedActionsList" to allow an easy adding of new actions customs apps wants to perform on selected files;
2014-03-11 14:29:26 +01:00
Georg Ehrke 9a5c2d0080 add preDelete hook for files_versions app 2014-03-11 14:17:08 +01:00
Georg Ehrke 0f864c38bb add preDelete hook for files_trashbin app 2014-03-11 14:10:12 +01:00
Robin Appelman d55c7223a9 Merge branch 'master' into foldersize-reuse
Conflicts:
lib/private/files/cache/homecache.php
2014-03-11 13:04:20 +01:00
Bjoern Schiessle a09df0083e add 'received_from' info to the share, so that every share can have a different value 2014-03-11 12:59:37 +01:00
Bjoern Schiessle 36885dc64c fix path creation for re-shares, issue #7662 2014-03-11 12:58:46 +01:00
Jenkins for ownCloud b0ec38e202 [tx-robot] updated from transifex 2014-03-11 01:59:39 -04:00
Vincent Petry 022d76c7bb Fixed warning when browsing Shared folder
The virtual "Shared" folder doesn't have an unencrypted_size field.
This fix adds a check to prevent warnings in the log.
2014-03-10 17:25:16 +01:00
Thomas Müller 41f814515e Merge branch 'master' into close-session-faster-master 2014-03-10 17:00:09 +01:00
Thomas Müller 9fb9684da7 Merge pull request #7646 from owncloud/fix_ocs_api_unshare
we need the file_source to delete a share successfully
2014-03-10 16:06:17 +01:00
Vincent Petry 4fdf7682c9 Merge pull request #7398 from owncloud/trash_dont_rely_on_db
[trash] fall back if file is not in db
2014-03-10 16:04:47 +01:00
Bjoern Schiessle 5ddabd7cd0 fix mimetype detection, introduce fake etag to identify preview images 2014-03-10 15:13:28 +01:00
Bjoern Schiessle 4562909a20 get trash size from file cache 2014-03-10 15:13:28 +01:00
Bjoern Schiessle abad625cac only enable previews if the encryption is disabled 2014-03-10 15:13:28 +01:00
Bjoern Schiessle eab844e226 if file is not in db, fall back to restore file to the users root 2014-03-10 15:13:28 +01:00
Thomas Müller 58c216d0e8 close the session on all file operations 2014-03-10 14:39:27 +01:00
Robin Appelman 8ab7d18a6a Move the router classes to a namespace and expose it with a public interface 2014-03-10 14:04:58 +01:00
Vincent Petry 0ffd32a1ae Merge pull request #7629 from owncloud/files-allfileswarningtypo
Fixed log warning when deleting a single file
2014-03-10 11:40:28 +01:00
Bjoern Schiessle 9548670da7 we need the file_source to delete a share successfully 2014-03-10 11:35:54 +01:00
Vincent Petry 92df8deb0a Merge pull request #7631 from ichEben/master
[6.0.2RC1] Share folder as link -- no public upload, drag&drop still works #7422
2014-03-10 10:04:54 +01:00
Vincent Petry 26513bc17b Merge pull request #7624 from owncloud/enc-encryptedusedspacefix
[master] Fixed used space to be based on unencrypted size
2014-03-10 09:38:24 +01:00
IchEben e7d5715114 only initialise upload dropZone if public upload is allowed 2014-03-07 17:45:24 +01:00
Vincent Petry 5671aac5ca Fixed log warning when deleting a single file 2014-03-07 15:03:35 +01:00
Vincent Petry 48d63a6278 Return unencrypted_size of folder when queried
This fixes the "used space" to be based on the unencrypted size, not
encrypted size, to be consistent with how quota/space is handled when
encryption is enabled
2014-03-07 14:59:09 +01:00
icewind1991 3eb58d9973 Merge pull request #7529 from owncloud/getlocalfile-cache
Add caching for getLocalFile on remote storages
2014-03-07 13:29:47 +01:00
Vincent Petry 536c33895f Merge pull request #7592 from owncloud/fixstoragefreespace
Fixed upload issue when free space is not known (ex: FTP)
2014-03-06 17:22:40 +01:00
Vincent Petry 0dcac65aa1 Fixed upload issue when free space is not known 2014-03-06 13:53:55 +01:00
Vincent Petry 07f78c8248 Added unit tests for "add()" method for file upload
- Added OC.Upload.init() to make the code testable
- Added unit tests for the add() method of the uploader with some error
  cases
2014-03-06 13:53:34 +01:00
Thomas Müller 32b29c9d73 Merge branch 'master' into fix-7307
Conflicts:
	core/js/router.js
	settings/js/admin.js
2014-03-06 00:15:08 +01:00
Vincent Petry 1785c0c9b9 Merge pull request #7575 from owncloud/issue/7571
Do not set #dir when on public.php
2014-03-05 19:57:25 +01:00
Lukas Reschke e3156fa5ad Merge pull request #7354 from pschmitt/master
Use 'command -v' to detect whether and where software is installed (instead of 'which')
2014-03-05 19:25:09 +01:00
Joas Schilling 1ab10cb4f7 Do not set #dir when on public.php
Fix #7571
2014-03-05 18:46:55 +01:00
Björn Schießle 9111af0478 Merge pull request #7531 from owncloud/dont_create_shared_folder
don't allow to create a file or folder named 'Shared' in the root folder
2014-03-05 18:13:31 +01:00
Jan-Christoph Borchardt 7ad7f94797 fix some spaces to tabs issues reported by Scrutinizer 2014-03-05 15:47:12 +01:00
Jan-Christoph Borchardt bd86642747 Merge pull request #7261 from owncloud/issue/6793
Allow admins to disable certain external storages for users
2014-03-05 14:41:36 +01:00
Vincent Petry 36d7c0b6a7 Merge pull request #7556 from owncloud/enc_dont_create_files_folder
[enc] don't create users files folder
2014-03-05 13:30:11 +01:00
Bjoern Schiessle 2e73c957e5 don't allow to create a file or folder named 'Shared' in the root folder, also exclude all combinations of lower and upper case letters 2014-03-05 13:16:25 +01:00
Bjoern Schiessle fbd8c00a89 don't create files folder, let ownCloud core handle it 2014-03-05 12:44:02 +01:00