0299ea0a96
Handle token insert conflicts
...
Env-based SAML uses the "Apache auth" mechanism to log users in. In this
code path, we first delete all existin auth tokens from the database,
before a new one is inserted. This is problematic for concurrent
requests as they might reach the same code at the same time, hence both
trying to insert a new row wit the same token (the session ID). This
also bubbles up and disables user_saml.
As the token might still be OK (both request will insert the same data),
we can actually just check if the UIDs of the conflict row is the same
as the one we want to insert right now. In that case let's just use the
existing entry and carry on.
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-11-26 12:07:12 +01:00
e3bee2cb78
Merge pull request #18026 from nextcloud/feature/noid/fix_overlappin_text_icon
...
fix share side bar icon and text overlapping
2019-11-26 12:02:41 +01:00
2a2d0cd312
Merge pull request #18082 from nextcloud/design/style-update
...
Update style of log in page and header
2019-11-26 12:01:47 +01:00
1fac8174b9
Merge pull request #18013 from nextcloud/bugfix/noid/fix-autocomplete-suggestions-with-numeric-users
...
Fix autocomplete suggestions with numeric users
2019-11-26 11:12:10 +01:00
77d136cbdf
Apply share permission mask to all files obtained via shareinfo
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-26 11:07:01 +01:00
fe6dc8082c
add var for theming images , advanced options ( #16815 )
...
add var for theming images , advanced options
2019-11-26 10:55:20 +01:00
1b8cbf115a
add Nextcloud specific GenericEvent implementation
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-26 10:23:33 +01:00
dfe85ae0c2
Merge pull request #18025 from nextcloud/refactor/extract-ownership-transfer-service
...
Extract transfer ownership logic into a reusable service
2019-11-26 09:32:18 +01:00
7015501a74
Merge pull request #18005 from nextcloud/fix/manual-app-instances
...
Remove some more direct app instance creations
2019-11-26 09:20:14 +01:00
06f97c0fd0
Fix autocomplete suggestions with numeric user ids
...
Signed-off-by: Joas Schilling <coding@schilljs.com>
2019-11-26 09:19:49 +01:00
07c5f3775c
Extract transfer ownership logic into a reusable service
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-11-26 08:50:19 +01:00
0fab27f459
Merge pull request #18108 from nextcloud/refactor/strict-credential-store
...
Add return type hint to credential store and make it strict
2019-11-26 08:08:10 +01:00
123c4aa4e0
[tx-robot] updated from transifex
2019-11-26 02:15:57 +00:00
a9fb567621
Merge pull request #18107 from nextcloud/undefined-index-owner
...
dont throw undefined index errors for storages that have no owner set
2019-11-25 20:53:02 +01:00
9002b0f245
Merge pull request #18088 from nextcloud/dependabot/npm_and_yarn/handlebars-4.5.3
...
Bump handlebars from 4.5.2 to 4.5.3
2019-11-25 20:02:58 +01:00
7ccb70487b
Improve tag icon ( #18109 )
...
Improve tag icon
2019-11-25 17:43:31 +01:00
b1dffc5c2d
Merge pull request #17896 from nextcloud/fix/noid/consider-create-group-result
...
take group creation result into consideration
2019-11-25 17:16:40 +01:00
27d68b4f90
Improve tag icon
...
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
2019-11-25 16:32:22 +01:00
067ee3150c
Adjust gradient to theming value
...
Signed-off-by: Julius Härtl <jus@bitgrid.net>
2019-11-25 16:29:29 +01:00
128a460d7b
Add return type hint to credential store and make it strict
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-11-25 15:59:55 +01:00
f2848fc17c
dont throw undefined index errors for storages that have no owner set
...
Signed-off-by: Robin Appelman <robin@icewind.nl>
2019-11-25 15:17:15 +01:00
11b57c062a
Bump handlebars from 4.5.2 to 4.5.3
...
Bumps [handlebars](https://github.com/wycats/handlebars.js ) from 4.5.2 to 4.5.3.
- [Release notes](https://github.com/wycats/handlebars.js/releases )
- [Changelog](https://github.com/wycats/handlebars.js/blob/master/release-notes.md )
- [Commits](https://github.com/wycats/handlebars.js/compare/v4.5.2...v4.5.3 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-11-25 13:13:57 +00:00
279c0cb2ed
Merge pull request #18098 from nextcloud/fix/migration_import_order
...
Fix the import order of new migrations
2019-11-25 14:11:09 +01:00
c7d5b8fc49
Merge pull request #18079 from nextcloud/fixes/phpcs
...
Some php-cs fixes
2019-11-25 14:07:00 +01:00
b4408e4245
fix and improve check of create group result
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:25 +01:00
cdf8c16942
reformat Setup.php
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:25 +01:00
f0ff8b0307
reformat code for @skjnldsv <3
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:25 +01:00
7ff15c9756
fix documentation, get and createGroup may return null
...
* also have stricter checks in place
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:25 +01:00
7b1eedb11e
take group creation result into consideration
...
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
2019-11-25 14:01:20 +01:00
20ec763337
Merge pull request #18027 from str0g/fix/14920/convert_type_boolean
...
Incorrect integer value: '' for column 'password_invalid' while migra…
2019-11-25 11:37:45 +01:00
b451488471
Merge pull request #18068 from nextcloud/3rdparty/swiftmailer/6.2.3
...
Bump swiftmailer to 6.2.3
2019-11-25 11:37:14 +01:00
daa636260f
Merge pull request #18073 from nextcloud/harden/cache/watcher
...
Harden watcher
2019-11-25 10:06:04 +01:00
792f84e846
fix min-height
...
Signed-off-by: Greta Doci <gretadoci@gmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
2019-11-25 09:05:41 +00:00
da45eee634
Merge pull request #17993 from waleczny/patch-1
...
Get first element of nodes array
2019-11-25 10:05:23 +01:00
f79d98e089
Fix the import order of new migrations
...
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
2019-11-25 09:46:39 +01:00
31fced9698
Merge pull request #18081 from nextcloud/design/info-icon
...
Adjust info icon style to other icons
2019-11-25 09:20:35 +01:00
97385cef33
Remove some more direct app instance creations
...
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
2019-11-25 08:42:16 +01:00
646748cbbe
Merge pull request #18057 from nextcloud/fix/noid/forbidden-help
...
make help available to ordinary users again
2019-11-25 08:40:59 +01:00
cfdabbec0f
Bump @babel/plugin-syntax-dynamic-import from 7.2.0 to 7.7.4 ( #18085 )
...
Bump @babel/plugin-syntax-dynamic-import from 7.2.0 to 7.7.4
2019-11-25 08:38:03 +01:00
96a337389b
Bump url-loader from 2.2.0 to 2.3.0 ( #18089 )
...
Bump url-loader from 2.2.0 to 2.3.0
2019-11-25 08:37:43 +01:00
e4fe1fcc12
Merge pull request #18095 from nextcloud/enh/svg-settings-app
...
Remove exception for settings app from svg controller
2019-11-25 08:37:09 +01:00
df5a985eca
Bump @babel/plugin-syntax-dynamic-import from 7.2.0 to 7.7.4
...
Bumps [@babel/plugin-syntax-dynamic-import](https://github.com/babel/babel ) from 7.2.0 to 7.7.4.
- [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.2.0...v7.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-25 06:07:56 +00:00
3c17d1b5e2
Merge pull request #18090 from nextcloud/dependabot/npm_and_yarn/babel/plugin-proposal-class-properties-7.7.4
...
Bump @babel/plugin-proposal-class-properties from 7.7.0 to 7.7.4
2019-11-25 07:05:55 +01:00
573c800b00
[tx-robot] updated from transifex
2019-11-25 02:15:54 +00:00
6d883f3641
Remove some whitespace
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-11-24 21:51:44 +01:00
761f331d1e
fix test for new css vars / logoheader and favicon
...
Signed-off-by: Guillaume COMPAGNON <gcompagnon@outlook.com>
2019-11-24 21:51:43 +01:00
ed399a31bd
add var for theming images , advanced options
...
Signed-off-by: Guillaume COMPAGNON <gcompagnon@outlook.com>
2019-11-24 21:51:43 +01:00
957c0df01b
Remove exception for settings app from svg controller
...
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
2019-11-24 17:15:06 +01:00
24ae10c7d9
Bump @babel/plugin-proposal-class-properties from 7.7.0 to 7.7.4
...
Bumps [@babel/plugin-proposal-class-properties](https://github.com/babel/babel ) from 7.7.0 to 7.7.4.
- [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.0...v7.7.4 )
Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
2019-11-24 13:28:36 +00:00
cd7af395d7
Merge pull request #18091 from nextcloud/dependabot/npm_and_yarn/babel/preset-env-7.7.4
...
Bump @babel/preset-env from 7.7.1 to 7.7.4
2019-11-24 14:26:37 +01:00
Christoph Wurst
Roeland Jago Douma
Roeland Jago Douma
John Molakvoæ
Arthur Schiwon
Joas Schilling
Nextcloud bot
John Molakvoæ (skjnldsv)
Julius Härtl
Robin Appelman
dependabot-preview[bot]
Greta Doci
Daniel Kesselberg
Guillaume COMPAGNON