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

51399 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
0e87c6fac9
Merge pull request #18058 from nextcloud/enh/shareinfo/permissionmask 
Apply share permission mask to all files obtained via shareinfo
 2019-11-26 19:49:01 +01:00
Roeland Jago Douma
d09f8c7423
Merge pull request #17939 from nextcloud/fix/token-insert-conflict-handling 
Handle token insert conflicts
 2019-11-26 19:47:59 +01:00
Roeland Jago Douma
2b913de417
Merge pull request #18123 from nextcloud/fixbug/18053/summary_not_aligned 
fix summary elements alignment
 2019-11-26 19:39:57 +01:00
Greta Doci
efb73a9b3c fix summary elements alignment 
Signed-off-by: Greta Doci <gretadoci@gmail.com>
 2019-11-26 18:52:56 +01:00
Roeland Jago Douma
fa1b23b67a
Merge pull request #17995 from nextcloud/fix/sharing/federation-order 
Sort users and groups first in sharing input
 2019-11-26 15:24:36 +01:00
Roeland Jago Douma
b607e3e6f4
Merge pull request #17948 from nextcloud/enh/check-if-property-is-bool 
Make isXXX available for bool properties only
 2019-11-26 12:25:36 +01:00
John Molakvoæ (skjnldsv)
644ee02fea Sort users and groups first in sharing input 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-11-26 11:12:35 +00:00
Christoph Wurst
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
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
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
John Molakvoæ
fe6dc8082c
add var for theming images , advanced options (#16815) 
add var for theming images , advanced options
 2019-11-26 10:55:20 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Joas Schilling
06f97c0fd0
Fix autocomplete suggestions with numeric user ids 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2019-11-26 09:19:49 +01:00
Christoph Wurst
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
Roeland Jago Douma
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
Nextcloud bot
123c4aa4e0
[tx-robot] updated from transifex 2019-11-26 02:15:57 +00:00
Roeland Jago Douma
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
Roeland Jago Douma
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
John Molakvoæ
7ccb70487b
Improve tag icon (#18109) 
Improve tag icon
 2019-11-25 17:43:31 +01:00
blizzz
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
John Molakvoæ (skjnldsv)
27d68b4f90
Improve tag icon 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2019-11-25 16:32:22 +01:00
Julius Härtl
067ee3150c
Adjust gradient to theming value 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-11-25 16:29:29 +01:00
Christoph Wurst
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
Robin Appelman
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
dependabot-preview[bot]
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
Roeland Jago Douma
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
Roeland Jago Douma
c7d5b8fc49
Merge pull request #18079 from nextcloud/fixes/phpcs 
Some php-cs fixes
 2019-11-25 14:07:00 +01:00
Arthur Schiwon
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
Arthur Schiwon
cdf8c16942
reformat Setup.php 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-25 14:01:25 +01:00
Arthur Schiwon
f0ff8b0307
reformat code for @skjnldsv <3 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-25 14:01:25 +01:00
Arthur Schiwon
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
Arthur Schiwon
7b1eedb11e
take group creation result into consideration 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-11-25 14:01:20 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Roeland Jago Douma
daa636260f
Merge pull request #18073 from nextcloud/harden/cache/watcher 
Harden watcher
 2019-11-25 10:06:04 +01:00
Greta Doci
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
Roeland Jago Douma
da45eee634
Merge pull request #17993 from waleczny/patch-1 
Get first element of nodes array
 2019-11-25 10:05:23 +01:00
Roeland Jago Douma
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
Roeland Jago Douma
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
Christoph Wurst
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
Roeland Jago Douma
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
John Molakvoæ
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
John Molakvoæ
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
Roeland Jago Douma
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
dependabot-preview[bot]
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
Roeland Jago Douma
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
Nextcloud bot
573c800b00
[tx-robot] updated from transifex 2019-11-25 02:15:54 +00:00