wbrawner/server
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions
22176 commits 157 branches 562 tags 714 MiB
Commit graph

1122 commits

Author SHA1 Message Date
Jenkins for ownCloud
0dcd8079dc [tx-robot] updated from transifex 2014-09-11 01:54:41 -04:00
Robin McCorkell
08e38a1072 Fix mkdir error in mountconfig.php 2014-09-10 17:28:25 +02:00
Robin McCorkell
b754a8261a Load apps in test situations 2014-09-10 17:28:25 +02:00
Jenkins for ownCloud
c119a9fd32 [tx-robot] updated from transifex 2014-09-10 01:54:54 -04:00
Vincent Petry
412da87e65 Move select2 from files_external to core 2014-09-09 18:03:05 +02:00
Jenkins for ownCloud
317e6d03b4 [tx-robot] updated from transifex 2014-09-09 01:55:47 -04:00
Lukas Reschke
0ec9c2ccf8 Merge pull request #10885 from owncloud/swift-hasupdated 
Fix hasUpdated for folders in openstack swift
 2014-09-08 18:19:59 +02:00
Jenkins for ownCloud
6ca2ba6fde [tx-robot] updated from transifex 2014-09-06 01:55:03 -04:00
Robin Appelman
a1f4a0601b Fix hasUpdated for folders in swift backend 2014-09-05 13:23:10 +02:00
Robin Appelman
3d7aff84e5 Fix configuration of rackspace 2014-09-05 13:22:35 +02:00
Jenkins for ownCloud
a8861c70c8 [tx-robot] updated from transifex 2014-09-04 01:55:22 -04:00
Johan Björk
d2979da864 Fix failing AmazonS3::touch on updated aws sdk 2014-09-03 12:09:12 +02:00
Johan Björk
dadb1fad2a Update AWS sdk to 2.6.15 2014-09-03 12:09:06 +02:00
Jenkins for ownCloud
8787162ec9 [tx-robot] updated from transifex 2014-09-03 01:54:34 -04:00
Jenkins for ownCloud
689bbbe937 [tx-robot] updated from transifex 2014-09-02 01:56:07 -04:00
Jenkins for ownCloud
e6e04bde4f [tx-robot] updated from transifex 2014-09-01 01:59:19 -04:00
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
c1b11571ea Move certificate management interface from files_external to core 2014-08-31 10:47:50 +02:00
Robin Appelman
dcc4f96d3e Verify names of 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
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
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
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
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
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
c733842a9a [tx-robot] updated from transifex 2014-08-26 01:56:33 -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
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
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
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
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
Jenkins for ownCloud
77cfddff0f [tx-robot] updated from transifex 2014-08-19 01:57:09 -04: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
Jenkins for ownCloud
c132dd6357 [tx-robot] updated from transifex 2014-08-16 01:56:44 -04:00
Jenkins for ownCloud
93f5e90c9f [tx-robot] updated from transifex 2014-08-15 01:56:14 -04:00
Jörn Friedrich Dreyer
240b952333 use S3Client::encodeKey(), fixes #8325 2014-08-14 21:46:50 +02:00
Jenkins for ownCloud
67b7160e7b [tx-robot] updated from transifex 2014-08-14 01:55:35 -04:00
Volkan Gezer
d1f483c9ed remove obsolete japanese lang code 2014-08-13 22:35:08 +02:00
Jenkins for ownCloud
e4221869c2 [tx-robot] updated from transifex 2014-08-12 01:56:16 -04:00
Jenkins for ownCloud
c920ca32e8 [tx-robot] updated from transifex 2014-08-10 01:55:15 -04:00
Jenkins for ownCloud
d63b9e68c4 [tx-robot] updated from transifex 2014-08-08 01:55:11 -04: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
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
Jenkins for ownCloud
c1562057e8 [tx-robot] updated from transifex 2014-07-31 01:55:01 -04: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
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
Andreas Fischer
a27753dd80 Pass existing Net_SFTP object into Net_SFTP_Stream. 2014-07-18 15:47:13 +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
Jenkins for ownCloud
b736864e78 [tx-robot] updated from transifex 2014-07-17 01:55:09 -04: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
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
384be680be fix CSS coding style 2014-07-16 14:30:58 +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
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
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
Johan Björk
ac75a24597 Converted an array to PHP5.3 compatible version 2014-07-09 14:54:03 +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
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
Georg Ehrke
e5e8e28ae7 add ocsids to info.xml 2014-07-07 17:11:50 +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
Vincent Petry
59ca30d462 Fix reload call for all subclasses 
All subclasses must also properly return the ajax call object.
 2014-07-04 11:45:36 +02:00
Jenkins for ownCloud
e4a3f8d3c4 [tx-robot] updated from transifex 2014-07-04 01:56:01 -04:00
Jenkins for ownCloud
1a1c5aa3c0 [tx-robot] updated from transifex 2014-07-03 01:56:24 -04:00
Jenkins for ownCloud
9933b33166 [tx-robot] updated from transifex 2014-07-02 01:55:17 -04:00
Vincent Petry
5e6f6da786 Fix warnings when personal is not set 2014-07-01 13:32:57 +02:00
Vincent Petry
19ab6165e7 Merge pull request #9300 from owncloud/extstorage-listfilterfix 
Use filtered list for ext storage list mounts API
 2014-07-01 09:56:47 +02:00
Jenkins for ownCloud
a878b42b42 [tx-robot] updated from transifex 2014-07-01 01:54:43 -04:00
Vincent Petry
8977a68548 Use filtered list for ext storage list mounts API 
Now the external storage correctly returns the mount points visible only
for the current user by using the method getAbsoluteMountPoints() which
is already filtered.

Since that call was missing the backend name which is important for the
UI, this one was added as well.
 2014-06-30 12:33:11 +02:00
Jenkins for ownCloud
589f68ebf6 [tx-robot] updated from transifex 2014-06-30 01:54:47 -04:00
Jenkins for ownCloud
ebf93448f2 [tx-robot] updated from transifex 2014-06-29 01:56:00 -04:00
Morris Jobke
cec20d5049 Merge pull request #9020 from owncloud/l10n-external-errors-fix 
some strings to localize external mount api responses. fix #8094
 2014-06-28 11:40:32 +02:00
Jenkins for ownCloud
26d0978993 [tx-robot] updated from transifex 2014-06-28 01:54:54 -04:00
Vincent Petry
fd8b5680dd Merge pull request #8383 from owncloud/object_storage 
Object storage
 2014-06-27 16:53:03 +02:00
Vincent Petry
586b3a9683 Sync file list with file actions 
Whenever file actions are registered later, now the file lists are
automatically notified.

Added FileActions.addUpdateListener() to be able to receive such
notifications.

This removes the need for apps to manually call FileActions.display()
after registering new actions.

This fixes issues with race conditions when file actions are
registered after the file list was already rendered.
 2014-06-27 13:41:01 +02:00
Thomas Müller
171475b95a fix autoloader 2014-06-27 08:52:40 +02:00
Thomas Müller
c745240543 Move \OC\Files\Storage\DAV to core in order to reduce inter-app dependencies 2014-06-27 08:52:28 +02:00
Jenkins for ownCloud
36f771e9f0 [tx-robot] updated from transifex 2014-06-27 01:55:44 -04:00
Jörn Friedrich Dreyer
42e9d49d72 update files_external swift to php-opencloud v1.9.2 2014-06-25 17:15:59 +02:00
Jörn Friedrich Dreyer
e792d38c11 remove rackspace opencloud libs from files_external 3rdparty 2014-06-25 14:54:43 +02:00
Jenkins for ownCloud
b1116880f8 [tx-robot] updated from transifex 2014-06-25 06:33:53 -04:00
Robin Appelman
544963f414 Allow adding object stores with the files_external mount config 2014-06-24 14:36:57 +02:00
Jenkins for ownCloud
6a4a474aa9 [tx-robot] updated from transifex 2014-06-24 01:54:39 -04:00
Robin Appelman
d24c0f4d42 Dont allow opening writable streams on a read only dav mount 2014-06-23 14:35:19 +02:00
Jenkins for ownCloud
b8b7c97a41 [tx-robot] updated from transifex 2014-06-23 01:54:38 -04:00
Jenkins for ownCloud
e1fd10f226 [tx-robot] updated from transifex 2014-06-19 01:55:38 -04:00
Morris Jobke
ed10f56994 Merge pull request #9071 from owncloud/extstorage-list-unittests 
Added JS unit tests for ext storage
 2014-06-19 01:21:21 +02:00
Jenkins for ownCloud
baf46c74cd [tx-robot] updated from transifex 2014-06-18 01:55:13 -04:00
Vincent Petry
58c204abb4 Added JS unit tests for ext storage 
Added JS unit tests for the external storage file list extension.
 2014-06-17 18:29:07 +02:00
icewind1991
8d1cf79152 Merge pull request #8399 from owncloud/server-server-sharing 
Add server<->server sharing
 2014-06-17 17:40:05 +02:00
Jenkins for ownCloud
ce179dcdcb [tx-robot] updated from transifex 2014-06-17 01:55:43 -04:00
Morris Jobke
3069091e61 Merge pull request #9030 from owncloud/default-allow-user-mount-backends 
AllowUserMount defaults now to all backends fixes #7958
 2014-06-16 13:10:01 +02:00
Morris Jobke
0a2c676cda fix camelCase and avoiud re-wrapping $() 2014-06-16 11:35:48 +02:00
Morris Jobke
78b6f59523 fix typo - Backups -> Backends 2014-06-16 11:33:51 +02:00
Jenkins for ownCloud
ec5448bf7d [tx-robot] updated from transifex 2014-06-16 01:54:35 -04:00
Jenkins for ownCloud
4d6fc6f309 [tx-robot] updated from transifex 2014-06-15 01:55:06 -04:00
Robin Appelman
be93b0d01d Fix permissions functions for webdav external storages 2014-06-14 10:22:38 +02:00
Robin Appelman
3f2cb39aba Properly set read permissions for webdav storages 2014-06-14 10:14:08 +02:00
Robin Appelman
21ced89beb Dont return false for internalPath 2014-06-14 10:13:24 +02:00
Robin Appelman
65f3b2fad2 Add server<->server sharing backend 2014-06-14 10:10:37 +02:00
Jenkins for ownCloud
4a26219ecf [tx-robot] updated from transifex 2014-06-14 01:55:24 -04:00
Morris Jobke
86e1d8ca54 AllowUserMount defaults now to all backends fixes #7958 2014-06-13 18:14:41 +02:00
Jenkins for ownCloud
083cf63cc2 [tx-robot] updated from transifex 2014-06-13 01:54:32 -04:00
Volkan Gezer
565f0b281c some strings to localize external mount api responses. fix #8094 2014-06-12 20:31:07 +02:00
Jenkins for ownCloud
55b5ddd735 [tx-robot] updated from transifex 2014-06-12 01:54:34 -04:00
Jenkins for ownCloud
f769c52522 [tx-robot] updated from transifex 2014-06-11 01:55:07 -04:00
Jenkins for ownCloud
6546b589ce [tx-robot] updated from transifex 2014-06-10 01:54:54 -04:00
Jenkins for ownCloud
e5c47a5e30 [tx-robot] updated from transifex 2014-06-09 01:54:32 -04:00
Jenkins for ownCloud
1f2722053f [tx-robot] updated from transifex 2014-06-08 01:56:13 -04:00
Jenkins for ownCloud
e0446a1df5 [tx-robot] updated from transifex 2014-06-07 01:56:13 -04:00
Vincent Petry
e39e6a5584 Fixed delete button CSS in ext storage list 2014-06-06 15:33:33 +02:00
Vincent Petry
710d017eec Added more columns to ext storage list 
Now using system mount and personal mount calls to get the relevant
mount points including backend information.
 2014-06-06 15:06:26 +02:00
Vincent Petry
a47ef52ae2 Fixed ext storage list sorting 2014-06-06 15:06:26 +02:00
Vincent Petry
01c2c3107a Added external storage list in files app 2014-06-06 15:06:26 +02:00
Robin Appelman
a66c2e6a47 Fix the removeMount for personal mounts 2014-06-06 09:55:59 +02:00
Robin Appelman
cabe2873c4 Make personal external mount points (re)movable from the files app 2014-06-06 09:55:59 +02:00
Jenkins for ownCloud
ca739a59f0 [tx-robot] updated from transifex 2014-06-06 01:57:10 -04:00
Thomas Müller
d0eb8f8668 Merge pull request #8880 from owncloud/webdav-read-permissions 
Use the permissions exposed by ownCloud for webdav external storages
 2014-06-05 11:38:02 +02:00
Jenkins for ownCloud
cb61d8a226 [tx-robot] updated from transifex 2014-06-05 01:57:20 -04:00
Robin Appelman
9eb177e8bc Use the permissions exposed by ownCloud for webdav external storages 2014-06-04 18:19:52 +02:00
Thomas Müller
76e04027bc Upgrade SabreDAV to 1.8.10 
Updating SabreDAV namespaces
 2014-06-04 12:22:23 +02:00
Jenkins for ownCloud
f5c4754c2b [tx-robot] updated from transifex 2014-06-04 01:57:48 -04:00
Thomas Müller
d3e830e938 Merge pull request #8729 from owncloud/add-phpseclib-master 
use phpseclib from 3rdparty
 2014-06-03 12:19:04 +02:00
Thomas Müller
17cbfc714a use phpseclib from 3rdparty 
rename class Crypt_Blowfish to Legacy_Crypt_Blowfish
 2014-06-03 12:18:30 +02:00
Morris Jobke
bdfad3440c fix success status symbol to a circle 2014-06-02 17:25:08 +02:00
Jenkins for ownCloud
cff9440a37 [tx-robot] updated from transifex 2014-05-31 01:55:46 -04:00
Jenkins for ownCloud
929882a32a [tx-robot] updated from transifex 2014-05-30 01:55:11 -04:00
Jenkins for ownCloud
368006c7af [tx-robot] updated from transifex 2014-05-29 01:54:40 -04:00
Vincent Petry
c64e920b4d Adjust core apps to use "requiremin" instead of "require" 
Also added a few missing authors.
 2014-05-27 11:54:44 +02:00
Jenkins for ownCloud
a756666585 [tx-robot] updated from transifex 2014-05-27 01:54:54 -04:00
Jenkins for ownCloud
790c0e8e7c [tx-robot] updated from transifex 2014-05-26 01:55:36 -04:00
Jenkins for ownCloud
3029029afd [tx-robot] updated from transifex 2014-05-25 01:54:35 -04:00
Jenkins for ownCloud
2afdd1bf1a [tx-robot] updated from transifex 2014-05-24 01:55:34 -04: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
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
Sascha Schmidt
4b2888cd9a Changed access mode for Dropbox to 'auto' 2014-05-21 09:40:03 +02:00
Jenkins for ownCloud
40fc1d5b4b [tx-robot] updated from transifex 2014-05-20 01:54:53 -04:00
Morris Jobke
dc36d30953 Remove all occurences of @brief and @returns from PHPDoc 
* test case added to avoid adding them later
 2014-05-19 17:50:53 +02:00
Andreas Fischer
6c4b650524 Merge pull request #8585 from owncloud/phpdoc-improvements-apps 
PHPDoc improvements /apps

* owncloud/phpdoc-improvements-apps:
  Fix whitespace issues
  Reduce double-space with single-space.
  Remove spaces around | operator in doc block.
  Fix more missing or broken PHPDoc
  PHPDoc fixes for user_ldap
  Fix PHPDoc in /apps
 2014-05-19 14:08:42 +02:00
Jenkins for ownCloud
d52252998a [tx-robot] updated from transifex 2014-05-19 01:54:46 -04:00
Jenkins for ownCloud
a7509e5fd9 [tx-robot] updated from transifex 2014-05-18 01:55:01 -04:00
Jenkins for ownCloud
a1b356c7b6 [tx-robot] updated from transifex 2014-05-17 01:57:38 -04:00
Robin McCorkell
e7aebc5c32 Fix whitespace issues 2014-05-16 22:23:36 +01:00
Robin McCorkell
6930ae22e4 Fix more missing or broken PHPDoc 2014-05-16 22:21:57 +01:00
Robin McCorkell
c4f1de63a8 Fix PHPDoc in /apps 2014-05-16 22:21:57 +01:00
Jenkins for ownCloud
43d6650d19 [tx-robot] updated from transifex 2014-05-16 01:55:55 -04:00
Robin McCorkell
a0f309bbd8 Merge pull request #8589 from fibsifan/files_external_sftp_port 
rename URL-fields to Host for SFTP/FTP and SMB external Storage backends
 2014-05-15 13:22:22 +01:00
fibsifan
06c084cc3c changing label "URL" to "Host" 2014-05-15 14:09:10 +02:00
Jenkins for ownCloud
d9d684197a [tx-robot] updated from transifex 2014-05-15 01:55:53 -04:00
Jenkins for ownCloud
c9df98abae [tx-robot] updated from transifex 2014-05-14 01:55:31 -04:00
Robin McCorkell
08a8a409d6 Extract mount point merging logic into separate function 2014-05-13 00:14:30 +01:00
Jenkins for ownCloud
f4e8de3cbb [tx-robot] updated from transifex 2014-05-12 01:55:44 -04:00
Jenkins for ownCloud
05ea8c8a10 [tx-robot] updated from transifex 2014-05-10 01:55:50 -04:00
Jenkins for ownCloud
9919ec48df [tx-robot] updated from transifex 2014-05-09 01:55:42 -04:00
Vincent Petry
af2b7634ee Merge pull request #8293 from owncloud/files_external_fix_readData 
Fix issue with personal mount points and sharing
 2014-05-08 11:01:54 +02:00
Jenkins for ownCloud
283b483100 [tx-robot] updated from transifex 2014-05-07 01:55:48 -04:00