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

51660 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
6ddb789f0d
Merge pull request #18299 from nextcloud/bugfix/noid/filecache_bigint_mounts 
Convert various columns in oc_mounts to bigint
 2019-12-09 21:37:58 +01:00
Roeland Jago Douma
72155009fa
Merge pull request #18184 from nextcloud/bugfix/noid/is-trusted-domain 
Move overwritehost check to isTrustedDomain
 2019-12-09 21:37:22 +01:00
Roeland Jago Douma
3e720942e5
Merge pull request #18300 from nextcloud/bug/18295/recovery-initialization 
Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must …
 2019-12-09 21:34:01 +01:00
Roeland Jago Douma
0360ab408e
Merge pull request #18256 from nextcloud/files-aditional-scripts-new-events 
Use non-depricated events for loading additional scripts in files app
 2019-12-09 21:24:55 +01:00
Roeland Jago Douma
061b9bb0e7
Merge pull request #18231 from nextcloud/fix/shared_version_restore 
Fix restoring shared versions
 2019-12-09 21:17:24 +01:00
Roeland Jago Douma
905cd37626
Merge pull request #18263 from nextcloud/fix/search/limit_to_home_limit 
Fix search limit to home
 2019-12-09 21:13:09 +01:00
Roeland Jago Douma
5dba8d318d
Fix search limit to home 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-09 20:38:13 +01:00
Roeland Jago Douma
bb8ac6ca34
Merge pull request #18287 from nextcloud/enh/add-mimetype-kdbx 
Add mimetype for keepass database.
 2019-12-09 16:03:03 +01:00
Roeland Jago Douma
e35a31f53b
Merge pull request #18281 from nextcloud/dependabot/npm_and_yarn/nextcloud-vue-collections-0.7.1 
Bump nextcloud-vue-collections from 0.6.0 to 0.7.1
 2019-12-09 15:38:33 +01:00
Roeland Jago Douma
962a51ebcb
Merge pull request #18288 from nextcloud/bug/18277/catch-json-errors 
Ensure that we don't merge broken json.
 2019-12-09 15:18:50 +01:00
Roeland Jago Douma
b13da60da2
Merge pull request #18294 from nextcloud/fix/18020/get_share_for_recipient 
Fetch the share for the recipient
 2019-12-09 14:33:25 +01:00
Daniel Kesselberg
8f403b66d1
Fix Argument 3 passed to OCA\Encryption\Recovery::__construct() must be an instance of OCA\Encryption\KeyManager 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-09 14:29:22 +01:00
Robin Appelman
1c585d2c50
use OCP\EventDispatcher\GenericEvent in more places 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-12-09 14:24:57 +01:00
Georg Ehrke
699f3a6817
Convert various columns in oc_mounts to bigint 
Signed-off-by: Georg Ehrke <developer@georgehrke.com>
 2019-12-09 14:13:18 +01:00
Roeland Jago Douma
63a2725f3d
Merge pull request #18292 from nextcloud/fix/ldap-application-routes-instance 
Fix LDAP application class instance created directly
 2019-12-09 12:27:40 +01:00
Roeland Jago Douma
c0229768f2
Fetch the share for the recipient 
Fixes #18020

For group shares your invite might be handled but that doesn't mean the
whole share is handled. So we just need to make sure to fetch the share
for the current user.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-09 12:23:38 +01:00
Daniel Kesselberg
29575c4d36
Move custom definition logic into method 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-09 12:10:19 +01:00
Daniel Kesselberg
64aba49461
Ensure that we don't merge broken json. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-09 12:09:43 +01:00
Christoph Wurst
9772dbd19e
Fix LDAP application class instance created directly 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-09 10:12:02 +01:00
Christoph Wurst
8bc4295cfa
Merge pull request #17325 from nextcloud/enh/decouple-register-resource-provider 
Decouple resource provider registration
 2019-12-09 09:51:25 +01:00
Roeland Jago Douma
fca2e588b9
Merge pull request #18278 from nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.7.6 
Bump @babel/preset-env from 7.7.4 to 7.7.6
 2019-12-09 09:28:50 +01:00
Roeland Jago Douma
95ceff44a2
Merge pull request #18289 from nextcloud/bug/18203/dont-log-exception-on-connect-exception 
Don't log the stack trace for ConnectException
 2019-12-09 09:05:31 +01:00
dependabot-preview[bot]
65b9b3d6da
Bump @babel/preset-env from 7.7.4 to 7.7.6 
Bumps [@babel/preset-env](https://github.com/babel/babel) from 7.7.4 to 7.7.6.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.7.6)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-09 07:31:07 +00:00
Roeland Jago Douma
fb1f6b7d11
Merge pull request #18264 from nextcloud/enh/actions/fix 
Move away from fixupbot
 2019-12-09 08:30:17 +01:00
Roeland Jago Douma
7d5f6dedeb
Merge pull request #18282 from nextcloud/dependabot/npm_and_yarn/eslint-loader-3.0.3 
Bump eslint-loader from 3.0.2 to 3.0.3
 2019-12-09 08:29:39 +01:00
Roeland Jago Douma
5491bcb199
Merge pull request #18280 from nextcloud/dependabot/npm_and_yarn/babel/core-7.7.5 
Bump @babel/core from 7.7.4 to 7.7.5
 2019-12-09 08:29:14 +01:00
Roeland Jago Douma
9a5a03c75c
Merge pull request #18290 from nextcloud/debt/tests-enable-disable-apps-contains-string 
Fix: Using assertContains() with string haystacks is deprecated and w…
 2019-12-09 08:28:21 +01:00
Nextcloud bot
37fcf92bac
[tx-robot] updated from transifex 2019-12-09 02:16:28 +00:00
Daniel Kesselberg
48a130c2a8
Fix: Using assertContains() with string haystacks is deprecated and will not be supported in PHPUnit 9. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-08 22:33:17 +01:00
Daniel Kesselberg
f578fa6d24
Add mimetype for keepass database. 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-08 22:03:43 +01:00
Daniel Kesselberg
dbb1eef446
Don't log the stack trace for ConnectException 
The stack trace for ConnectException could contain the old apps.json content and is probably huge.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-08 18:17:06 +01:00
dependabot-preview[bot]
c89aae94b0 Bump nextcloud-vue-collections from 0.6.0 to 0.7.1 
Bumps [nextcloud-vue-collections](https://github.com/juliushaertl/nextcloud-vue-collections) from 0.6.0 to 0.7.1.
- [Release notes](https://github.com/juliushaertl/nextcloud-vue-collections/releases)
- [Commits](https://github.com/juliushaertl/nextcloud-vue-collections/commits)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-12-08 10:28:43 +00:00
John Molakvoæ
71e2c0bda4
Bump css-loader from 3.2.0 to 3.2.1 (#18279) 
Bump css-loader from 3.2.0 to 3.2.1
 2019-12-08 11:26:29 +01:00
dependabot-preview[bot]
5591aabeb2 Bump css-loader from 3.2.0 to 3.2.1 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 3.2.0 to 3.2.1.
- [Release notes](https://github.com/webpack-contrib/css-loader/releases)
- [Changelog](https://github.com/webpack-contrib/css-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/css-loader/compare/v3.2.0...v3.2.1)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-12-08 08:31:14 +00:00
Nextcloud bot
270ebb2aa9
[tx-robot] updated from transifex 2019-12-08 02:17:32 +00:00
dependabot-preview[bot]
2009630368
Bump eslint-loader from 3.0.2 to 3.0.3 
Bumps [eslint-loader](https://github.com/webpack-contrib/eslint-loader) from 3.0.2 to 3.0.3.
- [Release notes](https://github.com/webpack-contrib/eslint-loader/releases)
- [Changelog](https://github.com/webpack-contrib/eslint-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/eslint-loader/compare/v3.0.2...v3.0.3)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-08 02:16:26 +00:00
dependabot-preview[bot]
f5ebdcd8ae
Bump @babel/core from 7.7.4 to 7.7.5 
Bumps [@babel/core](https://github.com/babel/babel) from 7.7.4 to 7.7.5.
- [Release notes](https://github.com/babel/babel/releases)
- [Changelog](https://github.com/babel/babel/blob/master/CHANGELOG.md)
- [Commits](https://github.com/babel/babel/compare/v7.7.4...v7.7.5)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
 2019-12-08 02:15:15 +00:00
Daniel Kesselberg
0016480370
Decouple resource provider registration 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-12-07 22:04:07 +01:00
Julius Härtl
d05f131929
Move overwritehost check to isTrustedDomain 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-07 09:53:06 +01:00
John Molakvoæ
2959487f71
Fix size of header menus (#16057) 
Fix size of header menus
 2019-12-07 09:48:10 +01:00
Nextcloud bot
b41112a023
[tx-robot] updated from transifex 2019-12-07 02:16:37 +00:00
John Molakvoæ
4fff033c12
rejig right to left join for sqlite's satisfaction (#18254) 
rejig right to left join for sqlite's satisfaction
 2019-12-06 16:10:08 +01:00
Roeland Jago Douma
31dfe01d96
Move away from fixupbot 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-06 11:46:10 +01:00
Arthur Schiwon
43efa40864
rejig right to left join for sqlite's satisfaction 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-12-06 11:37:31 +01:00
Roeland Jago Douma
6caec491c1
Merge pull request #18262 from nextcloud/bugfix/noid/workflow-eventnames-fallback 
Make sure event names is always an array
 2019-12-06 11:36:56 +01:00
Julius Härtl
c3061e6929
Make sure event names is always an array 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-06 10:32:55 +01:00
Nextcloud bot
da84b36186
[tx-robot] updated from transifex 2019-12-06 02:16:59 +00:00
Roeland Jago Douma
4bf5a23ec0
Merge pull request #18242 from nextcloud/directEditingEditorWithId 
add id to editor of direct editing
 2019-12-05 19:48:50 +01:00
Roeland Jago Douma
12bdb95c1a
Merge pull request #18216 from nextcloud/fix/license-script 
Fix license header script and update headers
 2019-12-05 19:46:19 +01:00
Robin Appelman
829f4a1a1b
update tests 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2019-12-05 17:31:07 +01:00