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

40252 commits

This branch
This branch
All branches
Author SHA1 Message Date
Joas Schilling
b29baababd
Oracle does not support PDO::FETCH_KEY_PAIR 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-02 09:48:12 +02:00
Morris Jobke
45d080d70e Merge pull request #5951 from nextcloud/use-public-method 
Use public API instead of private
 2017-08-02 09:27:34 +02:00
Nextcloud bot
2800e017de
[tx-robot] updated from transifex 2017-08-02 00:08:10 +00:00
Morris Jobke
3f0f18b4c4 Merge pull request #5948 from nextcloud/remove-explicit-declaration 
Remove explicit type hints for Controller
 2017-08-01 20:12:02 +02:00
Julius Härtl
9cd21bbe8a
Use same lightness calculation as the SCSS compiler for theming 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-08-01 18:09:07 +01:00
Morris Jobke
cd02b2205e Use public methods for OC_App::isShipped 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-01 18:57:00 +02:00
Lukas Reschke
21d1d05667
Use public API instead of private 
The private API here doesn't have the backends yet properly initialized, probably another bug but let's go with the easy bug fix here. Next step is to write integration tests and then figure out why changing this to the private API (which it actually calls) doesn't work.

Fixes https://github.com/nextcloud/server/issues/5950

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 18:19:28 +02:00
Lukas Reschke
f93a82b8b0
Remove explicit type hints for Controller 
This is public API and breaks the middlewares of existing apps. Since this also requires maintaining two different code paths for 12 and 13 I'm at the moment voting for reverting this change.

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 17:32:03 +02:00
Robin Appelman
578e4f9903
Filter magic dot object when swift directory 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-08-01 14:57:33 +02:00
Morris Jobke
84c22fdeef Merge pull request #5907 from nextcloud/add-metadata-to-throttle-call 
Add metadata to \OCP\AppFramework\Http\Response::throttle
 2017-08-01 14:43:47 +02:00
Morris Jobke
6010c4f267 Merge pull request #5877 from nextcloud/typehint_middleware 
Prop argument type for Middleware
 2017-08-01 14:28:16 +02:00
Joas Schilling
a20934227c Remove undocumented config 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:59:10 +02:00
Joas Schilling
c23c05d4f6 Fix versions app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:57:08 +02:00
Joas Schilling
231bb47ae6 Fix file size comparison 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling
d703744d4a Fix comparisions in the trashbin app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling
80febeae21 Fix comparisons in the sharing app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling
7a62fbd205 Fix comparisons in the files external app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling
e30287cf81 Fix comparisons in the files app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling
45e2c415d4 Fix comparison in the ldap app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling
1e2de86c3a Fix comparisons in the versions app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:56:12 +02:00
Joas Schilling
89238164e1 Fix comparisons in the dav app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:55:07 +02:00
Joas Schilling
0ebdf871e0 Fix comparisons in encryption app 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-08-01 13:54:07 +02:00
Morris Jobke
050fa63380 Merge pull request #5939 from nextcloud/dont-have-set-uid-as-displayname 
Remove setUidAsDisplayName
 2017-08-01 13:28:27 +02:00
Roeland Jago Douma
c8452803ef Merge pull request #5897 from nextcloud/add-share-mail-for-user-share 
Send an email once a file/folder is shared with a user
 2017-08-01 13:27:15 +02:00
Roeland Jago Douma
e73fdad88c Merge pull request #5943 from nextcloud/update-URLs-in-tests 
Update the URLs in tests to use example.org
 2017-08-01 13:11:10 +02:00
Lukas Reschke
f396f803ad Merge pull request #5942 from nextcloud/typo-tRicks 
Fix typo ticks to tRicks
 2017-08-01 11:26:55 +02:00
Roeland Jago Douma
bc54e6ff7c
Use ITimeFactory 
* Inject the timefacotry so we can mock it properly in the tests.
* Extended unit tests to cover the new paths

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 11:23:40 +02:00
Morris Jobke
582fb5d129 Update the URLs in tests to use example.org 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-08-01 11:16:04 +02:00
Jos Poortvliet
a69bbd7ffb Update server.php 
Typo: tips and tRicks ...

Signed-off-by: Jos Poortvliet <jospoortvliet@gmail.com>
 2017-08-01 10:19:01 +02:00
Bjoern Schiessle
3ffff08819
we don't need to remove the job manually here, even if we ask once more the other server will decline and the background job will be removed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle
80c08e8fd0
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle
9c9cb1a6db
cleanup constructors 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle
06b9e58081
expire requestSharedSecret job after 30 days 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:53 +02:00
Bjoern Schiessle
51d85eb2f8
expire getShareadSecret job after 30 days 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-08-01 10:07:51 +02:00
Roeland Jago Douma
2b895e0c60 Merge pull request #5847 from nextcloud/make-phan-config-more-strict-2 
Phan fixes
 2017-08-01 09:25:09 +02:00
Roeland Jago Douma
2fae696d35
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma
61a6adff14
Fix sabre test 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma
a5feb51a6a
Fix OCS Exception 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma
ede15f0988
Fix L10N::t 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma
fd465d4e49
[files_external] Fix phpdoc 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma
fc369dd86e
[DAV] Fix URLUtil::splitPath usage 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:17 +02:00
Roeland Jago Douma
f57a3aa81b
[DAV][CalDAV] Fixes 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Roeland Jago Douma
201bbb962c
Fix Comments 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Roeland Jago Douma
19b039e6e0
[files_external] fix commands 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Roeland Jago Douma
b7c8e9ed88
[files_external] Fix phpdoc 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
0fa49db770
Some more invalid PHPDocs in legacy classes 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
66b8208791
Function also accepts ints 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
fd059a25d3
Properly name variable 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
6fb84ebb71
null is a valid parameter 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00
Lukas Reschke
dfd8125aeb
Replace wrong PHPDocs 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-08-01 08:20:16 +02:00