upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-03-02 21:41:12 -05:00
Code Issues Projects Releases Packages Wiki Activity Actions 14
55714 commits 699 branches 1186 tags 6.5 GiB
Commit graph

23401 commits

Author SHA1 Message Date
Julius Härtl
889d162ab7
Bump bundles 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-16 11:36:35 +01:00
Joas Schilling
7a821da1bc
Merge pull request #24079 from nextcloud/backport/24053/stable20 
[stable20] Make is_user_defined nullable so we can store false on oracle
 2020-11-16 11:23:17 +01:00
John Molakvoæ
18f5ad1a34
Merge pull request #24114 from nextcloud/backport/24096/stable20 
[stable20] Convert the card resource to a string if necessary
 2020-11-16 10:15:18 +01:00
Joas Schilling
9b694e59f5
Bump versions 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-16 08:54:30 +01:00
Nextcloud bot
9abc65c573
[tx-robot] updated from transifex 2020-11-16 02:19:33 +00:00
Nextcloud bot
c9001eb7ef
[tx-robot] updated from transifex 2020-11-15 02:19:11 +00:00
Nextcloud bot
66b6ccc69e
[tx-robot] updated from transifex 2020-11-14 02:19:47 +00:00
Christoph Wurst
07861fe52d Convert the card resource to a string if necessary 
Apparently the fetched column can be a string or resource. Hence we have
to catch the resource type and convert it to a string.

Signed-off-by: Christoph Wurst <christoph@winzerhof-wurst.at>
 2020-11-13 18:18:24 +00:00
John Molakvoæ (skjnldsv)
680853d077 Fix default internal expiration date enforce 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2020-11-13 06:31:16 +00:00
Joas Schilling
32d7459d8b Make is_user_defined nullable so we can store false on oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-12 20:46:55 +00:00
Joas Schilling
cd76043691
Fix CS 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-12 12:57:52 +01:00
Joas Schilling
bb52911d16
Create primary keys on all tables and add a command to create the afterwards 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-12 12:57:52 +01:00
Joas Schilling
b6ce689e25
Fix public calendars as they are stored with null on oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-12 12:57:51 +01:00
Joas Schilling
8ff0523c3d
Make sure columns with an empty default are nullable for Oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-12 12:57:51 +01:00
Joas Schilling
fcef3c0e8a
Fix "Invalid fetch style: 12" on Oracle 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-12 12:57:51 +01:00
Joas Schilling
48c2f6d5a0
Make the test pass on repeating calls 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-12 12:57:51 +01:00
Nextcloud bot
140068e91d
[tx-robot] updated from transifex 2020-11-12 02:19:35 +00:00
Roeland Jago Douma
a0f95cd1d3
Merge pull request #24058 from nextcloud/backport/24054/stable20 
[stable20] Manually iterate over calendardata when oracle is used
 2020-11-11 21:54:55 +01:00
Roeland Jago Douma
8270aed206
Merge pull request #24050 from nextcloud/backport/23915/stable20 
[stable20] Use png icons in caldav reminder emails
 2020-11-11 21:27:53 +01:00
Julius Härtl
bf0dbffe81 Manually iterate over calendardata when oracle is used 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-11 16:12:25 +00:00
Morris Jobke
bcb6a71548
Merge pull request #24044 from nextcloud/backport/24042/stable20 
[stable20] Fix sharing tab state not matching resharing admin settings
 2020-11-11 13:45:46 +01:00
Richard Steinmetz
b82b3b0140 Use png icons in caldav reminder emails 
Signed-off-by: Richard Steinmetz <richard@steinmetz.cloud>
 2020-11-11 12:38:21 +00:00
Daniel Calviño Sánchez
bafab8af2d Disable share input for a received share if resharing is not allowed 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-11-11 11:51:26 +01:00
Daniel Calviño Sánchez
c034dff408 Do not show "Can reshare" in the menu if resharing is not allowed 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2020-11-11 11:51:18 +01:00
Joas Schilling
60ca39bb53
Merge pull request #24033 from nextcloud/backport/23993/stable20 
[stable20] Don't leave cursors open
 2020-11-11 10:56:53 +01:00
Nextcloud bot
3d3cebc321
[tx-robot] updated from transifex 2020-11-11 02:20:23 +00:00
Joas Schilling
19816fe85f Don't leave cursors open when tests fail 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-10 14:18:02 +00:00
John Molakvoæ
7032c880f0
Merge pull request #24012 from nextcloud/backport/23981/stable20 
[stable20] Fix js search in undefined ocs response
 2020-11-10 07:00:19 +01:00
Nextcloud bot
34fae53598
[tx-robot] updated from transifex 2020-11-10 02:18:56 +00:00
John Molakvoæ (skjnldsv)
49676d909b Fix js search in undefined ocs response 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2020-11-09 19:28:15 +00:00
Morris Jobke
cc777911c2 Shortcut to avoid file system setup when generating the logo URL 
If an SVG is requested and the app config value for logoMime is set then the logo is there. Otherwise we need to check it and maybe also generate a PNG from the SVG (that's done in getImage() which needs to be called then).

Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2020-11-09 13:13:31 +00:00
Morris Jobke
3459db0472
Merge pull request #23992 from nextcloud/backport/23574/stable20 
[stable20] Fix link share label placeholder not showing
 2020-11-09 14:10:41 +01:00
Morris Jobke
20885847c8
Merge pull request #23971 from nextcloud/backport/23936/stable20 
[stable20] Use query builder instead of OC_DB in trashbin
 2020-11-09 10:27:29 +01:00
Gary Kim
baf06b9894 Fix link share label placeholder not showing 
Signed-off-by: Gary Kim <gary@garykim.dev>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2020-11-09 08:29:05 +00:00
Nextcloud bot
0624ca3527
[tx-robot] updated from transifex 2020-11-09 02:19:02 +00:00
Nextcloud bot
d34145f942
[tx-robot] updated from transifex 2020-11-08 02:18:33 +00:00
Joas Schilling
ef22580a32 Use query builder instead of OC_DB in trashbin 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2020-11-07 09:21:46 +00:00
Nextcloud bot
c9f3f2563f
[tx-robot] updated from transifex 2020-11-07 02:19:08 +00:00
Nextcloud bot
43a80714a7
[tx-robot] updated from transifex 2020-11-06 02:19:21 +00:00
GretaD
6787f5de50 Add default font size 
Signed-off-by: GretaD <gretadoci@gmail.com>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2020-11-05 08:40:28 +00:00
Nextcloud bot
841801b9ac
[tx-robot] updated from transifex 2020-11-05 02:18:59 +00:00
Morris Jobke
e30c80c490
Merge pull request #23894 from nextcloud/backport/23799/stable20-minimal 
[stable20] fix potentially passing null to events where IUser is expected
 2020-11-04 21:14:51 +01:00
Morris Jobke
5e4debcd98
Merge pull request #23899 from nextcloud/backport/23898/stable20 
[stable20] Make user status styles scoped
 2020-11-04 19:34:55 +01:00
Morris Jobke
cea90b9dcb
Merge pull request #23900 from nextcloud/backport/23897/stable20 
[stable20] Move help to separate stylesheet
 2020-11-04 19:34:44 +01:00
Julius Härtl
2386f8e1cc Make user status styles scoped 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
Signed-off-by: npmbuildbot-nextcloud[bot] <npmbuildbot-nextcloud[bot]@users.noreply.github.com>
 2020-11-04 14:51:48 +00:00
John Molakvoæ
54fd9bfecf
Merge pull request #23884 from nextcloud/backport/23097/stable20 
[stable20] Restrict query when searching for versions of trashbin files
 2020-11-04 15:40:32 +01:00
Julius Härtl
0d457ce76d Move help to separate stylesheet 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-04 14:34:33 +00:00
Arthur Schiwon
59f9183ea1
fix potentially passing null to events where IUser is expected 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2020-11-04 11:59:09 +01:00
Morris Jobke
54fb4c28c4
Merge pull request #23419 from nextcloud/backport/23350/stable20 
[stable20] Inidicate preview availability in share api responses
 2020-11-04 08:45:44 +01:00
Julius Härtl
07506dd10c Restrict query when searching for versions of trashbin files 
Signed-off-by: Julius Härtl <jus@bitgrid.net>
 2020-11-04 07:32:47 +00:00