Commit Graph

7516 Commits

Author SHA1 Message Date
Vincent Petry 1469ce7b38 Merge pull request #7898 from owncloud/ext-swiftmtime
Fixed mtime reading from OpenStack API
2014-03-27 09:31:37 +01:00
Jenkins for ownCloud ed0cba0ff4 [tx-robot] updated from transifex 2014-03-27 01:56:30 -04:00
Vincent Petry fa00a18677 Fixed mtime reading from OpenStack API
The API seems to return floating point values, which prevents
the hasUpdated() check to work and causes the scanner to rescan
everything every time.
2014-03-26 17:20:40 +01:00
Robin McCorkell 50dba97bde Miscellaneous text fixes for core apps 2014-03-26 15:43:03 +00:00
Vincent Petry b656c68ede Merge pull request #7888 from owncloud/extstorage-multiplemountpointconfig
Fix merging of external storage configurations
2014-03-26 14:30:35 +01:00
Vincent Petry e002b7242c Fix merging of external storage configurations
Merging of configurations is whenever the same config is available for
multiple users/groups, in which case the config is considered as a
single one by the UI, and shows multiple users/groups selected.

Fixed merging logic to make sure that class, mount point and options are
the same before merging them.

Fixed merging to work correctly when the same mount point path is used
for separate users and configs. These are now correctly shows in the UI
as separate entries.
2014-03-26 12:41:25 +01:00
Vincent Petry 8d95c0d013 Pretty print mount.json when possible 2014-03-26 11:32:03 +01:00
Jenkins for ownCloud 75d8de378c [tx-robot] updated from transifex 2014-03-26 01:56:21 -04:00
Thomas Müller 1ae10b9da3 Merge pull request #7420 from owncloud/cachehooks-first
Manually triger the filecache update hooks before any other hook
2014-03-25 22:41:09 +01:00
Thomas Müller bbc2e37259 Merge pull request #7477 from owncloud/foldersize-reuse
Allow re-using already known fileinfo when calculating folder sizes
2014-03-25 22:33:24 +01:00
Vincent Petry 5111fad006 Merge pull request #7689 from owncloud/last_cron_log
Log last cron execution
2014-03-25 19:17:36 +01:00
Vincent Petry e72b2e6e3b Fix public upload to not close session when encryption is on
The encryption app needs to create keys when uploading files, so the
session needs to be kept open in such case.
2014-03-24 17:34:37 +01:00
icewind1991 d87001a093 Merge pull request #7768 from owncloud/trashempty-nocache
Use a more efficient way to determine that the trashbin is empty that doesn't rely on the cache
2014-03-24 13:34:30 +01:00
Robin Appelman 6b66b42f6e catch the case where files_trashbin/files doesn't exist 2014-03-24 12:33:44 +01:00
Jenkins for ownCloud abdc823bb6 [tx-robot] updated from transifex 2014-03-24 01:55:51 -04:00
Jenkins for ownCloud 0245e64cec [tx-robot] updated from transifex 2014-03-22 01:56:09 -04:00
kondou e6b4d28229 Move success/error squircles to settings 2014-03-21 20:27:22 +01:00
Arthur Schiwon 422ccf4cdb add test for cloning and keeping configuration seperate 2014-03-21 15:31:30 +01:00
Arthur Schiwon 86d479cb28 Use array_key_exists instead of isset, because the latter returns false if the assigned value is null 2014-03-21 15:29:49 +01:00
Arthur Schiwon 055a09e487 On clone create a new instance of the Configuration
To avide effects on the original instance of Connection when the clone
is modified, for instance on authentication checks.
2014-03-21 15:27:51 +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
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
Vincent Petry 8ababef4cd Fix validation of allowed personal backend 2014-03-18 17:54:14 +01:00