Commit graph

810 commits

Author SHA1 Message Date
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