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

47964 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
6e4c5a6248
Merge pull request #13403 from nextcloud/csp/allow_data_fonts 
CSP: Allow fonts to be provided in data
 2019-01-07 15:39:45 +01:00
Roeland Jago Douma
64244e1a4f
CSP: Allow fonts to be provided in data 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-07 15:07:06 +01:00
Roeland Jago Douma
8508e296e3
Merge pull request #13365 from nextcloud/3rdparty/phpseclib/2.0.12 
[3rdparty] Bump phpseclib to 2.0.13
 2019-01-07 14:13:53 +01:00
Roeland Jago Douma
eb407565b0
OAuth2 client identifier must be unique 
Fixes #12981

This is highly unlikely to happen. But better to enforce it on the DB
level as well!

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-07 13:51:59 +01:00
Roeland Jago Douma
bd697f63bd
Merge pull request #13402 from nextcloud/fix/13285/inject_the_real_logger 
Use the real logger in the settings
 2019-01-07 13:40:01 +01:00
Roeland Jago Douma
e11048932f
Merge pull request #13381 from nextcloud/menu-apps-fixes 
Fix apps menu overlapping
 2019-01-07 13:33:20 +01:00
Roeland Jago Douma
e0f41dfcdc
[3rdparty] Bump phpseclib to 2.0.13 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-07 13:04:57 +01:00
Roeland Jago Douma
8e914c01c5
Use the real logger in the settings 
Fixes #13285
The wrapper logger should not be used here. But we need the real logger.
Since this in internal we can just pass that on directly.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-07 12:32:07 +01:00
Morris Jobke
b820803cf1
Merge pull request #13383 from nextcloud/3rdparty/broker-add-timezone-cancel-message 
[3rdparty] Broker: add timezone to CANCEL messages
 2019-01-07 11:45:21 +01:00
Morris Jobke
2bd98daaa2
Merge pull request #12227 from nextcloud/bugfix/cleanu_upload_folders 
Background job to cleanup leftover chunked uploads
 2019-01-07 11:19:43 +01:00
Roeland Jago Douma
8f4e6fcea1
Merge pull request #13398 from nextcloud/improve-nav-bullet-collapse-hover 
Fix/improve collapsible nav bullet hover
 2019-01-07 11:10:41 +01:00
Roeland Jago Douma
8b0f5e02c7
Merge pull request #12621 from nextcloud/td/12224/cleanup_middleware_registering 
Cleanup middleware registering
 2019-01-07 10:48:41 +01:00
Nextcloud bot
35a372dadd
[tx-robot] updated from transifex 2019-01-07 01:11:58 +00:00
Michael Weimann
f54e3c7576
Make the nav bullet transparent selector more specific 
Signed-off-by: Michael Weimann <mail@michael-weimann.eu>
 2019-01-06 22:36:18 +01:00
Roeland Jago Douma
f91802ab4f
Merge pull request #13391 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-merge-4.2.1 
Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/oauth2
 2019-01-06 16:03:07 +01:00
Roeland Jago Douma
49a2dc2b49
Merge pull request #13392 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-merge-4.2.1 
Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/updatenotification
 2019-01-06 16:02:57 +01:00
Roeland Jago Douma
6725de2979
Merge pull request #13393 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-merge-4.2.1 
Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/accessibility
 2019-01-06 16:02:48 +01:00
Roeland Jago Douma
5393e89335
Merge pull request #13394 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/vue-loader-15.5.0 
Bump vue-loader from 15.4.2 to 15.5.0 in /apps/updatenotification
 2019-01-06 16:02:38 +01:00
Roeland Jago Douma
186b0699a8
Merge pull request #13390 from nextcloud/dependabot/npm_and_yarn/settings/webpack-merge-4.2.1 
Bump webpack-merge from 4.1.5 to 4.2.1 in /settings
 2019-01-06 16:02:26 +01:00
dependabot[bot]
20b2c8a685
Bump vue-loader from 15.4.2 to 15.5.0 in /apps/updatenotification 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.4.2 to 15.5.0.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits/v15.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-06 13:55:51 +00:00
Roeland Jago Douma
1789885410
Merge pull request #13389 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/vue-loader-15.5.0 
Bump vue-loader from 15.4.2 to 15.5.0 in /apps/accessibility
 2019-01-06 14:53:38 +01:00
Roeland Jago Douma
6f4f14cf63
Merge pull request #13388 from nextcloud/dependabot/npm_and_yarn/settings/vue-loader-15.5.0 
Bump vue-loader from 15.4.2 to 15.5.0 in /settings
 2019-01-06 14:53:11 +01:00
Roeland Jago Douma
55970962ab
Merge pull request #13387 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/vue-loader-15.5.0 
Bump vue-loader from 15.4.2 to 15.5.0 in /apps/oauth2
 2019-01-06 14:52:37 +01:00
dependabot[bot]
34622fb38a
Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/accessibility 
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.5 to 4.2.1.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v4.1.5...v4.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-06 13:02:20 +00:00
dependabot[bot]
bc993e4a7d
Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/updatenotification 
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.5 to 4.2.1.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v4.1.5...v4.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-06 13:01:47 +00:00
dependabot[bot]
be87dccc66
Bump webpack-merge from 4.1.5 to 4.2.1 in /settings 
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.5 to 4.2.1.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v4.1.5...v4.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-06 13:01:26 +00:00
dependabot[bot]
181dc5baa2
Bump webpack-merge from 4.1.5 to 4.2.1 in /apps/oauth2 
Bumps [webpack-merge](https://github.com/survivejs/webpack-merge) from 4.1.5 to 4.2.1.
- [Release notes](https://github.com/survivejs/webpack-merge/releases)
- [Changelog](https://github.com/survivejs/webpack-merge/blob/master/CHANGELOG.md)
- [Commits](https://github.com/survivejs/webpack-merge/compare/v4.1.5...v4.2.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-06 13:01:25 +00:00
dependabot[bot]
26ee7d2f17
Bump vue-loader from 15.4.2 to 15.5.0 in /apps/accessibility 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.4.2 to 15.5.0.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits/v15.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-06 13:01:19 +00:00
dependabot[bot]
10fd2e8f74
Bump vue-loader from 15.4.2 to 15.5.0 in /settings 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.4.2 to 15.5.0.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits/v15.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-06 13:00:57 +00:00
dependabot[bot]
c3e1fb1ff1
Bump vue-loader from 15.4.2 to 15.5.0 in /apps/oauth2 
Bumps [vue-loader](https://github.com/vuejs/vue-loader) from 15.4.2 to 15.5.0.
- [Release notes](https://github.com/vuejs/vue-loader/releases)
- [Changelog](https://github.com/vuejs/vue-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/vuejs/vue-loader/commits/v15.5.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2019-01-06 13:00:48 +00:00
Nextcloud bot
29dc12c885
[tx-robot] updated from transifex 2019-01-06 01:13:07 +00:00
Daniel Kesselberg
0d8bd1b87d
[3rdparty] Broker: add timezone to CANCEL messages 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-01-05 17:14:39 +01:00
Daniel Kesselberg
51f0651d68
Run setupchecks when #security-warnings is present 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2019-01-05 16:29:57 +01:00
John Molakvoæ (skjnldsv)
f611c777d1
Fix apps menu overlapping 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-01-05 09:53:22 +01:00
Nextcloud bot
a1b6333712
[tx-robot] updated from transifex 2019-01-05 01:11:57 +00:00
Morris Jobke
c1ddd2fec9
Merge pull request #13138 from nextcloud/enhancement/noid/ldap-remnants-detected-field 
register and show when an LDAP user was detected as unavailable/deleted
 2019-01-04 22:48:05 +01:00
Morris Jobke
076f6b8ed1
Merge pull request #13363 from nextcloud/fix/loginflow_apptoken_ios 
Fix loginflow with apptoken enter on iOS
 2019-01-04 22:42:24 +01:00
Roeland Jago Douma
40e3a7bbcf
Merge pull request #13367 from nextcloud/fix/13202/throttle_with_correct_metadata 
Throttle with correct metadata
 2019-01-04 22:21:01 +01:00
Arthur Schiwon
925043c60c
ensure db is pristine before starting the tests 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-01-04 22:10:22 +01:00
Roeland Jago Douma
e6ac233947
Fix loginflow with apptoken enter on iOS 
It seems iOS doesn't like us to change the location. So now we submit it
to the server that geneartes the redirect.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-04 21:51:36 +01:00
Roeland Jago Douma
6980ecf7ab
Throttle with correct metadata 
Fixes #13202

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-01-04 21:45:44 +01:00
Roeland Jago Douma
846d21e7f5
Merge pull request #13117 from nextcloud/vcard-avatar-fixes 
Allow URI as data for vcard PHOTO
 2019-01-04 21:33:59 +01:00
Roeland Jago Douma
5ef74e2952
Merge pull request #13362 from nextcloud/backport/13354/master 
[master] check anonymous OPTIONS requests file in root (not in subdir)
 2019-01-04 20:35:47 +01:00
Morris Jobke
7f5c38bb60
Update apps/dav/lib/CardDAV/PhotoCache.php 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>

Co-Authored-By: skjnldsv <skjnldsv@users.noreply.github.com>
 2019-01-04 20:04:13 +01:00
John Molakvoæ (skjnldsv)
1d2d7fd60d
Log failure on parsing 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-01-04 20:04:13 +01:00
John Molakvoæ (skjnldsv)
fa6c257084
Allow URI as data for vcard PHOTO 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-01-04 20:04:13 +01:00
Roeland Jago Douma
14fcc64c49
Merge pull request #13358 from nextcloud/bugfix/12927-bigint-mtime-storagetime 
Install new instances with bigint filecache
 2019-01-04 19:42:42 +01:00
Bastien Durel
4535cc50ad check anonymous OPTIONS requests file in root (not in subdir) 
Signed-off-by: Bastien Durel <bastien@durel.org>
 2019-01-04 18:42:42 +00:00
Morris Jobke
f736b3445f
Merge pull request #13145 from nextcloud/ie11-apps-menu-fix 
IE fix for apps menu
 2019-01-04 19:30:11 +01:00
Morris Jobke
0aa30b76de
Merge pull request #13134 from nextcloud/bugfix/13088/404-instead-of-exception 
returns a 404 instead of exception if app is not installed - #13088
 2019-01-04 17:08:04 +01:00