6ffb139a46
Merge pull request #8658 from realriot/master
...
Changed access mode for Dropbox to 'auto'
2014-05-23 10:14:09 +02:00
856c48bc25
Use default priority of 100 if backend default is not set
2014-05-21 22:31:18 +01:00
da03ef25d9
Add priority overriding comments
2014-05-21 22:29:16 +01:00
0a8a319915
Fix priority merging logic and add unit test
2014-05-21 22:18:22 +01:00
eae45dca71
Add unit tests
2014-05-21 22:18:22 +01:00
2254678a0c
Use constants for priority type and add comments
2014-05-21 22:17:21 +01:00
a0ccb060fa
Use more strict type comparisons
2014-05-21 22:17:21 +01:00
e4d3ee7866
Preserve priority if already set
2014-05-21 22:17:21 +01:00
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
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
4b2888cd9a
Changed access mode for Dropbox to 'auto'
2014-05-21 09:40:03 +02:00
40fc1d5b4b
[tx-robot] updated from transifex
2014-05-20 01:54:53 -04:00
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
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
d52252998a
[tx-robot] updated from transifex
2014-05-19 01:54:46 -04:00
a7509e5fd9
[tx-robot] updated from transifex
2014-05-18 01:55:01 -04:00
a1b356c7b6
[tx-robot] updated from transifex
2014-05-17 01:57:38 -04:00
e7aebc5c32
Fix whitespace issues
2014-05-16 22:23:36 +01:00
6930ae22e4
Fix more missing or broken PHPDoc
2014-05-16 22:21:57 +01:00
c4f1de63a8
Fix PHPDoc in /apps
2014-05-16 22:21:57 +01:00
43d6650d19
[tx-robot] updated from transifex
2014-05-16 01:55:55 -04:00
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
06c084cc3c
changing label "URL" to "Host"
2014-05-15 14:09:10 +02:00
d9d684197a
[tx-robot] updated from transifex
2014-05-15 01:55:53 -04:00
c9df98abae
[tx-robot] updated from transifex
2014-05-14 01:55:31 -04:00
08a8a409d6
Extract mount point merging logic into separate function
2014-05-13 00:14:30 +01:00
f4e8de3cbb
[tx-robot] updated from transifex
2014-05-12 01:55:44 -04:00
05ea8c8a10
[tx-robot] updated from transifex
2014-05-10 01:55:50 -04:00
9919ec48df
[tx-robot] updated from transifex
2014-05-09 01:55:42 -04:00
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
283b483100
[tx-robot] updated from transifex
2014-05-07 01:55:48 -04:00
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
51d1e6c8b1
[tx-robot] updated from transifex
2014-05-05 01:55:47 -04:00
9385b97b5f
[tx-robot] updated from transifex
2014-05-04 01:56:15 -04:00
cf20de185c
[tx-robot] updated from transifex
2014-05-03 01:56:11 -04:00
6519b9672a
[tx-robot] updated from transifex
2014-05-02 01:55:53 -04:00
17f5a18922
[tx-robot] updated from transifex
2014-05-01 01:56:01 -04:00
654a6e6c6a
[tx-robot] updated from transifex
2014-04-30 01:57:53 -04:00
b4a5093da8
[tx-robot] updated from transifex
2014-04-29 01:56:49 -04:00
9128900c56
drop files_irods from apps_external
2014-04-28 12:39:28 +02:00
727e3e2359
Merge pull request #8327 from owncloud/l10n-files_external-fields
...
Add translatable mount configs
2014-04-28 08:52:50 +02:00
642f57c1d5
[tx-robot] updated from transifex
2014-04-28 01:56:24 -04:00
6de6f68ae2
fix single quote sanitization
2014-04-26 18:58:01 +02:00
c591cf0836
[tx-robot] updated from transifex
2014-04-26 01:55:32 -04:00
ace0293bd1
fix layout of external storage config table
2014-04-25 16:34:48 +02:00
3fc809dfd8
[tx-robot] updated from transifex
2014-04-25 01:56:28 -04:00
f520305848
Merge pull request #8026 from owncloud/remove_shared_folder
...
remove the "Shared" folder
2014-04-24 18:45:45 +02:00
435672feaa
[tx-robot] updated from transifex
2014-04-24 01:55:33 -04:00
da61acd1e2
Add translatable mount configs
...
Will close #8070
2014-04-23 17:58:14 +02:00
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
Thomas Müller
Robin McCorkell
Sascha Schmidt
Jenkins for ownCloud
Morris Jobke
Andreas Fischer
fibsifan
Vincent Petry
Volkan Gezer
Morris Jobke
Björn Schießle