9ea6573416
Merge pull request #12242 from nextcloud/uid-conccurency
...
Uid concurrency check fix for vcards
2018-11-05 15:24:44 +01:00
68968a870b
Phpunit tests
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-05 13:15:21 +01:00
b6d8c5ff2f
Add check for vCard uid
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-05 12:49:39 +01:00
41cace8c49
Merge pull request #12191 from nextcloud/sessions-fixes
...
Sessions fixes
2018-11-05 12:37:37 +01:00
04774eaf68
Merge pull request #12271 from nextcloud/prevent-upload-cancel
...
Ask before cancelling an ongoing upload
2018-11-05 12:28:32 +01:00
cba3883410
Merge pull request #12185 from nextcloud/cleanup/dicontainer
...
Cleanup the DIContainer
2018-11-05 12:16:36 +01:00
934d08b2e8
Merge pull request #12004 from nextcloud/dl-vcf-groups-plugin
...
Multi vcf download plugin
2018-11-05 10:16:30 +01:00
a793b1027c
Ask before cancelling an ongoing upload
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-05 10:11:50 +01:00
1a667d0613
Merge pull request #12260 from nextcloud/dependabot/npm_and_yarn/build/node-sass-4.10.0
...
Bump node-sass from 4.9.4 to 4.10.0 in /build
2018-11-05 10:07:13 +01:00
f838b24bd1
Merge pull request #12253 from nextcloud/2fa-settings-hint
...
Add class "settings-hint" to 2FA-text
2018-11-05 09:29:22 +01:00
765c576029
Merge pull request #12262 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.24.0
...
Bump webpack from 4.23.1 to 4.24.0 in /apps/accessibility
2018-11-05 09:28:38 +01:00
47462064ca
Bump node-sass from 4.9.4 to 4.10.0 in /build
...
Bumps [node-sass](https://github.com/sass/node-sass ) from 4.9.4 to 4.10.0.
- [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/compare/v4.9.4...v4.10.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 08:27:57 +00:00
d4b6a8739a
Merge pull request #12261 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/css-loader-1.0.1
...
Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibility
2018-11-05 09:24:44 +01:00
f749ab0da8
Bump webpack from 4.23.1 to 4.24.0 in /apps/accessibility
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 08:09:33 +00:00
dcddccb004
Merge pull request #12265 from nextcloud/dav-bump
...
bump dav version for migration
2018-11-05 09:05:32 +01:00
f85215e41c
Merge pull request #12244 from nextcloud/fix/3752/twofactorbutton-attempt2
...
make twofactor .button inline-block
2018-11-05 08:52:29 +01:00
87e27faadb
Merge pull request #12266 from nextcloud/bump/npm/settings
...
Bump npm deps: settings
2018-11-05 08:49:34 +01:00
2528dc751a
Merge pull request #12252 from nextcloud/theming-advanced-h3
...
Change "Advanced options" to h3
2018-11-05 08:28:12 +01:00
30b54cf287
Merge pull request #12263 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.24.0
...
Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2
2018-11-05 08:26:21 +01:00
32f9a32352
Merge pull request #12264 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/css-loader-1.0.1
...
Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2
2018-11-05 08:25:15 +01:00
c3a877f7e9
Rebuild assets
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-05 08:22:10 +01:00
4fa8dfb153
Merge pull request #12254 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/css-loader-1.0.1
...
Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotification
2018-11-05 08:19:44 +01:00
e81e11db46
Merge pull request #12255 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.24.0
...
Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotification
2018-11-05 08:18:57 +01:00
ca09e75083
Bump npm deps: settings
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-05 08:16:59 +01:00
889dfb624b
Merge pull request #12257 from nextcloud/dependabot/npm_and_yarn/settings/nextcloud-vue-0.3.1
2018-11-05 07:13:29 +00:00
a6c8fe099d
bump dav version for migration
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-05 08:11:31 +01:00
4be625b128
Merge pull request #12231 from nextcloud/bugfix/10934/setmodel_before_render
...
Set the filemodel before rending the detailsview
2018-11-05 08:07:49 +01:00
ead6ce8e97
Bump css-loader from 1.0.0 to 1.0.1 in /apps/oauth2
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 1.0.0 to 1.0.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/v1.0.0...v1.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:20:03 +00:00
436ee94fe6
Bump webpack from 4.23.1 to 4.24.0 in /apps/oauth2
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:19:45 +00:00
834c7fef0f
Bump css-loader from 1.0.0 to 1.0.1 in /apps/accessibility
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 1.0.0 to 1.0.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/v1.0.0...v1.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:18:53 +00:00
a15f906af2
Bump nextcloud-vue from 0.2.0 to 0.3.1 in /settings
...
Bumps [nextcloud-vue](https://github.com/nextcloud/vue-components ) from 0.2.0 to 0.3.1.
- [Release notes](https://github.com/nextcloud/vue-components/releases )
- [Commits](https://github.com/nextcloud/vue-components/compare/v0.2.0...v0.3.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:13:43 +00:00
e81ff4ebcb
Bump webpack from 4.23.1 to 4.24.0 in /apps/updatenotification
...
Bumps [webpack](https://github.com/webpack/webpack ) from 4.23.1 to 4.24.0.
- [Release notes](https://github.com/webpack/webpack/releases )
- [Commits](https://github.com/webpack/webpack/compare/v4.23.1...v4.24.0 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:13:08 +00:00
39b111d58d
Bump css-loader from 1.0.0 to 1.0.1 in /apps/updatenotification
...
Bumps [css-loader](https://github.com/webpack-contrib/css-loader ) from 1.0.0 to 1.0.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/v1.0.0...v1.0.1 )
Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-11-05 01:12:42 +00:00
c28ea52155
[tx-robot] updated from transifex
2018-11-05 01:12:32 +00:00
bf5ad5bd6b
Add class "settings-hint" to 2FA-text
...
Signed-off-by: Marius Blüm <marius@lineone.io
2018-11-05 00:19:18 +01:00
9340a6a0e4
Change "Advanced options" to h3
...
Signed-off-by: Marius Blüm <marius@lineone.io>
2018-11-04 23:52:22 +01:00
72b7c9ffa0
Merge pull request #12105 from nextcloud/using-resharing-right-to-display-shares
...
Shares are displayed to users with resharing rights
2018-11-04 21:08:11 +01:00
4ebb2090db
Merge pull request #12230 from nextcloud/bugfix/do_not_logerror_on_filelock
...
Do not log FileLock as exception
2018-11-04 20:40:17 +01:00
60d8b56856
Added multi-get vcf download plugin
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2018-11-04 20:01:49 +01:00
ab8c2b0719
Fix tests
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-04 13:55:49 +01:00
5d3051ff62
Do not log FileLock as exception
...
There is no reason to log FileLock errors as exceptions to the log file.
Locks happen for very legit reasons and it is actually a sign of the
code doing its job.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-04 13:55:49 +01:00
afd39c27af
make twofactor .button inlin-block
...
fixes #3752
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
2018-11-04 04:01:40 +01:00
9d7f02ec47
[tx-robot] updated from transifex
2018-11-04 01:14:02 +00:00
b9783993da
Merge pull request #10890 from nextcloud/bugfix/10857/app-menu-resize
...
Fix app menu calculation for random size of the right header
2018-11-03 09:35:14 +01:00
f196394c44
[tx-robot] updated from transifex
2018-11-03 01:12:38 +00:00
b1fd72c1cf
Set the filemodel before rending the detailsview
...
fixes #10934
Else it triggers the rendering two times. Resulting is weird state in
for example the comments. Because the comments for OLD_FILEID are
retrieved but then the model is changed to NEW_FILEID. But the old
comments still get in and get parsed.
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-11-02 22:45:25 +01:00
a696c011c2
Fix app menu calculation for random size of the right header
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-11-02 19:57:06 +01:00
9d89f8bbac
Merge pull request #12071 from nextcloud/addressbook-uid-check-migration
...
Addressbook uid check migration
2018-11-02 19:37:48 +01:00
927130ef34
Merge pull request #12215 from nextcloud/wait-for-the-link-share-menu-to-open-in-acceptance-tests
...
Wait for the link share menu to open in acceptance tests
2018-11-02 19:35:32 +01:00
bc98330a58
Merge pull request #12216 from nextcloud/bugfix/appmenu/loading
...
Fix loading indicator in app menu
2018-11-02 19:34:21 +01:00
John Molakvoæ
John Molakvoæ (skjnldsv)
Roeland Jago Douma
Morris Jobke
dependabot[bot]
Roeland Jago Douma
dependabot[bot]
Nextcloud bot
Marius Blüm
Jonas Sulzer
Julius Härtl