Commit Graph

47734 Commits

Author SHA1 Message Date
Daniel Kesselberg 21b80a89b0
Fetch lastInsertId only when id null
When id column has no autoincrement flag query for lastInsertId fails
on postgres because no value has been generated. Call lastInsertId only
if id is null.

Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2018-12-24 14:21:39 +01:00
Roeland Jago Douma 027f69df3f
Merge pull request #13227 from nextcloud/fix-opening-search-results-for-comments
Fix opening search results for comments
2018-12-24 14:20:24 +01:00
Roeland Jago Douma 39131eee3e
Merge pull request #13240 from nextcloud/bugfix/noid/accountmanager-defaults
Add default values when parsing account data
2018-12-24 14:18:32 +01:00
Roeland Jago Douma 73e0b7d8e6
Merge pull request #13249 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/css-loader-2.0.2
Bump css-loader from 2.0.1 to 2.0.2 in /apps/accessibility
2018-12-24 08:55:06 +01:00
Roeland Jago Douma 3a898e7569
Merge pull request #13246 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/css-loader-2.0.2
Bump css-loader from 2.0.1 to 2.0.2 in /apps/updatenotification
2018-12-24 08:54:32 +01:00
Roeland Jago Douma d322ba1078
Merge pull request #13245 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/css-loader-2.0.2
Bump css-loader from 2.0.1 to 2.0.2 in /apps/oauth2
2018-12-24 08:54:21 +01:00
Roeland Jago Douma 07a0231a0b
Merge pull request #13244 from nextcloud/dependabot/npm_and_yarn/settings/css-loader-2.0.2
Bump css-loader from 2.0.1 to 2.0.2 in /settings
2018-12-24 08:54:10 +01:00
Roeland Jago Douma a3c09085a8
Merge pull request #13243 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/webpack-4.28.2
Bump webpack from 4.28.1 to 4.28.2 in /apps/updatenotification
2018-12-24 08:28:35 +01:00
Roeland Jago Douma 5dfeb6edc7
Merge pull request #13250 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/webpack-4.28.2
Bump webpack from 4.28.1 to 4.28.2 in /apps/accessibility
2018-12-24 08:28:14 +01:00
Roeland Jago Douma 471b5c84eb
Merge pull request #13248 from nextcloud/dependabot/npm_and_yarn/apps/oauth2/webpack-4.28.2
Bump webpack from 4.28.1 to 4.28.2 in /apps/oauth2
2018-12-24 08:27:51 +01:00
Roeland Jago Douma 752e3f02dc
Merge pull request #13247 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.28.2
Bump webpack from 4.28.1 to 4.28.2 in /settings
2018-12-24 08:27:28 +01:00
dependabot[bot] 3d2e3fdf48
Bump webpack from 4.28.1 to 4.28.2 in /apps/accessibility
Bumps [webpack](https://github.com/webpack/webpack) from 4.28.1 to 4.28.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.28.1...v4.28.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-24 02:19:18 +00:00
dependabot[bot] 5ac5fac7c4
Bump css-loader from 2.0.1 to 2.0.2 in /apps/accessibility
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.0.1 to 2.0.2.
- [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/v2.0.1...v2.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-24 02:19:01 +00:00
dependabot[bot] 1b436332c6
Bump webpack from 4.28.1 to 4.28.2 in /apps/oauth2
Bumps [webpack](https://github.com/webpack/webpack) from 4.28.1 to 4.28.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.28.1...v4.28.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-24 02:18:47 +00:00
dependabot[bot] 2680310cd9
Bump webpack from 4.28.1 to 4.28.2 in /settings
Bumps [webpack](https://github.com/webpack/webpack) from 4.28.1 to 4.28.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.28.1...v4.28.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-24 02:18:27 +00:00
dependabot[bot] 3a5728d73d
Bump css-loader from 2.0.1 to 2.0.2 in /apps/updatenotification
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.0.1 to 2.0.2.
- [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/v2.0.1...v2.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-24 02:17:40 +00:00
dependabot[bot] c8cb56df2f
Bump css-loader from 2.0.1 to 2.0.2 in /apps/oauth2
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.0.1 to 2.0.2.
- [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/v2.0.1...v2.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-24 02:17:40 +00:00
dependabot[bot] 2a8732c4d0
Bump css-loader from 2.0.1 to 2.0.2 in /settings
Bumps [css-loader](https://github.com/webpack-contrib/css-loader) from 2.0.1 to 2.0.2.
- [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/v2.0.1...v2.0.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-24 02:17:20 +00:00
dependabot[bot] ed63c9e7fa
Bump webpack from 4.28.1 to 4.28.2 in /apps/updatenotification
Bumps [webpack](https://github.com/webpack/webpack) from 4.28.1 to 4.28.2.
- [Release notes](https://github.com/webpack/webpack/releases)
- [Commits](https://github.com/webpack/webpack/compare/v4.28.1...v4.28.2)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-24 02:17:02 +00:00
Nextcloud bot 9d5f7c7f62
[tx-robot] updated from transifex 2018-12-24 01:11:46 +00:00
Julius Härtl 0f911e2d13
Add default values when parsing account data
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-12-23 16:33:02 +01:00
Nextcloud bot f5286bcb07
[tx-robot] updated from transifex 2018-12-23 01:12:27 +00:00
Nextcloud bot 53b7762c2e
[tx-robot] updated from transifex 2018-12-22 01:11:48 +00:00
Daniel Calviño Sánchez bc74a44cbc Fix opening search results for comments
"OC.dirname" removes everything after the last "/", so a path without
slashes is returned without changes. "result.path" does not include
leading nor trailing "/", so when the path is for a file or folder in
the base folder "OC.dirname(result.path)" returns "result.path".

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-21 21:49:10 +01:00
Daniel Calviño Sánchez 4566670fa3 Add acceptance tests for opening search results for comments
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-21 20:14:38 +01:00
Daniel Calviño Sánchez 1a887aaad0 Add acceptance tests for searching comments
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
2018-12-21 20:14:16 +01:00
Jonas Sulzer 139f5d3b0c
remove user_external from shipped.json
Signed-off-by: Jonas Sulzer <jonas@violoncello.ch>
2018-12-21 17:32:42 +01:00
Arthur Schiwon 85f14bc591
LDAP: extend remnants output with "detected on" field
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-12-21 17:24:28 +01:00
Arthur Schiwon fbd4e9e651
add tests for the DUI
as they are interact with the DB they are more integraiton than unit tests

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2018-12-21 17:24:23 +01:00
Roeland Jago Douma 58d4b8ee85
Merge pull request #13122 from nextcloud/td/min_php_bump
NC16 is php >= 7.1
2018-12-21 16:53:14 +01:00
Roeland Jago Douma 70936dcfb3
Fix drone images
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-21 16:04:12 +01:00
Roeland Jago Douma 3a6e739d8d
NC16 is php >= 7.1
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-21 16:04:11 +01:00
Roeland Jago Douma dd9514bfb3
Merge pull request #13198 from nextcloud/dependabot/npm_and_yarn/settings/file-loader-3.0.1
Bump file-loader from 1.1.11 to 3.0.1 in /settings
2018-12-21 14:25:15 +01:00
Roeland Jago Douma 2f395c5516
Merge pull request #13195 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/file-loader-3.0.1
Bump file-loader from 1.1.11 to 3.0.1 in /apps/accessibility
2018-12-21 14:24:53 +01:00
Roeland Jago Douma 50a7f79dd7
Merge pull request #13190 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/file-loader-3.0.1
Bump file-loader from 1.1.11 to 3.0.1 in /apps/updatenotification
2018-12-21 14:24:45 +01:00
Roeland Jago Douma ea8120b1e4
Merge pull request #13210 from nextcloud/followup/12883/handle_slash
Followup 12883, gracefully handle the getting of /
2018-12-21 14:23:13 +01:00
Roeland Jago Douma bcea6c3697
Merge pull request #13212 from nextcloud/bugfix/noid/ie11-files-loading
Files list not rendering if user has favorites navigation unfolded
2018-12-21 14:20:41 +01:00
Roeland Jago Douma 16cc68a2fe
Add twofactor_providers_uid index
Fixes #12943

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-21 13:03:02 +01:00
John Molakvoæ c2d75ddc4f
Merge pull request #13187 from nextcloud/fix/noid/ldap-misses-store-2n-displayname-portion
do not forgot to store the second displayname portion
2018-12-21 12:39:03 +01:00
Julius Härtl 6bcc77a7c6
Replace ChildNode.before with custom before helper
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2018-12-21 12:03:34 +01:00
Roeland Jago Douma d0956c9a42
Followup 12833, gracefully handle the getting of /
Else this breaks the app page

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2018-12-21 11:08:19 +01:00
John Molakvoæ 7717fc0378
Merge pull request #13196 from nextcloud/dependabot/npm_and_yarn/settings/webpack-4.28.1
Bump webpack from 4.28.0 to 4.28.1 in /settings
2018-12-21 11:04:52 +01:00
John Molakvoæ a8f611093a
Merge pull request #13185 from nextcloud/fix/proper_version_theming_scss
SCSS cache buster is a combination of apps/theming/scc_vars
2018-12-21 10:32:43 +01:00
John Molakvoæ bb90e3d2d0
Merge pull request #13154 from nextcloud/ie11-checkboxes-fix
Fix ie11 checkboxes
2018-12-21 10:17:43 +01:00
dependabot[bot] 31c34bda30
Bump file-loader from 1.1.11 to 3.0.1 in /settings
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 1.1.11 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v1.1.11...v3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-21 08:36:44 +00:00
dependabot[bot] 674ef82516
Bump file-loader from 1.1.11 to 3.0.1 in /apps/updatenotification
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 1.1.11 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v1.1.11...v3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-21 08:36:42 +00:00
dependabot[bot] 7b0dbb6e54
Bump file-loader from 1.1.11 to 3.0.1 in /apps/accessibility
Bumps [file-loader](https://github.com/webpack-contrib/file-loader) from 1.1.11 to 3.0.1.
- [Release notes](https://github.com/webpack-contrib/file-loader/releases)
- [Changelog](https://github.com/webpack-contrib/file-loader/blob/master/CHANGELOG.md)
- [Commits](https://github.com/webpack-contrib/file-loader/compare/v1.1.11...v3.0.1)

Signed-off-by: dependabot[bot] <support@dependabot.com>
2018-12-21 08:36:33 +00:00
John Molakvoæ 5dfdae3187
Merge pull request #13197 from nextcloud/dependabot/npm_and_yarn/apps/accessibility/@babel/preset-env-7.2.3
Bump @babel/preset-env from 7.2.0 to 7.2.3 in /apps/accessibility
2018-12-21 09:35:21 +01:00
John Molakvoæ 7fe851f64e
Merge pull request #13194 from nextcloud/dependabot/npm_and_yarn/settings/@babel/preset-env-7.2.3
Bump @babel/preset-env from 7.2.0 to 7.2.3 in /settings
2018-12-21 09:34:50 +01:00
John Molakvoæ 4856079d2f
Merge pull request #13193 from nextcloud/dependabot/npm_and_yarn/apps/updatenotification/@babel/preset-env-7.2.3
Bump @babel/preset-env from 7.2.0 to 7.2.3 in /apps/updatenotification
2018-12-21 09:34:38 +01:00