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

12117 commits

Author SHA1 Message Date
Lukas Reschke
00a01a8de2 Fix PHPDoc + Add handling for error cases 
Makes static code analyzers happier.
 2016-01-07 21:30:44 +01:00
Thomas Müller
1cc6fddead Merge pull request #21498 from owncloud/cleanup-OC_DB 
Cleanup OC_DB methods
 2016-01-07 20:13:16 +01:00
Robin McCorkell
430c5df6c4 Fix OAuth external storage auth for step 2 
Parameters are only available after the onCompletion promise is run
 2016-01-07 16:44:17 +00:00
Thomas Müller
6a796ff3cc Merge pull request #21066 from owncloud/behat_capabilities_changing_server_configuration 
Added new capabilities test with changes in server configuration
 2016-01-07 17:07:29 +01:00
Thomas Müller
46107f82d4 Merge pull request #21506 from owncloud/issue-20218-min-max-owncloud-version-warning 
Issue 20218 min max owncloud version warning
 2016-01-07 16:51:00 +01:00
Thomas Müller
629061d00a Merge pull request #21481 from owncloud/ext-smb-dependencies 
Check libsmbclient-php as well as smbclient binary
 2016-01-07 16:19:20 +01:00
Thomas Müller
fddbdbd0e6 Merge pull request #21455 from owncloud/fix-method-signature 
Fix method call + undefined variable
 2016-01-07 16:18:02 +01:00
Joas Schilling
ae285c0654 Remove deprecated shipped flag from info.xml which has no use anymore 2016-01-07 15:15:58 +01:00
Joas Schilling
40f786060e Add ownCloud min and max version for shipped apps 2016-01-07 15:11:49 +01:00
Thomas Müller
601457d221 Merge pull request #20773 from owncloud/share2.0_create 
[Sharing 2.0] create share
 2016-01-07 14:57:05 +01:00
Morris Jobke
547fbfdb76 Remove OC_DB::dropTable 2016-01-07 14:54:54 +01:00
Thomas Müller
29416b07ac Merge pull request #21359 from owncloud/check-changes 
remove mention of 'filesystem_check_changes' => 2 from the config sample
 2016-01-07 14:07:38 +01:00
Vincent Petry
9742e9b113 Add token in webdav download link of public page 2016-01-07 13:37:18 +01:00
Lukas Reschke
fb12063ae5 Fix method call + undefined variable 
1. Variable is not defined
2. Method does not expect any parameters

```
Undefined variable: user at /Users/lukasreschke/Documents/Programming/master/apps/encryption/settings/settings-admin.php#45
```
 2016-01-07 13:22:06 +01:00
Roeland Jago Douma
4a38793d11 Allow only cookie auth to webdav 2016-01-07 10:44:26 +01:00
Morris Jobke
06708cc172 fix js unit tests 2016-01-07 08:57:15 +01:00
Robin Appelman
dbafec0c28 Also remove it from the web interface 2016-01-07 08:57:15 +01:00
Robin McCorkell
fc52327d2c Check libsmbclient-php as well as smbclient binary 2016-01-07 08:56:45 +01:00
Thomas Müller
470bf234c5 Merge pull request #21343 from owncloud/ldap-showremnants-json-output 
Add an option to occ ldap:showremnants to output a json encoded array…
 2016-01-07 08:45:06 +01:00
Jenkins for ownCloud
27dfa74d89 [tx-robot] updated from transifex 2016-01-07 01:55:48 -05:00
Roeland Jago Douma
26280e1f19 [Sharing 2.0] Add L10N instance to manager for translated errors 2016-01-06 14:53:43 +01:00
Roeland Jago Douma
527b434cd2 [Sharing 2.0] Do not use static function to get numeric storage id 2016-01-06 14:53:43 +01:00
Roeland Jago Douma
0ab227310f [Sharing 2.0] General exceptions return 403 
This is the same as the old behaviour
 2016-01-06 14:53:43 +01:00
Roeland Jago Douma
38d3a638ed [Share 2.0] Enable share creation via OCS API 2016-01-06 14:53:43 +01:00
Morris Jobke
553a981980 Make LDAP more robust to exceptions and log them properly 2016-01-06 13:46:55 +01:00
Lukas Reschke
88c7face07 Inject OCSClient 
Fixes https://github.com/owncloud/core/issues/21451
 2016-01-06 11:40:22 +01:00
Jenkins for ownCloud
c77917f48c [tx-robot] updated from transifex 2016-01-06 01:55:16 -05:00
Morris Jobke
80e75aae49 Use color instead of transparency for proper tooltip appearance 
* fixes #21436
 2016-01-05 09:39:24 +01:00
Jenkins for ownCloud
d4034ffca0 [tx-robot] updated from transifex 2016-01-05 01:57:14 -05:00
Jan-Christoph Borchardt
bfee488c56 remove unneeded 'goto' prefix from settings anchors 2016-01-04 12:59:32 +01:00
Jenkins for ownCloud
157bb50a39 [tx-robot] updated from transifex 2016-01-04 01:55:05 -05:00
Jenkins for ownCloud
970495a067 [tx-robot] updated from transifex 2015-12-31 01:55:16 -05:00
Thomas Müller
edd051dc02 Merge pull request #21291 from owncloud/refactor-call-check 
Refactor OC_Util::callCheck
 2015-12-28 10:21:44 +01:00
Thomas Müller
7693c6d84a Merge pull request #21254 from owncloud/files-uploadcanceliconfix 
Correctly render uploadtext indicator only on folders
 2015-12-28 10:21:38 +01:00
Thomas Müller
24271cf953 Merge pull request #21216 from owncloud/fopen-statcache 
Clear SMB statcache after fopen
 2015-12-28 10:21:26 +01:00
Jenkins for ownCloud
89584716f8 [tx-robot] updated from transifex 2015-12-28 01:55:10 -05:00
Jenkins for ownCloud
6fe60569f5 [tx-robot] updated from transifex 2015-12-27 01:54:38 -05:00
Jenkins for ownCloud
33a83a0926 [tx-robot] updated from transifex 2015-12-25 01:55:16 -05:00
Robin Appelman
5f3c462743 Merge pull request #21093 from owncloud/migrate-no-user 
Dont break the files_external migrator if no user is logged in
 2015-12-24 16:43:28 +01:00
Jenkins for ownCloud
726f7e5fa8 [tx-robot] updated from transifex 2015-12-23 02:02:31 -05:00
Stephen Colebrook
064580a56e Add an option to occ ldap:showremnants to output a json encoded array for use in scripts and other tools. 2015-12-22 16:28:32 -05:00
Vincent Petry
ca14277fca Make a modifiable copy of the webdav properties in JS file list 
Plugins can extend _getWebdavProperties to add custom properties.
These should not be added to the original properties list, so now the
FileList makes a copy of the array.
 2015-12-22 11:17:24 +01:00
Thomas Müller
d17c2fb8d9 Merge pull request #21287 from owncloud/travis-dav-caldavtester 
Adding integration tests for CalDAV
 2015-12-22 10:52:54 +01:00
Morris Jobke
6f00729124 Refactor OC_Util::callCheck 2015-12-22 09:32:14 +01:00
Robin Appelman
ef9a231f6c Add error logging to federated sharing handshake 2015-12-21 16:37:54 +01:00
Thomas Müller
d3883ca9d4 Adding integration tests for CalDAV 2015-12-21 16:04:27 +01:00
Thomas Müller
38a006b1e8 Merge pull request #21293 from owncloud/restructure-travis-dav-testing 
Restructure travis tests
 2015-12-21 12:07:21 +01:00
Thomas Müller
ac78d248b7 Sleep in carddavtester as well 2015-12-21 11:43:15 +01:00
Thomas Müller
40d796dde9 Merge pull request #21195 from owncloud/test-carddav-sharing-plugin 
Fix carddav sharing plugin + adding unit tests
 2015-12-21 11:40:03 +01:00
Thomas Müller
0b597c37b3 Restructure travis tests 2015-12-21 11:35:48 +01:00
Jenkins for ownCloud
bc25015bf9 [tx-robot] updated from transifex 2015-12-21 01:55:07 -05:00
Jenkins for ownCloud
7080594670 [tx-robot] updated from transifex 2015-12-20 01:55:09 -05:00
Jenkins for ownCloud
d0cb4c9ab3 [tx-robot] updated from transifex 2015-12-19 01:55:14 -05:00
Vincent Petry
7ecb9696ba Use showBusyState for upload into folder 
This makes sure that the original icon will be restored properly in case
it's not the default folder icon
 2015-12-18 18:09:54 +01:00
Vincent Petry
d27826bac0 Correctly render uploadtext indicator only on folders 2015-12-18 18:09:46 +01:00
Roeland Jago Douma
b460bde7c6 Removed deprecated OC_Helper::mimeTypeIcon function 2015-12-18 14:00:20 +01:00
Roeland Jago Douma
4f20e3bac0 Removed deprecated OC_Helper::getSecureMimeType 2015-12-18 13:42:59 +01:00
Thomas Müller
9e97bef935 Merge pull request #21268 from owncloud/cleanup-OC_Helper-getFileNameMimeType 
Use proper public API for OC_Helper::getFileNameMimeType
 2015-12-18 10:15:33 +01:00
Thomas Müller
551e553bf4 Merge pull request #21264 from owncloud/deprecated_oc_user_methods 
Cleanup OC_User deprecated methods
 2015-12-18 10:15:18 +01:00
Thomas Müller
67e9506261 Fix failing unit tests 2015-12-18 09:18:38 +01:00
Thomas Müller
aac06a33f1 Fix carddav sharing plugin + adding unit tests 2015-12-18 09:18:38 +01:00
Morris Jobke
ecdf88e41b Use proper public API for OC_Helper::getFileNameMimeType 2015-12-17 17:07:48 +01:00
Thomas Müller
792b270f22 Merge pull request #20696 from owncloud/add-carddav-backends-to-ocp-contactsmanager 
Add carddav backend to OCP\ContactsManager
 2015-12-17 16:36:48 +01:00
Roeland Jago Douma
1f715289bf Removed deprecated function OC_User::deleteUser 
Replaced with proper OCP calls
 2015-12-17 16:18:40 +01:00
Roeland Jago Douma
835911bce5 Removed deprecated private OC_User::createUser 
All function calls are replaced with the recommended (which was already
the body of the function).
 2015-12-17 16:18:40 +01:00
Roeland Jago Douma
7e44ea5da0 Remove deprecated function OC_User::getManager 
Private deprecated function => removed
Replaced all instances with suggested replacement
 2015-12-17 16:18:34 +01:00
Thomas Müller
1285b78086 Merge pull request #21200 from owncloud/files-authorizationheader 
Use Authorization headers for public webdav in web UI
 2015-12-17 15:30:13 +01:00
Thomas Müller
38f4407761 Merge pull request #21201 from mmattel/scanFiles_stat_output_II 
Statistics output for ./occ files:scan (rework)
 2015-12-17 14:43:55 +01:00
Jenkins for ownCloud
a7cd8103b5 [tx-robot] updated from transifex 2015-12-17 01:55:09 -05:00
Morris Jobke
89233cab83 add unit test for #21230 2015-12-16 15:03:50 +01:00
Morris Jobke
66c0f4eb59 Use name of ICollection for exception message 
* fixes #21230
 2015-12-16 14:44:28 +01:00
Jenkins for ownCloud
1d932e4c98 [tx-robot] updated from transifex 2015-12-16 01:55:55 -05:00
martin.mattel@diemattels.at
b7e8258d99 Statistics output for ./occ files:scan 2015-12-15 19:05:05 +01:00
C. Montero Luque
a376fec984 Merge pull request #21133 from owncloud/fix-shared-files-of-deleted-users 
Fix shared files of deleted users, detect DN change when checking for existence on LDAP
 2015-12-15 12:14:58 -05:00
Björn Schießle
3ce845e2b1 avoid duplicates on search 2015-12-15 15:40:47 +01:00
Thomas Müller
70e9e31497 Fix last Oracle issue 2015-12-15 14:52:27 +01:00
Thomas Müller
e5469a1121 Fix Oracle insert error 2015-12-15 14:52:27 +01:00
Björn Schießle
cd55a19034 implement delete, create, update, search, get permissions 2015-12-15 14:52:27 +01:00
Robin Appelman
667d7383e1 clear statcache after fopen for smb 2015-12-15 14:24:02 +01:00
Thomas Müller
1ecda59c24 Merge pull request #21189 from owncloud/fix_21187 
File shares can't have create permissions
 2015-12-15 13:18:22 +01:00
Thomas Müller
67263ef8b4 Merge pull request #21067 from owncloud/fix_20296 
don't allow to create a federated share if source and target are the same
 2015-12-15 13:18:04 +01:00
Morris Jobke
7608af6f7d Remove unneeded upgrade code 
stable8.2 has version 0.7.0 of the user_ldap app
 2015-12-15 09:38:29 +01:00
Arthur Schiwon
e39415c946 fix find DN by UUID for AD 2015-12-14 22:42:27 +01:00
Vincent Petry
1d37e7abfc Fixed JS unit tests for fed owner display name 2015-12-14 18:00:35 +01:00
Vincent Petry
ab9849e72f Use Authorization headers for public webdav instead of URL 
Instead of prepending the token as username in the URL, use the
Authorization header instead. This is because IE9 considers this a
cross-domain call and refuses to do it in the first place.
 2015-12-14 17:42:13 +01:00
Björn Schießle
c4b65170f2 show display name but internally use the user name 2015-12-14 17:25:10 +01:00
Björn Schießle
efc030aa25 don't allow to create a federated share if source and target server are the same 2015-12-14 17:16:14 +01:00
Roeland Jago Douma
843cf906b1 File shares can't have create permissions 
fixes #21187
 2015-12-14 14:03:14 +01:00
Robin Appelman
f27e98a3e2 Migrate files external for the user that the filesystem is being setup for 2015-12-14 13:38:54 +01:00
Vincent Petry
4d9e12b8bc Fix mount type root detection 
Since Webdav doesn't contain that information, we need to rely on the
parent folder's mount type to find out whether a child item is a
shared/external root or not.

Fixed the mount type detection logic and added unit test.

Also added a fix that ignores detection if no parent folder exists (ex:
shared file list, favorites, etc)
 2015-12-14 10:44:47 +01:00
Jenkins for ownCloud
74de12c698 [tx-robot] updated from transifex 2015-12-13 01:54:51 -05:00
Jenkins for ownCloud
f2ac1a80d8 [tx-robot] updated from transifex 2015-12-12 01:55:39 -05:00
Thomas Müller
32525fa977 save wip 2015-12-11 17:39:27 +01:00
Arthur Schiwon
35a2639701 unit test on getHome in combination with OfflineUser 2015-12-11 17:25:57 +01:00
Joas Schilling
7d3e40c065 Add an OCS app for testing instead of using sudo and exec 2015-12-11 16:20:04 +01:00
Thomas Müller
aee4887224 Merge pull request #21153 from owncloud/files-deleteactiontext 
Bring back file delete action text to be based on context
 2015-12-11 16:04:06 +01:00
Vincent Petry
baa5a69c55 Bring back file delete action text to be based on context 
For received shares, the delete action becomes "Unshare" and for
personal mounts it becomes "Disconnect storage".

This also makes it possible from now on to pass a function to a file
action's "displayName" attribute.
 2015-12-11 15:14:30 +01:00
Robin Appelman
5b2957bad1 skip test if we cant use the filesystem when not logged in 2015-12-11 14:29:38 +01:00
Robin Appelman
415cf92784 Fix thrashbin wrapper when no user is loggedin 2015-12-11 14:27:37 +01:00
Arthur Schiwon
aedbc0c626 adjust unit test 2015-12-11 12:52:12 +01:00