Mirrors/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2024-07-24 13:24:51 +02:00
Code Issues Actions 34 Packages Projects Releases Wiki Activity
59,085 Commits 440 Branches 1,012 Tags 4.9 GiB
aae16c21e6
Commit Graph

24836 Commits

Author SHA1 Message Date
John Molakvoæ
5d7d70538b
Merge pull request #27827 from nextcloud/enh/27292/singular-plural 2021-07-07 08:23:39 +02:00
Nextcloud bot
085f9d6ca9
[tx-robot] updated from transifex 2021-07-07 02:26:06 +00:00
szaimen
addc825275 add singular and plural in for days in admin sharing settings 
Signed-off-by: szaimen <szaimen@e.mail.de>
 2021-07-06 19:05:17 +02:00
Nextcloud bot
17e58f5056
[tx-robot] updated from transifex 2021-07-06 02:26:02 +00:00
Nextcloud bot
4aefd04f40
[tx-robot] updated from transifex 2021-07-04 02:25:36 +00:00
Nextcloud bot
329e517fd9
[tx-robot] updated from transifex 2021-07-03 02:25:58 +00:00
Joas Schilling
8ebbd91909
Merge pull request #17148 from nextcloud/always-provide-color-to-default-personal-calendar 
Always provide theme color for default personal calendar
 2021-07-02 16:29:18 +02:00
Nextcloud bot
129214e430
[tx-robot] updated from transifex 2021-07-02 02:25:20 +00:00
John Molakvoæ
9a7d432b55
Merge pull request #27742 from nextcloud/enh/explicit-hint-federation-local 
Clarify that federated sharing settings may also affect shares between users on the current instanc
 2021-07-01 15:23:52 +02:00
Julius Härtl
660c0f7942
Clarify that federated sharing settings may also affect shares between users on the current instance 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2021-07-01 11:41:21 +02:00
Julius Härtl
3853307a6a
Merge pull request #26681 from nextcloud/techdebt/hint-exception-ocp 
Move HintException to OCP
 2021-07-01 08:34:55 +02:00
Nextcloud bot
bb40e65e4e
[tx-robot] updated from transifex 2021-07-01 02:24:48 +00:00
Gary Kim
b78f3a57d1
Migrate HintException to OCP 
Signed-off-by: Gary Kim <gary@garykim.dev>
 2021-06-30 15:28:02 -04:00
Arthur Schiwon
f62c066459
unset ldap provider when disabling user_ldap 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 15:25:00 +02:00
Julius Härtl
75f7287b5e
Merge pull request #27638 from nextcloud/enh/noid/fix-encrypted-version 2021-06-30 14:17:38 +02:00
Arthur Schiwon
6b910d4f02
fix incredible off-by-one-typo-error 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 11:01:46 +02:00
John Molakvoæ
9124c69cf6
Merge pull request #27474 from nextcloud/feat/26866/prov-api 2021-06-30 07:13:24 +02:00
Nextcloud bot
62ff4fe50a
[tx-robot] updated from transifex 2021-06-30 02:25:27 +00:00
Arthur Schiwon
ad0a11b2bf
cleanup 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 01:03:44 +02:00
Arthur Schiwon
a0752543d8
fix small issues in UsersController handling 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:48:05 +02:00
Arthur Schiwon
00ffad3c60
adjust access permissions of new controller method 
- fixes wrong veriable usage also

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:48:05 +02:00
Arthur Schiwon
6eda6af5c6
fix regex 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:48:04 +02:00
Arthur Schiwon
02808e38b4
create a property on editUser when it was not set before 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:47:43 +02:00
Arthur Schiwon
d109d4f581
prov api to be able to edit multivalue properties 
- adding as usual
- deleting and scope setting via additional endpoint

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:41:11 +02:00
Arthur Schiwon
3da9064f9d
prov api reports multiple mail as editable field 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:41:11 +02:00
Arthur Schiwon
13818005a3
prov api reports additional emails on getUser 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-30 00:41:10 +02:00
Vincent Petry
d3eeecba54
Prevent running FixEncryptedVersion without master key 
Return an error when running occ encryption:fix-encrypted-version
when master key encryption is not enabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 20:44:07 +02:00
Julius Härtl
d1b0ccb715
Merge pull request #27488 from msrn/win10cal-useragent 
Add regex to match Windows 10 calendar user-agent
 2021-06-29 18:36:51 +02:00
Vincent Petry
101c65a949
Fix FixEncryptedVersionTest test 
Fixed setup to use EncryptionTrait like other existing tests.
Fix expectations to not rely on side effects from previous test cases.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 14:39:51 +02:00
Vincent Petry
6170912ace
Fix warnings in FixEncryptedVersion command 
Fixed code warnings

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 14:39:51 +02:00
Vincent Petry
4e9241c706
Detect disabled signature check when reparing 
When running occ encryption:fix-encrypted-version, detect whether the
setting 'encryption_skip_signature_check' is set and abort if it is,
because the repair cannot detect version mismatch errors with it
enabled.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 14:39:51 +02:00
Vincent Petry
43a0016aa7
Downstream FixEncryptedVersionTest 
Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 14:39:51 +02:00
Vincent Petry
a6dc81d419
Downstream encryption:fix-encrypted-version 
For fixing "Bad signature" errors.

Signed-off-by: Vincent Petry <vincent@nextcloud.com>
 2021-06-29 14:39:51 +02:00
J0WI
c694b9d52b Remember current cipher 
Signed-off-by: J0WI <J0WI@users.noreply.github.com>
 2021-06-29 13:41:22 +02:00
blizzz
73c5738ac7
Merge pull request #27698 from nextcloud/fix/25761/userexistsonldap-loop 
LDAP: determine shares of offline users only when needed
 2021-06-28 19:13:05 +02:00
Lukas Reschke
583e597237
Merge pull request #27676 from nextcloud/localize-invitation-email-subjects 
Localize invitation email subjects
 2021-06-28 19:10:24 +02:00
Arthur Schiwon
bbcd8c9a68
LDAP: determine shares of offline users only when needed 
- determine shares may via Sharing code result in user exists checks
- this may result in an infinite loop when user exists was called before
- the info is really only required at one occ command

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2021-06-28 12:56:37 +02:00
Nextcloud bot
ac97873a17
[tx-robot] updated from transifex 2021-06-28 02:25:09 +00:00
Nextcloud bot
67851a0262
[tx-robot] updated from transifex 2021-06-27 02:25:38 +00:00
Nextcloud bot
1cf04c8b6f
[tx-robot] updated from transifex 2021-06-26 02:25:44 +00:00
Thomas Citharel
fc49b2600b
Add indications for the translators 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2021-06-25 17:27:45 +02:00
Paweł Lechowicz
f33eea69ce
Subjects for Invitation, Invitation cancellation and Invitation replies are now localizable. 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2021-06-25 17:23:00 +02:00
Joas Schilling
080e26fb80
Validate the theming color also on CLI 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-06-25 16:58:29 +02:00
Thomas Citharel
8927205d8a
Make default calendar only contain VEVENTS 
Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2021-06-25 14:26:18 +02:00
Thomas Citharel
f73478654d
Always provide theme color for default personal calendar 
Before this calendar-color wasn't defined for default calendar

Signed-off-by: Thomas Citharel <tcit@tcit.fr>
 2021-06-25 14:15:10 +02:00
John Molakvoæ
00edbc2adf
Merge pull request #27664 from nextcloud/techdebt/noid/master-is-now-23-part2 
Bump app version
 2021-06-25 13:17:48 +02:00
Nextcloud bot
95447d0152
[tx-robot] updated from transifex 2021-06-25 02:25:29 +00:00
Joas Schilling
655108a3dc
Bump app version 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-06-24 16:08:39 +02:00
Joas Schilling
8b0448d407
Master is now 23 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2021-06-24 12:56:06 +02:00
dependabot[bot]
0c1ba19658
Merge pull request #27629 from nextcloud/dependabot/npm_and_yarn/core-js-3.15.1 2021-06-24 07:38:27 +00:00