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

4589 commits

Author SHA1 Message Date
Roeland Jago Douma
05ef2d70e7
Merge pull request #8590 from nextcloud/redirect-to-download-after-share 
Sharing: redirect to download after authentification if requested
 2018-03-05 11:11:43 +01:00
Roeland Jago Douma
0c500e460f
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-03-05 09:06:51 +01:00
Björn Schießle
1953a11dfa
Merge pull request #6805 from nextcloud/can-not-change-encryption-directory 
Can not change encryption directory
 2018-03-02 16:10:49 +01:00
Bjoern Schiessle
3a33683364
update unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-03-02 15:20:35 +01:00
Joas Schilling
158aac00a0
Merge pull request #8289 from nextcloud/appdata_hardening 
AppData hardening
 2018-03-02 11:26:36 +01:00
Bjoern Schiessle
8042e6b8fb
this was a migration step to ownCloud 8.0 to restructure the encryption folder which is no longer needed 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-03-02 10:09:52 +01:00
John Molakvoæ (skjnldsv)
2d4896e2a7
fixup! Acceptance fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-01 12:57:00 +01:00
John Molakvoæ (skjnldsv)
484568e995
Acceptance fix 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-03-01 10:45:56 +01:00
Roeland Jago Douma
926419e15c
Merge pull request #7600 from nextcloud/new-user-button-to-sidebar 
New user button to sidebar
 2018-02-28 12:33:30 +01:00
John Molakvoæ (skjnldsv)
907234fde2 Fix acceptance tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-02-28 11:17:39 +01:00
Morris Jobke
7bc3c2e057
Merge pull request #7363 from nextcloud/default-share-perms 
Let the admin configure the default share permissions
 2018-02-27 13:44:34 +01:00
Roeland Jago Douma
8b5997483c
Hardening of SimpleFile getContent 
if file_get_contents fails remove the file. And traverse up the tree
checking if the other folders are there.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 13:35:09 +01:00
Roeland Jago Douma
01f420c7ac
Merge pull request #8051 from nextcloud/public-template 
Public page template response
 2018-02-27 13:33:19 +01:00
Bjoern Schiessle
3285becdc1
fix unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Bjoern Schiessle
1615312bf1
add share permissions to settings page 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2018-02-27 12:29:25 +01:00
Julius Härtl
fd830b90eb
Fix acceptance test for new menu structure 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:53 +01:00
Julius Härtl
5a4aa2b7dd
Add test for PublicTemplateResponse 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-27 12:25:53 +01:00
Roeland Jago Douma
6994bce951
Loglevel is an int 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 10:45:35 +01:00
Roeland Jago Douma
4077f16aec
Make ILogger strict 
* Make implementations strict
* Add scalar typehints

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-27 10:41:46 +01:00
Morris Jobke
8867629cf1
Merge pull request #8359 from nextcloud/swift-v3 
Support swift v3 authentication
 2018-02-26 18:30:00 +01:00
Morris Jobke
a60d7a8563
Merge pull request #8541 from nextcloud/translate-permission-error-page 
Provide translated error message for permission error
 2018-02-26 17:50:21 +01:00
Morris Jobke
cf35c4b03a
Provide translated error message for permission error 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-26 17:00:29 +01:00
Roeland Jago Douma
3afc41a49b
Kill objectstore CI if we can't create a file 
This is more of a hack. But one of the nodes won't properly run this. No
sense in waiting 60 minutes

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 14:54:27 +01:00
Roeland Jago Douma
9a201bd7fa
Use username + pass in config 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 14:54:21 +01:00
Roeland Jago Douma
fe05ecfd16
Other config 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 14:54:15 +01:00
Roeland Jago Douma
4bcc282a48
Add v3.0 auth run 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-26 14:54:12 +01:00
Roeland Jago Douma
0ee45d3d20
Fix proper types 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-22 15:51:19 +01:00
Roeland Jago Douma
e1bdeb786e
Merge pull request #8472 from nextcloud/strict_integritycheck 
Make OC\IntegrityCheck strict
 2018-02-22 10:01:50 +01:00
Roeland Jago Douma
72e745be26
Handle strict typing in Checker and fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 21:09:08 +01:00
Roeland Jago Douma
ca9f364fd4
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-21 10:55:52 +01:00
blizzz
8e5120ce66
Merge pull request #8206 from nextcloud/bugfix/noid/fix-collaboration-result-size 
Better result handling of email search
 2018-02-20 23:02:53 +01:00
Joas Schilling
b30e035e25
Better result handling of email search 
1. Local users should not be returned when searching for empty string
2. The limit of the response should be respected

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-20 17:38:32 +01:00
Roeland Jago Douma
cf83eb5e77
Merge pull request #8336 from nextcloud/cleanup-unused-parameter 
Cleanup unused parameter
 2018-02-20 10:16:59 +01:00
Roeland Jago Douma
1541af432e
Use a proper wait for create of the container 
* Also create a test file so we know for sure it all works

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-19 21:49:38 +01:00
Robin Appelman
2a9b3b31aa
use more precise method for waiting for swift 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-19 19:41:16 +01:00
Robin Appelman
a80f72c6c8
fix controller test 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-19 19:41:16 +01:00
Morris Jobke
ac63c207a9
Merge pull request #8411 from nextcloud/add-strict-types-to-oc_app 
Add strict types to OC_App
 2018-02-17 21:34:20 +01:00
Morris Jobke
9dc3b04802
Fix app version to be always string and neither array nor null 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-17 16:05:13 +01:00
Morris Jobke
57e0881a9e
Merge pull request #8232 from nextcloud/bugfix/8007/validate-appinfo-against-appstore-schema 
Validate appinfo against appstore schema
 2018-02-16 22:56:10 +01:00
Joas Schilling
211212f4b3
App manager is not needed anymore 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 17:13:36 +01:00
Joas Schilling
17a26dfcc1
Validate the info.xml against the appstore schema file 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-02-16 10:23:51 +01:00
Daniel Calviño Sánchez
81fdbc6554 Take into account the comment message when looking for it 
Instead of checking that the list contains one comment it is now checked
that a comment with certain message is visible. This makes the step (and
the locator) more reusable in future tests and also simplifies the code.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-02-15 17:48:07 +01:00
Daniel Calviño Sánchez
0a2c98ac89 Adjust timeouts in the step to create a new comment 
Depending on the previous steps the new comment field may be already
shown or not when the step to create a new comment is executed.
Therefore, the timeout was increased from 2 to the "standard" 10 seconds
used in other tests.

If the new comment field was found there is no need to use a timeout
when looking for the new comment button; it is either there or not, it
will not appear after some time.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-02-15 17:48:07 +01:00
Daniel Calviño Sánchez
28d5862643 Move locators above step definitions 
The locators are moved above the step definitions for consistency with
other context files; besides that I made some minor adjustments for
consistency too in the locator descriptions and identation, and moved
the locators for ".newCommentRow" descendants together.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-02-15 17:48:07 +01:00
Morris Jobke
14bc9b1714
Merge pull request #8095 from nextcloud/webapps-capabilities 
Expose navigation entries as API endpoint
 2018-02-15 16:55:12 +01:00
Morris Jobke
24f96513fd
Merge pull request #8259 from nextcloud/guzzle6 
update guzzlehttp/guzzle to 6.3.0
 2018-02-14 22:26:19 +01:00
Morris Jobke
bcf1668cc8
Remove config from AutoCompleteController 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:40:30 +01:00
Morris Jobke
b7c944fac1
Remove crypto and timefactory from UsersController 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-02-13 21:39:57 +01:00
Julius Härtl
5a23b35ddb
Also rewrite icon url 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-12 21:20:21 +01:00
Julius Härtl
922cf44c81
Move to OCS endpoint 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-12 17:22:33 +01:00
Julius Härtl
8ecac56543
Allow requesting absolute URLs 
They might be useful when requesting the navigation from the clients

Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-12 17:22:32 +01:00
Julius Härtl
6211d18dc1
Add tests for NavigationController 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-12 17:22:32 +01:00
Julius Härtl
f9dbaf6f2a
Make sure we test the proper order in the NavigationManagerTest 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-12 17:22:32 +01:00
Robin Appelman
9b25ff9fcb
adjust httpclient to guzzle6 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-09 17:13:21 +01:00
Morris Jobke
ba9711f5d3
Merge pull request #8263 from nextcloud/fix_dev_man_link 
Link to NC 14 dev manual
 2018-02-08 23:18:00 +01:00
Roeland Jago Douma
f07d3a3b55
Link to NC 14 dev manual 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-08 21:26:04 +01:00
Robin Appelman
2e3ed7db90
sleep more 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-08 15:18:26 +01:00
Robin Appelman
df6e23c98c
add ci for swift primary storage 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-02-08 15:18:25 +01:00
Morris Jobke
26e0c14c6d
Merge pull request #8033 from nextcloud/s3-uploader 
Use S3Client::upload instead of splitting single/multipart upload ourselves
 2018-02-08 14:30:02 +01:00
Roeland Jago Douma
047fb6d2c5
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-02-03 22:16:09 +01:00
Julius Härtl
b87e5a0f2e
Move depsCache clearing to SCSSCacher/JSCombiner 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-03 15:21:51 +01:00
Julius Härtl
5460166ff5
Add tests and class mapping 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-02-03 15:21:51 +01:00
Julius Härtl
372e06d742
Add all parameters to returnValueMap 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-31 14:15:12 +01:00
Roeland Jago Douma
1429146083
Merge pull request #8096 from nextcloud/feature/6382/do-not-cache-settings-in-db-anymore 
Do not cache the settings/sections in the database anymore
 2018-01-31 12:49:45 +01:00
Morris Jobke
4fcdfbf5de
Merge pull request #8078 from nextcloud/theming-validate-scss 
SCSS hardening
 2018-01-29 16:12:10 +01:00
Joas Schilling
d971b104ed
Do not cache the settings/sections in the database anymore 
This caused more troubles then it had benefits, especially
when an app got disabled or was removed without being disabled.

Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-29 15:47:37 +01:00
Roeland Jago Douma
7405dfb544
Update tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-29 14:37:18 +01:00
Julius Härtl
5ec7296f6d
Add tests for URL rewriting 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2018-01-26 19:56:13 +01:00
Morris Jobke
b9bbb894f8
Merge pull request #7916 from nextcloud/2fa_log 
Add 2FA to logfile
 2018-01-25 15:57:32 +01:00
Roeland Jago Douma
8160d0bc2a
Merge pull request #8036 from nextcloud/phpunit6 
Require PHPUnit 6.5 or higher
 2018-01-25 14:50:46 +01:00
Roeland Jago Douma
9e76577ead
Add tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-25 13:44:47 +01:00
Roeland Jago Douma
c92eff919e
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-25 13:25:09 +01:00
Joas Schilling
3917a54113
Class "ProgressBar" is declared "final" and cannot be mocked. 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-25 11:33:26 +01:00
Joas Schilling
bf2be08c9f
Fix risky tests without assertions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-25 11:33:25 +01:00
Joas Schilling
870023365c
Fix "Undefined method setExpectedException()" 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-24 18:10:16 +01:00
Joas Schilling
c3424df1f0
Require PHPUnit 6.5 or higher 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-24 17:23:59 +01:00
Robin Appelman
3499cbdb76
Use S3Client::upload instead of splitting single/multipart upload ourselves 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-01-24 17:22:05 +01:00
Morris Jobke
1daddd678e
Merge pull request #8002 from nextcloud/dont_polutelog_dav_emaillogin 
Dont polute the log on DAV emaillogin
 2018-01-24 14:00:01 +01:00
Morris Jobke
abd33bb619
Properly catch InvalidTokenException for better error response 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-24 13:56:12 +01:00
Roeland Jago Douma
4537faa5da
Merge pull request #7918 from nextcloud/properly-log-exceptions 
Properly log the full exception instead of only the message
 2018-01-23 11:56:02 +01:00
Morris Jobke
2a38605545
Properly log the full exception instead of only the message 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-23 10:57:21 +01:00
Roeland Jago Douma
ef127a30ec
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-23 10:35:37 +01:00
Morris Jobke
d9b1492e03
Remove old repair steps that aren't executed anymore 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-22 14:51:02 +01:00
Morris Jobke
c70927eaa0
Remove not needed 3rdparty app disabling during upgrade for PHP 5.x 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-19 14:00:27 +01:00
Julius Härtl
f0b7b2dedf
Merge pull request #7911 from nextcloud/improve-oc_image 
Improve OC_Image code to not guess the type of input
 2018-01-18 14:39:08 +01:00
Morris Jobke
3d4c698f44
Improve OC_Image code to not guess the type of input, but actually request the specific methods to be called 
Followup to #7836

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-18 13:40:55 +01:00
Roeland Jago Douma
1e7b20f615
Remove IAppConfig::setValue 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-17 21:41:57 +01:00
Roeland Jago Douma
09f8a755ec
Remove IAppConfig::getValue 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-17 21:41:56 +01:00
Roeland Jago Douma
6e29b8731e
Merge pull request #7914 from nextcloud/fix-7254 
format self-mentions, but don't offer them
 2018-01-17 14:59:46 +01:00
Arthur Schiwon
6fdd686111
do not offer the handle of the current user for auto completion 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-01-17 13:49:18 +01:00
Arthur Schiwon
3784fa2074
comments should compile mentions also if done by author 
it is used by clients for formatting reasons, there is no reason not format
the author if her handle is included in the comment body.
It is unrelated to sending out notifications.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-01-17 13:48:43 +01:00
Morris Jobke
24c58d39f4
Merge pull request #7909 from nextcloud/fix-migration-type-hints 
Fix the type hints of migrations and correctly inject the wrapped sch…
 2018-01-17 13:47:58 +01:00
Roeland Jago Douma
f8756d96bc
Merge pull request #7847 from nextcloud/avatarmanager_strict 
Fixes for avatarmanager
 2018-01-17 13:46:18 +01:00
Joas Schilling
4a5282ba21
Fix the type hints of migrations and correctly inject the wrapped schema into migrations 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-01-17 11:37:36 +01:00
Morris Jobke
4ef302c0be
Request->getHeader() should always return a string 
PHPDoc (of the public API) says that this method returns string but it also returns null, which is not allowed in some method calls. This fixes that behaviour and returns an empty string and fixes all code paths that explicitly checked for null to be still compliant.

Found while enabling the strict_typing for lib/private for the PHP7+ migration.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-01-17 09:51:31 +01:00
Morris Jobke
cb0dbfa987
Merge pull request #7900 from nextcloud/strict_security 
Make OCP\Security stricter
 2018-01-17 09:29:32 +01:00
Roeland Jago Douma
d1420ef481
Merge pull request #7901 from nextcloud/strict_cache_factory 
Made the cache factory strict
 2018-01-17 06:51:04 +01:00
Morris Jobke
0b464e5274
Merge pull request #7884 from nextcloud/cleanup-oc_user 
Cleanup OC_User and OCP\User
 2018-01-17 05:33:07 +01:00
Roeland Jago Douma
0e0db37658
Make OCP\Security stricter 
* Add typehints
* Add return types
* Opcode opts from phpstorm
* Made strict
* Fixed tests: No need to test bogus values anymore strict typing fixes
this

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-16 22:01:19 +01:00
Roeland Jago Douma
c5fcfb0709
Made the cache factory strict 
* Return types
* Typehints
* made strict
* fix tests

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-01-16 21:58:20 +01:00