mbk-lab
/
nextcloud
2
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
33,152 Commits 349 Branches 696 Tags 1.6 GiB
Commit Graph

2013 Commits

Author SHA1 Message Date
Morris Jobke ba16fd0d33 Merge branch 'master' into sync-master 2016-07-07 11:29:46 +02:00
Morris Jobke 5ace43f438 Revert "[tx-robot] updated from transifex" 
This reverts commit 3731b2a006.

Revert "[tx-robot] updated from transifex"

This reverts commit 94d91113f1.

Revert "[tx-robot] updated from transifex"

This reverts commit e7cc8bac1e.

Revert "[tx-robot] updated from transifex"

This reverts commit 59fc3ff45a.

Revert "[tx-robot] updated from transifex"

This reverts commit 6a89a63d2e.

Revert "[tx-robot] updated from transifex"

This reverts commit b0bad03234.
 2016-07-07 11:04:08 +02:00
Jenkins for ownCloud 38718bf89e [tx-robot] updated from transifex 2016-07-07 01:56:27 -04:00
Nextcloud bot da2363a1dd [tx-robot] updated from transifex 2016-07-06 13:28:06 +00:00
Jenkins for ownCloud 34eec57262 [tx-robot] updated from transifex 2016-07-05 02:31:32 -04:00
Vincent Petry 8d866dfba4 Merge pull request #25314 from owncloud/files_external-backends-config 
show configuration options for authentication backends
 2016-07-04 16:10:03 +02:00
Jenkins for ownCloud 9e0d8fcf41 [tx-robot] updated from transifex 2016-07-04 01:56:34 -04:00
Jenkins for ownCloud cea84cf7a8 [tx-robot] updated from transifex 2016-07-03 01:54:52 -04:00
Jenkins for ownCloud dea7b5be35 [tx-robot] updated from transifex 2016-07-02 01:54:53 -04:00
Lukas Reschke 179a355b2c Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-07-01 11:36:35 +02:00
Robin Appelman 9fb92b56ec show configuration options for authentication backends while listing storage 
Fixes #22447
 2016-06-30 15:50:14 +02:00
Robin Appelman f982d104f3 hide hidden parameters from list backend/auth parameters 2016-06-30 15:44:42 +02:00
Jenkins for ownCloud 2b0f053126 [tx-robot] updated from transifex 2016-06-29 05:52:18 -04:00
Morris Jobke b6397ef73a Merge pull request #236 from nextcloud/master-sync-upstream 
[Master] sync upstream
 2016-06-28 09:02:03 +02:00
Jenkins for ownCloud 894b7d93f6 [tx-robot] updated from transifex 2016-06-28 01:57:10 -04:00
Marius Blüm 52f6d97e4e Merge pull request #235 from nextcloud/fix-app-code 
Add app:check-code for already compatible apps
 2016-06-27 23:02:32 +02:00
Lukas Reschke 6670d37658 Merge remote-tracking branch 'upstream/master' into master-sync-upstream 2016-06-27 18:23:00 +02:00
Morris Jobke cee2f5dc65 Merge pull request #233 from nextcloud/allow-users-to-change-global-credentials 
Allow regular users to specify global credentials password
 2016-06-27 17:03:19 +02:00
Morris Jobke 5961d5aae4 Add app:check-code for already compatible apps 
* admin_audit, comments, federation
* removed not needed call to OC_Util::checkAdminUser() (is already
  done by the request handler before)
 2016-06-27 16:50:10 +02:00
Lukas Reschke 341dabf300 Merge pull request #190 from nextcloud/add-wnd-1 
Add "Login credentials" and "User Provided"
 2016-06-27 16:15:31 +02:00
Lukas Reschke 1cd255af56
Allow regular users to specify global credentials password 
While the UI is existent the feature simply doesn't work because admin privileges are required for the controller. This adds proper permission checks and also unit tests.

To test this:
1. Enable external storage
2. Login as non-admin user
3. Go to personal page and try to change global credentials
 2016-06-27 12:29:27 +02:00
Vincent Petry 0d3de20b02 Quickfix: do not lazy load auth mechanisms for ext storages 
Some auth mechanisms like SessionCredentials need to register hooks
early, so they cannot be lazy loaded.
 2016-06-27 10:50:10 +02:00
Lukas Reschke 7a9d60d87e
Merge remote-tracking branch 'upstream/master' into master-upstream-sync 2016-06-26 12:55:05 +02:00
Robin Appelman bac1a3a623 Add option to `occ files_external:list` to show all configured mounts 2016-06-23 13:12:03 +02:00
Vincent Petry d5f4328842 Merge pull request #25223 from owncloud/external-list-default-options 
Hide more default options in occ files_external:list
 2016-06-22 15:53:20 +02:00
Robin Appelman eed1c52aec Hide more default options in occ files_external:list 2016-06-22 13:34:55 +02:00
Jenkins for ownCloud b85bcccc09 [tx-robot] updated from transifex 2016-06-22 01:54:55 -04:00
Vincent Petry 755c86e3a2 Merge pull request #24505 from owncloud/ceph-wait-for-http 
Don't rely on the notify socket but on the service responding
 2016-06-21 16:21:11 +02:00
Lukas Reschke d5dd30c3a0
Add "Login credentials" and "User Provided" 
This adds the "Login Credentials" and "User Provided" option to the external storage implementation, it is basically done by reverting 176fb191b7 from https://github.com/owncloud/core/pull/22432.

This was taken from owncloud/core which is AGPL licensed.
 2016-06-21 14:58:35 +02:00
Robin Appelman 6affbdc6e7
Add "Global Auth" option to external storage 
This adds the "Global Auth" option to the external storage implementation, it is basically done by reverting c2c6caee93 from https://github.com/owncloud/core/pull/22468.

This was taken from owncloud/core which is AGPL licensed. Commited with "icewind@owncloud.com" to keep the license header signature in sync.

![2016-06-21_14-01-06](https://cloud.githubusercontent.com/assets/878997/16228662/9c243136-37b8-11e6-9700-c1076ddb3d17.png)
 2016-06-21 14:16:45 +02:00
Vincent Petry ef5217d6e8 Merge pull request #25173 from owncloud/fix_conversion_issues 
Fix conversion issues
 2016-06-20 17:15:45 +02:00
Juan Pablo Villafáñez bb24e40bf4 Fix conversion issues 
Change to phpdoc type for automatic conversion
 2016-06-20 14:51:36 +02:00
Vincent Petry 09261fca86 Merge pull request #25010 from owncloud/gdrive-fix-tests 
Fix GDrive test rename overwrite folder
 2016-06-20 11:02:24 +02:00
Markus Goetz 111bd8e57d files_external: Keep checkbox and its label on one line #20032 #22655 
Else the checkbox and the decription end up on different lines in my Chrome on OS X
 2016-06-17 16:19:38 +02:00
Thomas Müller bac96e7ffc
Wait for port being accessible in addition to the notify socket 2016-06-17 13:29:24 +02:00
Jenkins for ownCloud cc532bb14a [tx-robot] updated from transifex 2016-06-17 02:00:01 -04:00
Vincent Petry 1a35dea8a6 Merge pull request #24965 from owncloud/streams-0.4.1 
update icewind/streams to 0.4.1
 2016-06-16 17:50:39 +02:00
Vincent Petry d6cf310dfc Merge pull request #25104 from owncloud/dropbox-catchratelimit 
Convert Dropbox Forbidden exception to StorageNotAvailableException
 2016-06-16 16:03:20 +02:00
Robin Appelman 8dea26094b update icewind/streams to 0.4.1 2016-06-15 13:44:02 +02:00
Jürgen Weigert 02e8021b1a Update start-swift-ceph.sh (#25109) 
fix failing https://ci.owncloud.org/job/server-master-linux-externals/database=sqlite,external=swift-ceph,label=SLAVE/
 2016-06-15 10:17:59 +02:00
Vincent Petry e325209291
Convert Dropbox Forbidden exception to StorageNotAvailableException 2016-06-14 17:38:32 +02:00
Vincent Petry c51bdd1809
Fix GDrive test rename overwrite folder 2016-06-10 14:53:37 +02:00
Jenkins for ownCloud e8a66f8e7d [tx-robot] updated from transifex 2016-06-10 05:55:19 +00:00
Vincent Petry ac163426ef Merge pull request #25008 from owncloud/externals_test_with_origin 
Add support to know where the storage test comes from
 2016-06-09 16:21:05 +02:00
Jenkins for ownCloud 355f50bd6c [tx-robot] updated from transifex 2016-06-09 06:16:41 +00:00
Juan Pablo Villafáñez 7d85bed1fc Change the default value to true instead of null 2016-06-08 12:48:33 +02:00
Vincent Petry fa9c96ac4f
Fix GDrive file size when mime type doesn't match contents 
Uploading a txt file with XML contents makes GDrive return the XML mime
type.

This fix makes sure the logic that returns "SPACE_UNKNOWN" for the size
properly rely on the Google Docs mime types.
 2016-06-08 09:46:49 +02:00
Juan Pablo Villafáñez a2b00582bc Fix test 2016-06-07 18:27:10 +02:00
Juan Pablo Villafáñez 110edd3d3c Rename variable 2016-06-07 18:25:17 +02:00
Juan Pablo Villafáñez 8526bbb347 Add support to know where the storage test comes from 2016-06-07 16:53:16 +02:00