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

3944 commits

Author SHA1 Message Date
Roeland Jago Douma
34632de102 Merge pull request #4025 from nextcloud/downstream-27292 
Update karma
 2017-03-24 08:44:42 +01:00
Morris Jobke
1397b84777 Merge pull request #3928 from nextcloud/downstream-17978 
Adjust 4 byte MySQL code to upstream
 2017-03-23 23:45:43 -06:00
Vincent Petry
46a32045d7
Update karma, use sinon from npm 
Update karma library and use sinon JS library provided by
karma-jasmine-sinon instead of local file.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-23 23:35:41 -06:00
Roeland Jago Douma
35a21b4180
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 20:14:18 +01:00
Roeland Jago Douma
e3925ba2a1
Cache SCSS dependency file in memcache 
Since reading a file from disks can be costly. Lets store the dependency
json also in memcache.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 20:14:08 +01:00
Roeland Jago Douma
8b94fbe014
Add the AppContainer 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-22 11:24:16 +01:00
Joas Schilling
5695a4ec92
Don't do a recursive search 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-22 10:44:13 +01:00
Morris Jobke
1aef2f417b
Adjust tests as well 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-21 16:42:42 -06:00
Morris Jobke
713f684a8b
Adding tests for 4 byte unicode characters 
* success on SQLite and Postgres
* failure on MySQL due to the limited charset that only supports up to 3 bytes

Add config option to update charset of mysql to utf8mb4

* fully optional
* requires additional options set in the database

only disable unicode test on mysql

Fixing ctor call

Adding docker based unit test execution for mysql utf8mb4

Add mysqlmb4 test configuration to Jenkinsfile

fix collation on utf8mb4

Properly setup charset and collation in the doctrine connection

Allow files containing 4-byte chars in case the database supports it

During setup of a mysql database we try to detect if charset 'utf8mb4' can be used

Fix mysql settings

Add console command to migrate the charset

Set ROW_FORMAT before setting collation to mb4

Also select tables with wrong collation

Faster MySQL docker

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-21 16:42:12 -06:00
Joas Schilling
348d97dfd6 Merge pull request #3844 from nextcloud/unshare_event 
Unshare event
 2017-03-21 16:57:09 +01:00
Roeland Jago Douma
7e95837097 Merge pull request #3955 from nextcloud/downstream-27113 
Can we get some faster phpunit execution?
 2017-03-21 11:27:00 +01:00
Roeland Jago Douma
0fb5776133
Fix NODB tests etc 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma
21641302a9
Add DI intergration tests 
* Moved some interface definitions to Server.php (more to come)
* Build/Query only for existing classes in the AppContainer
* Build/Query only for classes of the App in the AppContainer
* Offload other stuff to the servercontainer

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Roeland Jago Douma
7cece61ff6
Extend DI tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-21 08:52:20 +01:00
Lukas Reschke
21cf1b22e9 Merge pull request #3530 from nextcloud/scss-variables 
Implement scss variables
 2017-03-20 19:49:53 +01:00
Thomas Müller
5bfce597a9
[CI] Can we get some faster phpunit execution? (#27113) 
* Don't backup globals and static attributes

* Unset global variable to remove impact on followup tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 12:34:05 -06:00
Christoph Wurst
03a92eaf74 Merge pull request #3957 from nextcloud/downstream-27307 
Follow up to #3949 (app exists on enable)
 2017-03-20 18:10:05 +01:00
Roeland Jago Douma
1565177fb5
Revert "Add a magic wrapper to allow phpunit4 to run the code again " 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-20 14:25:43 +01:00
Julius Härtl
a0f7d4b688
Fix tests 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 14:20:34 +01:00
Julius Härtl
29ec58f1b5
Add tests for SCSSCacher 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 14:12:35 +01:00
Julius Haertl
4fbf9a4feb
Add tests for SCSSCacher 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2017-03-20 12:49:08 +01:00
Joas Schilling
85a5c24934 Merge pull request #3939 from nextcloud/downstream-27159 
Fix malformed logging in exception
 2017-03-20 12:46:48 +01:00
Joas Schilling
257fbd85eb Merge pull request #3929 from nextcloud/downstream-27068 
cache loadUser if not exists
 2017-03-20 12:44:54 +01:00
Joas Schilling
35f6b8716e Merge pull request #3884 from nextcloud/downstream-26956 
Skip null groups in group manager
 2017-03-20 12:27:38 +01:00
Lukas Reschke
a3739906f6 Merge pull request #3924 from nextcloud/preview_fixes 
Do not generate the max preview twice
 2017-03-20 11:45:51 +01:00
Joas Schilling
5795482282
createMock 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-20 11:14:14 +01:00
Lukas Reschke
ab9e3525cc
Move error message to log entry 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-20 11:06:08 +01:00
Joas Schilling
3eb8313657
Fix the test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-20 10:45:27 +01:00
Joas Schilling
591e75df5c
Don't use a generic exception 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-20 10:33:16 +01:00
Morris Jobke
c969d8005e Merge pull request #3949 from nextcloud/downstream-27307 
Check if app exists before enabling
 2017-03-20 03:21:02 -06:00
Morris Jobke
50b0a4b181
Improve the test case 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 02:47:32 -06:00
Vincent Petry
aacfef463c
Add tests for database user backend caching 
Add comment, closeCursor in user DB query

Invalidate user in cache after successful creation

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 02:03:03 -06:00
noveens
5481a9b84a
checking if app exists in the FileStream now 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-20 00:38:29 -06:00
Jörn Friedrich Dreyer
c96486cfae
test setTagGroups with empty groupids 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 22:01:46 -06:00
Morris Jobke
edd55b0ea9
Use SystemConfig instead of AllConfig for DB stuff 
* preparation for followup PRs to clean up the DB bootstrapping

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 15:53:49 -06:00
Morris Jobke
c02527e414 Merge pull request #3927 from nextcloud/minor-fixes 
Namespace and array syntax fixes
 2017-03-19 15:49:38 -06:00
Morris Jobke
d99ce3971b
Namespace and array syntax fixes 
* minor fixes in preparation of a bigger DB and config PR

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-19 14:52:54 -06:00
Roeland Jago Douma
a1f46db793
Fix tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-19 21:15:54 +01:00
Roeland Jago Douma
ef789f8480 Merge pull request #3906 from nextcloud/shares-circles-2 
Support Circles
 2017-03-19 20:45:55 +01:00
Lukas Reschke
3adee0f18b Merge pull request #3898 from nextcloud/issue-3627-always-suggest-cli-url 
Always suggest the overwrite.cli.url
 2017-03-18 00:01:17 +01:00
Maxence Lange
69694012ab shares-circles 
Signed-off-by: Maxence Lange <maxence@nextcloud.com>
 2017-03-17 18:48:33 -01:00
Joas Schilling
26eda9dd58 Merge pull request #3892 from nextcloud/downstream-27101 
Redirect unlink to rmdir
 2017-03-17 13:56:36 +01:00
Joas Schilling
80d2717e5c
Fix 5.6 duplicate class import 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 13:54:58 +01:00
Joas Schilling
75b81c3e01
Always suggest the overwrite.cli.url 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 13:40:58 +01:00
Joas Schilling
c65848effe Merge pull request #3878 from nextcloud/downstream-26303 
Fixed failing test which was ignoring a required (not null) column
 2017-03-17 11:10:21 +01:00
Joas Schilling
70bd819dd2
Cleanup test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:59:53 +01:00
Joas Schilling
2f16f3ba44
Fix unit test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:39:08 +01:00
Joas Schilling
ebabf81473
Clean up the test 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:35:22 +01:00
Joas Schilling
bd97b7d130
Use DI 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-17 10:23:04 +01:00
Roeland Jago Douma
85601259fb
Add LegacyHooks 
Use a helper class to listen to the eventDispatcher calls from the share
manager to emit the old \OC_Hooks

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-17 08:50:56 +01:00
Philipp Schaffrath
2ccf544ad7
Fixed failing test which was ignoring a required (not null) column (#26303) 
* Fixed failing test which was ignoring a required (not null) column

* restored test to original, catching DriverException which also catches ConstraintViolationException

* catch ConstraintViolationException again

* removed unnecessary field from this test

* clobfield should be nullable

* clobfield now is nullable

* removed autoincrement since whenever this strategy is enabled, oracle would not throw constraint violation exceptions (needed for setValues), which mysql still does

* this field does not auto increment anymore

* mark integerfield as primary, since it is not getting marked as such through auto increment anymore,
integerfield default always has been 0 instead of null

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-17 00:09:07 -06:00
Vincent Petry
377fdf3860
Skip null groups in group manager (#26871) (#26956) 
* Skip null groups in group manager (#26871)

* Skip null groups in group manager

* Also skip null groups in group manager's search function

* Add more group null checks in sharing code

* Add unit tests for null group safety in group manager

* Add unit tests for sharing code null group checks

* Added tests for null groups handling in sharing code

* Ignore moveShare optional repair in mount provider

In some cases, data is inconsistent in the oc_share table due to legacy
data. The mount provider might attempt to make it consistent but if the
target group does not exist any more it cannot work. In such case we
simply ignore the exception as it is not critical. Keeping the
exception would break user accounts as they would be unable to use
their filesystem.

* Adjust null group handing + tests

* Fix new group manager tests

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-17 00:07:03 -06:00
Vincent Petry
7256940524
Redirect unlink to rmdir (#27101) 
Many API callers will call unlink even for directories and it can mess
up with some wrappers like the encryption wrapper

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-16 23:45:03 -06:00
Lukas Reschke
5f8f29508f
Adjust tests to include base-uri 
Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-16 18:12:10 +01:00
Lukas Reschke
adfd1e63f6
Add base-uri to CSP policy 
As per https://twitter.com/we1x/status/842032709543333890 a nice security hardening

Signed-off-by: Lukas Reschke <lukas@statuscode.ch>
 2017-03-16 15:16:20 +01:00
Roeland Jago Douma
bb2ec51bbb
Fix unit tests of master 
Follow up to #3802

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2017-03-16 12:46:02 +01:00
Morris Jobke
f7cef9f702 Merge pull request #3772 from nextcloud/favorite-search 
Allow searching for favorites
 2017-03-13 00:55:12 -06:00
Lukas Reschke
f74911b638 Merge pull request #3787 from nextcloud/ocs-cookie 
dont require strict same site cookies for ocs requests
 2017-03-10 18:14:38 +01:00
Robin Appelman
9a8cef965f
add test for skipping cookie checks for ocs 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-10 14:11:00 +01:00
Morris Jobke
a5ba1f7803
Remove legacy class OC_Group and OC_User 
* basically a straight replacement of the wrapped code at the calling code parts

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-09 17:35:09 -06:00
Björn Schießle
c23c062c89 Merge pull request #3611 from nextcloud/announce-trsuted-server-endpoints 
Announce trusted server endpoints
 2017-03-09 14:39:18 +01:00
Bjoern Schiessle
43bca9f7f6
add and adjust unit tests 
Signed-off-by: Bjoern Schiessle <bjoern@schiessle.org>
 2017-03-09 10:07:52 +01:00
Robin Appelman
e61606a767
Allow searching for favorites 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-08 16:30:55 +01:00
Robin Appelman
2a8e922d67 Merge pull request #3360 from nextcloud/dav-search 
Implement webdav SEARCH
 2017-03-08 13:09:19 +01:00
Joas Schilling
342ee51dad
Make the test useful 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-03 12:01:38 +01:00
Morris Jobke
0b12eb0640
Execute UpdateLanguageCode only once 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-02 21:53:36 -06:00
Joas Schilling
ba472f7ce0
Fix table name and add a test for more than 1 entries 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-03-02 09:11:47 +01:00
Morris Jobke
1bcd396679
Change language code for languages with only one translation 
* then the language is not that specific and get also matched for fi
* fallback from fi_FI to fi is supported - the other way around not
* contains repair script
* contains tests for repair script
* fixes #869

Order results to make postgres happy

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-03-01 22:35:28 -06:00
Robin Appelman
709f64d396
add tests for filesearchbackend 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-01 14:06:40 +01:00
Robin Appelman
e6a896f2f0
add tests for searchQuery 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-01 14:06:40 +01:00
Robin Appelman
df2063ee7b
Implement webdav SEARCH 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-03-01 14:06:39 +01:00
Robin Appelman
706131b394
add icewind/searchdav 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-28 14:24:18 +01:00
Christoph Wurst
e782f90d98
DefaultTokenProviderTest mocked/asserted the wrong method 
It's 'getRemember' instead of 'getRememberMe', hence some warnings
were generated by phpunit.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-28 10:26:19 +01:00
Morris Jobke
8a7b8f966e Merge pull request #3489 from nextcloud/give-hint-about-opcache 
Show info in admin settings about PHP opcache if disabled
 2017-02-24 13:10:47 -06:00
Joas Schilling
d0980bec73 Merge pull request #3287 from nextcloud/readd_appstoreenabled_switch 
Add back appstoreenabled config switch
 2017-02-24 10:07:25 +01:00
Joas Schilling
b26568133f Merge pull request #3605 from nextcloud/single-user 
Clean up single user mode
 2017-02-24 08:52:26 +01:00
Morris Jobke
f3bfacc976
Fix unit tests and improve appstore logic 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-24 08:34:14 +01:00
Morris Jobke
ee52313e76 Merge pull request #3589 from nextcloud/remove-unneeded-repair-step 
Remove unneeded repair steps
 2017-02-23 15:57:21 -06:00
Morris Jobke
cee8853658
Show info in admin settings about PHP opcache if disabled 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-22 23:45:48 -06:00
Morris Jobke
9533f4e5ed
Clean up single user mode 
Single user mode basically disables WebDAV, OCS and cron execution. Since
we heavily rely on WebDAV and OCS also in the web UI it's basically useless.
An admin only sees a broken interface and can't even change any settings nor
sees any files. Also sharing is not possible.

As this is at least the case since Nextcloud 9 and we haven't received any
reports for this it seems that this feature is not used at all so I removed it.

The encryption commands now rely on the well tested maintenance mode.

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-22 23:02:31 -06:00
Morris Jobke
2bbf3b18d9
cleanup old and not needed repair steps to speed up the update 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-22 22:35:18 -06:00
Joas Schilling
1e281bc616
Use 90% JPEG quality for thumbnails and previews by default 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-02-22 14:53:15 +01:00
Morris Jobke
3382950297
add unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-15 18:07:21 -06:00
Morris Jobke
200a28255e
Always enable avatars 
* we introduced this setting in the begining because our
  avatar support caused some performance issues, but we
  fixed them and should only provide one way how Nextcloud
  looks

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-13 17:53:33 -06:00
Robin Appelman
bf88060a98 Merge pull request #3297 from nextcloud/cloud-id-resolve 
Add a single public api for resolving a cloud id to a user and remote and back
 2017-02-09 14:54:32 +01:00
Robin Appelman
f6cd5200a2
clean cloud ids 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-09 13:31:06 +01:00
Lukas Reschke
4a5a3681d9 Merge pull request #3184 from nextcloud/issue-3165 
Prevent migration from ownCloud 11 to Nextcloud 12
 2017-02-09 13:29:08 +01:00
Joas Schilling
ed4633a552 Merge pull request #3408 from nextcloud/nullstorage-free-space 
return unknown free space from nullstorage
 2017-02-09 13:17:54 +01:00
Joas Schilling
ac841ee002 Merge pull request #3362 from nextcloud/fix/nc-token-cookie-name 
oc_token should be nc_token
 2017-02-09 10:07:59 +01:00
Morris Jobke
5e408aeb6c
Fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-08 20:39:34 -06:00
Robin Appelman
ae66cf8d37
add tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-02-08 15:17:03 +01:00
Morris Jobke
942465c8b1
fix unit tests 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-02-03 11:52:01 -06:00
Christoph Wurst
5e728d0eda oc_token should be nc_token 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2017-02-02 21:56:44 +01:00
Morris Jobke
5bad417e57 Merge pull request #2044 from nextcloud/login-credential-store 
Login credential store
 2017-01-30 19:30:04 -06:00
Morris Jobke
8b95bd29ee Merge pull request #2822 from nextcloud/add-navigation-via-info.xml 
Add navigation via info.xml (#26785)
 2017-01-27 11:25:26 -06:00
Joas Schilling
27f8a832e4
Force to specify the name 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2017-01-27 09:44:11 +01:00
Morris Jobke
98dc58356f Merge pull request #3284 from nextcloud/remove-avatar-fixup 
remote now unneeded AvatarPermissions repair step
 2017-01-26 20:14:24 -06:00
Morris Jobke
e21170bd1a Merge pull request #3246 from nextcloud/fix-sqlite-dependency 
Remove useless dependency on SQLite (non-PDO)
 2017-01-26 15:41:11 -06:00
Robin Appelman
c76fe2b4f5
remote now unneeded AvatarPermissions repair step 
Avatars are now stored in appdata

Signed-off-by: Robin Appelman <robin@icewind.nl>
 2017-01-26 19:24:55 +01:00
Morris Jobke
4536ead454
Remove useless dependency on SQLite (non-PDO) 
* we only require the PDO driver
* fixes #481

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2017-01-25 22:23:05 -06:00