upstream/nextcloud
1
0
Fork 0
mirror of https://github.com/nextcloud/server.git synced 2026-06-13 10:40:40 -04:00
Code Issues Projects Releases Packages Wiki Activity Actions 9
47094 commits 1050 branches 1221 tags 8.4 GiB
Commit graph

47094 commits

This branch
This branch
All branches
Author SHA1 Message Date
Arthur Schiwon
acc7eee830 run LDAP integrations tests with redis which is the recommended setup 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-12-17 12:08:10 +00:00
Arthur Schiwon
c6b540a738 be careful with mixed return values even if it may look unsuspicious… 
Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-12-17 12:08:10 +00:00
Arthur Schiwon
e3fd241aba cache users as existing after mapping 
during login they might be cached as non-existing and cause an Exception
in the long run

reduces some duplication, too

Signed-off-by: Arthur Schiwon <blizzz@arthur-schiwon.de>
 2018-12-17 12:08:10 +00:00
Nextcloud bot
3f3337af9b
[tx-robot] updated from transifex 2018-12-17 01:11:42 +00:00
Nextcloud bot
3045b6aae2
[tx-robot] updated from transifex 2018-12-16 01:12:42 +00:00
Nextcloud bot
da3196fdb8
[tx-robot] updated from transifex 2018-12-15 01:11:48 +00:00
Nextcloud bot
e8e61acebc
[tx-robot] updated from transifex 2018-12-14 01:12:42 +00:00
Nextcloud bot
d92e3bb47b
[tx-robot] updated from transifex 2018-12-13 01:12:07 +00:00
Roeland Jago Douma
54111bfee9
Merge pull request #13029 from nextcloud/backport/13009/stable15 
[stable15] Better activities for systemtags that are removed by CLI
 2018-12-12 15:53:46 +01:00
Joas Schilling
a3145dc8e2 Better activities for systemtags that are removed by CLI 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-12 12:38:15 +00:00
Roeland Jago Douma
474c9fb8e5
Merge pull request #13007 from nextcloud/backport/13003/stable15 
[stable15] Use default cursor for disabled primary buttons
 2018-12-12 13:30:11 +01:00
Nextcloud bot
4fb51850c5
[tx-robot] updated from transifex 2018-12-12 01:11:48 +00:00
Daniel Calviño Sánchez
2a06ca4dae Use default cursor for disabled primary buttons 
Disabled buttons use the default cursor, but as the cursor property for
primary buttons is set after the cursor property for disabled buttons
the latter is always overridden, even if the primary button is also
disabled. Due to this it is necessary to explicitly set the default
cursor for disabled primary buttons.

Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-12-11 13:48:37 +00:00
Roeland Jago Douma
2c09c05f13
Merge pull request #12961 from nextcloud/stable15-drone-run-one 
Only run PUSH drone runs on stable15 branch
 2018-12-11 14:24:07 +01:00
Nextcloud bot
76d1364167
[tx-robot] updated from transifex 2018-12-11 01:11:57 +00:00
Roeland Jago Douma
b81531dead
Merge pull request #12984 from nextcloud/backport/12982/stable15 
[stable15] Use strengthify.min on personal settings page
 2018-12-10 20:17:39 +01:00
Roeland Jago Douma
f7ed3687d2 Use strengthify.min on personal settings page 
Else the CSP fails to load properly

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-10 18:36:27 +00:00
Roeland Jago Douma
9b41fedbd6
Merge pull request #12963 from nextcloud/change-doc-link 
Change doc link for 15
 2018-12-10 13:08:41 +01:00
Daniel Kesselberg
a77b33759f Change doc link for 15 
Signed-off-by: Daniel Kesselberg <mail@danielkesselberg.de>
 2018-12-10 11:28:18 +01:00
Roeland Jago Douma
3bb46a2acc
Merge pull request #12959 from nextcloud/stable15-15final 
Bump to 15.0.0 final
 2018-12-10 11:13:58 +01:00
Roeland Jago Douma
21101f0446
Only run PUSH drone runs on stable15 branch 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-10 11:11:14 +01:00
Roeland Jago Douma
bd352db77d
Bump to 15.0.0 final 
Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-10 10:39:04 +01:00
Nextcloud bot
303fa31b11
[tx-robot] updated from transifex 2018-12-10 01:11:48 +00:00
Nextcloud bot
9d6d39d218
[tx-robot] updated from transifex 2018-12-09 01:12:37 +00:00
Nextcloud bot
eb7c17add2
[tx-robot] updated from transifex 2018-12-08 01:11:34 +00:00
Morris Jobke
922c2ba4c7
Merge pull request #12913 from nextcloud/backport/12897/stable15 
[stable15] Fix unread comment icon not shown for the sharee
 2018-12-07 16:11:55 +01:00
Roeland Jago Douma
eaa19f891c If the parent is not cached we should request the file 
Else we ignore all incomming shares. Which basically does 💥

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-07 14:08:09 +00:00
Daniel Calviño Sánchez
9f0272ffd9 Add acceptance tests for comments on shared files and folders 
Signed-off-by: Daniel Calviño Sánchez <danxuliu@gmail.com>
 2018-12-07 14:08:09 +00:00
Morris Jobke
3c4c87948e
Merge pull request #12908 from nextcloud/backport/12889/stable15 
[stable15] Fix logo path in non-themed instance
 2018-12-07 14:46:30 +01:00
Morris Jobke
8a247d52de Fix logo path in non-themed instance 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-12-07 12:38:34 +00:00
Nextcloud bot
f7ef71bef5
[tx-robot] updated from transifex 2018-12-07 01:11:51 +00:00
Morris Jobke
f0abe398a8
Merge pull request #12847 from nextcloud/version/noid/15.0.0RC3 
15.0.0 RC 3
 2018-12-06 15:59:34 +01:00
Morris Jobke
cf69bf583e
15.0.0 RC 3 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-12-06 14:48:10 +01:00
Morris Jobke
9f2d48cbe5
Merge pull request #12882 from nextcloud/3rdparty-update 
Set 3rdparty to pr187
 2018-12-06 14:47:41 +01:00
Morris Jobke
6dfc3d9a98
Merge pull request #12880 from nextcloud/backport/12866/stable15 
[stable15] Do not show general warning on free space error
 2018-12-06 14:28:05 +01:00
Joas Schilling
7c421d6103
Set 3rdparty to pr187 
Signed-off-by: Joas Schilling <coding@schilljs.com>
 2018-12-06 14:25:51 +01:00
Morris Jobke
6d77389fbf Add abort stub in JSUnit 
Signed-off-by: Morris Jobke <hey@morrisjobke.de>
 2018-12-06 12:21:02 +00:00
Roeland Jago Douma
d500c4babf Do not show general warning on free space error 
Fixes #12588
Probably needs more fixing for the other cases. But this is the quick
fix I could come up with for now.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-06 12:21:02 +00:00
Nextcloud bot
1f94126f59
[tx-robot] updated from transifex 2018-12-06 01:12:12 +00:00
Morris Jobke
1e906fd15c
Merge pull request #12868 from nextcloud/backport/12857/stable15 
[stable15] Emit write update only once on touch
 2018-12-06 01:18:21 +01:00
Morris Jobke
f4497bbb57
Merge pull request #12867 from nextcloud/backport/12854/stable15 
[stable15] Log and continue on Dav reader failure (repair uid)
 2018-12-06 01:07:28 +01:00
Morris Jobke
61c17b5078
Merge pull request #12863 from nextcloud/fix/stable15-fix-password-confirmation-ie11 
[stable15] Fix password confirmation lib for ie11
 2018-12-06 00:05:21 +01:00
Morris Jobke
b490a46c4a
Merge pull request #12861 from nextcloud/backport/12855/stable15 
[stable15] Only execute query in propagateChange once
 2018-12-05 23:37:00 +01:00
Roeland Jago Douma
07eb6e5716 Emit write update only once on touch 
When a touch is done (i.e. when creating a new file in the node API)
The hooks contain 'write' and 'touch' (and the operation is touch as
well). This would cause a double write update. Which doesn't make sense.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-05 21:55:24 +00:00
John Molakvoæ (skjnldsv)
7028362604 Log and continue on Dav reader failure 
Signed-off-by: John Molakvoæ (skjnldsv) <skjnldsv@protonmail.com>
 2018-12-05 21:54:50 +00:00
Morris Jobke
fc6dd2d4cb
Merge pull request #12836 from nextcloud/backport/12624/stable15 
[stable15] Validate all rich objects
 2018-12-05 22:35:47 +01:00
Morris Jobke
4b27584e49
Merge pull request #12828 from nextcloud/backport/12626/stable15 
[stable15] Unshare from mail activity is missing
 2018-12-05 22:33:15 +01:00
Morris Jobke
3ead16baef
Merge pull request #12856 from nextcloud/backport/12814/stable15 
[stable15] No user enumeration on DAV if disabled
 2018-12-05 22:14:04 +01:00
Morris Jobke
0511f86c82
Merge pull request #12853 from nextcloud/backport/12824/stable15 
[stable15] Add setup check for pending bigint conversion
 2018-12-05 21:48:10 +01:00
Roeland Jago Douma
1656a08323 Only execute query in propagateChange once 
The second execute statement should be inside the if block. Else it gets
executed twice which makes no sense.

Signed-off-by: Roeland Jago Douma <roeland@famdouma.nl>
 2018-12-05 20:44:35 +00:00