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

43858 commits

This branch
This branch
All branches
Author SHA1 Message Date
Morris Jobke
8c3ec5f589
Merge pull request #9725 from nextcloud/fix/contacts-menu-local-null-check 
Fix local users check in contacts menu
 2018-06-04 14:58:23 +02:00
Morris Jobke
367b1be15c
Merge pull request #9425 from nextcloud/db-reconnect-timeout 
Check connection status and attempt to reconnect each each minute
 2018-06-04 10:40:12 +02:00
Christoph Wurst
9f8617a439
Fix local users check in contacts menu 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2018-06-04 08:45:04 +02:00
Nextcloud bot
a00cb2c5d7
[tx-robot] updated from transifex 2018-06-04 00:12:26 +00:00
Nextcloud bot
36d74047f7
[tx-robot] updated from transifex 2018-06-03 00:12:47 +00:00
Nextcloud bot
d9238b810a
[tx-robot] updated from transifex 2018-06-02 00:12:30 +00:00
Morris Jobke
80a993ca47
Merge pull request #9542 from nextcloud/anonymous-options 
Add sabre plugin to allow anonymous options requests to the dav root
 2018-06-01 18:57:35 +02:00
Robin Appelman
c52326f084
Add tests for handling anonymous auth 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-01 17:22:21 +02:00
Robin Appelman
ea4f4b8417
Add sabre plugin to allow anonymous options requests to the dav root 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-06-01 17:20:42 +02:00
Morris Jobke
38c38eec79
Merge pull request #9711 from nextcloud/fix/noid/fixmaster_unittests 
Fix the master unit tests
 2018-06-01 14:10:42 +02:00
Roeland Jago Douma
3ca15255f7
Fix the master unit tests 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-06-01 13:24:04 +02:00
Morris Jobke
f5e16dfaa7
Merge pull request #9609 from nextcloud/bugfix/3830/invitations_for_shared_calendars 
send invitations for shared calendars
 2018-06-01 12:40:53 +02:00
Morris Jobke
c3fc789b2c
Merge pull request #9550 from nextcloud/bugfix/noid/override_freebusy_sharing_rules 
allow admins to disable FreeBusy without modifying ShareAPI capabilities
 2018-06-01 12:00:56 +02:00
Nextcloud bot
d3fceb9b83
[tx-robot] updated from transifex 2018-06-01 00:12:28 +00:00
Roeland Jago Douma
45f2e48175
Merge pull request #9704 from nextcloud/fix/noid/remove-unneeded-imports 
Remove not needed change
 2018-05-31 19:51:48 +02:00
Morris Jobke
5aca062100
Remove not needed change 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-05-31 17:23:36 +02:00
Nextcloud bot
9ac36dc30b
[tx-robot] updated from transifex 2018-05-31 00:12:36 +00:00
Roeland Jago Douma
d2f5daf08a
Merge pull request #9167 from nextcloud/migration-description 
Add human readable description to migration steps
 2018-05-30 21:48:36 +02:00
Roeland Jago Douma
fcc6eb8427
Add since tags 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-30 21:28:55 +02:00
Robin Appelman
b40629ac8c
Add human readable description to migration steps 
Signed-off-by: Robin Appelman <robin@icewind.nl>
 2018-05-30 21:28:05 +02:00
Julius Härtl
2dd49206c7
Merge pull request #9673 from nextcloud/dependabot/composer/build/integration/guzzlehttp/guzzle-6.3.3 
Update guzzlehttp/guzzle requirement to 6.3.3 in /build/integration
 2018-05-30 14:44:04 +02:00
John Molakvoæ
619b0eece1
Merge pull request #9666 from nextcloud/enhancement/noid/preview_check_file_readbale 
Make sure the file is readable before attempting to create a preview
 2018-05-30 13:25:24 +02:00
John Molakvoæ
50f6015821
Merge pull request #9680 from nextcloud/dependabot/npm_and_yarn/build/karma-viewport-tw-1.0.2 
Update karma-viewport requirement to ^1.0.2 in /build
 2018-05-30 13:21:43 +02:00
John Molakvoæ
d24859ba00
Merge pull request #9682 from nextcloud/dependabot/npm_and_yarn/build/karma-tw-2.0.2 
Update karma requirement to ^2.0.2 in /build
 2018-05-30 13:21:20 +02:00
John Molakvoæ
6d81ea0258
Merge pull request #9681 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/css-loader-0.28.11 
Bump css-loader from 0.28.9 to 0.28.11 in /apps/updatenotification
 2018-05-30 13:17:54 +02:00
Julius Härtl
3988c89ea9
Merge pull request #9688 from nextcloud/dependabot/npm_and_yarn/settings/webpack-cli-2.1.4 
Bump webpack-cli from 2.1.3 to 2.1.4 in /settings
 2018-05-30 12:10:41 +02:00
dependabot[bot]
4d78f2e45b
Update karma-viewport requirement to ^1.0.2 in /build 
Updates the requirements on [karma-viewport](https://github.com/squidfunk/karma-viewport) to permit the latest version.
- [Release notes](https://github.com/squidfunk/karma-viewport/releases)
- [Changelog](https://github.com/squidfunk/karma-viewport/blob/master/CHANGELOG)
- [Commits](https://github.com/squidfunk/karma-viewport/commits/1.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-05-30 10:00:57 +00:00
dependabot[bot]
d7f725008f
Update karma requirement to ^2.0.2 in /build 
Updates the requirements on [karma](https://github.com/karma-runner/karma) to permit the latest version.
- [Release notes](https://github.com/karma-runner/karma/releases)
- [Changelog](https://github.com/karma-runner/karma/blob/master/CHANGELOG.md)
- [Commits](https://github.com/karma-runner/karma/commits/v2.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-05-30 10:00:50 +00:00
Julius Härtl
20b0658ff6
Merge pull request #9685 from nextcloud/dependabot/npm_and_yarn/build/node-sass-approx-4.9.0 
Update node-sass requirement to ~4.9.0 in /build
 2018-05-30 11:59:16 +02:00
Morris Jobke
69d633c403
Merge pull request #9679 from nextcloud/dependabot/npm_and_yarn/build/jsdoc-approx-3.5.5 
Update jsdoc requirement to ~3.5.5 in /build
 2018-05-30 11:35:28 +02:00
dependabot[bot]
81ccf33db4
Update guzzlehttp/guzzle requirement to 6.3.3 in /build/integration 
Updates the requirements on [guzzlehttp/guzzle](https://github.com/guzzle/guzzle) to permit the latest version.
- [Release notes](https://github.com/guzzle/guzzle/releases)
- [Changelog](https://github.com/guzzle/guzzle/blob/master/CHANGELOG.md)
- [Commits](https://github.com/guzzle/guzzle/commits/6.3.3)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-05-30 09:34:25 +00:00
Roeland Jago Douma
14acded171
Make sure the file is readable before attempting to create a preview 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-30 11:34:02 +02:00
Morris Jobke
182910b136
Merge pull request #9675 from nextcloud/dependabot/composer/build/integration/sabre/dav-3.2.2 
Update sabre/dav requirement to 3.2.2 in /build/integration
 2018-05-30 11:32:20 +02:00
dependabot[bot]
fcc0dabfc6
Bump webpack-cli from 2.1.3 to 2.1.4 in /settings 
Bumps [webpack-cli](https://github.com/webpack/webpack-cli) from 2.1.3 to 2.1.4.
- [Release notes](https://github.com/webpack/webpack-cli/releases)
- [Changelog](https://github.com/webpack/webpack-cli/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack/webpack-cli/compare/v2.1.3...v2.1.4)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-05-30 08:25:47 +00:00
dependabot[bot]
04764cf568
Update node-sass requirement to ~4.9.0 in /build 
Updates the requirements on [node-sass](https://github.com/sass/node-sass) to permit the latest version.
- [Release notes](https://github.com/sass/node-sass/releases)
- [Changelog](https://github.com/sass/node-sass/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sass/node-sass/commits/v4.9.0)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-05-30 08:23:54 +00:00
dependabot[bot]
f39ed3d449
Bump css-loader from 0.28.9 to 0.28.11 in /apps/updatenotification 
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 0.28.9 to 0.28.11.
- [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/v0.28.9...v0.28.11)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-05-30 08:23:38 +00:00
dependabot[bot]
fd107bc0e5
Update jsdoc requirement to ~3.5.5 in /build 
Updates the requirements on [jsdoc](https://github.com/jsdoc3/jsdoc) to permit the latest version.
- [Release notes](https://github.com/jsdoc3/jsdoc/releases)
- [Changelog](https://github.com/jsdoc3/jsdoc/blob/master/CHANGES.md)
- [Commits](https://github.com/jsdoc3/jsdoc/commits/3.5.5)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-05-30 08:23:35 +00:00
dependabot[bot]
354cac145c
Update sabre/dav requirement to 3.2.2 in /build/integration 
Updates the requirements on [sabre/dav](https://github.com/sabre-io/dav) to permit the latest version.
- [Release notes](https://github.com/sabre-io/dav/releases)
- [Changelog](https://github.com/sabre-io/dav/blob/master/CHANGELOG.md)
- [Commits](https://github.com/sabre-io/dav/commits/3.2.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
 2018-05-30 08:23:11 +00:00
Roeland Jago Douma
e8c680f74a
Merge pull request #9670 from nextcloud/drone-mysqlmb4-fix 
Fix drone mysqlmb4 tests
 2018-05-30 08:52:44 +02:00
John Molakvoæ (skjnldsv)
aec85bf04f
Fix drone mysqlmb4 tests 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-05-30 08:33:27 +02:00
Nextcloud bot
7df563ee39
[tx-robot] updated from transifex 2018-05-30 00:12:08 +00:00
Morris Jobke
8376ca3eb7
Merge pull request #9665 from nextcloud/add-workaround-for-parameter-not-available-in-mink-extension 
Add workaround for parameter not available in Mink Extension
 2018-05-29 20:59:46 +02:00
Daniel Calviño Sánchez
aedcbb64da Use "paths.base" parameter for the path to the custom Firefox profile 
Although in the case of the acceptance tests for the server it is not
strictly needed it was modified for consistency with the configuration
used for the acceptance tests in apps.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-05-29 20:25:18 +02:00
Daniel Calviño Sánchez
3bdb07320d Add workaround for parameter not available in Mink Extension 
Due to a bug in the Mink Extension for Behat it is not possible to use
the "paths.base" parameter in the path to the custom Firefox profile.
"paths.base" is a special parameter in the Behat configuration that
refers to the directory in which "behat.yml" is stored. This comes in
very handy to set the path to custom Firefox profiles in the acceptance
tests for apps, as even if the "behat.yml" file belongs to an app its
paths are relative to the directory in which the tests are run, that is,
the "tests/acceptance" directory of the server.

Until the bug is fixed, just before the acceptance tests are run the
"paths.base" parameter in the path to the custom Firefox profile is
replaced by its value in the "behat.yml" file used by the acceptance
tests. Note that the file that is modified is the one inside the Docker
container used to run the acceptance tests, so the original file is not
touched.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-05-29 20:24:32 +02:00
Daniel Calviño Sánchez
f4a64051b6 Extract path to configuration dir to its own variable 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-05-29 18:20:58 +02:00
blizzz
c0ed6f91a8
Merge pull request #9640 from nextcloud/fix/9502/missedstatecheck 
check user state when fetching to avoid dealing with offline objects, fixes #9502
 2018-05-29 16:55:14 +02:00
Morris Jobke
7f301be188
Merge pull request #9583 from nextcloud/files-home-userfolder 
use getUserFolder instead of getFileInfo when constructing FilesHome
 2018-05-29 16:50:01 +02:00
Morris Jobke
1924fed83e
Merge pull request #9589 from nextcloud/bugfix/noid/allow-empty-route-navigation 
Allow empty route for navigation entries
 2018-05-29 16:26:32 +02:00
Roeland Jago Douma
e37b77fa28
Merge pull request #9653 from nextcloud/bugfix/noid/oauth_basic_auth 
The OAuth endpoint needs to support Basic Auth
 2018-05-29 16:24:14 +02:00
Roeland Jago Douma
3556e78c25
The OAuth endpoint needs to support Basic Auth 
* Add test

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-05-29 15:17:54 +02:00