Commit Graph

17952 Commits

Author SHA1 Message Date
Vincent Petry a34491e288 Merge pull request #8687 from owncloud/recursive-remove-smb
Make the recursive delete more robust
2014-05-26 11:06:13 +02:00
Frank Karlitschek 48d0cebc42 Merge pull request #8674 from owncloud/watch-policy
Add a config option for setting the filesystem watcher policy
2014-05-26 10:48:44 +02:00
Jenkins for ownCloud 790c0e8e7c [tx-robot] updated from transifex 2014-05-26 01:55:36 -04:00
Volkan Gezer 5fa67a4fb0 Merge pull request #8711 from owncloud/l10n-fully-translatable-ldap
make user_ldap fully translatable
2014-05-25 19:26:37 +02:00
Volkan Gezer f880734827 make user_ldap fully translatable 2014-05-25 14:41:59 +02:00
Thomas Müller 3348019bfa Merge pull request #8705 from wakeup/master
fix typo
2014-05-25 11:00:34 +02:00
Jenkins for ownCloud 3029029afd [tx-robot] updated from transifex 2014-05-25 01:54:35 -04:00
Volkan Gezer 426f492f57 fix typo
Suggested by [mnestis](https://www.transifex.com/accounts/profile/mnestis/) on transifex
2014-05-24 14:36:10 +02:00
Lukas Reschke 1b215b0131 Merge pull request #8688 from owncloud/public-image-positioning
Show less whitespace above publicly shared images
2014-05-24 12:49:12 +02:00
Jenkins for ownCloud 2afdd1bf1a [tx-robot] updated from transifex 2014-05-24 01:55:34 -04:00
Björn Schießle 864cd2455c Merge pull request #8699 from owncloud/sharing_improvements
fix share label creation
2014-05-23 20:53:32 +02:00
Jan-Christoph Borchardt d6a22acd67 Merge pull request #8690 from owncloud/design-noise
remove noise texture from interface
2014-05-23 18:13:02 +02:00
Bjoern Schiessle ff4bb3a9e6 fix share label creation 2014-05-23 16:21:15 +02:00
Jan-Christoph Borchardt 7be0ce6ada remove noise texture from interface (not necessary, and blurry on high-res) 2014-05-23 14:15:36 +02:00
Robin Appelman 10c1fc8d24 Show less whitespace above publicly shared images 2014-05-23 13:36:16 +02:00
Robin Appelman be8326668a Make the recursive delete more robust 2014-05-23 13:31:45 +02:00
Björn Schießle 71e1d919de Merge pull request #8675 from owncloud/sharing-improvements
Sharing improvements
2014-05-23 06:41:34 -04:00
Robin Appelman 151c48494e Add a config option fro setting the filesystem watcher policy 2014-05-23 12:20:31 +02:00
Vincent Petry 0b0e038b8b Merge pull request #8671 from owncloud/log-upload-errors
php upload errors are written to log
2014-05-23 11:33:14 +02:00
Bjoern Schiessle 3b279c9056 prevent default action when clicking on the share notification 2014-05-23 11:17:13 +02:00
Thomas Müller 6ffb139a46 Merge pull request #8658 from realriot/master
Changed access mode for Dropbox to 'auto'
2014-05-23 10:14:09 +02:00
Vincent Petry 9c9644e646 Merge pull request #8647 from owncloud/public-image-scaling
Dont scale up the preview for publicly shared images
2014-05-23 10:06:51 +02:00
Robin Appelman 157b139b57 Dont scale up the preview for publicly shared images 2014-05-22 16:45:51 +02:00
Bjoern Schiessle 11aa2cf74b always check for unique filename, if a file gets added from outside the mount
point should be adjusted to ne unique again
2014-05-22 14:31:22 +02:00
Bjoern Schiessle 1166d62d9b fileList needs be be declared before the if-statement 2014-05-22 14:31:16 +02:00
Björn Schießle 050df76830 Merge pull request #8599 from owncloud/sharing_disable_for_groups
allow admin to disable sharing for specific groups of users
2014-05-22 08:19:27 -04:00
Robin Appelman ff1f341d97 Fix phpdoc 2014-05-22 13:30:32 +02:00
Vincent Petry c4f6a80bdc Merge pull request #8163 from Xenopathic/files_external_priority
Priority on external storage mounts
2014-05-22 13:17:44 +02:00
Thomas Müller 201cc59fe0 php upload errors are written to log 2014-05-22 12:20:27 +02:00
Bjoern Schiessle 12338e0ef0 allow admin to disable sharing for specific groups of users 2014-05-22 10:43:44 +02:00
Remco Brenninkmeijer 4f0370f1da Fix for #8654 2014-05-22 10:35:01 +02:00
Thomas Müller 0249c6d8c7 Merge pull request #8634 from owncloud/handle-excpetions-in-console-master
Handle excpetions in console master
2014-05-22 10:30:33 +02:00
Vincent Petry 25ecd2bdda Merge pull request #8659 from owncloud/get-preference-multiple-user
Add a method to get the values for multiple users to OC\Preferences
2014-05-22 09:59:20 +02:00
Jenkins for ownCloud 69717487f9 [tx-robot] updated from transifex 2014-05-22 01:54:28 -04:00
Robin McCorkell 856c48bc25 Use default priority of 100 if backend default is not set 2014-05-21 22:31:18 +01:00
Robin McCorkell da03ef25d9 Add priority overriding comments 2014-05-21 22:29:16 +01:00
Robin McCorkell 0a8a319915 Fix priority merging logic and add unit test 2014-05-21 22:18:22 +01:00
Robin McCorkell eae45dca71 Add unit tests 2014-05-21 22:18:22 +01:00
Robin McCorkell 2254678a0c Use constants for priority type and add comments 2014-05-21 22:17:21 +01:00
Robin McCorkell a0ccb060fa Use more strict type comparisons 2014-05-21 22:17:21 +01:00
Robin McCorkell e4d3ee7866 Preserve priority if already set 2014-05-21 22:17:21 +01:00
Robin McCorkell 9151d72507 Treat 'all users' as 'global'
A mount applicable to all users is as good a definition of global as can be
2014-05-21 22:17:21 +01:00
Robin McCorkell 05642733a3 Add storage priority support
Each storage backend has a default priority, assigned to any system mounts
created in ownCloud. mount.json can be manually modified to change these
priorities.

The priority order is as follows:
 * Personal
 * User
 * Group
 * Global

Within each mount type, the mount with the highest priority is active.

The storage backend defaults were chosen to be the following:
 * Local - 150
 * Remote storage - 100
 * SMB / CIFS with OC login - 90
2014-05-21 22:17:21 +01:00
Björn Schießle 14a953fbe0 Merge pull request #8416 from owncloud/sharing_keep_mount_points_visible
[sharing] move the mount point up if the parent folder no longer exists
2014-05-21 14:07:49 -04:00
Morris Jobke c586d1f4d5 Merge pull request #8652 from owncloud/logfile_rotate
rotate custom logfile if defined
2014-05-21 17:55:39 +02:00
Joas Schilling d621a6fe5e Clean the database after the test 2014-05-21 16:00:21 +02:00
Joas Schilling e20fb37038 Correctly create list of placeholders 2014-05-21 14:35:59 +02:00
Bjoern Schiessle 5f403f3e92 move the mount point up if a share is mounted to a subfolder and the subfolder no longer exists 2014-05-21 13:19:17 +02:00
Joas Schilling 66f94273c6 Add a lot of users for testing 2014-05-21 13:17:29 +02:00
Joas Schilling 4fbfe077fb Move return to new line 2014-05-21 13:10:23 +02:00