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

25062 commits

This branch
This branch
All branches
Author SHA1 Message Date
Frank Karlitschek
3abc6e6c44 8.1 beta 2 2015-05-17 14:25:56 -04:00
Jenkins for ownCloud
16c320df26 [tx-robot] updated from transifex 2015-05-17 01:55:56 -04:00
Jenkins for ownCloud
744a9f2c78 [tx-robot] updated from transifex 2015-05-16 01:54:47 -04:00
Thomas Müller
257ee205bb Merge pull request #15978 from owncloud/feature/fix-encryption-tooltips 
[enc2]fixing recovery tooltip
 2015-05-15 22:39:17 +02:00
Victor Dubiniuk
4c9734f630 Test overriding channel 2015-05-15 22:37:14 +03:00
Thomas Müller
2cafbc803a Merge pull request #16242 from owncloud/use-oc-webroot 
Use OC.webroot instead of calculating the URL
 2015-05-15 18:10:18 +02:00
Vincent Petry
246000f799 Merge pull request #16176 from owncloud/fix-provisioning-api-set-quota 
Validate the quota value to be a correct value
 2015-05-15 18:07:13 +02:00
Lukas Reschke
4c60b13d1e Merge pull request #16265 from owncloud/update-bundle 
Update CA bundle
 2015-05-15 18:05:42 +02:00
Craig Morrissey
ca341a8d59 add support for limit request parameter to getShareWith 2015-05-15 18:03:18 +02:00
Thomas Müller
8e61ad0872 Merge pull request #15811 from owncloud/exception-on-lost-ldap-connection 
throw exception when LDAP Connection was lost
 2015-05-15 17:32:07 +02:00
Thomas Müller
18661ceb63 do not execute integration tests when executing autotest.sh 2015-05-15 16:38:21 +02:00
Thomas Müller
c3e066c5eb Merge pull request #16367 from owncloud/fix-facade-autotest 
Fix facade autotest
 2015-05-15 15:40:34 +02:00
Joas Schilling
0991c0cc02 Merge pull request #16292 from owncloud/webdav-storage-fireprehooks 
Fire prehooks when uploading directly to storage
 2015-05-15 15:08:27 +02:00
Joas Schilling
03e26a0fbe Merge pull request #16337 from owncloud/versions-expireforowner 
Use owner when expiring versions, not the logged in user
 2015-05-15 15:02:26 +02:00
Joas Schilling
02912aef58 Merge pull request #16273 from owncloud/trash-fixrestoreuniquename 
Fix restoring files from trash with unique name
 2015-05-15 14:48:00 +02:00
Lukas Reschke
89b0bc1915 Store in array to allow paths with whitespace 2015-05-15 13:16:16 +02:00
Vincent Petry
f86699cd48 Fix restoring files from trash with unique name 
When restoring a file, a unique name needs to be generated if a file
with the same name already exists.

Also fixed the restore() method to return false if the file to restore
does not exist.

Added unit tests to cover restore cases.
 2015-05-15 12:42:27 +02:00
Vincent Petry
eab55aa959 Properly log out test users in unit tests 2015-05-15 12:33:17 +02:00
Vincent Petry
f8a4cc0284 Added unit tests for versions storing 2015-05-15 12:24:34 +02:00
Lukas Reschke
8b0c223d6e Add support for facade binary scripts 
Fixes https://github.com/owncloud/core/issues/16296
 2015-05-15 11:57:40 +02:00
Lukas Reschke
e3ac4d7b37 Lint bash script using ShellCheck 
Ref http://www.shellcheck.net/about.html
 2015-05-15 11:56:34 +02:00
Joas Schilling
e1923bac07 Merge pull request #16247 from owncloud/fixrmdirtodeletefolderstotrash 
Added rmdir to trashbin storage wrapper
 2015-05-15 11:16:13 +02:00
Thomas Müller
937306b416 Merge pull request #16323 from owncloud/enc_webdav_fixes 
some encryption fixes
 2015-05-15 10:38:22 +02:00
Lukas Reschke
54ef098867 Add unit tests for \OC\Connector\Sabre\DummyGetResponsePlugin 2015-05-15 09:08:10 +02:00
Lukas Reschke
13778893d9 Add notice that WebDAV interface is not intended for browsers 
Fixes https://github.com/owncloud/core/issues/16359
 2015-05-15 09:07:39 +02:00
Lukas Reschke
8ae8600b1f Merge pull request #16342 from owncloud/fix_16338 
fix preview hooks, enable_previews default is true
 2015-05-15 08:48:12 +02:00
Jenkins for ownCloud
49c4ee98b4 [tx-robot] updated from transifex 2015-05-15 01:54:49 -04:00
Lukas Reschke
e0a136d344 Show a empty response for GET on non-files instead of the Browser Plugin 
As discussed in https://github.com/owncloud/core/pull/14151, we missed to add this to the `files_sharing` S2S public WebDAV backend though.
 2015-05-14 14:02:32 +02:00
Jenkins for ownCloud
1596a1fd32 [tx-robot] updated from transifex 2015-05-14 01:54:47 -04:00
Georg Ehrke
745c3c64fa fix preview hooks, enable_previews default is true 2015-05-13 19:59:41 +02:00
Victor Dubiniuk
af814ba270 Allow change update channel via public API 2015-05-13 20:29:33 +03:00
Bjoern Schiessle
ccbefb6e75 delete all file keys doesn't need the encryption module as parameter; implement rmdir; getFileKeyDir should also work for part files and complete directories 2015-05-13 19:06:23 +02:00
Vincent Petry
033b3dac92 Use owner when expiring versions, not the logged in user 2015-05-13 18:40:35 +02:00
Vincent Petry
3cae0135ad Fire prehooks when uploading directly to storage 2015-05-13 17:47:04 +02:00
Arthur Schiwon
2bf92e0a43 include base dn test in functionality test 2015-05-13 16:21:50 +02:00
Robin Appelman
4789e87a53 Merge pull request #16276 from owncloud/dav-quota-root 
fix webdav quota check for the root of the dav endpoint
 2015-05-13 14:43:02 +02:00
Vincent Petry
1f7df3eba8 Added unit test to quota plugin for free_space argument 2015-05-13 13:58:01 +02:00
Lukas Reschke
5941e826b8 Merge pull request #16284 from owncloud/shared-storage-view 
dont go trough the view when renaming/copying on shared storages
 2015-05-13 10:37:04 +02:00
Lukas Reschke
e753e8cc37 Merge pull request #16290 from owncloud/upgrade-info-for-3rdparty-apps 
Add info message for upgrade of an 3rdparty app
 2015-05-13 08:32:42 +02:00
Jenkins for ownCloud
504586aec6 [tx-robot] updated from transifex 2015-05-13 01:55:14 -04:00
Lukas Reschke
b626de0b9f Merge pull request #16289 from owncloud/fix-stupid-mistake 
Add NoAdminRequired annotation
 2015-05-12 19:30:59 +02:00
Lukas Reschke
cbfdbf96d2 Mute XCache error when trying to clear the opcode cache 
From https://github.com/owncloud/core/issues/16287:

> This is caused by XCache at 8e59d4c64b/lib/private/util.php (L1276) where we are trying to reset the opcode cache with `XC_TYPE_PHP`.
> I suspect that while XCache is installed its opcode component is not used. Unfortunately, the XCache API is not really properly documented and thus I don't know what API we would have to call to check whether the `XC_TYPE_PHP` cache is populated. In fact, there is an [open XCache bug](http://xcache.lighttpd.net/ticket/176) since 7 years that discusses this problem and is likely to never get fixed since XCache is abandonware.

Fixes https://github.com/owncloud/core/issues/16287
 2015-05-12 19:22:39 +02:00
Morris Jobke
dc362823e0 Merge pull request #16269 from owncloud/master-fix-16179 
Check if cURL supports the desired features
 2015-05-12 18:27:57 +02:00
Lukas Reschke
a7a2579c89 Subadmin permissions are also not required 2015-05-12 18:08:10 +02:00
Morris Jobke
cb909cda97 Add info message for upgrade of an 3rdparty app 2015-05-12 18:02:31 +02:00
Lukas Reschke
cdeb2052bb Add NoAdminRequired annotation 
Stupid mistake in master, fixes https://github.com/owncloud/core/issues/16288
 2015-05-12 17:49:34 +02:00
Robin Appelman
3b1dde7005 dont go trough the view when renaming/copying on shared storages 2015-05-12 17:09:37 +02:00
Morris Jobke
d4eff55342 Merge pull request #16283 from owncloud/fix-search-users 
fix user mgmt search box position, fix #15928
 2015-05-12 16:21:31 +02:00
Morris Jobke
895a1a5efa Merge pull request #16282 from owncloud/fix-multiselect-ellipsize 
ellipsize first item in multiselect, fix #16174
 2015-05-12 16:08:13 +02:00
Jan-Christoph Borchardt
21a1995ad6 Merge pull request #16104 from owncloud/resize-filepicker 
Resize filepicker on window size change
 2015-05-12 15:57:23 +02:00