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

875 commits

Author SHA1 Message Date
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
Vincent Petry
0c8ae6eb66 Added ext storage app in autotest unit test run 
To make sure that the dynamic mount config and config classes from
external storages are tested, these are now added into the autotest.sh
test run by enabling the app.
 2014-05-05 15:03:10 +02:00
Jenkins for ownCloud
51d1e6c8b1 [tx-robot] updated from transifex 2014-05-05 01:55:47 -04:00
Jenkins for ownCloud
9385b97b5f [tx-robot] updated from transifex 2014-05-04 01:56:15 -04:00
Jenkins for ownCloud
cf20de185c [tx-robot] updated from transifex 2014-05-03 01:56:11 -04:00
Jenkins for ownCloud
6519b9672a [tx-robot] updated from transifex 2014-05-02 01:55:53 -04:00
Jenkins for ownCloud
17f5a18922 [tx-robot] updated from transifex 2014-05-01 01:56:01 -04:00
Jenkins for ownCloud
654a6e6c6a [tx-robot] updated from transifex 2014-04-30 01:57:53 -04:00
Jenkins for ownCloud
b4a5093da8 [tx-robot] updated from transifex 2014-04-29 01:56:49 -04:00
Thomas Müller
9128900c56 drop files_irods from apps_external 2014-04-28 12:39:28 +02:00
Thomas Müller
727e3e2359 Merge pull request #8327 from owncloud/l10n-files_external-fields 
Add translatable mount configs
 2014-04-28 08:52:50 +02:00
Jenkins for ownCloud
642f57c1d5 [tx-robot] updated from transifex 2014-04-28 01:56:24 -04:00
Volkan Gezer
6de6f68ae2 fix single quote sanitization 2014-04-26 18:58:01 +02:00
Jenkins for ownCloud
c591cf0836 [tx-robot] updated from transifex 2014-04-26 01:55:32 -04:00
Morris Jobke
ace0293bd1 fix layout of external storage config table 2014-04-25 16:34:48 +02:00
Jenkins for ownCloud
3fc809dfd8 [tx-robot] updated from transifex 2014-04-25 01:56:28 -04:00
Björn Schießle
f520305848 Merge pull request #8026 from owncloud/remove_shared_folder 
remove the "Shared" folder
 2014-04-24 18:45:45 +02:00
Jenkins for ownCloud
435672feaa [tx-robot] updated from transifex 2014-04-24 01:55:33 -04:00
Volkan Gezer
da61acd1e2 Add translatable mount configs 
Will close #8070
 2014-04-23 17:58:14 +02:00
Bjoern Schiessle
22e0a4b9a8 external storages: allow to mount a folder called "Shared", it is no longer a reserved name 2014-04-23 12:54:25 +02:00
Jenkins for ownCloud
3f453d1641 [tx-robot] updated from transifex 2014-04-23 01:56:35 -04:00
Jenkins for ownCloud
a9b4fba528 [tx-robot] updated from transifex 2014-04-22 01:54:58 -04:00
Robin McCorkell
abfd7ecb72 Permit personal mount points to be used for sharing 
An issue existed where `readData` used `OCP\User::getUser()` to get the user
for personal mount points, which worked in all situations apart from when a
personal mount point was used for sharing, so the return from `getUser()` is
not the user that owns the share. As such, any personal mount points would not
work correctly when shared.

`readData` and `writeData` have been changed from using a `$isPersonal`
boolean to using a `$user` string|null. `$isPersonal = false` can now be
written as `$user = NULL` (or left out in the case of `readData`), and
`$isPersonal = true` can be written as `$user = OCP\User::getUser()`.
 2014-04-21 21:42:35 +01:00
Jenkins for ownCloud
4fe5ca1908 [tx-robot] updated from transifex 2014-04-21 01:56:06 -04:00
Jenkins for ownCloud
23f2c48a43 [tx-robot] updated from transifex 2014-04-16 01:57:34 -04:00
Jenkins for ownCloud
2a2aabbdaf [tx-robot] updated from transifex 2014-04-14 01:55:09 -04:00
Lukas Reschke
2454759af7 Check whether the user has permissions to add personal storage backends 2014-04-13 11:01:50 +02:00
Jenkins for ownCloud
982d2bcc5b [tx-robot] updated from transifex 2014-04-13 01:55:12 -04:00
Jenkins for ownCloud
36107e1bad [tx-robot] updated from transifex 2014-04-11 01:55:15 -04:00
Jenkins for ownCloud
7c072510d3 [tx-robot] updated from transifex 2014-04-10 01:55:39 -04:00
Jenkins for ownCloud
796f719548 [tx-robot] updated from transifex 2014-04-09 01:56:49 -04:00
Thomas Müller
411a810ebe Merge pull request #8032 from owncloud/fs-backend-registration 
Files External: allow dynamic backend registration
 2014-04-08 11:27:02 +02:00
Jenkins for ownCloud
4ad4b9768c [tx-robot] updated from transifex 2014-04-08 01:57:51 -04:00
Thomas Müller
3ac009c2b4 unit tests for dynamic backend registration 2014-04-07 20:18:57 +02:00
Jenkins for ownCloud
e295d48fd4 [tx-robot] updated from transifex 2014-04-07 01:56:11 -04:00
Jenkins for ownCloud
a9d49de465 [tx-robot] updated from transifex 2014-04-06 01:56:11 -04:00
Jenkins for ownCloud
0805f678cc [tx-robot] updated from transifex 2014-04-04 01:57:01 -04:00
Thomas Müller
e3b9a86184 remove duplicate method checkDependencies() 2014-04-03 17:17:44 +02:00
Thomas Müller
c6976d89a6 use command -v to detect if smbclient exists 2014-04-03 17:09:40 +02:00
Thomas Müller
14a5381977 Merge branch 'master' into fs-backend-registration 
Conflicts:
	apps/files_external/templates/settings.php
 2014-04-03 17:04:16 +02:00
Thomas Müller
c0ebc1dfb1 Update backends and their configurations 2014-04-03 16:57:26 +02:00
Philipp Kapfer
730bca98b4 Moved dependency checks to end of class files 
Dependency messages now appear below the configuration options instead of above
Reworked dependency check method to support consolidated messages for multiple backends

Conflicts:
	apps/files_external/lib/google.php
	apps/files_external/lib/swift.php
	apps/files_external/templates/settings.php
 2014-04-03 16:46:22 +02:00
Philipp Kapfer
ff9a4a6d91 Added cURL dependency for Amazon S3, Dropbox and SWIFT 
Conflicts:
	apps/files_external/lib/amazons3.php
	apps/files_external/lib/swift.php
 2014-04-03 16:38:43 +02:00
Vincent Petry
e2969062ca Merge pull request #7969 from Xenopathic/files_external_fix 
Fix error log spam
 2014-04-03 16:31:58 +02:00
Philipp Kapfer
46379113a1 Changed dependency check messages from warnings to notes 
Added check for duplicate dependency check messages to display only the first
 2014-04-03 16:31:54 +02:00
Philipp Kapfer
8ca897df76 Added cURL dependency check to Google Drive and WebDAV backend 
Added check for backend's checkDependencies method to OC_Mount_Config::getBackends() when backend is configured to have some instead of blindly calling it and crashing

Conflicts:
	apps/files_external/lib/config.php
	apps/files_external/lib/google.php
 2014-04-03 16:30:48 +02:00
Philipp Kapfer
f7da4280ca Modified app to dynamically register backends instead of hard-coding them 
Moved dependency check to the individual backends instead of the config

Conflicts:
	apps/files_external/appinfo/app.php
	apps/files_external/lib/config.php
 2014-04-03 16:21:52 +02:00
Thomas Müller
a2efdb8722 Merge pull request #7970 from owncloud/webdav-upload-hash 
Fix uploading files containing a # in the path for webdav
 2014-04-03 16:09:44 +02:00