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

51881 commits

This branch
This branch
All branches
Author SHA1 Message Date
Roeland Jago Douma
5d9fd7ba0c
Merge pull request #16792 from MichaIng/patch-1 
Harden data and config protection .htaccess
 2019-12-19 11:26:12 +01:00
John Molakvoæ
79b9be7ebf
Fix Sidebar enabled check (#18449) 
Fix Sidebar enabled check
 2019-12-19 11:22:17 +01:00
Roeland Jago Douma
f87a71cf23
Merge pull request #18470 from nextcloud/techdebt/app-code-checker-php7-only 
Only parse php7 code in app code checker
 2019-12-19 10:33:30 +01:00
Christoph Wurst
4ff11e3955
Do not generate tokens for editor IDs that do not exist 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-19 09:38:22 +01:00
Roeland Jago Douma
11c19a4541
Merge pull request #18370 from nextcloud/version/18/beta3 
18 beta 3
 2019-12-19 08:57:48 +01:00
John Molakvoæ (skjnldsv)
27dc4ef268 Fix Sidebar enabled check 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-12-19 07:51:49 +00:00
John Molakvoæ
972c39bafc
fix credentials saving success message notification color (#18469) 
fix credentials saving success message notification color
 2019-12-19 08:48:46 +01:00
John Molakvoæ
8cd86f110b
Wiswedel/inherited shares/design polishing (#18447) 
Wiswedel/inherited shares/design polishing
 2019-12-19 08:45:16 +01:00
Nextcloud bot
b175211366
[tx-robot] updated from transifex 2019-12-19 02:26:26 +00:00
Christoph Wurst
cdd69c0f97
Only parse php7 code in app code checker 
Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2019-12-18 15:39:14 +01:00
Sascha Wiswedel
f63156976b
fix credentials saving success message notification color 
was red, now green

Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-18 15:32:39 +01:00
Roeland Jago Douma
c44fd46c8c
Merge pull request #18457 from nextcloud/fix/sharing/notifier/uid 
Use the user from the notification
 2019-12-18 13:16:06 +01:00
Roeland Jago Douma
65929e1fcf
Merge pull request #18462 from nextcloud/fix/18211/list-group-with-slash 
Fix listing users in groups with slash in the name
 2019-12-18 12:03:04 +01:00
blizzz
47a4a037ae
Merge pull request #18461 from nextcloud/fix/noid/ensure-entity-on-scope-extension 
Flows that are managing themselves do not necessarily set the entity
 2019-12-18 11:09:12 +01:00
Gary Kim
f23c2d0665
Fix listing users in groups with slash in the name 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2019-12-18 17:09:04 +08:00
Arthur Schiwon
0a00903261
Flows that are managing themselves do not necessarily set the entity 
for instance files_automatedtagging, which works on a lower level. Fixes a
Call to a member function isLegitimatedForUserId() on null.

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-12-18 09:35:03 +01:00
Roeland Jago Douma
34c48aaa92
Merge pull request #18456 from nextcloud/fix/office/previews 
Fix Office preview generation
 2019-12-18 09:19:06 +01:00
Roeland Jago Douma
b86990988e
Use the user from the notification 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-18 08:37:03 +01:00
Roeland Jago Douma
86dccffff9
Fix Office preview generation 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-18 08:36:30 +01:00
Nextcloud bot
9fd94b7e05
[tx-robot] updated from transifex 2019-12-18 02:26:30 +00:00
Roeland Jago Douma
ac045a2461
Merge pull request #18448 from nextcloud/fix/noid/wrong-paths-for-fileids 
pass the proper storage-internal path
 2019-12-17 16:04:20 +01:00
Roeland Jago Douma
e9e3d485bc
Merge pull request #18446 from nextcloud/fix/personal-settings-fix 
Don't overwrite the settings from files
 2019-12-17 16:04:00 +01:00
Arthur Schiwon
1378614f67
pass the proper storage-internal path 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-12-17 15:00:44 +01:00
Sascha Wiswedel
f4f69da4b8 removed inherited shares counter 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
Signed-off-by: npmbuildbot[bot] <npmbuildbot[bot]@users.noreply.github.com>
 2019-12-17 13:47:10 +00:00
Sascha Wiswedel
4d1a3a34d0
clarifying share source folder link string 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 14:38:38 +01:00
Sascha Wiswedel
73b1011d17
Streamline "unshare" wording 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 14:36:23 +01:00
Sascha Wiswedel
08b34aa4e3
replace "invited by" with "added by" 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 14:34:27 +01:00
Roeland Jago Douma
c810b531be
Don't overwrite the settings from files 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-17 14:17:07 +01:00
Roeland Jago Douma
1ac764e0b7
Merge pull request #18443 from nextcloud/fix/noid/update-xsd 
update app info schema files
 2019-12-17 14:05:23 +01:00
Arthur Schiwon
d4b4e54d5f
update app info schema files 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2019-12-17 12:34:54 +01:00
Roeland Jago Douma
7f2b3eabe1
Merge pull request #18429 from nextcloud/locale-fallback 
add a fallback locale for personal settings page
 2019-12-17 12:31:17 +01:00
Roeland Jago Douma
53f94b8101
Merge pull request #18422 from nextcloud/design/recommended-apps 
Design fixes for recommended apps
 2019-12-17 12:02:55 +01:00
Roeland Jago Douma
d3012bffeb
Merge pull request #18385 from nextcloud/fix/18255/user_setting_to_always_accept_share 
Allow users to accept (internal) shares by default
 2019-12-17 12:02:08 +01:00
Roeland Jago Douma
4c1c475072
Merge pull request #18270 from nextcloud/wiswedel/transferOwnership/polishing 
Transfer ownership function polishing
 2019-12-17 12:00:12 +01:00
Roeland Jago Douma
e7dc91002f
Allow users to specify to accept (internal) shares by default 
Fixes #18255

A new user setting allows a user to always accept (internal) shares. For
example if they don't like accepting shares manually ;)

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-17 10:49:29 +01:00
Roeland Jago Douma
76895b6945
Merge pull request #18428 from nextcloud/bugfix/noid/empty-template 
Return empty template for default creators
 2019-12-17 10:41:48 +01:00
Sascha Wiswedel
a1df5d1e98
added line breaks to incoming transfer notification 
wrapped notifications into double quotes to make line breaks possible

Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 10:38:15 +01:00
Gary Kim
e1382e2bc5
Clean up publishing 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2019-12-17 10:38:15 +01:00
Gary Kim
09f1c637da
Show path and uid on transfer button 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2019-12-17 10:38:14 +01:00
Sascha Wiswedel
bdceb0d38d
rephrase "Target user" to "new owner" 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 10:38:14 +01:00
Sascha Wiswedel
6a6b6dd1a4
added patience note for sharee 
note about incoming transfer taken out by background job

resolves #18272

Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 10:38:14 +01:00
Sascha Wiswedel
a64b5de491
transfer ownership dialog word choice 
Use Reject instead of Decline


Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 10:38:14 +01:00
Sascha Wiswedel
f567566803
notification polishing 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 10:38:14 +01:00
Sascha Wiswedel
f1319e1bc5
Transfer ownership function polishing 
Signed-off-by: Sascha Wiswedel <sascha.wiswedel@nextcloud.com>
 2019-12-17 10:38:12 +01:00
Roeland Jago Douma
a65269ffcd
Merge pull request #18438 from nextcloud/remove/old_npm_chunks 
Remove no longer generated chunks
 2019-12-17 10:30:11 +01:00
Roeland Jago Douma
90b7b5f18d
Remove no longer generated chunks 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2019-12-17 09:03:24 +01:00
Nextcloud bot
efb71d62f6
[tx-robot] updated from transifex 2019-12-17 02:26:28 +00:00
Roeland Jago Douma
2df9073025
Merge pull request #18430 from nextcloud/fix/noid/double-flow 
Fix/noid/double flow
 2019-12-16 20:29:53 +01:00
Roeland Jago Douma
9fee1d9851
Merge pull request #18431 from nextcloud/prov-api-query-application 
query FederatedFileSharing Application instead of creating it
 2019-12-16 20:29:39 +01:00
Julius Härtl
de5384466c
Return empty template for default creators 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2019-12-16 17:22:53 +01:00